diff --git a/assets/codefresh/cf-runtime-7.4.2.tgz b/assets/codefresh/cf-runtime-7.4.2.tgz
new file mode 100644
index 000000000..8b59676c1
Binary files /dev/null and b/assets/codefresh/cf-runtime-7.4.2.tgz differ
diff --git a/assets/external-secrets/external-secrets-0.13.0.tgz b/assets/external-secrets/external-secrets-0.13.0.tgz
new file mode 100644
index 000000000..3d2cd2dcb
Binary files /dev/null and b/assets/external-secrets/external-secrets-0.13.0.tgz differ
diff --git a/assets/jfrog/artifactory-ha-107.98.13.tgz b/assets/jfrog/artifactory-ha-107.98.13.tgz
index 4c2038623..4140ae7ee 100644
Binary files a/assets/jfrog/artifactory-ha-107.98.13.tgz and b/assets/jfrog/artifactory-ha-107.98.13.tgz differ
diff --git a/assets/jfrog/artifactory-ha-107.98.14.tgz b/assets/jfrog/artifactory-ha-107.98.14.tgz
new file mode 100644
index 000000000..545b91f99
Binary files /dev/null and b/assets/jfrog/artifactory-ha-107.98.14.tgz differ
diff --git a/assets/jfrog/artifactory-jcr-107.98.14.tgz b/assets/jfrog/artifactory-jcr-107.98.14.tgz
new file mode 100644
index 000000000..33b44f0d6
Binary files /dev/null and b/assets/jfrog/artifactory-jcr-107.98.14.tgz differ
diff --git a/assets/kuma/kuma-2.9.3.tgz b/assets/kuma/kuma-2.9.3.tgz
new file mode 100644
index 000000000..b68c35cdd
Binary files /dev/null and b/assets/kuma/kuma-2.9.3.tgz differ
diff --git a/assets/new-relic/nri-bundle-5.0.107.tgz b/assets/new-relic/nri-bundle-5.0.107.tgz
new file mode 100644
index 000000000..0fcaa59ea
Binary files /dev/null and b/assets/new-relic/nri-bundle-5.0.107.tgz differ
diff --git a/assets/percona/psmdb-db-1.19.0.tgz b/assets/percona/psmdb-db-1.19.0.tgz
new file mode 100644
index 000000000..0542cfbfb
Binary files /dev/null and b/assets/percona/psmdb-db-1.19.0.tgz differ
diff --git a/assets/percona/psmdb-operator-1.19.0.tgz b/assets/percona/psmdb-operator-1.19.0.tgz
new file mode 100644
index 000000000..d75c83678
Binary files /dev/null and b/assets/percona/psmdb-operator-1.19.0.tgz differ
diff --git a/assets/speedscale/speedscale-operator-2.3.134.tgz b/assets/speedscale/speedscale-operator-2.3.134.tgz
new file mode 100644
index 000000000..8354a4573
Binary files /dev/null and b/assets/speedscale/speedscale-operator-2.3.134.tgz differ
diff --git a/charts/codefresh/cf-runtime/7.4.2/.helmignore b/charts/codefresh/cf-runtime/7.4.2/.helmignore
new file mode 100644
index 000000000..bc71d4240
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/.helmignore
@@ -0,0 +1,3 @@
+tests/
+.ci/
+test-values/
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/Chart.yaml b/charts/codefresh/cf-runtime/7.4.2/Chart.yaml
new file mode 100644
index 000000000..6ab348349
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/Chart.yaml
@@ -0,0 +1,28 @@
+annotations:
+  artifacthub.io/changes: |
+    - kind: fixed
+      description: "reverted engine version back to 1.176.3"
+  artifacthub.io/containsSecurityUpdates: "false"
+  catalog.cattle.io/certified: partner
+  catalog.cattle.io/display-name: Codefresh
+  catalog.cattle.io/kube-version: '>=1.18-0'
+  catalog.cattle.io/release-name: ""
+apiVersion: v2
+dependencies:
+- name: cf-common
+  repository: oci://quay.io/codefresh/charts
+  version: 0.21.0
+description: A Helm chart for Codefresh Runner
+home: https://codefresh.io/
+icon: file://assets/icons/cf-runtime.png
+keywords:
+- codefresh
+- runner
+kubeVersion: '>=1.18-0'
+maintainers:
+- name: codefresh
+  url: https://codefresh-io.github.io/
+name: cf-runtime
+sources:
+- https://github.com/codefresh-io/venona
+version: 7.4.2
diff --git a/charts/codefresh/cf-runtime/7.4.2/README.md b/charts/codefresh/cf-runtime/7.4.2/README.md
new file mode 100644
index 000000000..4549b3282
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/README.md
@@ -0,0 +1,1290 @@
+## Codefresh Runner
+
+![Version: 7.4.2](https://img.shields.io/badge/Version-7.4.2-informational?style=flat-square)
+
+Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/installation/codefresh-runner/) to Kubernetes.
+
+## Table of Content
+
+- [Prerequisites](#prerequisites)
+- [Get Chart Info](#get-chart-info)
+- [Install Chart](#install-chart)
+- [Chart Configuration](#chart-configuration)
+- [Upgrade Chart](#upgrade-chart)
+  - [To 2.x](#to-2-x)
+  - [To 3.x](#to-3-x)
+  - [To 4.x](#to-4-x)
+  - [To 5.x](#to-5-x)
+  - [To 6.x](#to-6-x)
+  - [To 7.x](#to-7-x) 
+- [Architecture](#architecture)
+- [Configuration](#configuration)
+  - [EBS backend volume configuration in AWS](#ebs-backend-volume-configuration)
+  - [Azure Disks backend volume configuration in AKS](#azure-disks-backend-volume-configuration)
+  - [GCE Disks backend volume configuration in GKE](#gce-disks-backend-volume-configuration-in-gke)
+  - [Custom volume mounts](#custom-volume-mounts)
+  - [Custom global environment variables](#custom-global-environment-variables)
+  - [Volume reuse policy](#volume-reuse-policy)
+  - [Volume cleaners](#volume-cleaners)
+  - [Rootless DinD](#rootless-dind)
+  - [ARM](#arm)
+  - [Openshift](#openshift)
+  - [On-premise](#on-premise)
+
+## Prerequisites
+
+- Kubernetes **1.19+**
+- Helm **3.8.0+**
+
+⚠️⚠️⚠️
+> Since version 6.2.x chart is pushed **only** to OCI registry at `oci://quay.io/codefresh/cf-runtime`
+
+> Versions prior to 6.2.x are still available in ChartMuseum at `http://chartmuseum.codefresh.io/cf-runtime`
+
+## Get Chart Info
+
+```console
+helm show all oci://quay.io/codefresh/cf-runtime
+```
+See [Use OCI-based registries](https://helm.sh/docs/topics/registries/)
+
+## Install Chart
+
+**Important:** only helm3 is supported
+
+- Specify the following mandatory values
+
+`values.yaml`
+```yaml
+# -- Global parameters
+# @default -- See below
+global:
+  # -- User token in plain text (required if `global.codefreshTokenSecretKeyRef` is omitted!)
+  # Ref: https://g.codefresh.io/user/settings (see API Keys)
+  # Minimal API key scopes: Runner-Installation(read+write), Agent(read+write), Agents(read+write)
+  codefreshToken: ""
+  # -- User token that references an existing secret containing API key (required if `global.codefreshToken` is omitted!)
+  codefreshTokenSecretKeyRef: {}
+  # E.g.
+  # codefreshTokenSecretKeyRef:
+  #   name: my-codefresh-api-token
+  #   key: codefresh-api-token
+
+  # -- Account ID (required!)
+  # Can be obtained here https://g.codefresh.io/2.0/account-settings/account-information
+  accountId: ""
+
+  # -- K8s context name (required!)
+  context: ""
+  # E.g.
+  # context: prod-ue1-runtime-1
+
+  # -- Agent Name (optional!)
+  # If omitted, the following format will be used '{{ .Values.global.context }}_{{ .Release.Namespace }}'
+  agentName: ""
+  # E.g.
+  # agentName: prod-ue1-runtime-1
+
+  # -- Runtime name (optional!)
+  # If omitted, the following format will be used '{{ .Values.global.context }}/{{ .Release.Namespace }}'
+  runtimeName: ""
+  # E.g.
+  # runtimeName: prod-ue1-runtime-1/namespace
+```
+
+- Install chart
+
+```console
+helm upgrade --install cf-runtime oci://quay.io/codefresh/cf-runtime -f values.yaml --create-namespace --namespace codefresh
+```
+
+## Chart Configuration
+
+See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing).
+
+## Upgrade Chart
+
+### To 2.x
+
+This major release renames and deprecated several values in the chart. Most of the workload templates have been refactored.
+
+Affected values:
+- `dockerRegistry` is deprecated. Replaced with `global.imageRegistry`
+- `re` is renamed to `runtime`
+- `storage.localVolumeMonitor` is replaced with `volumeProvisioner.dind-lv-monitor`
+- `volumeProvisioner.volume-cleanup` is replaced with `volumeProvisioner.dind-volume-cleanup`
+- `image` values structure has been updated. Split to `image.registry` `image.repository` `image.tag`
+- pod's `annotations` is renamed to `podAnnotations`
+
+### To 3.x
+
+⚠️⚠️⚠️
+### READ this before the upgrade!
+
+This major release adds [runtime-environment](https://codefresh.io/docs/docs/installation/codefresh-runner/#runtime-environment-specification) spec into chart templates.
+That means it is possible to set parametes for `dind` and `engine` pods via [values.yaml](./values.yaml).
+
+**If you had any overrides (i.e. tolerations/nodeSelector/environment variables/etc) added in runtime spec via [codefresh CLI](https://codefresh-io.github.io/cli/) (for example, you did use [get](https://codefresh-io.github.io/cli/runtime-environments/get-runtime-environments/) and [patch](https://codefresh-io.github.io/cli/runtime-environments/apply-runtime-environments/) commands to modify the runtime-environment), you MUST add these into chart's [values.yaml](./values.yaml) for `.Values.runtime.dind` or(and) .`Values.runtime.engine`**
+
+**For backward compatibility, you can disable updating runtime-environment spec via** `.Values.runtime.patch.enabled=false`
+
+Affected values:
+- added **mandatory** `global.codefreshToken`/`global.codefreshTokenSecretKeyRef` **You must specify it before the upgrade!**
+- `runtime.engine` is added
+- `runtime.dind` is added
+- `global.existingAgentToken` is replaced with `global.agentTokenSecretKeyRef`
+- `global.existingDindCertsSecret` is replaced with `global.dindCertsSecretRef`
+
+### To 4.x
+
+This major release adds **agentless inCluster** runtime mode (relevant only for [Codefresh On-Premises](#on-premise) users)
+
+Affected values:
+- `runtime.agent` / `runtime.inCluster` / `runtime.accounts` / `runtime.description` are added
+
+### To 5.x
+
+This major release converts `.runtime.dind.pvcs` from **list** to **dict**
+
+> 4.x chart's values example:
+```yaml
+runtime:
+  dind:
+    pvcs:
+      - name: dind
+        storageClassName: my-storage-class-name
+        volumeSize: 32Gi
+        reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName'
+        reuseVolumeSortOrder: pipeline_id
+```
+
+> 5.x chart's values example:
+```yaml
+runtime:
+  dind:
+    pvcs:
+      dind:
+        name: dind
+        storageClassName: my-storage-class-name
+        volumeSize: 32Gi
+        reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName'
+        reuseVolumeSortOrder: pipeline_id
+```
+
+Affected values:
+- `.runtime.dind.pvcs` converted from **list** to **dict**
+
+### To 6.x
+
+⚠️⚠️⚠️
+### READ this before the upgrade!
+
+This major release deprecates previously required `codefresh runner init --generate-helm-values-file`.
+
+Affected values:
+- **Replaced** `.monitor.clusterId` with `.global.context` as **mandatory** value!
+- **Deprecated** `.global.agentToken` / `.global.agentTokenSecretKeyRef`
+- **Removed** `.global.agentId`
+- **Removed** `.global.keys` / `.global.dindCertsSecretRef`
+- **Removed** `.global.existingAgentToken` / `existingDindCertsSecret`
+- **Removed** `.monitor.clusterId` / `.monitor.token` / `.monitor.existingMonitorToken`
+
+#### Migrate the Helm chart from version 5.x to 6.x
+
+Given this is the legacy `generated_values.yaml` values:
+
+> legacy `generated_values.yaml`
+```yaml
+{
+    "appProxy": {
+        "enabled": false,
+    },
+    "monitor": {
+        "enabled": false,
+        "clusterId": "my-cluster-name",
+        "token": "1234567890"
+    },
+    "global": {
+        "namespace": "namespace",
+        "codefreshHost": "https://g.codefresh.io",
+        "agentToken": "0987654321",
+        "agentId": "agent-id-here",
+        "agentName": "my-cluster-name_my-namespace",
+        "accountId": "my-account-id",
+        "runtimeName": "my-cluster-name/my-namespace",
+        "codefreshToken": "1234567890",
+        "keys": {
+            "key": "-----BEGIN RSA PRIVATE KEY-----...",
+            "csr": "-----BEGIN CERTIFICATE REQUEST-----...",
+            "ca": "-----BEGIN CERTIFICATE-----...",
+            "serverCert": "-----BEGIN CERTIFICATE-----..."
+        }
+    }
+}
+```
+
+Update `values.yaml` for new chart version:
+
+> For existing installation for backward compatibility `.Values.global.agentToken/agentTokenSecretKeyRef` **must be provided!** For installation from scratch this value is no longer required.
+
+> updated `values.yaml`
+```yaml
+global:
+  codefreshToken: "1234567890"
+  accountId: "my-account-id"
+  context: "my-cluster-name"
+  agentToken: "0987654321"  # MANDATORY when migrating from < 6.x chart version !
+  agentName: "my-cluster-name_my-namespace" # optional
+  runtimeName: "my-cluster-name/my-namespace" # optional
+```
+
+> **Note!** Though it's still possible to update runtime-environment via [get](https://codefresh-io.github.io/cli/runtime-environments/get-runtime-environments/) and [patch](https://codefresh-io.github.io/cli/runtime-environments/apply-runtime-environments/) commands, it's recommended to enable sidecar container to pull runtime spec from Codefresh API to detect any drift in configuration.
+
+```yaml
+runner:
+  # -- Sidecar container
+  # Reconciles runtime spec from Codefresh API for drift detection
+  sidecar:
+    enabled: true
+```
+
+### To 7.x
+
+⚠️⚠️⚠️ **BREAKING CHANGE** ⚠️⚠️⚠️
+
+7.0.0 release adds image digests to all images in default values, for example:
+
+```yaml
+runtime:
+  engine:
+    image:
+      registry: quay.io
+      repository: codefresh/engine
+      tag: 1.174.15
+      pullPolicy: IfNotPresent
+      digest: sha256:d547c2044c1488e911ff726462cc417adf2dda731cafd736493c4de4eb9e357b
+```
+
+Which means any overrides for tags won't be used and underlying Kubernetes runtime will pull the image by the digest.
+
+See [Pull an image by digest (immutable identifier)](https://docs.docker.com/reference/cli/docker/image/pull/#pull-an-image-by-digest-immutable-identifier)
+
+## Architecture
+
+[Codefresh Runner architecture](https://codefresh.io/docs/docs/installation/codefresh-runner/#codefresh-runner-architecture)
+
+## Configuration
+
+See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing).
+
+### EBS backend volume configuration
+
+`dind-volume-provisioner` should have permissions to create/attach/detach/delete/get EBS volumes
+
+Minimal IAM policy for `dind-volume-provisioner`
+
+```json
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Action": [
+        "ec2:AttachVolume",
+        "ec2:CreateSnapshot",
+        "ec2:CreateTags",
+        "ec2:CreateVolume",
+        "ec2:DeleteSnapshot",
+        "ec2:DeleteTags",
+        "ec2:DeleteVolume",
+        "ec2:DescribeInstances",
+        "ec2:DescribeSnapshots",
+        "ec2:DescribeTags",
+        "ec2:DescribeVolumes",
+        "ec2:DetachVolume"
+      ],
+      "Resource": "*"
+    }
+  ]
+}
+```
+
+There are three options:
+
+1. Run `dind-volume-provisioner` pod on the node/node-group with IAM role
+
+```yaml
+storage:
+  # -- Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`)
+  backend: ebs-csi
+
+  ebs:
+    availabilityZone: "us-east-1a"
+
+volumeProvisioner:
+  # -- Set node selector
+  nodeSelector: {}
+  # -- Set tolerations
+  tolerations: []
+```
+
+2. Pass static credentials in `.Values.storage.ebs.accessKeyId/accessKeyIdSecretKeyRef` and `.Values.storage.ebs.secretAccessKey/secretAccessKeySecretKeyRef`
+
+```yaml
+storage:
+  # -- Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`)
+  backend: ebs-csi
+
+  ebs:
+    availabilityZone: "us-east-1a"
+
+    # -- Set AWS_ACCESS_KEY_ID for volume-provisioner (optional)
+    accessKeyId: ""
+    # -- Existing secret containing AWS_ACCESS_KEY_ID.
+    accessKeyIdSecretKeyRef: {}
+    # E.g.
+    # accessKeyIdSecretKeyRef:
+    #   name:
+    #   key:
+
+    # -- Set AWS_SECRET_ACCESS_KEY for volume-provisioner (optional)
+    secretAccessKey: ""
+    # -- Existing secret containing AWS_SECRET_ACCESS_KEY
+    secretAccessKeySecretKeyRef: {}
+    # E.g.
+    # secretAccessKeySecretKeyRef:
+    #   name:
+    #   key:
+```
+
+3. Assign IAM role to `dind-volume-provisioner` service account
+
+```yaml
+storage:
+  # -- Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`)
+  backend: ebs-csi
+
+  ebs:
+    availabilityZone: "us-east-1a"
+
+volumeProvisioner:
+  # -- Service Account parameters
+  serviceAccount:
+    # -- Create service account
+    create: true
+    # -- Additional service account annotations
+    annotations:
+      eks.amazonaws.com/role-arn: "arn:aws:iam::<ACCOUNT_ID>:role/<IAM_ROLE_NAME>"
+```
+
+### Custom volume mounts
+
+You can add your own volumes and volume mounts in the runtime environment, so that all pipeline steps will have access to the same set of external files.
+
+```yaml
+runtime:
+  dind:
+    userVolumes:
+      regctl-docker-registry:
+        name: regctl-docker-registry
+        secret:
+          items:
+            - key: .dockerconfigjson
+              path: config.json
+          secretName: regctl-docker-registry
+          optional: true
+    userVolumeMounts:
+      regctl-docker-registry:
+        name: regctl-docker-registry
+        mountPath: /home/appuser/.docker/
+        readOnly: true
+
+```
+
+### Azure Disks backend volume configuration
+
+`dind-volume-provisioner` should have permissions to create/delete/get Azure Disks
+
+Role definition for `dind-volume-provisioner`
+
+`dind-volume-provisioner-role.json`
+```json
+{
+  "Name": "CodefreshDindVolumeProvisioner",
+  "Description": "Perform create/delete/get disks",
+  "IsCustom": true,
+  "Actions": [
+      "Microsoft.Compute/disks/read",
+      "Microsoft.Compute/disks/write",
+      "Microsoft.Compute/disks/delete"
+
+  ],
+  "AssignableScopes": ["/subscriptions/<YOUR_SUBSCRIPTION_ID>"]
+}
+```
+
+When creating an AKS cluster in Azure there is the option to use a [managed identity](https://learn.microsoft.com/en-us/azure/aks/use-managed-identity) that is assigned to the kubelet. This identity is assigned to the underlying node pool in the AKS cluster and can then be used by the dind-volume-provisioner.
+
+```console
+export ROLE_DEFINITIN_FILE=dind-volume-provisioner-role.json
+export SUBSCRIPTION_ID=$(az account show --query "id" | xargs echo )
+export RESOURCE_GROUP=<YOUR_RESOURCE_GROUP_NAME>
+export AKS_NAME=<YOUR_AKS_NAME>
+export LOCATION=$(az aks show -g $RESOURCE_GROUP -n $AKS_NAME --query location | xargs echo)
+export NODES_RESOURCE_GROUP=MC_${RESOURCE_GROUP}_${AKS_NAME}_${LOCATION}
+export NODE_SERVICE_PRINCIPAL=$(az aks show -g $RESOURCE_GROUP -n $AKS_NAME --query identityProfile.kubeletidentity.objectId | xargs echo)
+
+az role definition create --role-definition @${ROLE_DEFINITIN_FILE}
+az role assignment create --assignee $NODE_SERVICE_PRINCIPAL --scope /subscriptions/$SUBSCRIPTION_ID/resourceGroups/$NODES_RESOURCE_GROUP --role CodefreshDindVolumeProvisioner
+```
+
+Deploy Helm chart with the following values:
+
+`values.yaml`
+```yaml
+volumeProvisioner:
+  podSecurityContext:
+    enabled: true
+    runAsUser: 0
+    runAsGroup: 0
+    fsGroup: 0
+
+storage:
+  backend: azuredisk
+  azuredisk:
+    availabilityZone: northeurope-1 # replace with your zone
+    resourceGroup: my-resource-group-name
+
+  mountAzureJson: true
+
+runtime:
+  dind:
+    nodeSelector:
+      topology.kubernetes.io/zone: northeurope-1
+```
+
+### GCE Disks backend volume configuration in GKE
+
+`dind-volume-provisioner` should have `ComputeEngine.StorageAdmin` permissions
+
+There are three options:
+
+1. Run `dind-volume-provisioner` pod on the node/node-group with IAM Service Account
+
+```yaml
+storage:
+  # -- Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`)
+  backend: gcedisk
+
+  gcedisk:
+    # -- Set GCP volume backend type (`pd-ssd`/`pd-standard`)
+    volumeType: "pd-standard"
+    # -- Set GCP volume availability zone
+    availabilityZone: "us-central1-c"
+
+volumeProvisioner:
+  # -- Set node selector
+  nodeSelector: {}
+  # -- Set tolerations
+  tolerations: []
+
+# -- Set runtime parameters
+runtime:
+  # -- Parameters for DinD (docker-in-docker) pod
+  dind:
+    # -- Set node selector.
+    nodeSelector:
+      topology.kubernetes.io/zone: us-central1-c
+```
+
+2. Pass static credentials in `.Values.storage.gcedisk.serviceAccountJson` (inline) or `.Values.storage.gcedisk.serviceAccountJsonSecretKeyRef` (from your own secret)
+
+```yaml
+storage:
+  # -- Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`)
+  backend: gcedisk
+
+  gcedisk:
+    # -- Set GCP volume backend type (`pd-ssd`/`pd-standard`)
+    volumeType: "`pd-standard"
+    # -- Set GCP volume availability zone
+    availabilityZone: "us-central1-c"
+    # -- Set Google SA JSON key for volume-provisioner (optional)
+    serviceAccountJson: |
+        {
+        "type": "service_account",
+        "project_id": "...",
+        "private_key_id": "...",
+        "private_key": "...",
+        "client_email": "...",
+        "client_id": "...",
+        "auth_uri": "...",
+        "token_uri": "...",
+        "auth_provider_x509_cert_url": "...",
+        "client_x509_cert_url": "..."
+        }
+    # -- Existing secret containing containing Google SA JSON key for volume-provisioner (optional)
+    serviceAccountJsonSecretKeyRef: {}
+    # E.g.:
+    # serviceAccountJsonSecretKeyRef:
+    #   name: gce-service-account
+    #   key: service-account.json
+
+# -- Set runtime parameters
+runtime:
+  # -- Parameters for DinD (docker-in-docker) pod
+  dind:
+    # -- Set node selector.
+    nodeSelector:
+      topology.kubernetes.io/zone: us-central1-c
+```
+
+3. Assign IAM role to `dind-volume-provisioner` service account
+
+```yaml
+storage:
+  # -- Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`)
+  backend: gcedisk
+
+  gcedisk:
+    # -- Set GCP volume backend type (`pd-ssd`/`pd-standard`)
+    volumeType: "`pd-standard"
+    # -- Set GCP volume availability zone
+    availabilityZone: "us-central1-c"
+
+volumeProvisioner:
+  # -- Service Account parameters
+  serviceAccount:
+    # -- Create service account
+    create: true
+    # -- Additional service account annotations
+    annotations:
+      iam.gke.io/gcp-service-account: <GSA_NAME>@<PROJECT_ID>.iam.gserviceaccount.com
+
+# -- Set runtime parameters
+runtime:
+  # -- Parameters for DinD (docker-in-docker) pod
+  dind:
+    # -- Set node selector.
+    nodeSelector:
+      topology.kubernetes.io/zone: us-central1-c
+```
+
+### Custom global environment variables
+
+You can add your own environment variables to the runtime environment. All pipeline steps have access to the global variables.
+
+```yaml
+runtime:
+  engine:
+    userEnvVars:
+    - name: GITHUB_TOKEN
+      valueFrom:
+        secretKeyRef:
+          name: github-token
+          key: token
+```
+
+### Volume reuse policy
+
+Volume reuse behavior depends on the configuration for `reuseVolumeSelector` in the runtime environment spec.
+
+```yaml
+runtime:
+  dind:
+    pvcs:
+      - name: dind
+        ...
+        reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName'
+        reuseVolumeSortOrder: pipeline_id
+```
+
+The following options are available:
+- `reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName'` - PV can be used by ANY pipeline in the specified account (default).
+Benefit: Fewer PVs, resulting in lower costs. Since any PV can be used by any pipeline, the cluster needs to maintain/reserve fewer PVs in its PV pool for Codefresh.
+Downside: Since the PV can be used by any pipeline, the PVs could have assets and info from different pipelines, reducing the probability of cache.
+
+- `reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName,project_id'` - PV can be used by ALL pipelines in your account, assigned to the same project.
+
+- `reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName,pipeline_id'` - PV can be used only by a single pipeline.
+Benefit: More probability of cache without “spam” from other pipelines.
+Downside: More PVs to maintain and therefore higher costs.
+
+- `reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName,pipeline_id,io.codefresh.branch_name'` - PV can be used only by single pipeline AND single branch.
+
+- `reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName,pipeline_id,trigger'` - PV can be used only by single pipeline AND single trigger.
+
+### Volume cleaners
+
+Codefresh pipelines require disk space for:
+  * [Pipeline Shared Volume](https://codefresh.io/docs/docs/pipelines/introduction-to-codefresh-pipelines/#sharing-the-workspace-between-build-steps) (`/codefresh/volume`, implemented as [docker volume](https://docs.docker.com/storage/volumes/))
+  * Docker containers, both running and stopped
+  * Docker images and cached layers
+
+Codefresh offers two options to manage disk space and prevent out-of-space errors:
+* Use runtime cleaners on Docker images and volumes
+* [Set the minimum disk space per pipeline build volume](https://codefresh.io/docs/docs/pipelines/pipelines/#set-minimum-disk-space-for-a-pipeline-build)
+
+To improve performance by using Docker cache, Codefresh `volume-provisioner` can provision previously used disks with Docker images and pipeline volumes from previously run builds.
+
+### Types of runtime volume cleaners
+
+Docker images and volumes must be cleaned on a regular basis.
+
+* [IN-DIND cleaner](https://github.com/codefresh-io/dind/tree/master/cleaner): Deletes extra Docker containers, volumes, and images in **DIND pod**.
+* [External volume cleaner](https://github.com/codefresh-io/dind-volume-cleanup): Deletes unused **external** PVs (EBS, GCE/Azure disks).
+* [Local volume cleaner](https://github.com/codefresh-io/dind-volume-utils/blob/master/local-volumes/lv-cleaner.sh): Deletes **local** volumes if node disk space is close to the threshold.
+
+### IN-DIND cleaner
+
+**Purpose:** Removes unneeded *docker containers, images, volumes* inside Kubernetes volume mounted on the DIND pod
+
+**How it runs:** Inside each DIND pod as script
+
+**Triggered by:** SIGTERM and also during the run when disk usage > 90% (configurable)
+
+**Configured by:**  Environment Variables which can be set in Runtime Environment spec
+
+**Configuration/Logic:** [README.md](https://github.com/codefresh-io/dind/tree/master/cleaner#readme)
+
+Override `.Values.runtime.dind.env` if necessary (the following are **defaults**):
+
+```yaml
+runtime:
+  dind:
+    env:
+      CLEAN_PERIOD_SECONDS: '21600' # launch clean if last clean was more than CLEAN_PERIOD_SECONDS seconds ago
+      CLEAN_PERIOD_BUILDS: '5' # launch clean if last clean was more CLEAN_PERIOD_BUILDS builds since last build
+      IMAGE_RETAIN_PERIOD: '14400' # do not delete docker images if they have events since current_timestamp - IMAGE_RETAIN_PERIOD
+      VOLUMES_RETAIN_PERIOD: '14400' # do not delete docker volumes if they have events since current_timestamp - VOLUMES_RETAIN_PERIOD
+      DISK_USAGE_THRESHOLD: '0.8' # launch clean based on current disk usage DISK_USAGE_THRESHOLD
+      INODES_USAGE_THRESHOLD: '0.8' # launch clean based on current inodes usage INODES_USAGE_THRESHOLD
+```
+
+### External volumes cleaner
+
+**Purpose:** Removes unused *kubernetes volumes and related backend volumes*
+
+**How it runs:** Runs as `dind-volume-cleanup` CronJob. Installed in case the Runner uses non-local volumes `.Values.storage.backend != local`
+
+**Triggered by:** CronJob every 10min (configurable)
+
+**Configuration:**
+
+Set `codefresh.io/volume-retention` for dinds' PVCs:
+
+```yaml
+runtime:
+  dind:
+    pvcs:
+      dind:
+        ...
+        annotations:
+          codefresh.io/volume-retention: 7d
+```
+
+Or override environment variables for `dind-volume-cleanup` cronjob:
+
+```yaml
+volumeProvisioner:
+  dind-volume-cleanup:
+    env:
+      RETENTION_DAYS: 7   # clean volumes that were last used more than `RETENTION_DAYS` (default is 4) ago
+```
+
+### Local volumes cleaner
+
+**Purpose:** Deletes local volumes when node disk space is close to the threshold
+
+**How it runs:** Runs as `dind-lv-monitor` DaemonSet. Installed in case the Runner uses local volumes `.Values.storage.backend == local`
+
+**Triggered by:** Disk space usage or inode usage that exceeds thresholds (configurable)
+
+**Configuration:**
+
+Override environment variables for `dind-lv-monitor` daemonset:
+
+```yaml
+volumeProvisioner:
+  dind-lv-monitor:
+    env:
+      KB_USAGE_THRESHOLD: 60  # default 80 (percentage)
+      INODE_USAGE_THRESHOLD: 60  # default 80
+```
+
+### Rootless DinD
+
+DinD pod runs a `priviliged` container with **rootfull** docker.
+
+To run the docker daemon as non-root user (**rootless** mode), refer to `values-rootless.yaml`:
+
+```yaml
+volumeProvisioner:
+  env:
+    IS_ROOTLESS: true
+  # -- Only if local volumes are used as backend storage (ignored for ebs/ebs-csi disks)
+  dind-lv-monitor:
+    image:
+      tag: 1.30.0-rootless
+      digest: sha256:712e549e6e843b04684647f17e0973f8047e0d60e6e8b38a693ea64dc75b0479
+    containerSecurityContext:
+      runAsUser: 1000
+    podSecurityContext:
+      fsGroup: 1000
+      # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#configure-volume-permission-and-ownership-change-policy-for-pods
+      fsGroupChangePolicy: "OnRootMismatch"
+    # -- Enable initContainer to run chmod for /var/lib/codefresh/dind-volumes on host nodes
+    volumePermissions:
+      enabled: false
+
+runtime:
+  dind:
+    image:
+      tag: 26.1.4-1.28.10-rootless
+      digest: sha256:59dfc004eb22a8f09c8a3d585271a055af9df4591ab815bca418c24a2077f5c8
+    userVolumeMounts:
+      dind:
+        name: dind
+        mountPath: /home/rootless/.local/share/docker
+    containerSecurityContext:
+      privileged: true
+      runAsUser: 1000
+    podSecurityContext:
+      fsGroup: 1000
+      # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#configure-volume-permission-and-ownership-change-policy-for-pods
+      fsGroupChangePolicy: "OnRootMismatch"
+    # -- Enable initContainer to run chmod for /home/rootless in DinD pod
+    # !!! Will slow down dind pod startup
+    volumePermissions:
+      enabled: true
+```
+
+### ARM
+
+With the Codefresh Runner, you can run native ARM64v8 builds.
+
+> **Note!**
+> You cannot run both amd64 and arm64 images within the same pipeline. As one pipeline can map only to one runtime, you can run either amd64 or arm64 within the same pipeline.
+
+Provide `nodeSelector` and(or) `tolerations` for dind pods:
+
+`values.yaml`
+```yaml
+runtime:
+  dind:
+    nodeSelector:
+      arch: arm64
+    tolerations:
+    - key: arch
+      operator: Equal
+      value: arm64
+      effect: NoSchedule
+```
+
+### Openshift
+
+To install Codefresh Runner on OpenShift use the following `values.yaml` example
+
+```yaml
+runner:
+  podSecurityContext:
+    enabled: false
+
+volumeProvisioner:
+  podSecurityContext:
+    enabled: false
+  env:
+    PRIVILEGED_CONTAINER: true
+  dind-lv-monitor:
+    containerSecurityContext:
+      enabled: true
+      privileged: true
+    volumePermissions:
+      enabled: true
+      securityContext:
+        privileged: true
+        runAsUser: auto
+```
+
+Grant `privileged` SCC to `cf-runtime-runner` and `cf-runtime-volume-provisioner` service accounts.
+
+```console
+oc adm policy add-scc-to-user privileged system:serviceaccount:codefresh:cf-runtime-runner
+
+oc adm policy add-scc-to-user privileged system:serviceaccount:codefresh:cf-runtime-volume-provisioner
+```
+
+### On-premise
+
+If you have [Codefresh On-Premises](https://artifacthub.io/packages/helm/codefresh-onprem/codefresh) deployed, you can install Codefresh Runner in **agentless** mode.
+
+**What is agentless mode?**
+
+Agent (aka venona) is Runner component which responsible for calling Codefresh API to run builds and create dind/engine pods and pvc objects. Agent can only be assigned to a single account, thus you can't share one runtime across multiple accounts. However, with **agentless** mode it's possible to register the runtime as **system**-type runtime so it's registered on the platform level and can be assigned/shared across multiple accounts.
+
+**What are the prerequisites?**
+- You have a running [Codefresh On-Premises](https://artifacthub.io/packages/helm/codefresh-onprem/codefresh) control-plane environment
+- You have a Codefresh API token with platform **Admin** permissions scope
+
+### How to deploy agentless runtime when it's on the SAME k8s cluster as On-Premises control-plane environment?
+
+- Enable cluster-level permissions for cf-api (On-Premises control-plane component)
+
+> `values.yaml` for [Codefresh On-Premises](https://artifacthub.io/packages/helm/codefresh-onprem/codefresh) Helm chart
+```yaml
+cfapi:
+  ...
+  # -- Enable ClusterRole/ClusterRoleBinding
+  rbac:
+    namespaced: false
+```
+
+- Set the following values for Runner Helm chart
+
+`.Values.global.codefreshHost=...` \
+`.Values.global.codefreshToken=...` \
+`.Values.global.runtimeName=system/...` \
+`.Values.runtime.agent=false` \
+`.Values.runtime.inCluster=true`
+
+> `values.yaml` for [Codefresh Runner](https://artifacthub.io/packages/helm/codefresh-runner/cf-runtime) helm chart
+```yaml
+global:
+  # -- URL of Codefresh On-Premises Platform
+  codefreshHost: "https://myonprem.somedomain.com"
+  # -- User token in plain text with Admin permission scope
+  codefreshToken: ""
+  # -- User token that references an existing secret containing API key.
+  codefreshTokenSecretKeyRef: {}
+  # E.g.
+  # codefreshTokenSecretKeyRef:
+  #   name: my-codefresh-api-token
+  #   key: codefresh-api-token
+
+  # -- Distinguished runtime name
+  # (for On-Premise only; mandatory!) Must be prefixed with "system/..."
+  runtimeName: "system/prod-ue1-some-cluster-name"
+
+# -- Set runtime parameters
+runtime:
+  # -- (for On-Premise only; mandatory!) Disable agent
+  agent: false
+  # -- (for On-Premise only; optional) Set inCluster runtime (default: `true`)
+  # `inCluster=true` flag is set when Runtime and On-Premises control-plane are run on the same cluster
+  # `inCluster=false` flag is set when Runtime and On-Premises control-plane are on different clusters
+  inCluster: true
+  # -- (for On-Premise only; optional) Assign accounts to runtime (list of account ids; default is empty)
+  # Accounts can be assigned to the runtime in Codefresh UI later so you can kepp it empty.
+  accounts: []
+  # -- Set parent runtime to inherit.
+  runtimeExtends: []
+```
+
+- Install the chart
+
+```console
+helm upgrade --install cf-runtime oci://quay.io/codefresh/cf-runtime -f values.yaml --create-namespace --namespace cf-runtime
+```
+
+- Verify the runtime and run test pipeline
+
+Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system) to check the runtime. Assign it to the required account(s). Run test pipeline on it.
+
+### How to deploy agentless runtime when it's on the DIFFERENT k8s cluster than On-Premises control-plane environment?
+
+In this case, it's required to mount runtime cluster's `KUBECONFIG` into On-Premises `cf-api` deployment
+
+- Create the neccessary RBAC resources
+
+> `values.yaml` for [Codefresh Runner](https://artifacthub.io/packages/helm/codefresh-runner/cf-runtime) helm chart
+```yaml
+extraResources:
+- apiVersion: rbac.authorization.k8s.io/v1
+  kind: Role
+  metadata:
+    name: codefresh-role
+    namespace: '{{ .Release.Namespace }}'
+  rules:
+    - apiGroups: [""]
+      resources: ["pods", "persistentvolumeclaims", "persistentvolumes"]
+      verbs: ["list", "watch", "get", "create", "patch", "delete"]
+    - apiGroups: ["snapshot.storage.k8s.io"]
+      resources: ["volumesnapshots"]
+      verbs: ["list", "watch", "get", "create", "patch", "delete"]
+- apiVersion: v1
+  kind: ServiceAccount
+  metadata:
+    name: codefresh-runtime-user
+    namespace: '{{ .Release.Namespace }}'
+- apiVersion: rbac.authorization.k8s.io/v1
+  kind: RoleBinding
+  metadata:
+    name: codefresh-runtime-user
+    namespace: '{{ .Release.Namespace }}'
+  roleRef:
+    apiGroup: rbac.authorization.k8s.io
+    kind: Role
+    name: codefresh-role
+  subjects:
+  - kind: ServiceAccount
+    name: codefresh-runtime-user
+    namespace: '{{ .Release.Namespace }}'
+- apiVersion: v1
+  kind: Secret
+  metadata:
+    name: codefresh-runtime-user-token
+    namespace: '{{ .Release.Namespace }}'
+    annotations:
+      kubernetes.io/service-account.name: codefresh-runtime-user
+  type: kubernetes.io/service-account-token
+```
+
+- Set up the following environment variables to create a `KUBECONFIG` file
+
+```shell
+NAMESPACE=cf-runtime
+CLUSTER_NAME=prod-ue1-some-cluster-name
+CURRENT_CONTEXT=$(kubectl config current-context)
+
+USER_TOKEN_VALUE=$(kubectl -n cf-runtime get secret/codefresh-runtime-user-token -o=go-template='{{.data.token}}' | base64 --decode)
+CURRENT_CLUSTER=$(kubectl config view --raw -o=go-template='{{range .contexts}}{{if eq .name "'''${CURRENT_CONTEXT}'''"}}{{ index .context "cluster" }}{{end}}{{end}}')
+CLUSTER_CA=$(kubectl config view --raw -o=go-template='{{range .clusters}}{{if eq .name "'''${CURRENT_CLUSTER}'''"}}"{{with index .cluster "certificate-authority-data" }}{{.}}{{end}}"{{ end }}{{ end }}')
+CLUSTER_SERVER=$(kubectl config view --raw -o=go-template='{{range .clusters}}{{if eq .name "'''${CURRENT_CLUSTER}'''"}}{{ .cluster.server }}{{end}}{{ end }}')
+
+export -p USER_TOKEN_VALUE CURRENT_CONTEXT CURRENT_CLUSTER CLUSTER_CA CLUSTER_SERVER CLUSTER_NAME
+```
+
+- Create a kubeconfig file
+
+```console
+cat << EOF > $CLUSTER_NAME-kubeconfig
+apiVersion: v1
+kind: Config
+current-context: ${CLUSTER_NAME}
+contexts:
+- name: ${CLUSTER_NAME}
+  context:
+    cluster: ${CLUSTER_NAME}
+    user: codefresh-runtime-user
+    namespace: ${NAMESPACE}
+clusters:
+- name: ${CLUSTER_NAME}
+  cluster:
+    certificate-authority-data: ${CLUSTER_CA}
+    server: ${CLUSTER_SERVER}
+users:
+- name: ${CLUSTER_NAME}
+  user:
+    token: ${USER_TOKEN_VALUE}
+EOF
+```
+
+- **Switch context to On-Premises control-plane cluster**. Create k8s secret (via any tool like [ESO](https://external-secrets.io/v0.4.4/), `kubectl`, etc ) containing runtime cluster's `KUBECONFG` created in previous step.
+
+```shell
+NAMESPACE=codefresh
+kubectl create secret generic dind-runtime-clusters --from-file=$CLUSTER_NAME=$CLUSTER_NAME-kubeconfig -n $NAMESPACE
+```
+
+- Mount secret containing runtime cluster's `KUBECONFG` into cf-api in On-Premises control-plane cluster
+
+> `values.yaml` for [Codefresh On-Premises](https://artifacthub.io/packages/helm/codefresh-onprem/codefresh) helm chart
+```yaml
+cf-api:
+  ...
+  volumes:
+    dind-clusters:
+      enabled: true
+      type: secret
+      nameOverride: dind-runtime-clusters
+      optional: true
+```
+> volumeMount `/etc/kubeconfig` is already configured in cf-api Helm chart template. No need to specify it.
+
+- Set the following values for Runner helm chart
+
+> `values.yaml` for [Codefresh Runner](https://artifacthub.io/packages/helm/codefresh-runner/cf-runtime) helm chart
+
+`.Values.global.codefreshHost=...` \
+`.Values.global.codefreshToken=...` \
+`.Values.global.runtimeName=system/...` \
+`.Values.runtime.agent=false` \
+`.Values.runtime.inCluster=false`
+
+**Important!**
+`.Values.global.name` ("system/" prefix is ignored!) should match the cluster name (key in `dind-runtime-clusters` secret created previously)
+```yaml
+global:
+  # -- URL of Codefresh On-Premises Platform
+  codefreshHost: "https://myonprem.somedomain.com"
+  # -- User token in plain text with Admin permission scope
+  codefreshToken: ""
+  # -- User token that references an existing secret containing API key.
+  codefreshTokenSecretKeyRef: {}
+  # E.g.
+  # codefreshTokenSecretKeyRef:
+  #   name: my-codefresh-api-token
+  #   key: codefresh-api-token
+
+  # -- Distinguished runtime name
+  # (for On-Premise only; mandatory!) Must be prefixed with "system/..."
+  name: "system/prod-ue1-some-cluster-name"
+
+# -- Set runtime parameters
+runtime:
+  # -- (for On-Premise only; mandatory!) Disable agent
+  agent: false
+  # -- (for On-Premise only; optional) Set inCluster runtime (default: `true`)
+  # `inCluster=true` flag is set when Runtime and On-Premises control-plane are run on the same cluster
+  # `inCluster=false` flag is set when Runtime and On-Premises control-plane are on different clusters
+  inCluster: false
+  # -- (for On-Premise only; optional) Assign accounts to runtime (list of account ids; default is empty)
+  # Accounts can be assigned to the runtime in Codefresh UI later so you can kepp it empty.
+  accounts: []
+  # -- (optional) Set parent runtime to inherit.
+  runtimeExtends: []
+```
+
+- Install the chart
+
+```console
+helm upgrade --install cf-runtime oci://quay.io/codefresh/cf-runtime -f values.yaml --create-namespace --namespace cf-runtime
+```
+
+- Verify the runtime and run test pipeline
+
+Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system) to see the runtime. Assign it to the required account(s).
+
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| oci://quay.io/codefresh/charts | cf-common | 0.21.0 |
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| appProxy.affinity | object | `{}` | Set affinity |
+| appProxy.enabled | bool | `false` | Enable app-proxy |
+| appProxy.env | object | `{}` | Add additional env vars |
+| appProxy.image | object | `{"digest":"sha256:324a9b89924152cce195c7239ddd8501c8aa5f901d19bc4d9f3936cbe5dac14f","registry":"quay.io","repository":"codefresh/cf-app-proxy","tag":"0.0.47"}` | Set image |
+| appProxy.ingress.annotations | object | `{}` | Set extra annotations for ingress object |
+| appProxy.ingress.class | string | `""` | Set ingress class |
+| appProxy.ingress.host | string | `""` | Set DNS hostname the ingress will use |
+| appProxy.ingress.pathPrefix | string | `""` | Set path prefix for ingress (keep empty for default `/` path) |
+| appProxy.ingress.tlsSecret | string | `""` | Set k8s tls secret for the ingress object |
+| appProxy.nodeSelector | object | `{}` | Set node selector |
+| appProxy.podAnnotations | object | `{}` | Set pod annotations |
+| appProxy.podSecurityContext | object | `{}` | Set security context for the pod |
+| appProxy.rbac | object | `{"create":true,"namespaced":true,"rules":[]}` | RBAC parameters |
+| appProxy.rbac.create | bool | `true` | Create RBAC resources |
+| appProxy.rbac.namespaced | bool | `true` | Use Role(true)/ClusterRole(true) |
+| appProxy.rbac.rules | list | `[]` | Add custom rule to the role |
+| appProxy.readinessProbe | object | See below | Readiness probe configuration |
+| appProxy.replicasCount | int | `1` | Set number of pods |
+| appProxy.resources | object | `{}` | Set requests and limits |
+| appProxy.serviceAccount | object | `{"annotations":{},"create":true,"name":"","namespaced":true}` | Service Account parameters |
+| appProxy.serviceAccount.annotations | object | `{}` | Additional service account annotations |
+| appProxy.serviceAccount.create | bool | `true` | Create service account |
+| appProxy.serviceAccount.name | string | `""` | Override service account name |
+| appProxy.serviceAccount.namespaced | bool | `true` | Use Role(true)/ClusterRole(true) |
+| appProxy.tolerations | list | `[]` | Set tolerations |
+| appProxy.updateStrategy | object | `{"type":"RollingUpdate"}` | Upgrade strategy |
+| dockerRegistry | string | `""` |  |
+| event-exporter | object | See below | Event exporter parameters |
+| event-exporter.affinity | object | `{}` | Set affinity |
+| event-exporter.enabled | bool | `false` | Enable event-exporter |
+| event-exporter.env | object | `{}` | Add additional env vars |
+| event-exporter.image | object | `{"digest":"sha256:cf52048f1378fb6659dffd1394d68fdf23a7ea709585dc14b5007f3e5a1b7584","registry":"docker.io","repository":"codefresh/k8s-event-exporter","tag":"latest"}` | Set image |
+| event-exporter.nodeSelector | object | `{}` | Set node selector |
+| event-exporter.podAnnotations | object | `{}` | Set pod annotations |
+| event-exporter.podSecurityContext | object | See below | Set security context for the pod |
+| event-exporter.rbac | object | `{"create":true,"rules":[]}` | RBAC parameters |
+| event-exporter.rbac.create | bool | `true` | Create RBAC resources |
+| event-exporter.rbac.rules | list | `[]` | Add custom rule to the role |
+| event-exporter.replicasCount | int | `1` | Set number of pods |
+| event-exporter.resources | object | `{}` | Set resources |
+| event-exporter.serviceAccount | object | `{"annotations":{},"create":true,"name":""}` | Service Account parameters |
+| event-exporter.serviceAccount.annotations | object | `{}` | Additional service account annotations |
+| event-exporter.serviceAccount.create | bool | `true` | Create service account |
+| event-exporter.serviceAccount.name | string | `""` | Override service account name |
+| event-exporter.tolerations | list | `[]` | Set tolerations |
+| event-exporter.updateStrategy | object | `{"type":"Recreate"}` | Upgrade strategy |
+| extraResources | list | `[]` | Array of extra objects to deploy with the release |
+| fullnameOverride | string | `""` | String to fully override cf-runtime.fullname template |
+| global | object | See below | Global parameters |
+| global.accountId | string | `""` | Account ID (required!) Can be obtained here https://g.codefresh.io/2.0/account-settings/account-information |
+| global.agentName | string | `""` | Agent Name (optional!) If omitted, the following format will be used `{{ .Values.global.context }}_{{ .Release.Namespace }}` |
+| global.agentToken | string | `""` | DEPRECATED Agent token in plain text. !!! MUST BE provided if migrating from < 6.x chart version |
+| global.agentTokenSecretKeyRef | object | `{}` | DEPRECATED Agent token that references an existing secret containing API key. !!! MUST BE provided if migrating from < 6.x chart version |
+| global.codefreshHost | string | `"https://g.codefresh.io"` | URL of Codefresh Platform (required!) |
+| global.codefreshToken | string | `""` | User token in plain text (required if `global.codefreshTokenSecretKeyRef` is omitted!) Ref: https://g.codefresh.io/user/settings (see API Keys) Minimal API key scopes: Runner-Installation(read+write), Agent(read+write), Agents(read+write) |
+| global.codefreshTokenSecretKeyRef | object | `{}` | User token that references an existing secret containing API key (required if `global.codefreshToken` is omitted!) |
+| global.context | string | `""` | K8s context name (required!) |
+| global.imagePullSecrets | list | `[]` | Global Docker registry secret names as array |
+| global.imageRegistry | string | `""` | Global Docker image registry |
+| global.runtimeName | string | `""` | Runtime name (optional!) If omitted, the following format will be used `{{ .Values.global.context }}/{{ .Release.Namespace }}` |
+| monitor.affinity | object | `{}` | Set affinity |
+| monitor.enabled | bool | `false` | Enable monitor Ref: https://codefresh.io/docs/docs/installation/codefresh-runner/#install-monitoring-component |
+| monitor.env | object | `{}` | Add additional env vars |
+| monitor.image | object | `{"digest":"sha256:5be2b798d583abdae68271f57724dd7f2b0251a238845c466fa7b67f078f59ad","registry":"quay.io","repository":"codefresh/cf-k8s-agent","tag":"1.3.19"}` | Set image |
+| monitor.nodeSelector | object | `{}` | Set node selector |
+| monitor.podAnnotations | object | `{}` | Set pod annotations |
+| monitor.podSecurityContext | object | `{}` |  |
+| monitor.rbac | object | `{"create":true,"namespaced":true,"rules":[]}` | RBAC parameters |
+| monitor.rbac.create | bool | `true` | Create RBAC resources |
+| monitor.rbac.namespaced | bool | `true` | Use Role(true)/ClusterRole(true) |
+| monitor.rbac.rules | list | `[]` | Add custom rule to the role |
+| monitor.readinessProbe | object | See below | Readiness probe configuration |
+| monitor.replicasCount | int | `1` | Set number of pods |
+| monitor.resources | object | `{}` | Set resources |
+| monitor.serviceAccount | object | `{"annotations":{},"create":true,"name":""}` | Service Account parameters |
+| monitor.serviceAccount.annotations | object | `{}` | Additional service account annotations |
+| monitor.serviceAccount.create | bool | `true` | Create service account |
+| monitor.serviceAccount.name | string | `""` | Override service account name |
+| monitor.tolerations | list | `[]` | Set tolerations |
+| monitor.updateStrategy | object | `{"type":"RollingUpdate"}` | Upgrade strategy |
+| nameOverride | string | `""` | String to partially override cf-runtime.fullname template (will maintain the release name) |
+| podMonitor | object | See below | Add podMonitor (for engine pods) |
+| podMonitor.main.enabled | bool | `false` | Enable pod monitor for engine pods |
+| podMonitor.runner.enabled | bool | `false` | Enable pod monitor for runner pod |
+| podMonitor.volume-provisioner.enabled | bool | `false` | Enable pod monitor for volumeProvisioner pod |
+| re | object | `{}` |  |
+| runner | object | See below | Runner parameters |
+| runner.affinity | object | `{}` | Set affinity |
+| runner.enabled | bool | `true` | Enable the runner |
+| runner.env | object | `{}` | Add additional env vars |
+| runner.image | object | `{"digest":"sha256:bcc6e7495186f1f9c3e885afa891a3bda11b5374a577f069f34ddc75142342ef","registry":"quay.io","repository":"codefresh/venona","tag":"2.0.0"}` | Set image |
+| runner.init | object | `{"image":{"digest":"sha256:b256d150ff8a636851ddc1d5fb0490114d5036cc5bff357eac6a9899fea87562","registry":"quay.io","repository":"codefresh/cli","tag":"0.88.4-rootless"},"resources":{"limits":{"cpu":"1","memory":"512Mi"},"requests":{"cpu":"0.2","memory":"256Mi"}}}` | Init container |
+| runner.nodeSelector | object | `{}` | Set node selector |
+| runner.podAnnotations | object | `{}` | Set pod annotations |
+| runner.podSecurityContext | object | See below | Set security context for the pod |
+| runner.rbac | object | `{"create":true,"rules":[]}` | RBAC parameters |
+| runner.rbac.create | bool | `true` | Create RBAC resources |
+| runner.rbac.rules | list | `[]` | Add custom rule to the role |
+| runner.readinessProbe | object | See below | Readiness probe configuration |
+| runner.replicasCount | int | `1` | Set number of pods |
+| runner.resources | object | `{}` | Set requests and limits |
+| runner.serviceAccount | object | `{"annotations":{},"create":true,"name":""}` | Service Account parameters |
+| runner.serviceAccount.annotations | object | `{}` | Additional service account annotations |
+| runner.serviceAccount.create | bool | `true` | Create service account |
+| runner.serviceAccount.name | string | `""` | Override service account name |
+| runner.sidecar | object | `{"enabled":false,"env":{"RECONCILE_INTERVAL":300},"image":{"digest":"sha256:a30a8810dde249d0198f67792ed9696363f15c8cecbac955ee9bd267b5454ee7","registry":"quay.io","repository":"codefresh/kubectl","tag":"1.31.2"},"resources":{}}` | Sidecar container Reconciles runtime spec from Codefresh API for drift detection |
+| runner.tolerations | list | `[]` | Set tolerations |
+| runner.updateStrategy | object | `{"type":"RollingUpdate"}` | Upgrade strategy |
+| runtime | object | See below | Set runtime parameters |
+| runtime.accounts | list | `[]` | (for On-Premise only) Assign accounts to runtime (list of account ids) |
+| runtime.agent | bool | `true` | (for On-Premise only) Enable agent |
+| runtime.description | string | `""` | Runtime description |
+| runtime.dind | object | `{"affinity":{},"containerSecurityContext":{},"env":{"DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE":true},"image":{"digest":"sha256:33c343dd01e8a24f0b4a872bbe62884320719f9d9dc27b7a8fed9f7e9fc7e80e","pullPolicy":"IfNotPresent","registry":"quay.io","repository":"codefresh/dind","tag":"26.1.4-1.28.8"},"nodeSelector":{},"podAnnotations":{},"podLabels":{},"podSecurityContext":{},"pvcs":{"dind":{"annotations":{},"name":"dind","reuseVolumeSelector":"codefresh-app,io.codefresh.accountName","reuseVolumeSortOrder":"pipeline_id","storageClassName":"{{ include \"dind-volume-provisioner.storageClassName\" . }}","volumeSize":"16Gi"}},"resources":{"limits":{"cpu":"400m","memory":"800Mi"},"requests":null},"schedulerName":"","serviceAccount":"codefresh-engine","terminationGracePeriodSeconds":30,"tolerations":[],"userAccess":true,"userVolumeMounts":{},"userVolumes":{},"volumePermissions":{"enabled":false,"image":{"digest":"sha256:dd60c75fba961ecc5e918961c713f3c42dd5665171c58f9b2ef5aafe081ad5a0","registry":"docker.io","repository":"alpine","tag":3.18},"resources":{},"securityContext":{"runAsUser":0}}}` | Parameters for DinD (docker-in-docker) pod (aka "runtime" pod). |
+| runtime.dind.affinity | object | `{}` | Set affinity |
+| runtime.dind.containerSecurityContext | object | `{}` | Set container security context. |
+| runtime.dind.env | object | `{"DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE":true}` | Set additional env vars. |
+| runtime.dind.image | object | `{"digest":"sha256:33c343dd01e8a24f0b4a872bbe62884320719f9d9dc27b7a8fed9f7e9fc7e80e","pullPolicy":"IfNotPresent","registry":"quay.io","repository":"codefresh/dind","tag":"26.1.4-1.28.8"}` | Set dind image. |
+| runtime.dind.nodeSelector | object | `{}` | Set node selector. |
+| runtime.dind.podAnnotations | object | `{}` | Set pod annotations. |
+| runtime.dind.podLabels | object | `{}` | Set pod labels. |
+| runtime.dind.podSecurityContext | object | `{}` | Set security context for the pod. |
+| runtime.dind.pvcs | object | `{"dind":{"annotations":{},"name":"dind","reuseVolumeSelector":"codefresh-app,io.codefresh.accountName","reuseVolumeSortOrder":"pipeline_id","storageClassName":"{{ include \"dind-volume-provisioner.storageClassName\" . }}","volumeSize":"16Gi"}}` | PV claim spec parametes. |
+| runtime.dind.pvcs.dind | object | `{"annotations":{},"name":"dind","reuseVolumeSelector":"codefresh-app,io.codefresh.accountName","reuseVolumeSortOrder":"pipeline_id","storageClassName":"{{ include \"dind-volume-provisioner.storageClassName\" . }}","volumeSize":"16Gi"}` | Default dind PVC parameters |
+| runtime.dind.pvcs.dind.annotations | object | `{}` | PV annotations. |
+| runtime.dind.pvcs.dind.name | string | `"dind"` | PVC name prefix. Keep `dind` as default! Don't change! |
+| runtime.dind.pvcs.dind.reuseVolumeSelector | string | `"codefresh-app,io.codefresh.accountName"` | PV reuse selector. Ref: https://codefresh.io/docs/docs/installation/codefresh-runner/#volume-reuse-policy |
+| runtime.dind.pvcs.dind.storageClassName | string | `"{{ include \"dind-volume-provisioner.storageClassName\" . }}"` | PVC storage class name. Change ONLY if you need to use storage class NOT from Codefresh volume-provisioner |
+| runtime.dind.pvcs.dind.volumeSize | string | `"16Gi"` | PVC size. |
+| runtime.dind.resources | object | `{"limits":{"cpu":"400m","memory":"800Mi"},"requests":null}` | Set dind resources. |
+| runtime.dind.schedulerName | string | `""` | Set scheduler name. |
+| runtime.dind.serviceAccount | string | `"codefresh-engine"` | Set service account for pod. |
+| runtime.dind.terminationGracePeriodSeconds | int | `30` | Set termination grace period. |
+| runtime.dind.tolerations | list | `[]` | Set tolerations. |
+| runtime.dind.userAccess | bool | `true` | Keep `true` as default! |
+| runtime.dind.userVolumeMounts | object | `{}` | Add extra volume mounts |
+| runtime.dind.userVolumes | object | `{}` | Add extra volumes |
+| runtime.dindDaemon | object | See below | DinD pod daemon config |
+| runtime.engine | object | `{"affinity":{},"command":["npm","run","start"],"env":{"CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS":1000,"DOCKER_REQUEST_TIMEOUT_MS":30000,"FORCE_COMPOSE_SERIAL_PULL":false,"LOGGER_LEVEL":"debug","LOG_OUTGOING_HTTP_REQUESTS":false,"METRICS_PROMETHEUS_COLLECT_PROCESS_METRICS":false,"METRICS_PROMETHEUS_ENABLED":true,"METRICS_PROMETHEUS_ENABLE_LEGACY_METRICS":false,"METRICS_PROMETHEUS_HOST":"0.0.0.0","METRICS_PROMETHEUS_PORT":9100,"METRICS_PROMETHEUS_SCRAPE_TIMEOUT":"15000","TRUSTED_QEMU_IMAGES":""},"image":{"digest":"sha256:f814ae79c68405e00819458e050b58f0b4cb6db7635961c239beec2fc1f90785","pullPolicy":"IfNotPresent","registry":"quay.io","repository":"codefresh/engine","tag":"1.176.3"},"nodeSelector":{},"podAnnotations":{},"podLabels":{},"resources":{"limits":{"cpu":"1000m","memory":"2048Mi"},"requests":{"cpu":"100m","memory":"128Mi"}},"runtimeImages":{"COMPOSE_IMAGE":"quay.io/codefresh/compose:v2.32.2-1.5.2@sha256:9177054614f6db006a3500d2b9b8d2cafac4073ce891929d93e117714fccbd4b","CONTAINER_LOGGER_IMAGE":"quay.io/codefresh/cf-container-logger:1.11.8@sha256:db1e1e7f038262cb6051b01c20cde276150ae731479e5d1e0aef39d08fc72ae5","COSIGN_IMAGE_SIGNER_IMAGE":"quay.io/codefresh/cf-cosign-image-signer:2.4.0-cf.2@sha256:5e0993207aa809c25ed70cf89af444d9720892fb4a29deb82db45618b0cae4a9","CR_6177_FIXER":"alpine:edge@sha256:115729ec5cb049ba6359c3ab005ac742012d92bbaa5b8bc1a878f1e8f62c0cb8","DOCKER_BUILDER_IMAGE":"quay.io/codefresh/cf-docker-builder:1.4.1@sha256:d0e4b679ac83d092bc9424d49741ac6153521b4ab72bf6f7603b70de4b7afd12","DOCKER_PULLER_IMAGE":"quay.io/codefresh/cf-docker-puller:8.0.18@sha256:1a15c3ae0952d3986de7866a3def8ac7e3e39f668fe87fd46c63d886ca06c6d7","DOCKER_PUSHER_IMAGE":"quay.io/codefresh/cf-docker-pusher:6.0.16@sha256:05efc1af8b1196f1b9b3f0781b4dcc1aa2cdd0ffc1347ee5fa81b16d029ec5c2","DOCKER_TAG_PUSHER_IMAGE":"quay.io/codefresh/cf-docker-tag-pusher:1.3.15@sha256:3a3e90cd10801c7ec0d3cf3816d0dcc90894d5d1771448c43f67215d90da5eca","FS_OPS_IMAGE":"quay.io/codefresh/fs-ops:1.2.7@sha256:1e98266ba808f059005e94e8ae072522aeaff632730a8425b8b8849fce8eabd4","GC_BUILDER_IMAGE":"quay.io/codefresh/cf-gc-builder:0.5.3@sha256:33ac914e6b844909f188a208cf90e569358cafa5aaa60f49848f49d99bcaf875","GIT_CLONE_IMAGE":"quay.io/codefresh/cf-git-cloner:10.2.0@sha256:a3ec854823f17d0fd817d978219122e644b1abd6db778fd835688fcb6d88c515","KUBE_DEPLOY":"quay.io/codefresh/cf-deploy-kubernetes:16.1.11@sha256:b6b3fc6cc5fad3ba9e36055278ce99a74a86876be116574503c6fbb4c1b4aa76","PIPELINE_DEBUGGER_IMAGE":"quay.io/codefresh/cf-debugger:1.3.7@sha256:3391822b7ad9835cc2a3a0ce5aaa55774ca110a8682d9512205dea24f438718a","TEMPLATE_ENGINE":"quay.io/codefresh/pikolo:0.14.1@sha256:fb7173cfed7536f7de68e75996106e2ce3a0a204e6c5609cba0d7eb62c9db9e1"},"schedulerName":"","serviceAccount":"codefresh-engine","terminationGracePeriodSeconds":180,"tolerations":[],"userEnvVars":[],"workflowLimits":{"MAXIMUM_ALLOWED_TIME_BEFORE_PRE_STEPS_SUCCESS":600,"MAXIMUM_ALLOWED_WORKFLOW_AGE_BEFORE_TERMINATION":86400,"MAXIMUM_ELECTED_STATE_AGE_ALLOWED":900,"MAXIMUM_RETRY_ATTEMPTS_ALLOWED":20,"MAXIMUM_TERMINATING_STATE_AGE_ALLOWED":900,"MAXIMUM_TERMINATING_STATE_AGE_ALLOWED_WITHOUT_UPDATE":300,"TIME_ENGINE_INACTIVE_UNTIL_TERMINATION":300,"TIME_ENGINE_INACTIVE_UNTIL_UNHEALTHY":60,"TIME_INACTIVE_UNTIL_TERMINATION":2700}}` | Parameters for Engine pod (aka "pipeline" orchestrator). |
+| runtime.engine.affinity | object | `{}` | Set affinity |
+| runtime.engine.command | list | `["npm","run","start"]` | Set container command. |
+| runtime.engine.env | object | `{"CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS":1000,"DOCKER_REQUEST_TIMEOUT_MS":30000,"FORCE_COMPOSE_SERIAL_PULL":false,"LOGGER_LEVEL":"debug","LOG_OUTGOING_HTTP_REQUESTS":false,"METRICS_PROMETHEUS_COLLECT_PROCESS_METRICS":false,"METRICS_PROMETHEUS_ENABLED":true,"METRICS_PROMETHEUS_ENABLE_LEGACY_METRICS":false,"METRICS_PROMETHEUS_HOST":"0.0.0.0","METRICS_PROMETHEUS_PORT":9100,"METRICS_PROMETHEUS_SCRAPE_TIMEOUT":"15000","TRUSTED_QEMU_IMAGES":""}` | Set additional env vars. |
+| runtime.engine.env.CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS | int | `1000` | Interval to check the exec status in the container-logger |
+| runtime.engine.env.DOCKER_REQUEST_TIMEOUT_MS | int | `30000` | Timeout while doing requests to the Docker daemon |
+| runtime.engine.env.FORCE_COMPOSE_SERIAL_PULL | bool | `false` | If "true", composition images will be pulled sequentially |
+| runtime.engine.env.LOGGER_LEVEL | string | `"debug"` | Level of logging for engine |
+| runtime.engine.env.LOG_OUTGOING_HTTP_REQUESTS | bool | `false` | Enable debug-level logging of outgoing HTTP/HTTPS requests |
+| runtime.engine.env.METRICS_PROMETHEUS_COLLECT_PROCESS_METRICS | bool | `false` | Enable collecting process metrics |
+| runtime.engine.env.METRICS_PROMETHEUS_ENABLED | bool | `true` | Enable emitting metrics from engine |
+| runtime.engine.env.METRICS_PROMETHEUS_ENABLE_LEGACY_METRICS | bool | `false` | Enable legacy metrics |
+| runtime.engine.env.METRICS_PROMETHEUS_HOST | string | `"0.0.0.0"` | Host for Prometheus metrics server |
+| runtime.engine.env.METRICS_PROMETHEUS_PORT | int | `9100` | Port for Prometheus metrics server |
+| runtime.engine.env.METRICS_PROMETHEUS_SCRAPE_TIMEOUT | string | `"15000"` | The timeout till the engine waits for Prometheus to pull the latest metrics before engine shuts down (in milliseconds) |
+| runtime.engine.env.TRUSTED_QEMU_IMAGES | string | `""` | Trusted QEMU images used for docker builds - when left blank only 'tonistiigi/binfmt' is trusted. |
+| runtime.engine.image | object | `{"digest":"sha256:f814ae79c68405e00819458e050b58f0b4cb6db7635961c239beec2fc1f90785","pullPolicy":"IfNotPresent","registry":"quay.io","repository":"codefresh/engine","tag":"1.176.3"}` | Set image. |
+| runtime.engine.nodeSelector | object | `{}` | Set node selector. |
+| runtime.engine.podAnnotations | object | `{}` | Set pod annotations. |
+| runtime.engine.podLabels | object | `{}` | Set pod labels. |
+| runtime.engine.resources | object | `{"limits":{"cpu":"1000m","memory":"2048Mi"},"requests":{"cpu":"100m","memory":"128Mi"}}` | Set resources. |
+| runtime.engine.runtimeImages | object | See below. | Set system(base) runtime images. |
+| runtime.engine.schedulerName | string | `""` | Set scheduler name. |
+| runtime.engine.serviceAccount | string | `"codefresh-engine"` | Set service account for pod. |
+| runtime.engine.terminationGracePeriodSeconds | int | `180` | Set termination grace period. |
+| runtime.engine.tolerations | list | `[]` | Set tolerations. |
+| runtime.engine.userEnvVars | list | `[]` | Set extra env vars |
+| runtime.engine.workflowLimits | object | `{"MAXIMUM_ALLOWED_TIME_BEFORE_PRE_STEPS_SUCCESS":600,"MAXIMUM_ALLOWED_WORKFLOW_AGE_BEFORE_TERMINATION":86400,"MAXIMUM_ELECTED_STATE_AGE_ALLOWED":900,"MAXIMUM_RETRY_ATTEMPTS_ALLOWED":20,"MAXIMUM_TERMINATING_STATE_AGE_ALLOWED":900,"MAXIMUM_TERMINATING_STATE_AGE_ALLOWED_WITHOUT_UPDATE":300,"TIME_ENGINE_INACTIVE_UNTIL_TERMINATION":300,"TIME_ENGINE_INACTIVE_UNTIL_UNHEALTHY":60,"TIME_INACTIVE_UNTIL_TERMINATION":2700}` | Set workflow limits. |
+| runtime.engine.workflowLimits.MAXIMUM_ALLOWED_TIME_BEFORE_PRE_STEPS_SUCCESS | int | `600` | Maximum time allowed to the engine to wait for the pre-steps (aka "Initializing Process") to succeed; seconds. |
+| runtime.engine.workflowLimits.MAXIMUM_ALLOWED_WORKFLOW_AGE_BEFORE_TERMINATION | int | `86400` | Maximum time for workflow execution; seconds. |
+| runtime.engine.workflowLimits.MAXIMUM_ELECTED_STATE_AGE_ALLOWED | int | `900` | Maximum time allowed to workflow to spend in "elected" state; seconds. |
+| runtime.engine.workflowLimits.MAXIMUM_RETRY_ATTEMPTS_ALLOWED | int | `20` | Maximum retry attempts allowed for workflow. |
+| runtime.engine.workflowLimits.MAXIMUM_TERMINATING_STATE_AGE_ALLOWED | int | `900` | Maximum time allowed to workflow to spend in "terminating" state until force terminated; seconds. |
+| runtime.engine.workflowLimits.MAXIMUM_TERMINATING_STATE_AGE_ALLOWED_WITHOUT_UPDATE | int | `300` | Maximum time allowed to workflow to spend in "terminating" state without logs activity until force terminated; seconds. |
+| runtime.engine.workflowLimits.TIME_ENGINE_INACTIVE_UNTIL_TERMINATION | int | `300` | Time since the last health check report after which workflow is terminated; seconds. |
+| runtime.engine.workflowLimits.TIME_ENGINE_INACTIVE_UNTIL_UNHEALTHY | int | `60` | Time since the last health check report after which the engine is considered unhealthy; seconds. |
+| runtime.engine.workflowLimits.TIME_INACTIVE_UNTIL_TERMINATION | int | `2700` | Time since the last workflow logs activity after which workflow is terminated; seconds. |
+| runtime.gencerts | object | See below | Parameters for `gencerts-dind` post-upgrade/install hook |
+| runtime.inCluster | bool | `true` | (for On-Premise only) Set inCluster runtime |
+| runtime.patch | object | See below | Parameters for `runtime-patch` post-upgrade/install hook |
+| runtime.rbac | object | `{"create":true,"rules":[]}` | RBAC parameters |
+| runtime.rbac.create | bool | `true` | Create RBAC resources |
+| runtime.rbac.rules | list | `[]` | Add custom rule to the engine role |
+| runtime.runtimeExtends | list | `["system/default/hybrid/k8s_low_limits"]` | Set parent runtime to inherit. Should not be changes. Parent runtime is controlled from Codefresh side. |
+| runtime.serviceAccount | object | `{"annotations":{},"create":true}` | Set annotation on engine Service Account Ref: https://codefresh.io/docs/docs/administration/codefresh-runner/#injecting-aws-arn-roles-into-the-cluster |
+| serviceMonitor | object | See below | Add serviceMonitor |
+| serviceMonitor.main.enabled | bool | `false` | Enable service monitor for dind pods |
+| storage.azuredisk.cachingMode | string | `"None"` |  |
+| storage.azuredisk.skuName | string | `"Premium_LRS"` | Set storage type (`Premium_LRS`) |
+| storage.backend | string | `"local"` | Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`) |
+| storage.ebs.accessKeyId | string | `""` | Set AWS_ACCESS_KEY_ID for volume-provisioner (optional) Ref: https://codefresh.io/docs/docs/installation/codefresh-runner/#dind-volume-provisioner-permissions |
+| storage.ebs.accessKeyIdSecretKeyRef | object | `{}` | Existing secret containing AWS_ACCESS_KEY_ID. |
+| storage.ebs.availabilityZone | string | `"us-east-1a"` | Set EBS volumes availability zone (required) |
+| storage.ebs.encrypted | string | `"false"` | Enable encryption (optional) |
+| storage.ebs.kmsKeyId | string | `""` | Set KMS encryption key ID (optional) |
+| storage.ebs.secretAccessKey | string | `""` | Set AWS_SECRET_ACCESS_KEY for volume-provisioner (optional) Ref: https://codefresh.io/docs/docs/installation/codefresh-runner/#dind-volume-provisioner-permissions |
+| storage.ebs.secretAccessKeySecretKeyRef | object | `{}` | Existing secret containing AWS_SECRET_ACCESS_KEY |
+| storage.ebs.volumeType | string | `"gp2"` | Set EBS volume type (`gp2`/`gp3`/`io1`) (required) |
+| storage.fsType | string | `"ext4"` | Set filesystem type (`ext4`/`xfs`) |
+| storage.gcedisk.availabilityZone | string | `"us-west1-a"` | Set GCP volume availability zone |
+| storage.gcedisk.serviceAccountJson | string | `""` | Set Google SA JSON key for volume-provisioner (optional) |
+| storage.gcedisk.serviceAccountJsonSecretKeyRef | object | `{}` | Existing secret containing containing Google SA JSON key for volume-provisioner (optional) |
+| storage.gcedisk.volumeType | string | `"pd-ssd"` | Set GCP volume backend type (`pd-ssd`/`pd-standard`) |
+| storage.local.volumeParentDir | string | `"/var/lib/codefresh/dind-volumes"` | Set volume path on the host filesystem |
+| storage.mountAzureJson | bool | `false` |  |
+| volumeProvisioner | object | See below | Volume Provisioner parameters |
+| volumeProvisioner.affinity | object | `{}` | Set affinity |
+| volumeProvisioner.dind-lv-monitor | object | See below | `dind-lv-monitor` DaemonSet parameters (local volumes cleaner) |
+| volumeProvisioner.enabled | bool | `true` | Enable volume-provisioner |
+| volumeProvisioner.env | object | `{}` | Add additional env vars |
+| volumeProvisioner.image | object | `{"digest":"sha256:ede6f663c912a08b7d335b5ec5518ccc266b27c431d0854d22971005992adc5d","registry":"quay.io","repository":"codefresh/dind-volume-provisioner","tag":"1.35.2"}` | Set image |
+| volumeProvisioner.nodeSelector | object | `{}` | Set node selector |
+| volumeProvisioner.podAnnotations | object | `{}` | Set pod annotations |
+| volumeProvisioner.podSecurityContext | object | See below | Set security context for the pod |
+| volumeProvisioner.rbac | object | `{"create":true,"rules":[]}` | RBAC parameters |
+| volumeProvisioner.rbac.create | bool | `true` | Create RBAC resources |
+| volumeProvisioner.rbac.rules | list | `[]` | Add custom rule to the role |
+| volumeProvisioner.replicasCount | int | `1` | Set number of pods |
+| volumeProvisioner.resources | object | `{}` | Set resources |
+| volumeProvisioner.serviceAccount | object | `{"annotations":{},"create":true,"name":""}` | Service Account parameters |
+| volumeProvisioner.serviceAccount.annotations | object | `{}` | Additional service account annotations |
+| volumeProvisioner.serviceAccount.create | bool | `true` | Create service account |
+| volumeProvisioner.serviceAccount.name | string | `""` | Override service account name |
+| volumeProvisioner.tolerations | list | `[]` | Set tolerations |
+| volumeProvisioner.updateStrategy | object | `{"type":"Recreate"}` | Upgrade strategy |
+
diff --git a/charts/codefresh/cf-runtime/7.4.2/README.md.gotmpl b/charts/codefresh/cf-runtime/7.4.2/README.md.gotmpl
new file mode 100644
index 000000000..d080dc0e4
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/README.md.gotmpl
@@ -0,0 +1,1065 @@
+## Codefresh Runner
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/installation/codefresh-runner/) to Kubernetes.
+
+## Table of Content
+
+- [Prerequisites](#prerequisites)
+- [Get Chart Info](#get-chart-info)
+- [Install Chart](#install-chart)
+- [Chart Configuration](#chart-configuration)
+- [Upgrade Chart](#upgrade-chart)
+  - [To 2.x](#to-2-x)
+  - [To 3.x](#to-3-x)
+  - [To 4.x](#to-4-x)
+  - [To 5.x](#to-5-x)
+  - [To 6.x](#to-6-x)
+  - [To 7.x](#to-7-x)  
+- [Architecture](#architecture)
+- [Configuration](#configuration)
+  - [EBS backend volume configuration in AWS](#ebs-backend-volume-configuration)
+  - [Azure Disks backend volume configuration in AKS](#azure-disks-backend-volume-configuration)
+  - [GCE Disks backend volume configuration in GKE](#gce-disks-backend-volume-configuration-in-gke)
+  - [Custom volume mounts](#custom-volume-mounts)
+  - [Custom global environment variables](#custom-global-environment-variables)
+  - [Volume reuse policy](#volume-reuse-policy)
+  - [Volume cleaners](#volume-cleaners)
+  - [Rootless DinD](#rootless-dind)
+  - [ARM](#arm)
+  - [Openshift](#openshift)
+  - [On-premise](#on-premise)
+
+## Prerequisites
+
+- Kubernetes **1.19+**
+- Helm **3.8.0+**
+
+⚠️⚠️⚠️
+> Since version 6.2.x chart is pushed **only** to OCI registry at `oci://quay.io/codefresh/cf-runtime`
+
+> Versions prior to 6.2.x are still available in ChartMuseum at `http://chartmuseum.codefresh.io/cf-runtime`
+
+## Get Chart Info
+
+```console
+helm show all oci://quay.io/codefresh/cf-runtime
+```
+See [Use OCI-based registries](https://helm.sh/docs/topics/registries/)
+
+## Install Chart
+
+**Important:** only helm3 is supported
+
+- Specify the following mandatory values
+
+`values.yaml`
+```yaml
+# -- Global parameters
+# @default -- See below
+global:
+  # -- User token in plain text (required if `global.codefreshTokenSecretKeyRef` is omitted!)
+  # Ref: https://g.codefresh.io/user/settings (see API Keys)
+  # Minimal API key scopes: Runner-Installation(read+write), Agent(read+write), Agents(read+write)
+  codefreshToken: ""
+  # -- User token that references an existing secret containing API key (required if `global.codefreshToken` is omitted!)
+  codefreshTokenSecretKeyRef: {}
+  # E.g.
+  # codefreshTokenSecretKeyRef:
+  #   name: my-codefresh-api-token
+  #   key: codefresh-api-token
+
+  # -- Account ID (required!)
+  # Can be obtained here https://g.codefresh.io/2.0/account-settings/account-information
+  accountId: ""
+
+  # -- K8s context name (required!)
+  context: ""
+  # E.g.
+  # context: prod-ue1-runtime-1
+
+  # -- Agent Name (optional!)
+  # If omitted, the following format will be used '{{ `{{ .Values.global.context }}_{{ .Release.Namespace }}` }}'
+  agentName: ""
+  # E.g.
+  # agentName: prod-ue1-runtime-1
+
+  # -- Runtime name (optional!)
+  # If omitted, the following format will be used '{{ `{{ .Values.global.context }}/{{ .Release.Namespace }}` }}'
+  runtimeName: ""
+  # E.g.
+  # runtimeName: prod-ue1-runtime-1/namespace
+```
+
+- Install chart
+
+```console
+helm upgrade --install cf-runtime oci://quay.io/codefresh/cf-runtime -f values.yaml --create-namespace --namespace codefresh
+```
+
+## Chart Configuration
+
+See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing).
+
+## Upgrade Chart
+
+### To 2.x
+
+This major release renames and deprecated several values in the chart. Most of the workload templates have been refactored.
+
+Affected values:
+- `dockerRegistry` is deprecated. Replaced with `global.imageRegistry`
+- `re` is renamed to `runtime`
+- `storage.localVolumeMonitor` is replaced with `volumeProvisioner.dind-lv-monitor`
+- `volumeProvisioner.volume-cleanup` is replaced with `volumeProvisioner.dind-volume-cleanup`
+- `image` values structure has been updated. Split to `image.registry` `image.repository` `image.tag`
+- pod's `annotations` is renamed to `podAnnotations`
+
+### To 3.x
+
+⚠️⚠️⚠️
+### READ this before the upgrade!
+
+This major release adds [runtime-environment](https://codefresh.io/docs/docs/installation/codefresh-runner/#runtime-environment-specification) spec into chart templates.
+That means it is possible to set parametes for `dind` and `engine` pods via [values.yaml](./values.yaml).
+
+**If you had any overrides (i.e. tolerations/nodeSelector/environment variables/etc) added in runtime spec via [codefresh CLI](https://codefresh-io.github.io/cli/) (for example, you did use [get](https://codefresh-io.github.io/cli/runtime-environments/get-runtime-environments/) and [patch](https://codefresh-io.github.io/cli/runtime-environments/apply-runtime-environments/) commands to modify the runtime-environment), you MUST add these into chart's [values.yaml](./values.yaml) for `.Values.runtime.dind` or(and) .`Values.runtime.engine`**
+
+**For backward compatibility, you can disable updating runtime-environment spec via** `.Values.runtime.patch.enabled=false`
+
+Affected values:
+- added **mandatory** `global.codefreshToken`/`global.codefreshTokenSecretKeyRef` **You must specify it before the upgrade!**
+- `runtime.engine` is added
+- `runtime.dind` is added
+- `global.existingAgentToken` is replaced with `global.agentTokenSecretKeyRef`
+- `global.existingDindCertsSecret` is replaced with `global.dindCertsSecretRef`
+
+### To 4.x
+
+This major release adds **agentless inCluster** runtime mode (relevant only for [Codefresh On-Premises](#on-premise) users)
+
+Affected values:
+- `runtime.agent` / `runtime.inCluster` / `runtime.accounts` / `runtime.description` are added
+
+### To 5.x
+
+This major release converts `.runtime.dind.pvcs` from **list** to **dict**
+
+> 4.x chart's values example:
+```yaml
+runtime:
+  dind:
+    pvcs:
+      - name: dind
+        storageClassName: my-storage-class-name
+        volumeSize: 32Gi
+        reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName'
+        reuseVolumeSortOrder: pipeline_id
+```
+
+> 5.x chart's values example:
+```yaml
+runtime:
+  dind:
+    pvcs:
+      dind:
+        name: dind
+        storageClassName: my-storage-class-name
+        volumeSize: 32Gi
+        reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName'
+        reuseVolumeSortOrder: pipeline_id
+```
+
+Affected values:
+- `.runtime.dind.pvcs` converted from **list** to **dict**
+
+### To 6.x
+
+⚠️⚠️⚠️
+### READ this before the upgrade!
+
+This major release deprecates previously required `codefresh runner init --generate-helm-values-file`.
+
+Affected values:
+- **Replaced** `.monitor.clusterId` with `.global.context` as **mandatory** value!
+- **Deprecated** `.global.agentToken` / `.global.agentTokenSecretKeyRef`
+- **Removed** `.global.agentId`
+- **Removed** `.global.keys` / `.global.dindCertsSecretRef`
+- **Removed** `.global.existingAgentToken` / `existingDindCertsSecret`
+- **Removed** `.monitor.clusterId` / `.monitor.token` / `.monitor.existingMonitorToken`
+
+#### Migrate the Helm chart from version 5.x to 6.x
+
+Given this is the legacy `generated_values.yaml` values:
+
+> legacy `generated_values.yaml`
+```yaml
+{
+    "appProxy": {
+        "enabled": false,
+    },
+    "monitor": {
+        "enabled": false,
+        "clusterId": "my-cluster-name",
+        "token": "1234567890"
+    },
+    "global": {
+        "namespace": "namespace",
+        "codefreshHost": "https://g.codefresh.io",
+        "agentToken": "0987654321",
+        "agentId": "agent-id-here",
+        "agentName": "my-cluster-name_my-namespace",
+        "accountId": "my-account-id",
+        "runtimeName": "my-cluster-name/my-namespace",
+        "codefreshToken": "1234567890",
+        "keys": {
+            "key": "-----BEGIN RSA PRIVATE KEY-----...",
+            "csr": "-----BEGIN CERTIFICATE REQUEST-----...",
+            "ca": "-----BEGIN CERTIFICATE-----...",
+            "serverCert": "-----BEGIN CERTIFICATE-----..."
+        }
+    }
+}
+```
+
+Update `values.yaml` for new chart version:
+
+> For existing installation for backward compatibility `.Values.global.agentToken/agentTokenSecretKeyRef` **must be provided!** For installation from scratch this value is no longer required.
+
+> updated `values.yaml`
+```yaml
+global:
+  codefreshToken: "1234567890"
+  accountId: "my-account-id"
+  context: "my-cluster-name"
+  agentToken: "0987654321"  # MANDATORY when migrating from < 6.x chart version !
+  agentName: "my-cluster-name_my-namespace" # optional
+  runtimeName: "my-cluster-name/my-namespace" # optional
+```
+
+> **Note!** Though it's still possible to update runtime-environment via [get](https://codefresh-io.github.io/cli/runtime-environments/get-runtime-environments/) and [patch](https://codefresh-io.github.io/cli/runtime-environments/apply-runtime-environments/) commands, it's recommended to enable sidecar container to pull runtime spec from Codefresh API to detect any drift in configuration.
+
+```yaml
+runner:
+  # -- Sidecar container
+  # Reconciles runtime spec from Codefresh API for drift detection
+  sidecar:
+    enabled: true
+```
+
+### To 7.x
+
+⚠️⚠️⚠️ **BREAKING CHANGE** ⚠️⚠️⚠️
+
+7.0.0 release adds image digests to all images in default values, for example:
+
+```yaml
+runtime:
+  engine:
+    image:
+      registry: quay.io
+      repository: codefresh/engine
+      tag: 1.174.15
+      pullPolicy: IfNotPresent
+      digest: sha256:d547c2044c1488e911ff726462cc417adf2dda731cafd736493c4de4eb9e357b
+```
+
+Which means any overrides for tags won't be used and underlying Kubernetes runtime will pull the image by the digest. 
+
+See [Pull an image by digest (immutable identifier)](https://docs.docker.com/reference/cli/docker/image/pull/#pull-an-image-by-digest-immutable-identifier)
+
+
+
+## Architecture
+
+[Codefresh Runner architecture](https://codefresh.io/docs/docs/installation/codefresh-runner/#codefresh-runner-architecture)
+
+## Configuration
+
+See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing).
+
+### EBS backend volume configuration
+
+`dind-volume-provisioner` should have permissions to create/attach/detach/delete/get EBS volumes
+
+Minimal IAM policy for `dind-volume-provisioner`
+
+```json
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Action": [
+        "ec2:AttachVolume",
+        "ec2:CreateSnapshot",
+        "ec2:CreateTags",
+        "ec2:CreateVolume",
+        "ec2:DeleteSnapshot",
+        "ec2:DeleteTags",
+        "ec2:DeleteVolume",
+        "ec2:DescribeInstances",
+        "ec2:DescribeSnapshots",
+        "ec2:DescribeTags",
+        "ec2:DescribeVolumes",
+        "ec2:DetachVolume"
+      ],
+      "Resource": "*"
+    }
+  ]
+}
+```
+
+There are three options:
+
+1. Run `dind-volume-provisioner` pod on the node/node-group with IAM role
+
+```yaml
+storage:
+  # -- Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`)
+  backend: ebs-csi
+
+  ebs:
+    availabilityZone: "us-east-1a"
+
+volumeProvisioner:
+  # -- Set node selector
+  nodeSelector: {}
+  # -- Set tolerations
+  tolerations: []
+```
+
+2. Pass static credentials in `.Values.storage.ebs.accessKeyId/accessKeyIdSecretKeyRef` and `.Values.storage.ebs.secretAccessKey/secretAccessKeySecretKeyRef`
+
+```yaml
+storage:
+  # -- Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`)
+  backend: ebs-csi
+
+  ebs:
+    availabilityZone: "us-east-1a"
+
+    # -- Set AWS_ACCESS_KEY_ID for volume-provisioner (optional)
+    accessKeyId: ""
+    # -- Existing secret containing AWS_ACCESS_KEY_ID.
+    accessKeyIdSecretKeyRef: {}
+    # E.g.
+    # accessKeyIdSecretKeyRef:
+    #   name:
+    #   key:
+
+    # -- Set AWS_SECRET_ACCESS_KEY for volume-provisioner (optional)
+    secretAccessKey: ""
+    # -- Existing secret containing AWS_SECRET_ACCESS_KEY
+    secretAccessKeySecretKeyRef: {}
+    # E.g.
+    # secretAccessKeySecretKeyRef:
+    #   name:
+    #   key:
+```
+
+3. Assign IAM role to `dind-volume-provisioner` service account
+
+```yaml
+storage:
+  # -- Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`)
+  backend: ebs-csi
+
+  ebs:
+    availabilityZone: "us-east-1a"
+
+volumeProvisioner:
+  # -- Service Account parameters
+  serviceAccount:
+    # -- Create service account
+    create: true
+    # -- Additional service account annotations
+    annotations:
+      eks.amazonaws.com/role-arn: "arn:aws:iam::<ACCOUNT_ID>:role/<IAM_ROLE_NAME>"
+```
+
+### Custom volume mounts
+
+You can add your own volumes and volume mounts in the runtime environment, so that all pipeline steps will have access to the same set of external files.
+
+```yaml
+runtime:
+  dind:
+    userVolumes:
+      regctl-docker-registry:
+        name: regctl-docker-registry
+        secret:
+          items:
+            - key: .dockerconfigjson
+              path: config.json
+          secretName: regctl-docker-registry
+          optional: true
+    userVolumeMounts:
+      regctl-docker-registry:
+        name: regctl-docker-registry
+        mountPath: /home/appuser/.docker/
+        readOnly: true
+
+```
+
+### Azure Disks backend volume configuration
+
+`dind-volume-provisioner` should have permissions to create/delete/get Azure Disks
+
+Role definition for `dind-volume-provisioner`
+
+`dind-volume-provisioner-role.json`
+```json
+{
+  "Name": "CodefreshDindVolumeProvisioner",
+  "Description": "Perform create/delete/get disks",
+  "IsCustom": true,
+  "Actions": [
+      "Microsoft.Compute/disks/read",
+      "Microsoft.Compute/disks/write",
+      "Microsoft.Compute/disks/delete"
+
+  ],
+  "AssignableScopes": ["/subscriptions/<YOUR_SUBSCRIPTION_ID>"]
+}
+```
+
+When creating an AKS cluster in Azure there is the option to use a [managed identity](https://learn.microsoft.com/en-us/azure/aks/use-managed-identity) that is assigned to the kubelet. This identity is assigned to the underlying node pool in the AKS cluster and can then be used by the dind-volume-provisioner.
+
+```console
+export ROLE_DEFINITIN_FILE=dind-volume-provisioner-role.json
+export SUBSCRIPTION_ID=$(az account show --query "id" | xargs echo )
+export RESOURCE_GROUP=<YOUR_RESOURCE_GROUP_NAME>
+export AKS_NAME=<YOUR_AKS_NAME>
+export LOCATION=$(az aks show -g $RESOURCE_GROUP -n $AKS_NAME --query location | xargs echo)
+export NODES_RESOURCE_GROUP=MC_${RESOURCE_GROUP}_${AKS_NAME}_${LOCATION}
+export NODE_SERVICE_PRINCIPAL=$(az aks show -g $RESOURCE_GROUP -n $AKS_NAME --query identityProfile.kubeletidentity.objectId | xargs echo)
+
+az role definition create --role-definition @${ROLE_DEFINITIN_FILE}
+az role assignment create --assignee $NODE_SERVICE_PRINCIPAL --scope /subscriptions/$SUBSCRIPTION_ID/resourceGroups/$NODES_RESOURCE_GROUP --role CodefreshDindVolumeProvisioner
+```
+
+Deploy Helm chart with the following values:
+
+`values.yaml`
+```yaml
+volumeProvisioner:
+  podSecurityContext:
+    enabled: true
+    runAsUser: 0
+    runAsGroup: 0
+    fsGroup: 0
+
+storage:
+  backend: azuredisk
+  azuredisk:
+    availabilityZone: northeurope-1 # replace with your zone
+    resourceGroup: my-resource-group-name
+
+  mountAzureJson: true
+
+runtime:
+  dind:
+    nodeSelector:
+      topology.kubernetes.io/zone: northeurope-1
+```
+
+### GCE Disks backend volume configuration in GKE
+
+`dind-volume-provisioner` should have `ComputeEngine.StorageAdmin` permissions
+
+There are three options:
+
+1. Run `dind-volume-provisioner` pod on the node/node-group with IAM Service Account
+
+```yaml
+storage:
+  # -- Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`)
+  backend: gcedisk
+
+  gcedisk:
+    # -- Set GCP volume backend type (`pd-ssd`/`pd-standard`)
+    volumeType: "pd-standard"
+    # -- Set GCP volume availability zone
+    availabilityZone: "us-central1-c"
+
+volumeProvisioner:
+  # -- Set node selector
+  nodeSelector: {}
+  # -- Set tolerations
+  tolerations: []
+
+# -- Set runtime parameters
+runtime:
+  # -- Parameters for DinD (docker-in-docker) pod
+  dind:
+    # -- Set node selector.
+    nodeSelector:
+      topology.kubernetes.io/zone: us-central1-c
+```
+
+2. Pass static credentials in `.Values.storage.gcedisk.serviceAccountJson` (inline) or `.Values.storage.gcedisk.serviceAccountJsonSecretKeyRef` (from your own secret)
+
+```yaml
+storage:
+  # -- Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`)
+  backend: gcedisk
+
+  gcedisk:
+    # -- Set GCP volume backend type (`pd-ssd`/`pd-standard`)
+    volumeType: "`pd-standard"
+    # -- Set GCP volume availability zone
+    availabilityZone: "us-central1-c"
+    # -- Set Google SA JSON key for volume-provisioner (optional)
+    serviceAccountJson: |
+        {
+        "type": "service_account",
+        "project_id": "...",
+        "private_key_id": "...",
+        "private_key": "...",
+        "client_email": "...",
+        "client_id": "...",
+        "auth_uri": "...",
+        "token_uri": "...",
+        "auth_provider_x509_cert_url": "...",
+        "client_x509_cert_url": "..."
+        }
+    # -- Existing secret containing containing Google SA JSON key for volume-provisioner (optional)
+    serviceAccountJsonSecretKeyRef: {}
+    # E.g.:
+    # serviceAccountJsonSecretKeyRef:
+    #   name: gce-service-account
+    #   key: service-account.json
+
+# -- Set runtime parameters
+runtime:
+  # -- Parameters for DinD (docker-in-docker) pod
+  dind:
+    # -- Set node selector.
+    nodeSelector:
+      topology.kubernetes.io/zone: us-central1-c
+```
+
+3. Assign IAM role to `dind-volume-provisioner` service account
+
+```yaml
+storage:
+  # -- Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`)
+  backend: gcedisk
+
+  gcedisk:
+    # -- Set GCP volume backend type (`pd-ssd`/`pd-standard`)
+    volumeType: "`pd-standard"
+    # -- Set GCP volume availability zone
+    availabilityZone: "us-central1-c"
+
+volumeProvisioner:
+  # -- Service Account parameters
+  serviceAccount:
+    # -- Create service account
+    create: true
+    # -- Additional service account annotations
+    annotations:
+      iam.gke.io/gcp-service-account: <GSA_NAME>@<PROJECT_ID>.iam.gserviceaccount.com
+
+# -- Set runtime parameters
+runtime:
+  # -- Parameters for DinD (docker-in-docker) pod
+  dind:
+    # -- Set node selector.
+    nodeSelector:
+      topology.kubernetes.io/zone: us-central1-c
+```
+
+### Custom global environment variables
+
+You can add your own environment variables to the runtime environment. All pipeline steps have access to the global variables.
+
+```yaml
+runtime:
+  engine:
+    userEnvVars:
+    - name: GITHUB_TOKEN
+      valueFrom:
+        secretKeyRef:
+          name: github-token
+          key: token
+```
+
+### Volume reuse policy
+
+Volume reuse behavior depends on the configuration for `reuseVolumeSelector` in the runtime environment spec.
+
+```yaml
+runtime:
+  dind:
+    pvcs:
+      - name: dind
+        ...
+        reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName'
+        reuseVolumeSortOrder: pipeline_id
+```
+
+The following options are available:
+- `reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName'` - PV can be used by ANY pipeline in the specified account (default).
+Benefit: Fewer PVs, resulting in lower costs. Since any PV can be used by any pipeline, the cluster needs to maintain/reserve fewer PVs in its PV pool for Codefresh.
+Downside: Since the PV can be used by any pipeline, the PVs could have assets and info from different pipelines, reducing the probability of cache.
+
+- `reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName,project_id'` - PV can be used by ALL pipelines in your account, assigned to the same project.
+
+- `reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName,pipeline_id'` - PV can be used only by a single pipeline.
+Benefit: More probability of cache without “spam” from other pipelines.
+Downside: More PVs to maintain and therefore higher costs.
+
+- `reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName,pipeline_id,io.codefresh.branch_name'` - PV can be used only by single pipeline AND single branch.
+
+- `reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName,pipeline_id,trigger'` - PV can be used only by single pipeline AND single trigger.
+
+### Volume cleaners
+
+Codefresh pipelines require disk space for:
+  * [Pipeline Shared Volume](https://codefresh.io/docs/docs/pipelines/introduction-to-codefresh-pipelines/#sharing-the-workspace-between-build-steps) (`/codefresh/volume`, implemented as [docker volume](https://docs.docker.com/storage/volumes/))
+  * Docker containers, both running and stopped
+  * Docker images and cached layers
+
+Codefresh offers two options to manage disk space and prevent out-of-space errors:
+* Use runtime cleaners on Docker images and volumes
+* [Set the minimum disk space per pipeline build volume](https://codefresh.io/docs/docs/pipelines/pipelines/#set-minimum-disk-space-for-a-pipeline-build)
+
+To improve performance by using Docker cache, Codefresh `volume-provisioner` can provision previously used disks with Docker images and pipeline volumes from previously run builds.
+
+### Types of runtime volume cleaners
+
+Docker images and volumes must be cleaned on a regular basis.
+
+* [IN-DIND cleaner](https://github.com/codefresh-io/dind/tree/master/cleaner): Deletes extra Docker containers, volumes, and images in **DIND pod**.
+* [External volume cleaner](https://github.com/codefresh-io/dind-volume-cleanup): Deletes unused **external** PVs (EBS, GCE/Azure disks).
+* [Local volume cleaner](https://github.com/codefresh-io/dind-volume-utils/blob/master/local-volumes/lv-cleaner.sh): Deletes **local** volumes if node disk space is close to the threshold.
+
+### IN-DIND cleaner
+
+**Purpose:** Removes unneeded *docker containers, images, volumes* inside Kubernetes volume mounted on the DIND pod
+
+**How it runs:** Inside each DIND pod as script
+
+**Triggered by:** SIGTERM and also during the run when disk usage > 90% (configurable)
+
+**Configured by:**  Environment Variables which can be set in Runtime Environment spec
+
+**Configuration/Logic:** [README.md](https://github.com/codefresh-io/dind/tree/master/cleaner#readme)
+
+Override `.Values.runtime.dind.env` if necessary (the following are **defaults**):
+
+```yaml
+runtime:
+  dind:
+    env:
+      CLEAN_PERIOD_SECONDS: '21600' # launch clean if last clean was more than CLEAN_PERIOD_SECONDS seconds ago
+      CLEAN_PERIOD_BUILDS: '5' # launch clean if last clean was more CLEAN_PERIOD_BUILDS builds since last build
+      IMAGE_RETAIN_PERIOD: '14400' # do not delete docker images if they have events since current_timestamp - IMAGE_RETAIN_PERIOD
+      VOLUMES_RETAIN_PERIOD: '14400' # do not delete docker volumes if they have events since current_timestamp - VOLUMES_RETAIN_PERIOD
+      DISK_USAGE_THRESHOLD: '0.8' # launch clean based on current disk usage DISK_USAGE_THRESHOLD
+      INODES_USAGE_THRESHOLD: '0.8' # launch clean based on current inodes usage INODES_USAGE_THRESHOLD
+```
+
+### External volumes cleaner
+
+**Purpose:** Removes unused *kubernetes volumes and related backend volumes*
+
+**How it runs:** Runs as `dind-volume-cleanup` CronJob. Installed in case the Runner uses non-local volumes `.Values.storage.backend != local`
+
+**Triggered by:** CronJob every 10min (configurable)
+
+**Configuration:**
+
+Set `codefresh.io/volume-retention` for dinds' PVCs:
+
+```yaml
+runtime:
+  dind:
+    pvcs:
+      dind:
+        ...
+        annotations:
+          codefresh.io/volume-retention: 7d
+```
+
+Or override environment variables for `dind-volume-cleanup` cronjob:
+
+```yaml
+volumeProvisioner:
+  dind-volume-cleanup:
+    env:
+      RETENTION_DAYS: 7   # clean volumes that were last used more than `RETENTION_DAYS` (default is 4) ago
+```
+
+### Local volumes cleaner
+
+**Purpose:** Deletes local volumes when node disk space is close to the threshold
+
+**How it runs:** Runs as `dind-lv-monitor` DaemonSet. Installed in case the Runner uses local volumes `.Values.storage.backend == local`
+
+**Triggered by:** Disk space usage or inode usage that exceeds thresholds (configurable)
+
+**Configuration:**
+
+Override environment variables for `dind-lv-monitor` daemonset:
+
+```yaml
+volumeProvisioner:
+  dind-lv-monitor:
+    env:
+      KB_USAGE_THRESHOLD: 60  # default 80 (percentage)
+      INODE_USAGE_THRESHOLD: 60  # default 80
+```
+
+### Rootless DinD
+
+DinD pod runs a `priviliged` container with **rootfull** docker.
+
+To run the docker daemon as non-root user (**rootless** mode), refer to `values-rootless.yaml`:
+
+```yaml
+volumeProvisioner:
+  env:
+    IS_ROOTLESS: true
+  # -- Only if local volumes are used as backend storage (ignored for ebs/ebs-csi disks)
+  dind-lv-monitor:
+    image:
+      tag: 1.30.0-rootless
+      digest: sha256:712e549e6e843b04684647f17e0973f8047e0d60e6e8b38a693ea64dc75b0479
+    containerSecurityContext:
+      runAsUser: 1000
+    podSecurityContext:
+      fsGroup: 1000
+      # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#configure-volume-permission-and-ownership-change-policy-for-pods
+      fsGroupChangePolicy: "OnRootMismatch"
+    # -- Enable initContainer to run chmod for /var/lib/codefresh/dind-volumes on host nodes
+    volumePermissions:
+      enabled: false
+
+runtime:
+  dind:
+    image:
+      tag: 26.1.4-1.28.10-rootless
+      digest: sha256:59dfc004eb22a8f09c8a3d585271a055af9df4591ab815bca418c24a2077f5c8
+    userVolumeMounts:
+      dind:
+        name: dind
+        mountPath: /home/rootless/.local/share/docker
+    containerSecurityContext:
+      privileged: true
+      runAsUser: 1000
+    podSecurityContext:
+      fsGroup: 1000
+      # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#configure-volume-permission-and-ownership-change-policy-for-pods
+      fsGroupChangePolicy: "OnRootMismatch"
+    # -- Enable initContainer to run chmod for /home/rootless in DinD pod
+    # !!! Will slow down dind pod startup
+    volumePermissions:
+      enabled: true
+```
+
+### ARM
+
+With the Codefresh Runner, you can run native ARM64v8 builds.
+
+> **Note!**
+> You cannot run both amd64 and arm64 images within the same pipeline. As one pipeline can map only to one runtime, you can run either amd64 or arm64 within the same pipeline.
+
+Provide `nodeSelector` and(or) `tolerations` for dind pods:
+
+`values.yaml`
+```yaml
+runtime:
+  dind:
+    nodeSelector:
+      arch: arm64
+    tolerations:
+    - key: arch
+      operator: Equal
+      value: arm64
+      effect: NoSchedule
+```
+
+### Openshift
+
+To install Codefresh Runner on OpenShift use the following `values.yaml` example
+
+```yaml
+runner:
+  podSecurityContext:
+    enabled: false
+
+volumeProvisioner:
+  podSecurityContext:
+    enabled: false
+  env:
+    PRIVILEGED_CONTAINER: true
+  dind-lv-monitor:
+    containerSecurityContext:
+      enabled: true
+      privileged: true
+    volumePermissions:
+      enabled: true
+      securityContext:
+        privileged: true
+        runAsUser: auto
+```
+
+Grant `privileged` SCC to `cf-runtime-runner` and `cf-runtime-volume-provisioner` service accounts.
+
+```console
+oc adm policy add-scc-to-user privileged system:serviceaccount:codefresh:cf-runtime-runner
+
+oc adm policy add-scc-to-user privileged system:serviceaccount:codefresh:cf-runtime-volume-provisioner
+```
+
+### On-premise
+
+If you have [Codefresh On-Premises](https://artifacthub.io/packages/helm/codefresh-onprem/codefresh) deployed, you can install Codefresh Runner in **agentless** mode.
+
+**What is agentless mode?**
+
+Agent (aka venona) is Runner component which responsible for calling Codefresh API to run builds and create dind/engine pods and pvc objects. Agent can only be assigned to a single account, thus you can't share one runtime across multiple accounts. However, with **agentless** mode it's possible to register the runtime as **system**-type runtime so it's registered on the platform level and can be assigned/shared across multiple accounts.
+
+**What are the prerequisites?**
+- You have a running [Codefresh On-Premises](https://artifacthub.io/packages/helm/codefresh-onprem/codefresh) control-plane environment
+- You have a Codefresh API token with platform **Admin** permissions scope
+
+
+### How to deploy agentless runtime when it's on the SAME k8s cluster as On-Premises control-plane environment?
+
+- Enable cluster-level permissions for cf-api (On-Premises control-plane component)
+
+> `values.yaml` for [Codefresh On-Premises](https://artifacthub.io/packages/helm/codefresh-onprem/codefresh) Helm chart
+```yaml
+cfapi:
+  ...
+  # -- Enable ClusterRole/ClusterRoleBinding
+  rbac:
+    namespaced: false
+```
+
+- Set the following values for Runner Helm chart
+
+`.Values.global.codefreshHost=...` \
+`.Values.global.codefreshToken=...` \
+`.Values.global.runtimeName=system/...` \
+`.Values.runtime.agent=false` \
+`.Values.runtime.inCluster=true`
+
+> `values.yaml` for [Codefresh Runner](https://artifacthub.io/packages/helm/codefresh-runner/cf-runtime) helm chart
+```yaml
+global:
+  # -- URL of Codefresh On-Premises Platform
+  codefreshHost: "https://myonprem.somedomain.com"
+  # -- User token in plain text with Admin permission scope
+  codefreshToken: ""
+  # -- User token that references an existing secret containing API key.
+  codefreshTokenSecretKeyRef: {}
+  # E.g.
+  # codefreshTokenSecretKeyRef:
+  #   name: my-codefresh-api-token
+  #   key: codefresh-api-token
+
+  # -- Distinguished runtime name
+  # (for On-Premise only; mandatory!) Must be prefixed with "system/..."
+  runtimeName: "system/prod-ue1-some-cluster-name"
+
+# -- Set runtime parameters
+runtime:
+  # -- (for On-Premise only; mandatory!) Disable agent
+  agent: false
+  # -- (for On-Premise only; optional) Set inCluster runtime (default: `true`)
+  # `inCluster=true` flag is set when Runtime and On-Premises control-plane are run on the same cluster
+  # `inCluster=false` flag is set when Runtime and On-Premises control-plane are on different clusters
+  inCluster: true
+  # -- (for On-Premise only; optional) Assign accounts to runtime (list of account ids; default is empty)
+  # Accounts can be assigned to the runtime in Codefresh UI later so you can kepp it empty.
+  accounts: []
+  # -- Set parent runtime to inherit.
+  runtimeExtends: []
+```
+
+- Install the chart
+
+```console
+helm upgrade --install cf-runtime oci://quay.io/codefresh/cf-runtime -f values.yaml --create-namespace --namespace cf-runtime
+```
+
+- Verify the runtime and run test pipeline
+
+Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system) to check the runtime. Assign it to the required account(s). Run test pipeline on it.
+
+
+### How to deploy agentless runtime when it's on the DIFFERENT k8s cluster than On-Premises control-plane environment?
+
+In this case, it's required to mount runtime cluster's `KUBECONFIG` into On-Premises `cf-api` deployment
+
+- Create the neccessary RBAC resources
+
+> `values.yaml` for [Codefresh Runner](https://artifacthub.io/packages/helm/codefresh-runner/cf-runtime) helm chart
+```yaml
+extraResources:
+- apiVersion: rbac.authorization.k8s.io/v1
+  kind: Role
+  metadata:
+    name: codefresh-role
+    namespace: '{{ "{{ .Release.Namespace }}" }}'
+  rules:
+    - apiGroups: [""]
+      resources: ["pods", "persistentvolumeclaims", "persistentvolumes"]
+      verbs: ["list", "watch", "get", "create", "patch", "delete"]
+    - apiGroups: ["snapshot.storage.k8s.io"]
+      resources: ["volumesnapshots"]
+      verbs: ["list", "watch", "get", "create", "patch", "delete"]
+- apiVersion: v1
+  kind: ServiceAccount
+  metadata:
+    name: codefresh-runtime-user
+    namespace: '{{ "{{ .Release.Namespace }}" }}'
+- apiVersion: rbac.authorization.k8s.io/v1
+  kind: RoleBinding
+  metadata:
+    name: codefresh-runtime-user
+    namespace: '{{ "{{ .Release.Namespace }}" }}'
+  roleRef:
+    apiGroup: rbac.authorization.k8s.io
+    kind: Role
+    name: codefresh-role
+  subjects:
+  - kind: ServiceAccount
+    name: codefresh-runtime-user
+    namespace: '{{ "{{ .Release.Namespace }}" }}'
+- apiVersion: v1
+  kind: Secret
+  metadata:
+    name: codefresh-runtime-user-token
+    namespace: '{{ "{{ .Release.Namespace }}" }}'
+    annotations:
+      kubernetes.io/service-account.name: codefresh-runtime-user
+  type: kubernetes.io/service-account-token
+```
+
+- Set up the following environment variables to create a `KUBECONFIG` file
+
+```shell
+NAMESPACE=cf-runtime
+CLUSTER_NAME=prod-ue1-some-cluster-name
+CURRENT_CONTEXT=$(kubectl config current-context)
+
+USER_TOKEN_VALUE=$(kubectl -n cf-runtime get secret/codefresh-runtime-user-token -o=go-template='{{ `{{.data.token}}` }}' | base64 --decode)
+CURRENT_CLUSTER=$(kubectl config view --raw -o=go-template='{{ `{{range .contexts}}{{if eq .name "'''${CURRENT_CONTEXT}'''"}}{{ index .context "cluster" }}{{end}}{{end}}` }}')
+CLUSTER_CA=$(kubectl config view --raw -o=go-template='{{ `{{range .clusters}}{{if eq .name "'''${CURRENT_CLUSTER}'''"}}"{{with index .cluster "certificate-authority-data" }}{{.}}{{end}}"{{ end }}{{ end }}` }}')
+CLUSTER_SERVER=$(kubectl config view --raw -o=go-template='{{ `{{range .clusters}}{{if eq .name "'''${CURRENT_CLUSTER}'''"}}{{ .cluster.server }}{{end}}{{ end }}` }}')
+
+export -p USER_TOKEN_VALUE CURRENT_CONTEXT CURRENT_CLUSTER CLUSTER_CA CLUSTER_SERVER CLUSTER_NAME
+```
+
+- Create a kubeconfig file
+
+```console
+cat << EOF > $CLUSTER_NAME-kubeconfig
+apiVersion: v1
+kind: Config
+current-context: ${CLUSTER_NAME}
+contexts:
+- name: ${CLUSTER_NAME}
+  context:
+    cluster: ${CLUSTER_NAME}
+    user: codefresh-runtime-user
+    namespace: ${NAMESPACE}
+clusters:
+- name: ${CLUSTER_NAME}
+  cluster:
+    certificate-authority-data: ${CLUSTER_CA}
+    server: ${CLUSTER_SERVER}
+users:
+- name: ${CLUSTER_NAME}
+  user:
+    token: ${USER_TOKEN_VALUE}
+EOF
+```
+
+- **Switch context to On-Premises control-plane cluster**. Create k8s secret (via any tool like [ESO](https://external-secrets.io/v0.4.4/), `kubectl`, etc ) containing runtime cluster's `KUBECONFG` created in previous step.
+
+```shell
+NAMESPACE=codefresh
+kubectl create secret generic dind-runtime-clusters --from-file=$CLUSTER_NAME=$CLUSTER_NAME-kubeconfig -n $NAMESPACE
+```
+
+- Mount secret containing runtime cluster's `KUBECONFG` into cf-api in On-Premises control-plane cluster
+
+> `values.yaml` for [Codefresh On-Premises](https://artifacthub.io/packages/helm/codefresh-onprem/codefresh) helm chart
+```yaml
+cf-api:
+  ...
+  volumes:
+    dind-clusters:
+      enabled: true
+      type: secret
+      nameOverride: dind-runtime-clusters
+      optional: true
+```
+> volumeMount `/etc/kubeconfig` is already configured in cf-api Helm chart template. No need to specify it.
+
+- Set the following values for Runner helm chart
+
+> `values.yaml` for [Codefresh Runner](https://artifacthub.io/packages/helm/codefresh-runner/cf-runtime) helm chart
+
+`.Values.global.codefreshHost=...` \
+`.Values.global.codefreshToken=...` \
+`.Values.global.runtimeName=system/...` \
+`.Values.runtime.agent=false` \
+`.Values.runtime.inCluster=false`
+
+**Important!**
+`.Values.global.name` ("system/" prefix is ignored!) should match the cluster name (key in `dind-runtime-clusters` secret created previously)
+```yaml
+global:
+  # -- URL of Codefresh On-Premises Platform
+  codefreshHost: "https://myonprem.somedomain.com"
+  # -- User token in plain text with Admin permission scope
+  codefreshToken: ""
+  # -- User token that references an existing secret containing API key.
+  codefreshTokenSecretKeyRef: {}
+  # E.g.
+  # codefreshTokenSecretKeyRef:
+  #   name: my-codefresh-api-token
+  #   key: codefresh-api-token
+
+  # -- Distinguished runtime name
+  # (for On-Premise only; mandatory!) Must be prefixed with "system/..."
+  name: "system/prod-ue1-some-cluster-name"
+
+# -- Set runtime parameters
+runtime:
+  # -- (for On-Premise only; mandatory!) Disable agent
+  agent: false
+  # -- (for On-Premise only; optional) Set inCluster runtime (default: `true`)
+  # `inCluster=true` flag is set when Runtime and On-Premises control-plane are run on the same cluster
+  # `inCluster=false` flag is set when Runtime and On-Premises control-plane are on different clusters
+  inCluster: false
+  # -- (for On-Premise only; optional) Assign accounts to runtime (list of account ids; default is empty)
+  # Accounts can be assigned to the runtime in Codefresh UI later so you can kepp it empty.
+  accounts: []
+  # -- (optional) Set parent runtime to inherit.
+  runtimeExtends: []
+```
+
+- Install the chart
+
+```console
+helm upgrade --install cf-runtime oci://quay.io/codefresh/cf-runtime -f values.yaml --create-namespace --namespace cf-runtime
+```
+
+- Verify the runtime and run test pipeline
+
+Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system) to see the runtime. Assign it to the required account(s).
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
diff --git a/charts/codefresh/cf-runtime/7.4.2/files/cleanup-runtime.sh b/charts/codefresh/cf-runtime/7.4.2/files/cleanup-runtime.sh
new file mode 100644
index 000000000..c1fc5f368
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/files/cleanup-runtime.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+echo "-----"
+echo "API_HOST:           ${API_HOST}"
+echo "AGENT_NAME:         ${AGENT_NAME}"
+echo "RUNTIME_NAME:       ${RUNTIME_NAME}"
+echo "AGENT:              ${AGENT}"
+echo "AGENT_SECRET_NAME:  ${AGENT_SECRET_NAME}"
+echo "DIND_SECRET_NAME:   ${DIND_SECRET_NAME}"
+echo "-----"
+
+auth() {
+  codefresh auth create-context --api-key ${API_TOKEN} --url ${API_HOST}
+}
+
+remove_runtime() {
+  if [ "$AGENT" == "true" ]; then
+    codefresh delete re ${RUNTIME_NAME} || true
+  else
+    codefresh delete sys-re ${RUNTIME_NAME} || true
+  fi
+}
+
+remove_agent() {
+  codefresh delete agent ${AGENT_NAME} || true
+}
+
+remove_secrets() {
+  kubectl patch secret $(kubectl get secret -l codefresh.io/internal=true | awk 'NR>1{print $1}' | xargs) -p '{"metadata":{"finalizers":null}}' --type=merge || true
+  kubectl delete secret $AGENT_SECRET_NAME || true
+  kubectl delete secret $DIND_SECRET_NAME || true
+}
+
+auth
+remove_runtime
+remove_agent
+remove_secrets
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/files/configure-dind-certs.sh b/charts/codefresh/cf-runtime/7.4.2/files/configure-dind-certs.sh
new file mode 100644
index 000000000..a1092eb1e
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/files/configure-dind-certs.sh
@@ -0,0 +1,132 @@
+#!/usr/bin/env bash
+#
+
+#---
+fatal() {
+   echo "ERROR: $1"
+   exit 1
+}
+
+msg() { echo -e "\e[32mINFO ---> $1\e[0m"; }
+err() { echo -e "\e[31mERR ---> $1\e[0m" ; return 1; }
+
+exit_trap () {
+  local lc="$BASH_COMMAND" rc=$?
+  if [ $rc != 0 ]; then
+    if [[ -n "$SLEEP_ON_ERROR" ]]; then
+      echo -e "\nSLEEP_ON_ERROR is set - Sleeping to fix error"
+      sleep $SLEEP_ON_ERROR
+    fi
+  fi
+}
+trap exit_trap EXIT
+
+usage() {
+    echo "Usage:
+    $0 [-n | --namespace] [--server-cert-cn] [--server-cert-extra-sans] codefresh-api-host codefresh-api-token
+
+Example:
+   $0 -n workflow https://g.codefresh.io 21341234.423141234.412431234
+
+"
+}
+
+# Args
+while [[ $1 =~ ^(-(n|h)|--(namespace|server-cert-cn|server-cert-extra-sans|help)) ]]
+do
+  key=$1
+  value=$2
+
+  case $key in
+    -h|--help)
+        usage
+        exit
+      ;;
+    -n|--namespace)
+        NAMESPACE="$value"
+        shift
+      ;;
+    --server-cert-cn)
+        SERVER_CERT_CN="$value"
+        shift
+      ;;
+    --server-cert-extra-sans)
+        SERVER_CERT_EXTRA_SANS="$value"
+        shift
+      ;;
+  esac
+  shift # past argument or value
+done
+
+API_HOST=${1:-"$CF_API_HOST"}
+API_TOKEN=${2:-"$CF_API_TOKEN"}
+
+[[ -z "$API_HOST" ]] && usage && fatal "Missing API_HOST"
+[[ -z "$API_TOKEN" ]] && usage && fatal "Missing token"
+
+
+API_SIGN_PATH=${API_SIGN_PATH:-"api/custom_clusters/signServerCerts"}
+
+NAMESPACE=${NAMESPACE:-default}
+RELEASE=${RELEASE:-cf-runtime}
+
+DIR=$(dirname $0)
+TMPDIR=/tmp/codefresh/
+
+TMP_CERTS_FILE_ZIP=$TMPDIR/cf-certs.zip
+TMP_CERTS_HEADERS_FILE=$TMPDIR/cf-certs-response-headers.txt
+CERTS_DIR=$TMPDIR/ssl
+SRV_TLS_CA_CERT=${CERTS_DIR}/ca.pem
+SRV_TLS_KEY=${CERTS_DIR}/server-key.pem
+SRV_TLS_CSR=${CERTS_DIR}/server-cert.csr
+SRV_TLS_CERT=${CERTS_DIR}/server-cert.pem
+CF_SRV_TLS_CERT=${CERTS_DIR}/cf-server-cert.pem
+CF_SRV_TLS_CA_CERT=${CERTS_DIR}/cf-ca.pem
+mkdir -p $TMPDIR $CERTS_DIR
+
+K8S_CERT_SECRET_NAME=codefresh-certs-server
+echo -e "\n------------------\nGenerating server tls certificates ... "
+
+SERVER_CERT_CN=${SERVER_CERT_CN:-"docker.codefresh.io"}
+SERVER_CERT_EXTRA_SANS="${SERVER_CERT_EXTRA_SANS}"
+###
+
+  openssl genrsa -out $SRV_TLS_KEY 4096 || fatal "Failed to generate openssl key "
+  openssl req -subj "/CN=${SERVER_CERT_CN}" -new -key $SRV_TLS_KEY -out $SRV_TLS_CSR  || fatal "Failed to generate openssl csr "
+  GENERATE_CERTS=true
+  CSR=$(sed ':a;N;$!ba;s/\n/\\n/g' ${SRV_TLS_CSR})
+
+  SERVER_CERT_SANS="IP:127.0.0.1,DNS:dind,DNS:*.dind.${NAMESPACE},DNS:*.dind.${NAMESPACE}.svc${KUBE_DOMAIN},DNS:*.cf-cd.com,DNS:*.codefresh.io"
+  if [[ -n "${SERVER_CERT_EXTRA_SANS}" ]]; then
+    SERVER_CERT_SANS=${SERVER_CERT_SANS},${SERVER_CERT_EXTRA_SANS}
+  fi
+  echo "{\"reqSubjectAltName\": \"${SERVER_CERT_SANS}\", \"csr\": \"${CSR}\" }" > ${TMPDIR}/sign_req.json
+
+  rm -fv ${TMP_CERTS_HEADERS_FILE} ${TMP_CERTS_FILE_ZIP}
+
+  SIGN_STATUS=$(curl -k -sSL -d @${TMPDIR}/sign_req.json -H "Content-Type: application/json" -H "Authorization: ${API_TOKEN}" -H "Expect: " \
+        -o ${TMP_CERTS_FILE_ZIP} -D ${TMP_CERTS_HEADERS_FILE} -w '%{http_code}' ${API_HOST}/${API_SIGN_PATH} )
+
+  echo "Sign request completed with HTTP_STATUS_CODE=$SIGN_STATUS"
+  if [[ $SIGN_STATUS != 200 ]]; then
+     echo "ERROR: Cannot sign certificates"
+     if [[ -f ${TMP_CERTS_FILE_ZIP} ]]; then
+       mv ${TMP_CERTS_FILE_ZIP} ${TMP_CERTS_FILE_ZIP}.error
+       cat ${TMP_CERTS_FILE_ZIP}.error
+     fi
+     exit 1
+  fi
+  unzip -o -d ${CERTS_DIR}/  ${TMP_CERTS_FILE_ZIP} || fatal "Failed to unzip certificates to ${CERTS_DIR} "
+  cp -v ${CF_SRV_TLS_CA_CERT} $SRV_TLS_CA_CERT || fatal "received ${TMP_CERTS_FILE_ZIP} does not contains ca.pem"
+  cp -v ${CF_SRV_TLS_CERT} $SRV_TLS_CERT || fatal "received ${TMP_CERTS_FILE_ZIP} does not contains cf-server-cert.pem"
+
+
+echo -e "\n------------------\nCreating certificate secret "
+
+kubectl -n $NAMESPACE create secret generic $K8S_CERT_SECRET_NAME \
+    --from-file=$SRV_TLS_CA_CERT \
+    --from-file=$SRV_TLS_KEY \
+    --from-file=$SRV_TLS_CERT \
+    --dry-run=client -o yaml | kubectl apply --overwrite -f -
+kubectl -n $NAMESPACE label --overwrite secret ${K8S_CERT_SECRET_NAME} codefresh.io/internal=true
+kubectl -n $NAMESPACE patch secret $K8S_CERT_SECRET_NAME -p '{"metadata": {"finalizers": ["kubernetes"]}}'
diff --git a/charts/codefresh/cf-runtime/7.4.2/files/init-runtime.sh b/charts/codefresh/cf-runtime/7.4.2/files/init-runtime.sh
new file mode 100644
index 000000000..eb3488af1
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/files/init-runtime.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+echo "-----"
+echo "API_HOST:         ${API_HOST}"
+echo "AGENT_NAME:       ${AGENT_NAME}"
+echo "KUBE_CONTEXT:     ${KUBE_CONTEXT}"
+echo "KUBE_NAMESPACE:   ${KUBE_NAMESPACE}"
+echo "OWNER_NAME:       ${OWNER_NAME}"
+echo "RUNTIME_NAME:     ${RUNTIME_NAME}"
+echo "SECRET_NAME:      ${SECRET_NAME}"
+echo "-----"
+
+create_agent_secret() {
+
+  kubectl apply -f - <<EOF
+  apiVersion: v1
+  kind: Secret
+  type: Opaque
+  metadata:
+    name: ${SECRET_NAME}
+    namespace: ${KUBE_NAMESPACE}
+    labels:
+      codefresh.io/internal: "true"
+    finalizers:
+    - kubernetes
+    ownerReferences:
+    - apiVersion: apps/v1
+      kind: Deploy
+      name: ${OWNER_NAME}
+      uid: ${OWNER_UID}
+  stringData:
+    agent-codefresh-token: ${1}
+EOF
+
+}
+
+OWNER_UID=$(kubectl get deploy ${OWNER_NAME} --namespace ${KUBE_NAMESPACE} -o jsonpath='{.metadata.uid}')
+echo "got owner uid: ${OWNER_UID}"
+
+if [ ! -z "${AGENT_CODEFRESH_TOKEN}" ]; then
+    echo "-----"
+    echo "runtime and agent are already initialized"
+    echo "-----"
+    exit 0
+fi
+
+if [ ! -z "${EXISTING_AGENT_CODEFRESH_TOKEN}" ]; then
+    echo "using existing agentToken value"
+    create_agent_secret $EXISTING_AGENT_CODEFRESH_TOKEN
+    exit 0
+fi
+
+if [ -z "${USER_CODEFRESH_TOKEN}" ]; then
+    echo "-----"
+    echo "missing codefresh user token. must supply \".global.codefreshToken\" if agent-codefresh-token does not exist"
+    echo "-----"
+    exit 1
+fi
+
+codefresh auth create-context --api-key ${USER_CODEFRESH_TOKEN} --url ${API_HOST}
+
+# AGENT_TOKEN might be empty, in which case it will be returned by the call
+RES=$(codefresh install agent \
+    --name ${AGENT_NAME} \
+    --kube-context-name ${KUBE_CONTEXT} \
+    --kube-namespace ${KUBE_NAMESPACE} \
+    --agent-kube-namespace ${KUBE_NAMESPACE} \
+    --install-runtime \
+    --runtime-name ${RUNTIME_NAME} \
+    --skip-cluster-creation \
+    --platform-only)
+
+AGENT_CODEFRESH_TOKEN=$(echo "${RES}" | tail -n 1)
+echo "generated agent + runtime in platform"
+
+create_agent_secret $AGENT_CODEFRESH_TOKEN
+
+echo "-----"
+echo "done initializing runtime and agent"
+echo "-----"
diff --git a/charts/codefresh/cf-runtime/7.4.2/files/reconcile-runtime.sh b/charts/codefresh/cf-runtime/7.4.2/files/reconcile-runtime.sh
new file mode 100644
index 000000000..21e437355
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/files/reconcile-runtime.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+echo "-----"
+echo "API_HOST:             ${API_HOST}"
+echo "KUBE_CONTEXT:         ${KUBE_CONTEXT}"
+echo "KUBE_NAMESPACE:       ${KUBE_NAMESPACE}"
+echo "OWNER_NAME:           ${OWNER_NAME}"
+echo "RUNTIME_NAME:         ${RUNTIME_NAME}"
+echo "CONFIGMAP_NAME:       ${CONFIGMAP_NAME}"
+echo "RECONCILE_INTERVAL:   ${RECONCILE_INTERVAL}"
+echo "-----"
+
+msg() { echo -e "\e[32mINFO ---> $1\e[0m"; }
+err() { echo -e "\e[31mERR ---> $1\e[0m" ; return 1; }
+
+
+if [ -z "${USER_CODEFRESH_TOKEN}" ]; then
+    err "missing codefresh user token. must supply \".global.codefreshToken\" if agent-codefresh-token does not exist"
+    exit 1
+fi
+
+codefresh auth create-context --api-key ${USER_CODEFRESH_TOKEN} --url ${API_HOST}
+
+while true; do
+  msg "Reconciling ${RUNTIME_NAME} runtime"
+
+  sleep $RECONCILE_INTERVAL
+
+  codefresh get re \
+      --name ${RUNTIME_NAME} \
+      -o yaml \
+      | yq 'del(.version, .metadata.changedBy, .metadata.creationTime)' > /tmp/runtime.yaml
+
+  kubectl get cm ${CONFIGMAP_NAME} -n ${KUBE_NAMESPACE} -o yaml \
+  | yq 'del(.metadata.resourceVersion, .metadata.uid)' \
+  | yq eval '.data["runtime.yaml"] = load_str("/tmp/runtime.yaml")' \
+  | kubectl apply -f -
+done
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_deployment.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_deployment.yaml
new file mode 100644
index 000000000..26f3576b7
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_deployment.yaml
@@ -0,0 +1,70 @@
+{{- define "app-proxy.resources.deployment" -}}
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "app-proxy.fullname" . }}
+  labels:
+    {{- include "app-proxy.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicasCount }}
+  strategy:
+    type: {{ .Values.updateStrategy.type }}
+  selector:
+    matchLabels:
+      {{- include "app-proxy.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "app-proxy.selectorLabels" . | nindent 8 }}
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      {{- include (printf "%s.image.pullSecrets" $cfCommonTplSemver ) . | nindent 8 }}
+      serviceAccountName: {{ include "app-proxy.serviceAccountName" . }}
+      {{- if .Values.podSecurityContext.enabled }}
+      securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+      containers:
+      - name: app-proxy
+        image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" .Values.image "context" .) }}
+        imagePullPolicy: {{ .Values.image.pullPolicy | default "Always" }}
+        env:
+        {{- include "app-proxy.environment-variables" . | nindent 8 }}
+        ports:
+        - name: http
+          containerPort: 3000
+        readinessProbe:
+          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+          successThreshold: {{ .Values.readinessProbe.successThreshold }}
+          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          httpGet:
+            path: /health
+            port: http
+        resources:
+          {{- toYaml .Values.resources | nindent 12  }}
+        volumeMounts:
+        {{- with .Values.extraVolumeMounts }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+      volumes:
+      {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+{{- end -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_env-vars.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_env-vars.yaml
new file mode 100644
index 000000000..c9b9a0e36
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_env-vars.yaml
@@ -0,0 +1,19 @@
+{{- define "app-proxy.environment-variables.defaults" }}
+PORT: 3000
+{{- end }}
+
+{{- define "app-proxy.environment-variables.calculated" }}
+CODEFRESH_HOST: {{ include "runtime.runtime-environment-spec.codefresh-host" . }}
+{{- with .Values.ingress.pathPrefix }}
+API_PATH_PREFIX: {{ . | quote }}
+{{- end }}
+{{- end }}
+
+{{- define "app-proxy.environment-variables" }}
+{{- $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{- $defaults := (include "app-proxy.environment-variables.defaults" . | fromYaml) }}
+{{- $calculated := (include "app-proxy.environment-variables.calculated" . | fromYaml) }}
+{{- $overrides := .Values.env }}
+{{- $mergedValues := mergeOverwrite (merge $defaults $calculated) $overrides }}
+{{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $mergedValues "context" .) }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_helpers.tpl b/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_helpers.tpl
new file mode 100644
index 000000000..2d4272ca9
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_helpers.tpl
@@ -0,0 +1,43 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "app-proxy.name" -}}
+    {{- printf "%s-%s" (include "cf-runtime.name" .) "app-proxy" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "app-proxy.fullname" -}}
+    {{- printf "%s-%s" (include "cf-runtime.fullname" .) "app-proxy" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "app-proxy.labels" -}}
+{{ include "cf-runtime.labels" . }}
+codefresh.io/application: app-proxy
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "app-proxy.selectorLabels" -}}
+{{ include "cf-runtime.selectorLabels" . }}
+codefresh.io/application: app-proxy
+{{- end }}
+
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "app-proxy.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "app-proxy.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_ingress.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_ingress.yaml
new file mode 100644
index 000000000..4a4b5c159
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_ingress.yaml
@@ -0,0 +1,32 @@
+{{- define "app-proxy.resources.ingress" -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "app-proxy.fullname" . }}
+  labels: {{- include "app-proxy.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if and .Values.ingress.class (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.class }}
+  {{- end }}
+  {{- if .Values.ingress.tlsSecret }}
+  tls:
+    - hosts:
+        - {{ .Values.ingress.host }}
+      secretName: {{ .Values.ingress.tlsSecret }}
+  {{- end }}
+  rules:
+    - host: {{ .Values.ingress.host }}
+      http:
+        paths:
+          - path: {{ .Values.ingress.pathPrefix | default "/" }}
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: {{ include "app-proxy.fullname" . }}
+                port:
+                  number: 80
+{{- end -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_rbac.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_rbac.yaml
new file mode 100644
index 000000000..87bd869ba
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_rbac.yaml
@@ -0,0 +1,47 @@
+{{- define "app-proxy.resources.rbac" -}}
+{{- if .Values.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "app-proxy.serviceAccountName" . }}
+  labels:
+    {{- include "app-proxy.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
+---
+{{- if .Values.rbac.create }}
+kind: {{ .Values.rbac.namespaced | ternary "Role" "ClusterRole" }}
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ include "app-proxy.fullname" . }}
+  labels:
+    {{- include "app-proxy.labels" . | nindent 4 }}
+rules:
+  - apiGroups: [ "" ]
+    resources: [ "secrets" ]
+    verbs: [ "get" ]
+{{- with .Values.rbac.rules }}
+  {{ toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
+---
+{{- if and .Values.serviceAccount.create .Values.rbac.create }}
+kind: {{ .Values.rbac.namespaced | ternary "RoleBinding" "ClusterRoleBinding" }}
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ include "app-proxy.fullname" . }}
+  labels:
+    {{- include "app-proxy.labels" . | nindent 4 }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "app-proxy.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: Role
+  name: {{ include "app-proxy.fullname" . }}
+  apiGroup: rbac.authorization.k8s.io
+{{- end }}
+{{- end -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_service.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_service.yaml
new file mode 100644
index 000000000..4c3a93bf2
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/app-proxy/_service.yaml
@@ -0,0 +1,17 @@
+{{- define "app-proxy.resources.service" -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "app-proxy.fullname" . }}
+  labels:
+    {{- include "app-proxy.labels" . | nindent 4 }}
+spec:
+  type: ClusterIP
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+    targetPort: 3000
+  selector:
+    {{- include "app-proxy.selectorLabels" . | nindent 4 }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_deployment.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_deployment.yaml
new file mode 100644
index 000000000..62588b4d3
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_deployment.yaml
@@ -0,0 +1,62 @@
+{{- define "event-exporter.resources.deployment" -}}
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "event-exporter.fullname" . }}
+  labels:
+    {{- include "event-exporter.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicasCount }}
+  strategy:
+    type: {{ .Values.updateStrategy.type }}
+  selector:
+    matchLabels:
+      {{- include "event-exporter.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "event-exporter.selectorLabels" . | nindent 8 }}
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      {{- include (printf "%s.image.pullSecrets" $cfCommonTplSemver ) . | nindent 8 }}
+      serviceAccountName: {{ include "event-exporter.serviceAccountName" . }}
+      {{- if .Values.podSecurityContext.enabled }}
+      securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+      containers:
+      - name: event-exporter
+        image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" .Values.image "context" .) }}
+        imagePullPolicy: {{ .Values.image.pullPolicy | default "Always" }}
+        args: [--running-in-cluster=true]
+        env:
+        {{- include "event-exporter.environment-variables" . | nindent 8 }}
+        ports:
+        - name: metrics
+          containerPort: 9102
+        resources:
+          {{- toYaml .Values.resources | nindent 12  }}
+        volumeMounts:
+        {{- with .Values.extraVolumeMounts }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+      volumes:
+      {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_env-vars.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_env-vars.yaml
new file mode 100644
index 000000000..d28d0776f
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_env-vars.yaml
@@ -0,0 +1,14 @@
+{{- define "event-exporter.environment-variables.defaults" }}
+{{- end }}
+
+{{- define "event-exporter.environment-variables.calculated" }}
+{{- end }}
+
+{{- define "event-exporter.environment-variables" }}
+{{- $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{- $defaults := (include "event-exporter.environment-variables.defaults" . | fromYaml) }}
+{{- $calculated := (include "event-exporter.environment-variables.calculated" . | fromYaml) }}
+{{- $overrides := .Values.env }}
+{{- $mergedValues := mergeOverwrite (merge $defaults $calculated) $overrides }}
+{{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $mergedValues "context" .) }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_helpers.tpl b/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_helpers.tpl
new file mode 100644
index 000000000..5b8b5eff7
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_helpers.tpl
@@ -0,0 +1,43 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "event-exporter.name" -}}
+    {{- printf "%s-%s" (include "cf-runtime.name" .) "event-exporter" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "event-exporter.fullname" -}}
+    {{- printf "%s-%s" (include "cf-runtime.fullname" .) "event-exporter" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "event-exporter.labels" -}}
+{{ include "cf-runtime.labels" . }}
+app: event-exporter
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "event-exporter.selectorLabels" -}}
+{{ include "cf-runtime.selectorLabels" . }}
+app: event-exporter
+{{- end }}
+
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "event-exporter.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "event-exporter.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_rbac.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_rbac.yaml
new file mode 100644
index 000000000..69d7b6b2f
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_rbac.yaml
@@ -0,0 +1,47 @@
+{{- define "event-exporter.resources.rbac" -}}
+{{- if .Values.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "event-exporter.serviceAccountName" . }}
+  labels:
+    {{- include "event-exporter.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
+---
+{{- if .Values.rbac.create }}
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ include "event-exporter.fullname" . }}
+  labels:
+    {{- include "event-exporter.labels" . | nindent 4 }}
+rules:
+  - apiGroups: [""]
+    resources: [events]
+    verbs: [get, list, watch]
+{{- with .Values.rbac.rules }}
+  {{ toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
+---
+{{- if and .Values.serviceAccount.create .Values.rbac.create }}
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ include "event-exporter.fullname" . }}
+  labels:
+    {{- include "event-exporter.labels" . | nindent 4 }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "event-exporter.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: {{ include "event-exporter.fullname" . }}
+  apiGroup: rbac.authorization.k8s.io
+{{- end }}
+{{- end -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_service.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_service.yaml
new file mode 100644
index 000000000..6fa29ec1a
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_service.yaml
@@ -0,0 +1,17 @@
+{{- define "event-exporter.resources.service" -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "event-exporter.fullname" . }}
+  labels:
+    {{- include "event-exporter.labels" . | nindent 4 }}
+spec:
+  type: ClusterIP
+  ports:
+  - name: metrics
+    port: 9102
+    targetPort: metrics
+    protocol: TCP
+  selector:
+    {{- include "event-exporter.selectorLabels" . | nindent 4 }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_serviceMontor.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_serviceMontor.yaml
new file mode 100644
index 000000000..6092443f0
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/event-exporter/_serviceMontor.yaml
@@ -0,0 +1,14 @@
+{{- define "event-exporter.resources.serviceMonitor" -}}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "event-exporter.fullname" . }}
+  labels:
+    {{- include "event-exporter.labels" . | nindent 4 }}
+spec:
+  endpoints:
+  - port: metrics
+  selector:
+    matchLabels:
+    {{- include "event-exporter.selectorLabels" . | nindent 6 }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_deployment.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_deployment.yaml
new file mode 100644
index 000000000..7efa6557b
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_deployment.yaml
@@ -0,0 +1,70 @@
+{{- define "monitor.resources.deployment" -}}
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "monitor.fullname" . }}
+  labels:
+    {{- include "monitor.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicasCount }}
+  strategy:
+    type: {{ .Values.updateStrategy.type }}
+  selector:
+    matchLabels:
+      {{- include "monitor.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "monitor.selectorLabels" . | nindent 8 }}
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      {{- include (printf "%s.image.pullSecrets" $cfCommonTplSemver ) . | nindent 8 }}
+      serviceAccountName: {{ include "monitor.serviceAccountName" . }}
+      {{- if .Values.podSecurityContext.enabled }}
+      securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+      containers:
+      - name: monitor
+        image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" .Values.image "context" .) }}
+        imagePullPolicy: {{ .Values.image.pullPolicy | default "Always" }}
+        env:
+        {{- include "monitor.environment-variables" . | nindent 8 }}
+        ports:
+        - name: http
+          containerPort: 9020
+        readinessProbe:
+          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+          successThreshold: {{ .Values.readinessProbe.successThreshold }}
+          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          httpGet:
+            path: /api/ping
+            port: 9020
+        resources:
+          {{- toYaml .Values.resources | nindent 12  }}
+        volumeMounts:
+        {{- with .Values.extraVolumeMounts }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+      volumes:
+      {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_env-vars.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_env-vars.yaml
new file mode 100644
index 000000000..f58c7fa25
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_env-vars.yaml
@@ -0,0 +1,26 @@
+{{- define "monitor.environment-variables.defaults" }}
+SERVICE_NAME: {{ include "monitor.fullname" . }}
+PORT: 9020
+HELM3: true
+NODE_OPTIONS: "--max_old_space_size=4096"
+{{- end }}
+
+{{- define "monitor.environment-variables.calculated" }}
+API_TOKEN: {{ include "runtime.installation-token-env-var-value" . | nindent 2 }}
+CLUSTER_ID: {{ include "runtime.runtime-environment-spec.context-name" . }}
+API_URL: {{ include "runtime.runtime-environment-spec.codefresh-host" . }}/api/k8s-monitor/events
+ACCOUNT_ID: {{ .Values.global.accountId }}
+NAMESPACE: {{ .Release.Namespace }}
+{{- if .Values.rbac.namespaced }}
+ROLE_BINDING: true
+{{- end }}
+{{- end }}
+
+{{- define "monitor.environment-variables" }}
+{{- $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{- $defaults := (include "monitor.environment-variables.defaults" . | fromYaml) }}
+{{- $calculated := (include "monitor.environment-variables.calculated" . | fromYaml) }}
+{{- $overrides := .Values.env }}
+{{- $mergedValues := mergeOverwrite (merge $defaults $calculated) $overrides }}
+{{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $mergedValues "context" .) }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_helpers.tpl b/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_helpers.tpl
new file mode 100644
index 000000000..71cc1c027
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_helpers.tpl
@@ -0,0 +1,42 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "monitor.name" -}}
+    {{- printf "%s-%s" (include "cf-runtime.name" .) "monitor" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "monitor.fullname" -}}
+    {{- printf "%s-%s" (include "cf-runtime.fullname" .) "monitor" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "monitor.labels" -}}
+{{ include "cf-runtime.labels" . }}
+codefresh.io/application: monitor
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "monitor.selectorLabels" -}}
+{{ include "cf-runtime.selectorLabels" . }}
+codefresh.io/application: monitor
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "monitor.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "monitor.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_rbac.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_rbac.yaml
new file mode 100644
index 000000000..88204796a
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_rbac.yaml
@@ -0,0 +1,56 @@
+{{- define "monitor.resources.rbac" -}}
+{{- if .Values.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "monitor.serviceAccountName" . }}
+  labels:
+    {{- include "monitor.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
+---
+{{- if .Values.rbac.create }}
+kind: {{ .Values.rbac.namespaced | ternary "Role" "ClusterRole" }}
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ include "monitor.fullname" . }}
+  labels:
+    {{- include "monitor.labels" . | nindent 4 }}
+rules:
+  - apiGroups: [ "" ]
+    resources: [ "*" ]
+    verbs: [ "get", "list", "watch", "create", "delete" ]
+  - apiGroups: [ "" ]
+    resources: [ "pods" ]
+    verbs: [ "get", "list", "watch", "create", "deletecollection" ]
+  - apiGroups: [ "extensions" ]
+    resources: [ "*" ]
+    verbs: [ "get", "list", "watch" ]
+  - apiGroups: [ "apps" ]
+    resources: [ "*" ]
+    verbs: [ "get", "list", "watch" ]
+{{- with .Values.rbac.rules }}
+  {{ toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
+---
+{{- if and .Values.serviceAccount.create .Values.rbac.create }}
+kind: {{ .Values.rbac.namespaced | ternary "RoleBinding" "ClusterRoleBinding" }}
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ include "monitor.fullname" . }}
+  labels:
+    {{- include "monitor.labels" . | nindent 4 }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "monitor.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: {{ .Values.rbac.namespaced | ternary "Role" "ClusterRole" }}
+  name: {{ include "monitor.fullname" . }}
+  apiGroup: rbac.authorization.k8s.io
+{{- end }}
+{{- end -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_service.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_service.yaml
new file mode 100644
index 000000000..f6ae9bb0f
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/monitor/_service.yaml
@@ -0,0 +1,17 @@
+{{- define "monitor.resources.service" -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "monitor.fullname" . }}
+  labels:
+    {{- include "monitor.labels" . | nindent 4 }}
+spec:
+  type: ClusterIP
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+    targetPort: 9020
+  selector:
+    {{- include "monitor.selectorLabels" . | nindent 4 }}
+{{- end -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/_deployment.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/_deployment.yaml
new file mode 100644
index 000000000..e1fb9439a
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/_deployment.yaml
@@ -0,0 +1,103 @@
+{{- define "runner.resources.deployment" -}}
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "runner.fullname" . }}
+  labels:
+    {{- include "runner.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicasCount }}
+  strategy:
+    type: {{ .Values.updateStrategy.type }}
+  selector:
+    matchLabels:
+      {{- include "runner.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "runner.selectorLabels" . | nindent 8 }}
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      {{- include (printf "%s.image.pullSecrets" $cfCommonTplSemver ) . | nindent 8 }}
+      serviceAccountName: {{ include "runner.serviceAccountName" . }}
+      {{- if .Values.podSecurityContext.enabled }}
+      securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+      initContainers:
+      - name: init
+        image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" .Values.init.image "context" .) }}
+        imagePullPolicy: {{ .Values.init.image.pullPolicy | default "IfNotPresent" }}
+        command:
+        - /bin/bash
+        args:
+        - -ec
+        - | {{ .Files.Get "files/init-runtime.sh" | nindent 10 }}
+        env:
+        {{- include "runner-init.environment-variables" . | nindent 8 }}
+        {{- with .Values.init.resources }}
+        resources:
+          {{- toYaml . | nindent 10  }}
+        {{- end }}
+      containers:
+      - name: runner
+        image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" .Values.image "context" .) }}
+        imagePullPolicy: {{ .Values.image.pullPolicy | default "IfNotPresent" }}
+        env:
+        {{- include "runner.environment-variables" . | nindent 8 }}
+        ports:
+        - name: http
+          containerPort: 8080
+        readinessProbe:
+          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+          successThreshold: {{ .Values.readinessProbe.successThreshold }}
+          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          httpGet:
+            path: /health
+            port: http
+        {{- with .Values.resources }}
+        resources:
+          {{- toYaml . | nindent 10  }}
+        {{- end }}
+        {{- with .Values.extraVolumeMounts }}
+        volumeMounts:
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- if .Values.sidecar.enabled }}
+      - name: reconcile-runtime
+        image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" .Values.sidecar.image "context" .) }}
+        imagePullPolicy: {{ .Values.sidecar.image.pullPolicy | default "IfNotPresent" }}
+        command:
+        - /bin/bash
+        args:
+        - -ec
+        - | {{ .Files.Get "files/reconcile-runtime.sh" | nindent 10 }}
+        env:
+        {{- include "runner-sidecar.environment-variables" . | nindent 8 }}
+        {{- with .Values.sidecar.resources }}
+        resources:
+          {{- toYaml . | nindent 10  }}
+        {{- end }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+      {{- with .Values.extraVolumes }}
+      volumes:
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+{{- end -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/_helpers.tpl b/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/_helpers.tpl
new file mode 100644
index 000000000..2608cb67e
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/_helpers.tpl
@@ -0,0 +1,42 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "runner.name" -}}
+  {{- printf "%s-%s" (include "cf-runtime.name" .) "runner" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "runner.fullname" -}}
+  {{- printf "%s-%s" (include "cf-runtime.fullname" .) "runner" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "runner.labels" -}}
+{{ include "cf-runtime.labels" . }}
+codefresh.io/application: runner
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "runner.selectorLabels" -}}
+{{ include "cf-runtime.selectorLabels" . }}
+codefresh.io/application: runner
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "runner.serviceAccountName" -}}
+  {{- if .Values.serviceAccount.create }}
+    {{- default (include "runner.fullname" .) .Values.serviceAccount.name }}
+  {{- else }}
+    {{- default "default" .Values.serviceAccount.name }}
+  {{- end }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/_rbac.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/_rbac.yaml
new file mode 100644
index 000000000..d95b958d5
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/_rbac.yaml
@@ -0,0 +1,53 @@
+{{- define "runner.resources.rbac" -}}
+{{- if .Values.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "runner.serviceAccountName" . }}
+  labels:
+    {{- include "runner.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
+---
+{{- if .Values.rbac.create }}
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ include "runner.fullname" . }}
+  labels:
+    {{- include "runner.labels" . | nindent 4 }}
+rules:
+  - apiGroups: [ "" ]
+    resources: [ "pods", "persistentvolumeclaims" ]
+    verbs: [ "get", "create", "delete", patch ]
+  - apiGroups: [ "" ]
+    resources: [ "configmaps", "secrets" ]
+    verbs: [ "get", "create", "update", patch ]
+  - apiGroups: [ "apps" ]
+    resources: [ "deployments" ]
+    verbs: [ "get" ]
+{{- with .Values.rbac.rules }}
+  {{ toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
+---
+{{- if and .Values.serviceAccount.create .Values.rbac.create }}
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ include "runner.fullname" . }}
+  labels:
+    {{- include "runner.labels" . | nindent 4 }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "runner.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: Role
+  name: {{ include "runner.fullname" . }}
+  apiGroup: rbac.authorization.k8s.io
+{{- end }}
+{{- end -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/environment-variables/_init-container.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/environment-variables/_init-container.yaml
new file mode 100644
index 000000000..6dda110f7
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/environment-variables/_init-container.yaml
@@ -0,0 +1,30 @@
+{{- define "runner-init.environment-variables.defaults" }}
+HOME: /tmp
+{{- end }}
+
+{{- define "runner-init.environment-variables.calculated" }}
+AGENT_NAME: {{ include "runtime.runtime-environment-spec.agent-name" . }}
+API_HOST: {{ include "runtime.runtime-environment-spec.codefresh-host" . }}
+AGENT_CODEFRESH_TOKEN:
+  valueFrom:
+    secretKeyRef:
+      name: {{ include "runner.fullname" . }}
+      key: agent-codefresh-token
+      optional: true
+EXISTING_AGENT_CODEFRESH_TOKEN: {{ include "runtime.agent-token-env-var-value" . | nindent 2 }}
+KUBE_CONTEXT: {{ include "runtime.runtime-environment-spec.context-name" . }}
+KUBE_NAMESPACE: {{ .Release.Namespace }}
+OWNER_NAME: {{ include "runner.fullname" . }}
+RUNTIME_NAME: {{ include "runtime.runtime-environment-spec.runtime-name" . }}
+SECRET_NAME: {{ include "runner.fullname" . }}
+USER_CODEFRESH_TOKEN: {{ include "runtime.installation-token-env-var-value" . | nindent 2 }}
+{{- end }}
+
+{{- define "runner-init.environment-variables" }}
+  {{- $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+  {{- $defaults := (include "runner-init.environment-variables.defaults" . | fromYaml) }}
+  {{- $calculated := (include "runner-init.environment-variables.calculated" . | fromYaml) }}
+  {{- $overrides := .Values.env }}
+  {{- $mergedValues := mergeOverwrite (merge $defaults $calculated) $overrides }}
+  {{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $mergedValues "context" .) }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/environment-variables/_main-container.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/environment-variables/_main-container.yaml
new file mode 100644
index 000000000..a9e3b78de
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/environment-variables/_main-container.yaml
@@ -0,0 +1,29 @@
+{{- define "runner.environment-variables.defaults" }}
+AGENT_MODE: InCluster
+SELF_DEPLOYMENT_NAME:
+  valueFrom:
+    fieldRef:
+      fieldPath: metadata.name
+{{- end }}
+
+{{- define "runner.environment-variables.calculated" }}
+AGENT_ID: {{ include "runtime.runtime-environment-spec.agent-name" . }}
+CODEFRESH_HOST: {{ include "runtime.runtime-environment-spec.codefresh-host" . }}
+CODEFRESH_IN_CLUSTER_RUNTIME: {{ include "runtime.runtime-environment-spec.runtime-name" . }}
+CODEFRESH_TOKEN:
+  valueFrom:
+    secretKeyRef:
+      name: {{ include "runner.fullname" . }}
+      key: agent-codefresh-token
+DOCKER_REGISTRY: {{ .Values.global.imageRegistry }}
+RUNTIME_CHART_VERSION: {{ .Chart.Version }}
+{{- end }}
+
+{{- define "runner.environment-variables" }}
+{{- $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{- $defaults := (include "runner.environment-variables.defaults" . | fromYaml) }}
+{{- $calculated := (include "runner.environment-variables.calculated" . | fromYaml) }}
+{{- $overrides := .Values.env }}
+{{- $mergedValues := mergeOverwrite (merge $defaults $calculated) $overrides }}
+{{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $mergedValues "context" .) }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/environment-variables/_sidecar-container.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/environment-variables/_sidecar-container.yaml
new file mode 100644
index 000000000..3adcbe5d4
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/runner/environment-variables/_sidecar-container.yaml
@@ -0,0 +1,22 @@
+{{- define "runner-sidecar.environment-variables.defaults" }}
+HOME: /tmp
+{{- end }}
+
+{{- define "runner-sidecar.environment-variables.calculated" }}
+API_HOST: {{ include "runtime.runtime-environment-spec.codefresh-host" . }}
+USER_CODEFRESH_TOKEN: {{ include "runtime.installation-token-env-var-value" . | nindent 2 }}
+KUBE_CONTEXT: {{ include "runtime.runtime-environment-spec.context-name" . }}
+KUBE_NAMESPACE: {{ .Release.Namespace }}
+OWNER_NAME: {{ include "runner.fullname" . }}
+RUNTIME_NAME: {{ include "runtime.runtime-environment-spec.runtime-name" . }}
+CONFIGMAP_NAME: {{ printf "%s-%s" (include "runtime.fullname" .) "spec" }}
+{{- end }}
+
+{{- define "runner-sidecar.environment-variables" }}
+  {{- $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+  {{- $defaults := (include "runner-sidecar.environment-variables.defaults" . | fromYaml) }}
+  {{- $calculated := (include "runner-sidecar.environment-variables.calculated" . | fromYaml) }}
+  {{- $overrides := .Values.sidecar.env }}
+  {{- $mergedValues := mergeOverwrite (merge $defaults $calculated) $overrides }}
+  {{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $mergedValues "context" .) }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_cronjob.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_cronjob.yaml
new file mode 100644
index 000000000..20bd2d56e
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_cronjob.yaml
@@ -0,0 +1,58 @@
+{{- define "dind-volume-provisioner.resources.cronjob" -}}
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{- if not (eq .Values.storage.backend "local") }}
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: {{ include "dind-volume-cleanup.fullname" . }}
+  labels:
+    {{- include "dind-volume-cleanup.labels" . | nindent 4 }}
+spec:
+  concurrencyPolicy: {{ .Values.concurrencyPolicy }}
+  schedule: {{ .Values.schedule | quote }}
+  successfulJobsHistoryLimit: {{ .Values.successfulJobsHistory }}
+  failedJobsHistoryLimit: {{ .Values.failedJobsHistory }}
+  {{- with .Values.suspend }}
+  suspend: {{ . }}
+  {{- end }}
+  jobTemplate:
+    spec:
+      template:
+        metadata:
+          labels:
+            {{- include "dind-volume-cleanup.selectorLabels" . | nindent 12 }}
+          {{- with .Values.podAnnotations }}
+          annotations:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+        spec:
+          {{- include (printf "%s.image.pullSecrets" $cfCommonTplSemver ) . | nindent 10 }}
+          serviceAccountName: {{ include "dind-volume-provisioner.serviceAccountName" . }}
+          {{- if .Values.podSecurityContext.enabled }}
+          securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 12 }}
+          {{- end }}
+          restartPolicy: {{ .Values.restartPolicy | default "Never" }}
+          containers:
+          - name: dind-volume-cleanup
+            image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" .Values.image "context" .) }}
+            imagePullPolicy: {{ .Values.image.pullPolicy | default "Always" }}
+            env:
+            {{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" .Values.env "context" .) | nindent 12 }}
+            - name: PROVISIONED_BY
+              value: {{ include "dind-volume-provisioner.volumeProvisionerName" . }}
+            resources:
+            {{- toYaml .Values.resources | nindent 14 }}
+          {{- with .Values.nodeSelector }}
+          nodeSelector:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.affinity }}
+          affinity:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.tolerations }}
+          tolerations:
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
+  {{- end }}
+{{- end -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_daemonset.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_daemonset.yaml
new file mode 100644
index 000000000..b24814702
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_daemonset.yaml
@@ -0,0 +1,98 @@
+{{- define "dind-volume-provisioner.resources.daemonset" -}}
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{ $localVolumeParentDir := .Values.storage.local.volumeParentDir  }}
+{{- if eq .Values.storage.backend "local" }}
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: {{ include "dind-lv-monitor.fullname" . }}
+  labels:
+    {{- include "dind-lv-monitor.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "dind-lv-monitor.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "dind-lv-monitor.selectorLabels" . | nindent 8 }}
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      {{- include (printf "%s.image.pullSecrets" $cfCommonTplSemver ) . | nindent 8 }}
+      serviceAccountName: {{ include "dind-volume-provisioner.serviceAccountName" . }}
+      {{- if .Values.podSecurityContext.enabled }}
+      securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if .Values.volumePermissions.enabled }}
+      initContainers:
+      - name: volume-permissions
+        image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" .Values.volumePermissions.image "context" .) }}
+        imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | default "Always" }}
+        command:
+         - /bin/sh
+        args:
+         - -ec
+         - |
+           chown -R {{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.podSecurityContext.fsGroup }} {{ $localVolumeParentDir }}
+        volumeMounts:
+        - mountPath: {{ $localVolumeParentDir }}
+          name: dind-volume-dir
+        {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+        securityContext: {{- omit .Values.volumePermissions.securityContext "runAsUser" | toYaml | nindent 10 }}
+        {{- else }}
+        securityContext: {{- .Values.volumePermissions.securityContext | toYaml | nindent 10 }}
+        {{- end }}
+        resources:
+          {{- toYaml .Values.volumePermissions.resources | nindent 10 }}
+      {{- end }}
+      containers:
+      - name: dind-lv-monitor
+        image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" .Values.image "context" .) }}
+        imagePullPolicy: {{ .Values.image.pullPolicy | default "Always" }}
+        {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+        {{- end }}
+        command:
+          - /home/dind-volume-utils/bin/local-volumes-agent
+        env:
+          {{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" .Values.env "context" .) | nindent 10 }}
+          - name: NODE_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: spec.nodeName
+          - name: VOLUME_PARENT_DIR
+            value: {{ $localVolumeParentDir }}
+        resources:
+          {{- toYaml .Values.resources | nindent 10  }}
+        volumeMounts:
+        - mountPath: {{ $localVolumeParentDir }}
+          readOnly: false
+          name: dind-volume-dir
+        {{- with .Values.extraVolumeMounts }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+      volumes:
+      - name: dind-volume-dir
+        hostPath:
+          path: {{ $localVolumeParentDir }}
+      {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+{{- end }}
+{{- end -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_deployment.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_deployment.yaml
new file mode 100644
index 000000000..9252b4520
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_deployment.yaml
@@ -0,0 +1,67 @@
+{{- define "dind-volume-provisioner.resources.deployment" -}}
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "dind-volume-provisioner.fullname" . }}
+  labels:
+    {{- include "dind-volume-provisioner.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicasCount }}
+  strategy:
+    type: {{ .Values.updateStrategy.type }}
+  selector:
+    matchLabels:
+      {{- include "dind-volume-provisioner.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "dind-volume-provisioner.selectorLabels" . | nindent 8 }}
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      {{- include (printf "%s.image.pullSecrets" $cfCommonTplSemver ) . | nindent 8 }}
+      serviceAccountName: {{ include "dind-volume-provisioner.serviceAccountName" . }}
+      {{- if .Values.podSecurityContext.enabled }}
+      securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+      containers:
+      - name: dind-volume-provisioner
+        image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" .Values.image "context" .) }}
+        imagePullPolicy: {{ .Values.image.pullPolicy | default "Always" }}
+        command:
+          - /usr/local/bin/dind-volume-provisioner
+          - -v=4
+          - --resync-period=50s
+        env:
+        {{- include "dind-volume-provisioner.environment-variables" . | nindent 8 }}
+        ports:
+        - name: http
+          containerPort: 8080
+        resources:
+          {{- toYaml .Values.resources | nindent 12  }}
+        volumeMounts:
+        {{- include "dind-volume-provisioner.volumeMounts.calculated" . | nindent 8 }}
+        {{- with .Values.extraVolumeMounts }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+      volumes:
+      {{- include "dind-volume-provisioner.volumes.calculated" . | nindent 6 }}
+      {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_env-vars.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_env-vars.yaml
new file mode 100644
index 000000000..e1f5dfe60
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_env-vars.yaml
@@ -0,0 +1,88 @@
+{{- define "dind-volume-provisioner.environment-variables.defaults" }}
+{{- end }}
+
+{{- define "dind-volume-provisioner.environment-variables.calculated" }}
+DOCKER_REGISTRY: {{ .Values.global.imageRegistry }}
+PROVISIONER_NAME: {{ include "dind-volume-provisioner.volumeProvisionerName" . }}
+
+{{- if or .Values.storage.ebs.accessKeyId .Values.storage.ebs.accessKeyIdSecretKeyRef }}
+AWS_ACCESS_KEY_ID:
+  {{- if .Values.storage.ebs.accessKeyId }}
+  valueFrom:
+    secretKeyRef:
+      name: {{ include "dind-volume-provisioner.fullname" . }}
+      key: aws_access_key_id
+  {{- else if .Values.storage.ebs.accessKeyIdSecretKeyRef }}
+  valueFrom:
+    secretKeyRef:
+  {{- .Values.storage.ebs.accessKeyIdSecretKeyRef | toYaml | nindent 6 }}
+  {{- end }}
+{{- end }}
+
+{{- if or .Values.storage.ebs.secretAccessKey .Values.storage.ebs.secretAccessKeySecretKeyRef }}
+AWS_SECRET_ACCESS_KEY:
+  {{- if .Values.storage.ebs.secretAccessKey }}
+  valueFrom:
+    secretKeyRef:
+      name: {{ include "dind-volume-provisioner.fullname" . }}
+      key: aws_secret_access_key
+  {{- else if .Values.storage.ebs.secretAccessKeySecretKeyRef }}
+  valueFrom:
+    secretKeyRef:
+  {{- .Values.storage.ebs.secretAccessKeySecretKeyRef | toYaml | nindent 6 }}
+  {{- end }}
+{{- end }}
+
+{{- if or .Values.storage.gcedisk.serviceAccountJson .Values.storage.gcedisk.serviceAccountJsonSecretKeyRef }}
+GOOGLE_APPLICATION_CREDENTIALS: {{ printf "/etc/dind-volume-provisioner/credentials/%s" (.Values.storage.gcedisk.serviceAccountJsonSecretKeyRef.key | default "google-service-account.json") }}
+{{- end }}
+
+{{- if and .Values.storage.mountAzureJson }}
+AZURE_CREDENTIAL_FILE: /etc/kubernetes/azure.json
+CLOUDCONFIG_AZURE: /etc/kubernetes/azure.json
+{{- end }}
+
+{{- end }}
+
+{{- define "dind-volume-provisioner.environment-variables" }}
+{{- $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{- $defaults := (include "dind-volume-provisioner.environment-variables.defaults" . | fromYaml) }}
+{{- $calculated := (include "dind-volume-provisioner.environment-variables.calculated" . | fromYaml) }}
+{{- $overrides := .Values.env }}
+{{- $mergedValues := mergeOverwrite (merge $defaults $calculated) $overrides }}
+{{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $mergedValues "context" .) }}
+{{- end }}
+
+
+{{- define "dind-volume-provisioner.volumes.calculated" }}
+  {{- if .Values.storage.gcedisk.serviceAccountJson }}
+- name: credentials
+  secret:
+    secretName: {{ include "dind-volume-provisioner.fullname" . }}
+    optional: true
+  {{- else if .Values.storage.gcedisk.serviceAccountJsonSecretKeyRef }}
+- name: credentials
+  secret:
+    secretName: {{ .Values.storage.gcedisk.serviceAccountJsonSecretKeyRef.name }}
+    optional: true
+  {{- end }}
+  {{- if .Values.storage.mountAzureJson }}
+- name: azure-json
+  hostPath:
+    path: /etc/kubernetes/azure.json
+    type: File
+  {{- end }}
+{{- end }}
+
+{{- define "dind-volume-provisioner.volumeMounts.calculated" }}
+  {{- if or .Values.storage.gcedisk.serviceAccountJson .Values.storage.gcedisk.serviceAccountJsonSecretKeyRef }}
+- name: credentials
+  readOnly: true
+  mountPath: "/etc/dind-volume-provisioner/credentials"
+  {{- end }}
+  {{- if .Values.storage.mountAzureJson }}
+- name: azure-json
+  readOnly: true
+  mountPath: "/etc/kubernetes/azure.json"
+  {{- end }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_helpers.tpl b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_helpers.tpl
new file mode 100644
index 000000000..e3d3a0d3f
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_helpers.tpl
@@ -0,0 +1,93 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "dind-volume-provisioner.name" -}}
+    {{- printf "%s-%s" (include "cf-runtime.name" .) "volume-provisioner" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "dind-volume-provisioner.fullname" -}}
+    {{- printf "%s-%s" (include "cf-runtime.fullname" .) "volume-provisioner" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{- define "dind-volume-cleanup.fullname" -}}
+    {{- printf "%s-%s" (include "cf-runtime.fullname" .) "volume-cleanup" | trunc 52 | trimSuffix "-" }}
+{{- end }}
+
+{{- define "dind-lv-monitor.fullname" -}}
+    {{- printf "%s-%s" (include "cf-runtime.fullname" .) "lv-monitor" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Provisioner name for storage class
+*/}}
+{{- define "dind-volume-provisioner.volumeProvisionerName" }}
+    {{- printf "codefresh.io/dind-volume-provisioner-runner-%s" .Release.Namespace }}
+{{- end }}
+
+{{/*
+Common labels for dind-lv-monitor
+*/}}
+{{- define "dind-lv-monitor.labels" -}}
+{{ include "cf-runtime.labels" . }}
+codefresh.io/application: lv-monitor
+{{- end }}
+
+{{/*
+Selector labels for dind-lv-monitor
+*/}}
+{{- define "dind-lv-monitor.selectorLabels" -}}
+{{ include "cf-runtime.selectorLabels" . }}
+codefresh.io/application: lv-monitor
+{{- end }}
+
+{{/*
+Common labels for dind-volume-provisioner
+*/}}
+{{- define "dind-volume-provisioner.labels" -}}
+{{ include "cf-runtime.labels" . }}
+codefresh.io/application: volume-provisioner
+{{- end }}
+
+{{/*
+Selector labels for dind-volume-provisioner
+*/}}
+{{- define "dind-volume-provisioner.selectorLabels" -}}
+{{ include "cf-runtime.selectorLabels" . }}
+codefresh.io/application: volume-provisioner
+{{- end }}
+
+{{/*
+Common labels for dind-volume-cleanup
+*/}}
+{{- define "dind-volume-cleanup.labels" -}}
+{{ include "cf-runtime.labels" . }}
+codefresh.io/application: pv-cleanup
+{{- end }}
+
+{{/*
+Common labels for dind-volume-cleanup
+*/}}
+{{- define "dind-volume-cleanup.selectorLabels" -}}
+{{ include "cf-runtime.selectorLabels" . }}
+codefresh.io/application: pv-cleanup
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "dind-volume-provisioner.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "dind-volume-provisioner.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{- define "dind-volume-provisioner.storageClassName" }}
+{{- printf "dind-local-volumes-runner-%s" .Release.Namespace }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_rbac.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_rbac.yaml
new file mode 100644
index 000000000..fbcbc684f
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_rbac.yaml
@@ -0,0 +1,71 @@
+{{- define "dind-volume-provisioner.resources.rbac" -}}
+{{- if .Values.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "dind-volume-provisioner.serviceAccountName" . }}
+  labels:
+    {{- include "dind-volume-provisioner.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
+---
+{{- if .Values.rbac.create }}
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ include "dind-volume-provisioner.fullname" . }}
+  labels:
+    {{- include "dind-volume-provisioner.labels" . | nindent 4 }}
+rules:
+  - apiGroups: [ "" ]
+    resources: [ "persistentvolumes" ]
+    verbs: [ "get", "list", "watch", "create", "delete", "patch" ]
+  - apiGroups: [ "" ]
+    resources: [ "persistentvolumeclaims" ]
+    verbs: [ "get", "list", "watch", "update", "delete" ]
+  - apiGroups: [ "storage.k8s.io" ]
+    resources: [ "storageclasses" ]
+    verbs: [ "get", "list", "watch" ]
+  - apiGroups: [ "" ]
+    resources: [ "events" ]
+    verbs: [ "list", "watch", "create", "update", "patch" ]
+  - apiGroups: [ "" ]
+    resources: [ "secrets" ]
+    verbs: [ "get", "list" ]
+  - apiGroups: [ "" ]
+    resources: [ "nodes" ]
+    verbs: [ "get", "list", "watch" ]
+  - apiGroups: [ "" ]
+    resources: [ "pods" ]
+    verbs: [ "get", "list", "watch", "create", "delete", "patch" ]
+  - apiGroups: [ "" ]
+    resources: [ "endpoints" ]
+    verbs: [ "get", "list", "watch", "create", "update", "delete" ]
+  - apiGroups: [ "coordination.k8s.io" ]
+    resources: [ "leases" ]
+    verbs: [ "get", "create", "update" ]
+{{- with .Values.rbac.rules }}
+  {{ toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
+---
+{{- if and .Values.serviceAccount.create .Values.rbac.create }}
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ include "dind-volume-provisioner.fullname" . }}
+  labels:
+    {{- include "dind-volume-provisioner.labels" . | nindent 4 }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "dind-volume-provisioner.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: {{ include "dind-volume-provisioner.fullname" . }}
+  apiGroup: rbac.authorization.k8s.io
+{{- end }}
+{{- end -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_secret.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_secret.yaml
new file mode 100644
index 000000000..f361a7991
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_secret.yaml
@@ -0,0 +1,22 @@
+{{- define "dind-volume-provisioner.resources.secret" -}}
+{{- if or .Values.storage.ebs.accessKeyId .Values.storage.ebs.secretAccessKey .Values.storage.gcedisk.serviceAccountJson }}
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: {{ include "dind-volume-provisioner.fullname" . }}
+  labels:
+    {{- include "dind-volume-provisioner.labels" . | nindent 4 }}
+stringData:
+  {{- with .Values.storage.gcedisk.serviceAccountJson }}
+  google-service-account.json: |
+{{- . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.storage.ebs.accessKeyId }}
+  aws_access_key_id: {{ . }}
+  {{- end }}
+  {{- with .Values.storage.ebs.secretAccessKey }}
+  aws_secret_access_key: {{ . }}
+  {{- end }}
+{{- end }}
+{{- end -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_storageclass.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_storageclass.yaml
new file mode 100644
index 000000000..62e910c87
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_components/volume-provisioner/_storageclass.yaml
@@ -0,0 +1,47 @@
+{{- define "dind-volume-provisioner.resources.storageclass" -}}
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  {{/* has to be exactly that */}}
+  name: {{ include "dind-volume-provisioner.storageClassName" . }}
+  labels:
+    {{- include "dind-volume-provisioner.labels" . | nindent 4 }}
+provisioner: {{ include "dind-volume-provisioner.volumeProvisionerName" . }}
+parameters:
+{{- if eq .Values.storage.backend "local" }}
+  volumeBackend: local
+  volumeParentDir: {{ .Values.storage.local.volumeParentDir }}
+{{- else if eq .Values.storage.backend "gcedisk" }}
+  volumeBackend: {{ .Values.storage.backend }}
+  type: {{ .Values.storage.gcedisk.volumeType | default "pd-ssd" }}
+  zone: {{ required ".Values.storage.gcedisk.availabilityZone is required" .Values.storage.gcedisk.availabilityZone }}
+  fsType: {{ .Values.storage.fsType | default "ext4" }}
+{{- else if or (eq .Values.storage.backend "ebs") (eq .Values.storage.backend "ebs-csi")}}
+  volumeBackend: {{ .Values.storage.backend }}
+  VolumeType: {{ .Values.storage.ebs.volumeType | default "gp3" }}
+  AvailabilityZone: {{ required ".Values.storage.ebs.availabilityZone is required" .Values.storage.ebs.availabilityZone }}
+  fsType: {{ .Values.storage.fsType | default "ext4" }}
+  encrypted: {{ .Values.storage.ebs.encrypted | default "false" | quote }}
+  {{- with .Values.storage.ebs.kmsKeyId }}
+  kmsKeyId: {{ . | quote }}
+  {{- end }}
+  {{- with .Values.storage.ebs.iops }}
+  iops: {{ . | quote }}
+  {{- end }}
+  {{- with .Values.storage.ebs.throughput }}
+  throughput: {{ . | quote }}
+  {{- end }}
+{{- else if or (eq .Values.storage.backend "azuredisk") (eq .Values.storage.backend "azuredisk-csi")}}
+  volumeBackend: {{ .Values.storage.backend }}
+  kind: managed
+  skuName: {{ .Values.storage.azuredisk.skuName | default "Premium_LRS" }}
+  fsType: {{ .Values.storage.fsType | default "ext4" }}
+  cachingMode: {{ .Values.storage.azuredisk.cachingMode | default "None" }}
+  {{- with .Values.storage.azuredisk.availabilityZone }}
+  availabilityZone: {{ . | quote }}
+  {{- end }}
+  {{- with .Values.storage.azuredisk.resourceGroup }}
+  resourceGroup: {{ . | quote }}
+  {{- end }}
+{{- end }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/_helpers.tpl b/charts/codefresh/cf-runtime/7.4.2/templates/_helpers.tpl
new file mode 100644
index 000000000..72f44e36a
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/_helpers.tpl
@@ -0,0 +1,51 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "cf-runtime.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "cf-runtime.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "cf-runtime.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "cf-runtime.labels" -}}
+helm.sh/chart: {{ include "cf-runtime.chart" . }}
+{{ include "cf-runtime.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "cf-runtime.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "cf-runtime.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/app-proxy/deployment.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/app-proxy/deployment.yaml
new file mode 100644
index 000000000..90341b305
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/app-proxy/deployment.yaml
@@ -0,0 +1,9 @@
+{{- $appProxyContext := deepCopy . }}
+{{- $_ := set $appProxyContext "Values" (get .Values "appProxy") }}
+{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
+{{- $_ := set $appProxyContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $appProxyContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if $appProxyContext.Values.enabled }}
+{{- include "app-proxy.resources.deployment" $appProxyContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/app-proxy/ingress.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/app-proxy/ingress.yaml
new file mode 100644
index 000000000..56ab5e95e
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/app-proxy/ingress.yaml
@@ -0,0 +1,9 @@
+{{- $appProxyContext := deepCopy . }}
+{{- $_ := set $appProxyContext "Values" (get .Values "appProxy") }}
+{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
+{{- $_ := set $appProxyContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $appProxyContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if $appProxyContext.Values.enabled }}
+{{- include "app-proxy.resources.ingress" $appProxyContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/app-proxy/rbac.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/app-proxy/rbac.yaml
new file mode 100644
index 000000000..4db87dcb4
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/app-proxy/rbac.yaml
@@ -0,0 +1,9 @@
+{{- $appProxyContext := deepCopy . }}
+{{- $_ := set $appProxyContext "Values" (get .Values "appProxy") }}
+{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
+{{- $_ := set $appProxyContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $appProxyContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if $appProxyContext.Values.enabled }}
+{{- include "app-proxy.resources.rbac" $appProxyContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/app-proxy/service.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/app-proxy/service.yaml
new file mode 100644
index 000000000..0b9d85ec0
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/app-proxy/service.yaml
@@ -0,0 +1,9 @@
+{{- $appProxyContext := deepCopy . }}
+{{- $_ := set $appProxyContext "Values" (get .Values "appProxy") }}
+{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
+{{- $_ := set $appProxyContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $appProxyContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if $appProxyContext.Values.enabled }}
+{{- include "app-proxy.resources.service" $appProxyContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/event-exporter/deployment.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/event-exporter/deployment.yaml
new file mode 100644
index 000000000..494288240
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/event-exporter/deployment.yaml
@@ -0,0 +1,9 @@
+{{- $eventExporterContext := deepCopy . }}
+{{- $_ := set $eventExporterContext "Values" (get .Values "event-exporter") }}
+{{- $_ := set $eventExporterContext.Values "global" (get .Values "global") }}
+{{- $_ := set $eventExporterContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $eventExporterContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if and $eventExporterContext.Values.enabled }}
+{{- include "event-exporter.resources.deployment" $eventExporterContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/event-exporter/rbac.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/event-exporter/rbac.yaml
new file mode 100644
index 000000000..6a9bf5c65
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/event-exporter/rbac.yaml
@@ -0,0 +1,9 @@
+{{- $eventExporterContext := deepCopy . }}
+{{- $_ := set $eventExporterContext "Values" (get .Values "event-exporter") }}
+{{- $_ := set $eventExporterContext.Values "global" (get .Values "global") }}
+{{- $_ := set $eventExporterContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $eventExporterContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if and $eventExporterContext.Values.enabled }}
+{{- include "event-exporter.resources.rbac" $eventExporterContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/event-exporter/service.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/event-exporter/service.yaml
new file mode 100644
index 000000000..c5d856dfe
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/event-exporter/service.yaml
@@ -0,0 +1,11 @@
+{{- $eventExporterContext := deepCopy . }}
+{{- $_ := set $eventExporterContext "Values" (get .Values "event-exporter") }}
+{{- $_ := set $eventExporterContext.Values "global" (get .Values "global") }}
+{{- $_ := set $eventExporterContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $eventExporterContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if $eventExporterContext.Values.enabled }}
+{{- include "event-exporter.resources.service" $eventExporterContext }}
+---
+{{- include "event-exporter.resources.serviceMonitor" $eventExporterContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/extra/extra-resources.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/extra/extra-resources.yaml
new file mode 100644
index 000000000..1a9777c64
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/extra/extra-resources.yaml
@@ -0,0 +1,6 @@
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+
+{{- range .Values.extraResources }}
+---
+{{ include (printf "%s.tplrender" $cfCommonTplSemver) (dict "Values" . "context" $) }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/extra/runtime-images-cm.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/extra/runtime-images-cm.yaml
new file mode 100644
index 000000000..f269c84b2
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/extra/runtime-images-cm.yaml
@@ -0,0 +1,19 @@
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{ $values := .Values.runtime.engine.runtimeImages }}
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  {{- /* dummy template just to list runtime images */}}
+  name: {{ include "runtime.fullname" . }}-images
+  labels:
+    {{- include "runtime.labels" . | nindent 4 }}
+  annotations:
+    {{- with $values.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+data:
+  images: |
+    {{- range $key, $val := $values }}
+    image: {{ $val }}
+    {{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/hooks/post-install/cm-update-runtime.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/hooks/post-install/cm-update-runtime.yaml
new file mode 100644
index 000000000..46a306c56
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/hooks/post-install/cm-update-runtime.yaml
@@ -0,0 +1,18 @@
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{ $values := .Values.runtime.patch }}
+{{- if $values.enabled }}
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ include "runtime.fullname" . }}-spec
+  labels:
+    {{- include "runtime.labels" . | nindent 4 }}
+  annotations:
+    {{- with $values.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+data:
+  runtime.yaml: |
+    {{ include "runtime.runtime-environment-spec.template" . | nindent 4 | trim }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/hooks/post-install/job-gencerts-dind.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/hooks/post-install/job-gencerts-dind.yaml
new file mode 100644
index 000000000..4a08a229c
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/hooks/post-install/job-gencerts-dind.yaml
@@ -0,0 +1,68 @@
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{ $values := .Values.runtime.gencerts }}
+{{- if and $values.enabled }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ include "runtime.fullname" . }}-gencerts-dind
+  labels:
+    {{- include "runtime.labels" . | nindent 4 }}
+  annotations:
+    helm.sh/hook: post-install,post-upgrade
+    helm.sh/hook-weight: "3"
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+    {{- with $values.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  {{- with $values.ttlSecondsAfterFinished }}
+  ttlSecondsAfterFinished: {{ . }}
+  {{- end }}
+  {{- with $values.backoffLimit }}
+  backoffLimit: {{ . | int }}
+  {{- end }}
+  template:
+    metadata:
+      name: {{ include "runtime.fullname" . }}-gencerts-dind
+      labels:
+        {{- include "runtime.labels" . | nindent 8 }}
+    spec:
+      {{- if $values.rbac.enabled }}
+      serviceAccountName: {{ template "runtime.fullname" . }}-gencerts-dind
+      {{- end }}
+      securityContext:
+        {{- toYaml $values.podSecurityContext | nindent 8 }}
+      containers:
+      - name: gencerts-dind
+        image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" $values.image "context" .) }}
+        imagePullPolicy: {{ $values.image.pullPolicy | default "Always" }}
+        command:
+        - "/bin/bash"
+        args:
+        - -ec
+        - | {{ .Files.Get "files/configure-dind-certs.sh" | nindent 10 }}
+        env:
+        - name: NAMESPACE
+          value: {{ .Release.Namespace }}
+        - name: RELEASE
+          value: {{ .Release.Name }}
+        - name: CF_API_HOST
+          value: {{ include "runtime.runtime-environment-spec.codefresh-host" . }}
+        - name: CF_API_TOKEN
+          {{- include "runtime.installation-token-env-var-value" . | indent 10}}
+          {{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $values.env "context" .) | nindent 8 }}
+      {{- with $values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with $values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with $values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+      restartPolicy: OnFailure
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/hooks/post-install/job-update-runtime.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/hooks/post-install/job-update-runtime.yaml
new file mode 100644
index 000000000..955e882d7
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/hooks/post-install/job-update-runtime.yaml
@@ -0,0 +1,77 @@
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{ $values := .Values.runtime.patch }}
+{{- if $values.enabled }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ include "runtime.fullname" . }}-patch
+  labels:
+    {{- include "runtime.labels" . | nindent 4 }}
+  annotations:
+    helm.sh/hook: post-install,post-upgrade
+    helm.sh/hook-weight: "5"
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+    {{- with $values.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  {{- with $values.ttlSecondsAfterFinished }}
+  ttlSecondsAfterFinished: {{ . }}
+  {{- end }}
+  {{- with $values.backoffLimit }}
+  backoffLimit: {{ . | int }}
+  {{- end }}
+  template:
+    metadata:
+      name: {{ include "runtime.fullname" . }}-patch
+      labels:
+        {{- include "runtime.labels" . | nindent 8 }}
+    spec:
+      securityContext:
+        {{- toYaml $values.podSecurityContext | nindent 8 }}
+      containers:
+      - name: patch-runtime
+        image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" $values.image "context" .) }}
+        imagePullPolicy: {{ $values.image.pullPolicy | default "Always" }}
+        command:
+        - "/bin/bash"
+        args:
+        - -ec
+        - |
+          codefresh auth create-context --api-key $API_KEY --url $API_HOST
+          cat /usr/share/extras/runtime.yaml
+          codefresh get re
+{{- if .Values.runtime.agent }}
+          codefresh patch re -f /usr/share/extras/runtime.yaml
+{{- else }}
+          codefresh patch sys-re -f /usr/share/extras/runtime.yaml
+{{- end }}
+        env:
+        - name: API_KEY
+          {{- include "runtime.installation-token-env-var-value" . | indent 10}}
+        - name: API_HOST
+          value: {{ include "runtime.runtime-environment-spec.codefresh-host" . }}
+          {{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $values.env "context" .) | nindent 8 }}
+        volumeMounts:
+        - name: config
+          mountPath: /usr/share/extras/runtime.yaml
+          subPath: runtime.yaml
+      {{- with $values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with $values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with $values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+      restartPolicy: OnFailure
+      volumes:
+      - name: config
+        configMap:
+          name: {{ include "runtime.fullname" . }}-spec
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/hooks/post-install/rbac-gencerts-dind.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/hooks/post-install/rbac-gencerts-dind.yaml
new file mode 100644
index 000000000..4907dac38
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/hooks/post-install/rbac-gencerts-dind.yaml
@@ -0,0 +1,37 @@
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{ $values := .Values.runtime.gencerts }}
+{{- if and $values.enabled }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "runtime.fullname" . }}-gencerts-dind
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "runtime.fullname" . }}-gencerts-dind
+  namespace: {{ .Release.Namespace }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+      - configmaps
+    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "runtime.fullname" . }}-gencerts-dind
+  namespace: {{ .Release.Namespace }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "runtime.fullname" . }}-gencerts-dind
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "runtime.fullname" . }}-gencerts-dind
+    namespace: {{ .Release.Namespace }}
+{{ end }}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/hooks/pre-delete/job-cleanup-resources.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/hooks/pre-delete/job-cleanup-resources.yaml
new file mode 100644
index 000000000..0e3c7659f
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/hooks/pre-delete/job-cleanup-resources.yaml
@@ -0,0 +1,73 @@
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{ $values := .Values.runtime.patch }}
+{{- if and $values.enabled }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ include "runtime.fullname" . }}-cleanup
+  labels:
+    {{- include "runtime.labels" . | nindent 4 }}
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-delete-policy:  hook-succeeded,before-hook-creation
+    {{- with $values.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  {{- with $values.ttlSecondsAfterFinished }}
+  ttlSecondsAfterFinished: {{ . }}
+  {{- end }}
+  {{- with $values.backoffLimit }}
+  backoffLimit: {{ . | int }}
+  {{- end }}
+  template:
+    metadata:
+      name: {{ include "runtime.fullname" . }}-cleanup
+      labels:
+        {{- include "runtime.labels" . | nindent 8 }}
+    spec:
+      {{- if $values.rbac.enabled }}
+      serviceAccountName: {{ template "runtime.fullname" . }}-cleanup
+      {{- end }}
+      securityContext:
+        {{- toYaml $values.podSecurityContext | nindent 8 }}
+      containers:
+      - name: cleanup
+        image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" $values.image "context" .) }}
+        imagePullPolicy: {{ $values.image.pullPolicy | default "Always" }}
+        command:
+        - "/bin/bash"
+        args:
+        - -ec
+        - | {{ .Files.Get "files/cleanup-runtime.sh" | nindent 10 }}
+        env:
+        - name: AGENT_NAME
+          value: {{ include "runtime.runtime-environment-spec.agent-name" . }}
+        - name: RUNTIME_NAME
+          value: {{ include "runtime.runtime-environment-spec.runtime-name" . }}
+        - name: API_HOST
+          value: {{ include "runtime.runtime-environment-spec.codefresh-host" . }}
+        - name: API_TOKEN
+          {{- include "runtime.installation-token-env-var-value" . | indent 10}}
+        - name: AGENT
+          value: {{ .Values.runtime.agent | quote }}
+        - name: AGENT_SECRET_NAME
+          value: {{ include "runner.fullname" . }}
+        - name: DIND_SECRET_NAME
+          value: codefresh-certs-server
+          {{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $values.env "context" .) | nindent 8 }}
+      {{- with $values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with $values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with $values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+      restartPolicy: OnFailure
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/hooks/pre-delete/rbac-cleanup-resources.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/hooks/pre-delete/rbac-cleanup-resources.yaml
new file mode 100644
index 000000000..468ec2212
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/hooks/pre-delete/rbac-cleanup-resources.yaml
@@ -0,0 +1,46 @@
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{ $values := .Values.runtime.patch }}
+{{- if and $values.enabled }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "runtime.fullname" . }}-cleanup
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-delete
+    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "runtime.fullname" . }}-cleanup
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-delete
+    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
+rules:
+  - apiGroups:
+      - "*"
+    resources:
+      - "*"
+    verbs:
+      - "*"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "runtime.fullname" . }}-cleanup
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-delete
+    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "runtime.fullname" . }}-cleanup
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "runtime.fullname" . }}-cleanup
+    namespace: {{ .Release.Namespace }}
+{{ end }}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/monitor/deployment.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/monitor/deployment.yaml
new file mode 100644
index 000000000..00c9fb2f9
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/monitor/deployment.yaml
@@ -0,0 +1,9 @@
+{{- $monitorContext := deepCopy . }}
+{{- $_ := set $monitorContext "Values" (get .Values "monitor") }}
+{{- $_ := set $monitorContext.Values "global" (get .Values "global") }}
+{{- $_ := set $monitorContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $monitorContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if $monitorContext.Values.enabled }}
+{{- include "monitor.resources.deployment" $monitorContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/monitor/rbac.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/monitor/rbac.yaml
new file mode 100644
index 000000000..f9812d565
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/monitor/rbac.yaml
@@ -0,0 +1,9 @@
+{{- $monitorContext := deepCopy . }}
+{{- $_ := set $monitorContext "Values" (get .Values "monitor") }}
+{{- $_ := set $monitorContext.Values "global" (get .Values "global") }}
+{{- $_ := set $monitorContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $monitorContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if $monitorContext.Values.enabled }}
+{{- include "monitor.resources.rbac" $monitorContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/monitor/service.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/monitor/service.yaml
new file mode 100644
index 000000000..f99706614
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/monitor/service.yaml
@@ -0,0 +1,9 @@
+{{- $monitorContext := deepCopy . }}
+{{- $_ := set $monitorContext "Values" (get .Values "monitor") }}
+{{- $_ := set $monitorContext.Values "global" (get .Values "global") }}
+{{- $_ := set $monitorContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $monitorContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if $monitorContext.Values.enabled }}
+{{- include "monitor.resources.service" $monitorContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/other/external-secrets.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/other/external-secrets.yaml
new file mode 100644
index 000000000..dc24e24e5
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/other/external-secrets.yaml
@@ -0,0 +1,2 @@
+{{ $templateName := printf "cf-common-%s.external-secrets" (index .Subcharts "cf-common").Chart.Version }}
+{{- include $templateName . -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/other/podMonitor.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/other/podMonitor.yaml
new file mode 100644
index 000000000..4319b722b
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/other/podMonitor.yaml
@@ -0,0 +1,2 @@
+{{ $templateName := printf "cf-common-%s.podMonitor" (index .Subcharts "cf-common").Chart.Version }}
+{{- include $templateName . -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/other/serviceMonitor.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/other/serviceMonitor.yaml
new file mode 100644
index 000000000..29f890fe2
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/other/serviceMonitor.yaml
@@ -0,0 +1,2 @@
+{{ $templateName := printf "cf-common-%s.serviceMonitor" (index .Subcharts "cf-common").Chart.Version }}
+{{- include $templateName . -}}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/runner/deployment.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/runner/deployment.yaml
new file mode 100644
index 000000000..85777c487
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/runner/deployment.yaml
@@ -0,0 +1,9 @@
+{{- $runnerContext := deepCopy . }}
+{{- $_ := set $runnerContext "Values" (get .Values "runner") }}
+{{- $_ := set $runnerContext.Values "global" (get .Values "global") }}
+{{- $_ := set $runnerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $runnerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if and $runnerContext.Values.enabled .Values.runtime.agent }}
+{{- include "runner.resources.deployment" $runnerContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/runner/rbac.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/runner/rbac.yaml
new file mode 100644
index 000000000..d5f8c1323
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/runner/rbac.yaml
@@ -0,0 +1,9 @@
+{{- $runnerContext := deepCopy . }}
+{{- $_ := set $runnerContext "Values" (get .Values "runner") }}
+{{- $_ := set $runnerContext.Values "global" (get .Values "global") }}
+{{- $_ := set $runnerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $runnerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if and $runnerContext.Values.enabled .Values.runtime.agent }}
+{{- include "runner.resources.rbac" $runnerContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/runtime/_helpers.tpl b/charts/codefresh/cf-runtime/7.4.2/templates/runtime/_helpers.tpl
new file mode 100644
index 000000000..6ba04fcc3
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/runtime/_helpers.tpl
@@ -0,0 +1,123 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "runtime.name" -}}
+    {{- printf "%s" (include "cf-runtime.name" .)  | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "runtime.fullname" -}}
+    {{- printf "%s" (include "cf-runtime.fullname" .) | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "runtime.labels" -}}
+{{ include "cf-runtime.labels" . }}
+codefresh.io/application: runtime
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "runtime.selectorLabels" -}}
+{{ include "cf-runtime.selectorLabels" . }}
+codefresh.io/application: runtime
+{{- end }}
+
+{{/*
+Return runtime image (classic runtime) with private registry prefix
+*/}}
+{{- define "runtime.runtimeImageName" -}}
+  {{- if .registry -}}
+    {{- $imageName :=  (trimPrefix "quay.io/" .imageFullName) -}}
+    {{- printf "%s/%s" .registry $imageName -}}
+  {{- else -}}
+    {{- printf "%s" .imageFullName -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Environment variable value of Codefresh installation token
+*/}}
+{{- define "runtime.installation-token-env-var-value" -}}
+  {{- if .Values.global.codefreshToken }}
+valueFrom:
+  secretKeyRef:
+    name: {{ include "runtime.installation-token-secret-name" . }}
+    key: codefresh-api-token
+  {{- else if .Values.global.codefreshTokenSecretKeyRef  }}
+valueFrom:
+  secretKeyRef:
+  {{- .Values.global.codefreshTokenSecretKeyRef | toYaml | nindent 4 }}
+  {{- end }}
+{{- end }}
+
+{{/*
+Environment variable value of Codefresh agent token
+*/}}
+{{- define "runtime.agent-token-env-var-value" -}}
+  {{- if .Values.global.agentToken }}
+{{- printf "%s" .Values.global.agentToken | toYaml }}
+  {{- else if .Values.global.agentTokenSecretKeyRef  }}
+valueFrom:
+  secretKeyRef:
+  {{- .Values.global.agentTokenSecretKeyRef | toYaml | nindent 4 }}
+  {{- end }}
+{{- end }}
+
+{{/*
+Print Codefresh API token secret name
+*/}}
+{{- define "runtime.installation-token-secret-name" }}
+{{- print "codefresh-user-token" }}
+{{- end }}
+
+{{/*
+Print Codefresh host
+*/}}
+{{- define "runtime.runtime-environment-spec.codefresh-host" }}
+{{- if and (not .Values.global.codefreshHost) }}
+  {{- fail "ERROR: .global.codefreshHost is required" }}
+{{- else }}
+  {{- printf "%s" (trimSuffix "/" .Values.global.codefreshHost) }}
+{{- end }}
+{{- end }}
+
+{{/*
+Print runtime-environment name
+*/}}
+{{- define "runtime.runtime-environment-spec.runtime-name" }}
+{{- if and (not .Values.global.runtimeName) }}
+  {{- printf "%s/%s" .Values.global.context .Release.Namespace }}
+{{- else }}
+  {{- printf "%s" .Values.global.runtimeName }}
+{{- end }}
+{{- end }}
+
+{{/*
+Print agent name
+*/}}
+{{- define "runtime.runtime-environment-spec.agent-name" }}
+{{- if and (not .Values.global.agentName) }}
+  {{- printf "%s_%s" .Values.global.context .Release.Namespace }}
+{{- else }}
+  {{- printf "%s" .Values.global.agentName }}
+{{- end }}
+{{- end }}
+
+{{/*
+Print context
+*/}}
+{{- define "runtime.runtime-environment-spec.context-name" }}
+{{- if and (not .Values.global.context) }}
+  {{- fail "ERROR: .global.context is required" }}
+{{- else }}
+  {{- printf "%s" .Values.global.context }}
+{{- end }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/runtime/cm-dind-daemon.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/runtime/cm-dind-daemon.yaml
new file mode 100644
index 000000000..fc7f92905
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/runtime/cm-dind-daemon.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  {{- /* has to be a constant */}}
+  name: codefresh-dind-config
+  labels:
+    {{- include "runtime.labels" . | nindent 4 }}
+data:
+  daemon.json: |
+{{ coalesce .Values.re.dindDaemon .Values.runtime.dindDaemon | toPrettyJson | indent 4 }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/runtime/rbac.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/runtime/rbac.yaml
new file mode 100644
index 000000000..a51b12526
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/runtime/rbac.yaml
@@ -0,0 +1,48 @@
+{{ $values := .Values.runtime }}
+---
+{{- if or $values.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- /* has to be a constant */}}
+  name: codefresh-engine
+  labels:
+    {{- include "runtime.labels" . | nindent 4 }}
+  {{- with $values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
+---
+{{- if $values.rbac.create }}
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: codefresh-engine
+  labels:
+    {{- include "runner.labels" . | nindent 4 }}
+rules:
+  - apiGroups: [ "" ]
+    resources: [ "secrets" ]
+    verbs: [ "get" ]
+{{- with $values.rbac.rules }}
+  {{ toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
+---
+{{- if and $values.serviceAccount.create $values.rbac.create }}
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: codefresh-engine
+  labels:
+    {{- include "runner.labels" . | nindent 4 }}
+subjects:
+  - kind: ServiceAccount
+    name: codefresh-engine
+roleRef:
+  kind: Role
+  name: codefresh-engine
+  apiGroup: rbac.authorization.k8s.io
+{{- end }}
+
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/runtime/runtime-env-spec-tmpl.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/runtime/runtime-env-spec-tmpl.yaml
new file mode 100644
index 000000000..b0d08664e
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/runtime/runtime-env-spec-tmpl.yaml
@@ -0,0 +1,235 @@
+{{- define "runtime.runtime-environment-spec.template" }}
+{{- $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version -}}
+{{- $kubeconfigFilePath := (include "runtime.runtime-environment-spec.runtime-name" .) -}}
+{{- $name := (include "runtime.runtime-environment-spec.runtime-name" .) -}}
+{{- $engineContext := .Values.runtime.engine -}}
+{{- $dindContext := .Values.runtime.dind -}}
+{{- $imageRegistry := .Values.global.imageRegistry -}}
+metadata:
+  name: {{ include "runtime.runtime-environment-spec.runtime-name" . }}
+  agent: {{ .Values.runtime.agent }}
+runtimeScheduler:
+  type: KubernetesPod
+  {{- if $engineContext.image }}
+  image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" $engineContext.image "context" .) | squote }}
+  {{- end }}
+  imagePullPolicy: {{ $engineContext.image.pullPolicy }}
+  {{- with $engineContext.command }}
+  command: {{- toYaml . | nindent 4 }}
+  {{- end }}
+  envVars:
+  {{- with $engineContext.env }}
+    {{- range $key, $val := . }}
+    {{ $key }}: {{ $val | squote }}
+    {{- end }}
+  {{- end }}
+    COMPOSE_IMAGE: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.COMPOSE_IMAGE) | squote }}
+    CONTAINER_LOGGER_IMAGE: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.CONTAINER_LOGGER_IMAGE) | squote }}
+    DOCKER_BUILDER_IMAGE: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.DOCKER_BUILDER_IMAGE) | squote }}
+    DOCKER_PULLER_IMAGE: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.DOCKER_PULLER_IMAGE) | squote }}
+    DOCKER_PUSHER_IMAGE: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.DOCKER_PUSHER_IMAGE) | squote }}
+    DOCKER_TAG_PUSHER_IMAGE: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.DOCKER_TAG_PUSHER_IMAGE) | squote }}
+    FS_OPS_IMAGE: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.FS_OPS_IMAGE) | squote }}
+    GIT_CLONE_IMAGE: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.GIT_CLONE_IMAGE) | squote }}
+    KUBE_DEPLOY: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.KUBE_DEPLOY) | squote }}
+    PIPELINE_DEBUGGER_IMAGE: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.PIPELINE_DEBUGGER_IMAGE) | squote }}
+    TEMPLATE_ENGINE: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.TEMPLATE_ENGINE) | squote }}
+    CR_6177_FIXER: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.CR_6177_FIXER) | squote }}
+    GC_BUILDER_IMAGE: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.GC_BUILDER_IMAGE) | squote }}
+    COSIGN_IMAGE_SIGNER_IMAGE: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.COSIGN_IMAGE_SIGNER_IMAGE) | squote }}
+    RUNTIME_CHART_VERSION: {{ .Chart.Version }}
+  {{- with $engineContext.userEnvVars }}
+  userEnvVars:  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $engineContext.workflowLimits }}
+  workflowLimits: {{- toYaml . | nindent 4 }}
+  {{- end }}
+  cluster:
+    namespace: {{ .Release.Namespace }}
+    serviceAccount: {{ $engineContext.serviceAccount }}
+    {{- if .Values.runtime.agent }}
+    clusterProvider:
+      accountId: {{ .Values.global.accountId }}
+      selector: {{ include "runtime.runtime-environment-spec.context-name" . }}
+    {{- else }}
+      {{- if .Values.runtime.inCluster }}
+    inCluster: true
+    kubeconfigFilePath: null
+      {{- else }}
+    name: {{ $name }}
+    kubeconfigFilePath: {{ printf "/etc/kubeconfig/%s" $kubeconfigFilePath }}
+      {{- end }}
+    {{- end }}
+    {{- with $engineContext.nodeSelector }}
+    nodeSelector: {{- toYaml . | nindent 6 }}
+    {{- end }}
+  {{- with $engineContext.affinity }}
+  affinity:  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $engineContext.tolerations }}
+  tolerations:  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $engineContext.podAnnotations }}
+  annotations:
+    {{- range $key, $val := . }}
+    {{ $key }}: {{ $val | squote }}
+    {{- end }}
+  {{- end }}
+  {{- with $engineContext.podLabels }}
+  labels: {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if $engineContext.schedulerName }}
+  schedulerName: {{ $engineContext.schedulerName }}
+  {{- end }}
+  resources:
+  {{- if $engineContext.resources}}
+  {{- toYaml $engineContext.resources | nindent 4 }}
+  {{- end }}
+  {{- with $engineContext.terminationGracePeriodSeconds }}
+  terminationGracePeriodSeconds: {{ . }}
+  {{- end }}
+dockerDaemonScheduler:
+  type: DindKubernetesPod
+  {{- if $dindContext.image }}
+  dindImage: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" $dindContext.image "context" .) | squote }}
+  {{- end }}
+  imagePullPolicy: {{ $dindContext.image.pullPolicy }}
+  {{- with $dindContext.userAccess }}
+  userAccess: {{ . }}
+  {{- end }}
+  {{- with $dindContext.env }}
+  envVars:
+    {{- range $key, $val := . }}
+    {{ $key }}: {{ $val | squote }}
+    {{- end }}
+  {{- end }}
+  cluster:
+    namespace: {{ .Release.Namespace }}
+    serviceAccount: {{ $dindContext.serviceAccount }}
+    {{- if .Values.runtime.agent }}
+    clusterProvider:
+      accountId: {{ .Values.global.accountId }}
+      selector: {{ include "runtime.runtime-environment-spec.context-name" . }}
+    {{- else }}
+      {{- if .Values.runtime.inCluster }}
+    inCluster: true
+    kubeconfigFilePath: null
+      {{- else }}
+    name: {{ $name }}
+    kubeconfigFilePath: {{ printf "/etc/kubeconfig/%s" $kubeconfigFilePath }}
+      {{- end }}
+    {{- end }}
+    {{- with $dindContext.nodeSelector }}
+    nodeSelector: {{- toYaml . | nindent 6 }}
+    {{- end }}
+  {{- with $dindContext.affinity }}
+  affinity:  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $dindContext.tolerations }}
+  tolerations: {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $dindContext.podAnnotations }}
+  annotations:
+    {{- range $key, $val := . }}
+    {{ $key }}: {{ $val | squote }}
+    {{- end }}
+  {{- end }}
+  {{- with $dindContext.podLabels }}
+  labels: {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if $dindContext.schedulerName }}
+  schedulerName: {{ $dindContext.schedulerName }}
+  {{- end }}
+  {{- if $dindContext.pvcs }}
+  pvcs:
+  {{- range $index, $pvc := $dindContext.pvcs }}
+    - name: {{ $pvc.name }}
+      reuseVolumeSelector: {{ $pvc.reuseVolumeSelector | squote }}
+      reuseVolumeSortOrder: {{ $pvc.reuseVolumeSortOrder }}
+      storageClassName: {{ include (printf "%v.tplrender" $cfCommonTplSemver) (dict "Values" $pvc.storageClassName "context" $) }}
+      volumeSize: {{ $pvc.volumeSize }}
+      {{- with $pvc.annotations }}
+      annotations: {{ . | toYaml | nindent 8 }}
+      {{- end }}
+  {{- end }}
+  {{- end }}
+  defaultDindResources:
+  {{- with $dindContext.resources }}
+  {{- if not .requests }}
+    limits: {{- toYaml .limits | nindent 6 }}
+    requests: null
+  {{- else }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- end }}
+  {{- with $dindContext.terminationGracePeriodSeconds }}
+  terminationGracePeriodSeconds: {{ . }}
+  {{- end }}
+  {{- with $dindContext.userVolumeMounts }}
+  userVolumeMounts: {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $dindContext.userVolumes }}
+  userVolumes: {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if and (not .Values.runtime.agent)  }}
+  clientCertPath: /etc/ssl/cf/
+  volumeMounts:
+    codefresh-certs-server:
+      name: codefresh-certs-server
+      mountPath: /etc/ssl/cf
+      readOnly: false
+  volumes:
+    codefresh-certs-server:
+      name: codefresh-certs-server
+      secret:
+        secretName: codefresh-certs-server
+  {{- end }}
+  {{- with $dindContext.podSecurityContext }}
+  podSecurityContext: {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $dindContext.containerSecurityContext }}
+  containerSecurityContext: {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if $dindContext.volumePermissions.enabled }}
+  initContainers:
+  - name: volume-permissions
+    image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" $dindContext.volumePermissions.image "context" .) }}
+    imagePullPolicy: {{ $dindContext.volumePermissions.image.pullPolicy | default "Always" }}
+    command:
+      - /bin/sh
+    args:
+      - -ec
+      - |
+        chown -R {{ $dindContext.containerSecurityContext.runAsUser }}:{{ $dindContext.podSecurityContext.fsGroup }} /home/rootless/.local/share/docker
+    volumeMounts:
+    - mountPath: /home/rootless/.local/share/docker
+      name: dind
+    {{- if eq ( toString ( $dindContext.volumePermissions.securityContext.runAsUser )) "auto" }}
+    securityContext: {{- omit $dindContext.volumePermissions.securityContext "runAsUser" | toYaml | nindent 6 }}
+    {{- else }}
+    securityContext: {{- $dindContext.volumePermissions.securityContext | toYaml | nindent 6 }}
+    {{- end }}
+    resources:
+      {{- toYaml $dindContext.volumePermissions.resources | nindent 6 }}
+  {{- end }}
+extends: {{- toYaml .Values.runtime.runtimeExtends | nindent 2 }}
+  {{- if .Values.runtime.description }}
+description: {{ .Values.runtime.description }}
+  {{- else }}
+description: null
+  {{- end }}
+{{- if .Values.global.accountId }}
+accountId: {{ .Values.global.accountId }}
+{{- end }}
+{{- if not .Values.runtime.agent }}
+accounts: {{- toYaml .Values.runtime.accounts | nindent 2 }}
+{{- end }}
+{{- if .Values.appProxy.enabled }}
+appProxy:
+  externalIP: >-
+    {{ printf "https://%s%s" .Values.appProxy.ingress.host (.Values.appProxy.ingress.pathPrefix | default "/") }}
+{{- end }}
+{{- if not .Values.runtime.agent }}
+systemHybrid: true
+{{- end }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/runtime/secret.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/runtime/secret.yaml
new file mode 100644
index 000000000..2366d3ccf
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/runtime/secret.yaml
@@ -0,0 +1,11 @@
+{{- if and .Values.global.codefreshToken }}
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: {{ include "runtime.installation-token-secret-name" . }}
+  labels:
+    {{- include "runtime.labels" . | nindent 4 }}
+stringData:
+  codefresh-api-token: {{ .Values.global.codefreshToken }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/runtime/svc-dind.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/runtime/svc-dind.yaml
new file mode 100644
index 000000000..098edb4e8
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/runtime/svc-dind.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    {{- include "runtime.labels" . | nindent 4 }}
+    app: dind
+  {{/* has to be a constant */}}
+  name: dind
+spec:
+  ports:
+  - name: "dind-port"
+    port: 1300
+    protocol: TCP
+  clusterIP: None
+  selector:
+    app: dind
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/cronjob.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/cronjob.yaml
new file mode 100644
index 000000000..db955bc77
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/cronjob.yaml
@@ -0,0 +1,11 @@
+{{- $volumeProvisionerContext := deepCopy . }}
+{{- $_ := set $volumeProvisionerContext "Values" (get .Values.volumeProvisioner "dind-volume-cleanup") }}
+{{- $_ := set $volumeProvisionerContext.Values "serviceAccount" (get .Values.volumeProvisioner "serviceAccount") }}
+{{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
+{{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
+{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if and $volumeProvisionerContext.Values.enabled .Values.volumeProvisioner.enabled }}
+{{- include "dind-volume-provisioner.resources.cronjob" $volumeProvisionerContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/daemonset.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/daemonset.yaml
new file mode 100644
index 000000000..39927149e
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/daemonset.yaml
@@ -0,0 +1,11 @@
+{{- $volumeProvisionerContext := deepCopy . }}
+{{- $_ := set $volumeProvisionerContext "Values" (get .Values.volumeProvisioner "dind-lv-monitor") }}
+{{- $_ := set $volumeProvisionerContext.Values "serviceAccount" (get .Values.volumeProvisioner "serviceAccount") }}
+{{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
+{{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
+{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if and $volumeProvisionerContext.Values.enabled .Values.volumeProvisioner.enabled }}
+{{- include "dind-volume-provisioner.resources.daemonset" $volumeProvisionerContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/deployment.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/deployment.yaml
new file mode 100644
index 000000000..522fa8791
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/deployment.yaml
@@ -0,0 +1,10 @@
+{{- $volumeProvisionerContext := deepCopy . }}
+{{- $_ := set $volumeProvisionerContext "Values" (get .Values "volumeProvisioner") }}
+{{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
+{{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
+{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if $volumeProvisionerContext.Values.enabled }}
+{{- include "dind-volume-provisioner.resources.deployment" $volumeProvisionerContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/rbac.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/rbac.yaml
new file mode 100644
index 000000000..f3ae9609f
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/rbac.yaml
@@ -0,0 +1,9 @@
+{{- $volumeProvisionerContext := deepCopy . }}
+{{- $_ := set $volumeProvisionerContext "Values" (get .Values "volumeProvisioner") }}
+{{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
+{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if $volumeProvisionerContext.Values.enabled }}
+{{- include "dind-volume-provisioner.resources.rbac" $volumeProvisionerContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/secret.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/secret.yaml
new file mode 100644
index 000000000..accf601d1
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/secret.yaml
@@ -0,0 +1,10 @@
+{{- $volumeProvisionerContext := deepCopy . }}
+{{- $_ := set $volumeProvisionerContext "Values" (get .Values "volumeProvisioner") }}
+{{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
+{{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
+{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if $volumeProvisionerContext.Values.enabled }}
+{{- include "dind-volume-provisioner.resources.secret" $volumeProvisionerContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/storageclass.yaml b/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/storageclass.yaml
new file mode 100644
index 000000000..77a7602da
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/templates/volume-provisioner/storageclass.yaml
@@ -0,0 +1,10 @@
+{{- $volumeProvisionerContext := deepCopy . }}
+{{- $_ := set $volumeProvisionerContext "Values" (get .Values "volumeProvisioner") }}
+{{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
+{{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
+{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
+
+{{- if $volumeProvisionerContext.Values.enabled }}
+{{- include "dind-volume-provisioner.resources.storageclass" $volumeProvisionerContext }}
+{{- end }}
diff --git a/charts/codefresh/cf-runtime/7.4.2/values-rootless.yaml b/charts/codefresh/cf-runtime/7.4.2/values-rootless.yaml
new file mode 100644
index 000000000..cb35a74fe
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/values-rootless.yaml
@@ -0,0 +1,38 @@
+volumeProvisioner:
+  env:
+    IS_ROOTLESS: true
+  # -- Only if local volumes are used as backend storage (ignored for ebs/ebs-csi disks)
+  dind-lv-monitor:
+    image:
+      tag: 1.30.0-rootless
+      digest: sha256:712e549e6e843b04684647f17e0973f8047e0d60e6e8b38a693ea64dc75b0479
+    containerSecurityContext:
+      runAsUser: 1000
+    podSecurityContext:
+      fsGroup: 1000
+      # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#configure-volume-permission-and-ownership-change-policy-for-pods
+      fsGroupChangePolicy: "OnRootMismatch"
+    # -- Enable initContainer to run chmod for /var/lib/codefresh/dind-volumes on host nodes
+    volumePermissions:
+      enabled: false
+
+runtime:
+  dind:
+    image:
+      tag: 26.1.4-1.28.10-rootless
+      digest: sha256:59dfc004eb22a8f09c8a3d585271a055af9df4591ab815bca418c24a2077f5c8
+    userVolumeMounts:
+      dind:
+        name: dind
+        mountPath: /home/rootless/.local/share/docker
+    containerSecurityContext:
+      privileged: true
+      runAsUser: 1000
+    podSecurityContext:
+      fsGroup: 1000
+      # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#configure-volume-permission-and-ownership-change-policy-for-pods
+      fsGroupChangePolicy: "OnRootMismatch"
+    # -- Enable initContainer to run chmod for /home/rootless in DinD pod
+    # !!! Will slow down dind pod startup
+    volumePermissions:
+      enabled: true
diff --git a/charts/codefresh/cf-runtime/7.4.2/values.yaml b/charts/codefresh/cf-runtime/7.4.2/values.yaml
new file mode 100644
index 000000000..a9e2da89a
--- /dev/null
+++ b/charts/codefresh/cf-runtime/7.4.2/values.yaml
@@ -0,0 +1,916 @@
+# -- String to partially override cf-runtime.fullname template (will maintain the release name)
+nameOverride: ""
+# -- String to fully override cf-runtime.fullname template
+fullnameOverride: ""
+# -- Global parameters
+# @default -- See below
+global:
+  # -- Global Docker image registry
+  imageRegistry: ""
+  # -- Global Docker registry secret names as array
+  imagePullSecrets: []
+  # -- URL of Codefresh Platform (required!)
+  codefreshHost: "https://g.codefresh.io"
+  # -- User token in plain text (required if `global.codefreshTokenSecretKeyRef` is omitted!)
+  # Ref: https://g.codefresh.io/user/settings (see API Keys)
+  # Minimal API key scopes: Runner-Installation(read+write), Agent(read+write), Agents(read+write)
+  codefreshToken: ""
+  # -- User token that references an existing secret containing API key (required if `global.codefreshToken` is omitted!)
+  codefreshTokenSecretKeyRef: {}
+  # E.g.
+  # codefreshTokenSecretKeyRef:
+  #   name: my-codefresh-api-token
+  #   key: codefresh-api-token
+
+  # -- Account ID (required!)
+  # Can be obtained here https://g.codefresh.io/2.0/account-settings/account-information
+  accountId: ""
+  # -- K8s context name (required!)
+  context: ""
+  # E.g.
+  # context: prod-ue1-runtime-1
+
+  # -- Agent Name (optional!)
+  # If omitted, the following format will be used `{{ .Values.global.context }}_{{ .Release.Namespace }}`
+  agentName: ""
+  # E.g.
+  # agentName: prod-ue1-runtime-1
+
+  # -- Runtime name (optional!)
+  # If omitted, the following format will be used `{{ .Values.global.context }}/{{ .Release.Namespace }}`
+  runtimeName: ""
+  # E.g.
+  # runtimeName: prod-ue1-runtime-1/namespace
+
+  # -- DEPRECATED Agent token in plain text.
+  # !!! MUST BE provided if migrating from < 6.x chart version
+  agentToken: ""
+  # -- DEPRECATED Agent token that references an existing secret containing API key.
+  # !!! MUST BE provided if migrating from < 6.x chart version
+  agentTokenSecretKeyRef: {}
+  # E.g.
+  # agentTokenSecretKeyRef:
+  #   name: my-codefresh-agent-secret
+  #   key: codefresh-agent-token
+# DEPRECATED -- Use `.Values.global.imageRegistry` instead
+dockerRegistry: ""
+# DEPRECATED -- Use `.Values.runtime` instead
+re: {}
+# -- Runner parameters
+# @default -- See below
+runner:
+  # -- Enable the runner
+  enabled: true
+  # -- Set number of pods
+  replicasCount: 1
+  # -- Upgrade strategy
+  updateStrategy:
+    type: RollingUpdate
+  # -- Set pod annotations
+  podAnnotations: {}
+  # -- Set image
+  image:
+    registry: quay.io
+    repository: codefresh/venona
+    tag: 2.0.0
+    digest: sha256:bcc6e7495186f1f9c3e885afa891a3bda11b5374a577f069f34ddc75142342ef
+  # -- Init container
+  init:
+    image:
+      registry: quay.io
+      repository: codefresh/cli
+      tag: 0.88.4-rootless
+      digest: sha256:b256d150ff8a636851ddc1d5fb0490114d5036cc5bff357eac6a9899fea87562
+    resources:
+      limits:
+        memory: 512Mi
+        cpu: '1'
+      requests:
+        memory: 256Mi
+        cpu: '0.2'
+  # -- Sidecar container
+  # Reconciles runtime spec from Codefresh API for drift detection
+  sidecar:
+    enabled: false
+    image:
+      registry: quay.io
+      repository: codefresh/kubectl
+      tag: 1.31.2
+      digest: sha256:a30a8810dde249d0198f67792ed9696363f15c8cecbac955ee9bd267b5454ee7
+    env:
+      RECONCILE_INTERVAL: 300
+    resources: {}
+  # -- Add additional env vars
+  env: {}
+  # E.g.
+  # env:
+  #   WORKFLOW_CONCURRENCY: 50 # The number of workflow creation and termination tasks the Runner can handle in parallel. Defaults to 50
+
+  # -- Service Account parameters
+  serviceAccount:
+    # -- Create service account
+    create: true
+    # -- Override service account name
+    name: ""
+    # -- Additional service account annotations
+    annotations: {}
+  # -- RBAC parameters
+  rbac:
+    # -- Create RBAC resources
+    create: true
+    # -- Add custom rule to the role
+    rules: []
+  # -- Set security context for the pod
+  # @default -- See below
+  podSecurityContext:
+    enabled: true
+    runAsUser: 10001
+    runAsGroup: 10001
+    fsGroup: 10001
+  # -- Readiness probe configuration
+  # @default -- See below
+  readinessProbe:
+    failureThreshold: 5
+    initialDelaySeconds: 5
+    periodSeconds: 5
+    successThreshold: 1
+    timeoutSeconds: 5
+  # -- Set requests and limits
+  resources: {}
+  # -- Set node selector
+  nodeSelector: {}
+  # -- Set tolerations
+  tolerations: []
+  # -- Set affinity
+  affinity: {}
+# -- Volume Provisioner parameters
+# @default -- See below
+volumeProvisioner:
+  # -- Enable volume-provisioner
+  enabled: true
+  # -- Set number of pods
+  replicasCount: 1
+  # -- Upgrade strategy
+  updateStrategy:
+    type: Recreate
+  # -- Set pod annotations
+  podAnnotations: {}
+  # -- Set image
+  image:
+    registry: quay.io
+    repository: codefresh/dind-volume-provisioner
+    tag: 1.35.2
+    digest: sha256:ede6f663c912a08b7d335b5ec5518ccc266b27c431d0854d22971005992adc5d
+  # -- Add additional env vars
+  env: {}
+  # E.g.
+  # env:
+  #   THREADINESS: 4 # The number of PVC requests the dind-volume-provisioner can process in parallel. Defaults to 4
+
+  # -- Service Account parameters
+  serviceAccount:
+    # -- Create service account
+    create: true
+    # -- Override service account name
+    name: ""
+    # -- Additional service account annotations
+    annotations: {}
+    # E.g.
+    #   serviceAccount:
+    #     annotations:
+    #       eks.amazonaws.com/role-arn: "arn:aws:iam::<ACCOUNT_ID>:role/<IAM_ROLE_NAME>"
+  # -- RBAC parameters
+  rbac:
+    # -- Create RBAC resources
+    create: true
+    # -- Add custom rule to the role
+    rules: []
+  # -- Set security context for the pod
+  # @default -- See below
+  podSecurityContext:
+    enabled: true
+    runAsUser: 3000
+    runAsGroup: 3000
+    fsGroup: 3000
+  # -- Set node selector
+  nodeSelector: {}
+  # -- Set resources
+  resources: {}
+  # -- Set tolerations
+  tolerations: []
+  # -- Set affinity
+  affinity: {}
+  # -- `dind-lv-monitor` DaemonSet parameters
+  # (local volumes cleaner)
+  # @default -- See below
+  dind-lv-monitor:
+    enabled: true
+    image:
+      registry: quay.io
+      repository: codefresh/dind-volume-utils
+      tag: 1.30.0
+      digest: sha256:506915ccb63481cd6b249e9068235100ea2ae39d4c811c3e49851c20cbe5ee6f
+    podAnnotations: {}
+    podSecurityContext:
+      enabled: false
+      runAsUser: 1000
+      fsGroup: 1000
+    containerSecurityContext: {}
+    env: {}
+    resources: {}
+    nodeSelector: {}
+    tolerations:
+      - key: 'codefresh/dind'
+        operator: 'Exists'
+        effect: 'NoSchedule'
+    volumePermissions:
+      enabled: false
+      image:
+        registry: docker.io
+        repository: alpine
+        tag: 3.18
+        digest: sha256:dd60c75fba961ecc5e918961c713f3c42dd5665171c58f9b2ef5aafe081ad5a0
+      resources: {}
+      securityContext:
+        runAsUser: 0 # auto
+  # `dind-volume-cleanup` CronJob parameters
+  # (external volumes cleaner)
+  # @default -- See below
+  dind-volume-cleanup:
+    enabled: true
+    image:
+      registry: quay.io
+      repository: codefresh/dind-volume-cleanup
+      tag: 1.2.0
+      digest: sha256:1af3e3ecc87bf2e26ba07ecef68f54ad100d7e3b5fcf074099f627fd5d917369
+    env: {}
+    concurrencyPolicy: Forbid
+    schedule: "*/10 * * * *"
+    successfulJobsHistory: 3
+    failedJobsHistory: 1
+    suspend: false
+    podAnnotations: {}
+    podSecurityContext:
+      enabled: true
+      fsGroup: 3000
+      runAsGroup: 3000
+      runAsUser: 3000
+    nodeSelector: {}
+    affinity: {}
+    tolerations: []
+# Storage parameters for volume-provisioner
+# @default -- See below
+storage:
+  # -- Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`)
+  backend: local
+  # -- Set filesystem type (`ext4`/`xfs`)
+  fsType: "ext4"
+  # Storage parametrs example for local volumes on the K8S nodes filesystem (i.e. `storage.backend=local`)
+  # https://kubernetes.io/docs/concepts/storage/volumes/#local
+  # @default -- See below
+  local:
+    # -- Set volume path on the host filesystem
+    volumeParentDir: /var/lib/codefresh/dind-volumes
+  # Storage parameters example for aws ebs disks (i.e. `storage.backend=ebs`/`storage.backend=ebs-csi`)
+  # https://aws.amazon.com/ebs/
+  # https://codefresh.io/docs/docs/installation/codefresh-runner/#aws-backend-volume-configuration
+  # @default -- See below
+  ebs:
+    # -- Set EBS volume type (`gp2`/`gp3`/`io1`) (required)
+    volumeType: "gp2"
+    # -- Set EBS volumes availability zone (required)
+    availabilityZone: "us-east-1a"
+    # -- Enable encryption (optional)
+    encrypted: "false"
+    # -- Set KMS encryption key ID (optional)
+    kmsKeyId: ""
+    # -- Set AWS_ACCESS_KEY_ID for volume-provisioner (optional)
+    # Ref: https://codefresh.io/docs/docs/installation/codefresh-runner/#dind-volume-provisioner-permissions
+    accessKeyId: ""
+    # -- Existing secret containing AWS_ACCESS_KEY_ID.
+    accessKeyIdSecretKeyRef: {}
+    # E.g.
+    # accessKeyIdSecretKeyRef:
+    #   name:
+    #   key:
+
+    # -- Set AWS_SECRET_ACCESS_KEY for volume-provisioner (optional)
+    # Ref: https://codefresh.io/docs/docs/installation/codefresh-runner/#dind-volume-provisioner-permissions
+    secretAccessKey: ""
+    # -- Existing secret containing AWS_SECRET_ACCESS_KEY
+    secretAccessKeySecretKeyRef: {}
+    # E.g.
+    # secretAccessKeySecretKeyRef:
+    #   name:
+    #   key:
+  # E.g.
+  # ebs:
+  #   volumeType: gp3
+  #   availabilityZone: us-east-1c
+  #   encrypted: false
+  #   iops: "5000"
+  #   # I/O operations per second. Only effetive when gp3 volume type is specified.
+  #   # Default value - 3000.
+  #   # Max - 16,000
+  #   throughput: "500"
+  #   # Throughput in MiB/s. Only effective when gp3 volume type is specified.
+  #   # Default value - 125.
+  #   # Max - 1000.
+  # ebs:
+  #   volumeType: gp2
+  #   availabilityZone: us-east-1c
+  #   encrypted: true
+  #   kmsKeyId: "1234abcd-12ab-34cd-56ef-1234567890ab"
+  #   accessKeyId: "MYKEYID"
+  #   secretAccessKey: "MYACCESSKEY"
+
+  # Storage parameters example for gce disks
+  # https://cloud.google.com/compute/docs/disks#pdspecs
+  # https://codefresh.io/docs/docs/installation/codefresh-runner/#gke-google-kubernetes-engine-backend-volume-configuration
+  # @default -- See below
+  gcedisk:
+    # -- Set GCP volume backend type (`pd-ssd`/`pd-standard`)
+    volumeType: "pd-ssd"
+    # -- Set GCP volume availability zone
+    availabilityZone: "us-west1-a"
+    # -- Set Google SA JSON key for volume-provisioner (optional)
+    serviceAccountJson: ""
+    # -- Existing secret containing containing Google SA JSON key for volume-provisioner (optional)
+    serviceAccountJsonSecretKeyRef: {}
+    # E.g.
+    # gcedisk:
+    #   volumeType: pd-ssd
+    #   availabilityZone: us-central1-c
+    #   serviceAccountJson: |-
+    #          {
+    #           "type": "service_account",
+    #           "project_id": "...",
+    #           "private_key_id": "...",
+    #           "private_key": "...",
+    #           "client_email": "...",
+    #           "client_id": "...",
+    #           "auth_uri": "...",
+    #           "token_uri": "...",
+    #           "auth_provider_x509_cert_url": "...",
+    #           "client_x509_cert_url": "..."
+    #           }
+  # Storage parameters example for Azure Disks
+  # https://codefresh.io/docs/docs/installation/codefresh-runner/#install-codefresh-runner-on-azure-kubernetes-service-aks
+  # @default -- See below
+  azuredisk:
+    # -- Set storage type (`Premium_LRS`)
+    skuName: Premium_LRS
+    cachingMode: None
+    # availabilityZone: northeurope-1
+    # resourceGroup:
+    # DiskIOPSReadWrite: 500
+    # DiskMBpsReadWrite: 100
+  mountAzureJson: false
+# -- Set runtime parameters
+# @default -- See below
+runtime:
+  # -- Set annotation on engine Service Account
+  # Ref: https://codefresh.io/docs/docs/administration/codefresh-runner/#injecting-aws-arn-roles-into-the-cluster
+  serviceAccount:
+    create: true
+    annotations: {}
+    # E.g.
+    #   serviceAccount:
+    #     annotations:
+    #       eks.amazonaws.com/role-arn: "arn:aws:iam::<ACCOUNT_ID>:role/<IAM_ROLE_NAME>"
+  # -- Set parent runtime to inherit.
+  # Should not be changes. Parent runtime is controlled from Codefresh side.
+  runtimeExtends:
+    - system/default/hybrid/k8s_low_limits
+  # -- Runtime description
+  description: ""
+  # -- RBAC parameters
+  rbac:
+    # -- Create RBAC resources
+    create: true
+    # -- Add custom rule to the engine role
+    rules: []
+  # -- (for On-Premise only) Enable agent
+  agent: true
+  # -- (for On-Premise only) Set inCluster runtime
+  inCluster: true
+  # -- (for On-Premise only) Assign accounts to runtime (list of account ids)
+  accounts: []
+  # -- Parameters for DinD (docker-in-docker) pod (aka "runtime" pod).
+  dind:
+    # -- Set dind image.
+    image:
+      registry: quay.io
+      repository: codefresh/dind
+      tag: 26.1.4-1.28.8 # use `latest-rootless/rootless/26.1.4-1.28.8-rootless` tags for rootless-dind
+      pullPolicy: IfNotPresent
+      digest: sha256:33c343dd01e8a24f0b4a872bbe62884320719f9d9dc27b7a8fed9f7e9fc7e80e
+    # -- Set dind resources.
+    resources:
+      requests: null
+      limits:
+        cpu: 400m
+        memory: 800Mi
+    # -- Set termination grace period.
+    terminationGracePeriodSeconds: 30
+    # -- PV claim spec parametes.
+    pvcs:
+      # -- Default dind PVC parameters
+      dind:
+        # -- PVC name prefix.
+        # Keep `dind` as default! Don't change!
+        name: dind
+        # -- PVC storage class name.
+        # Change ONLY if you need to use storage class NOT from Codefresh volume-provisioner
+        storageClassName: '{{ include "dind-volume-provisioner.storageClassName" . }}'
+        # -- PVC size.
+        volumeSize: 16Gi
+        # -- PV reuse selector.
+        # Ref: https://codefresh.io/docs/docs/installation/codefresh-runner/#volume-reuse-policy
+        reuseVolumeSelector: codefresh-app,io.codefresh.accountName
+        reuseVolumeSortOrder: pipeline_id
+        # -- PV annotations.
+        annotations: {}
+        # E.g.:
+        # annotations:
+        #   codefresh.io/volume-retention: 7d
+    # -- Set additional env vars.
+    env:
+      DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: true
+    # -- Set pod annotations.
+    podAnnotations: {}
+    # -- Set pod labels.
+    podLabels: {}
+    # -- Set node selector.
+    nodeSelector: {}
+    # -- Set affinity
+    affinity: {}
+    # -- Set tolerations.
+    tolerations: []
+    # -- Set security context for the pod.
+    podSecurityContext: {}
+    # -- Set container security context.
+    containerSecurityContext: {}
+    # -- Set scheduler name.
+    schedulerName: ""
+    # -- Set service account for pod.
+    serviceAccount: codefresh-engine
+    # -- Keep `true` as default!
+    userAccess: true
+    # -- Add extra volumes
+    userVolumes: {}
+    # E.g.:
+    # userVolumes:
+    #   regctl-docker-registry:
+    #     name: regctl-docker-registry
+    #     secret:
+    #       items:
+    #         - key: .dockerconfigjson
+    #           path: config.json
+    #       secretName: regctl-docker-registry
+    #       optional: true
+    # -- Add extra volume mounts
+    userVolumeMounts: {}
+    # E.g.:
+    # userVolumeMounts:
+    #   regctl-docker-registry:
+    #     name: regctl-docker-registry
+    #     mountPath: /home/appuser/.docker/
+    #     readOnly: true
+    volumePermissions:
+      enabled: false
+      image:
+        registry: docker.io
+        repository: alpine
+        tag: 3.18
+        digest: sha256:dd60c75fba961ecc5e918961c713f3c42dd5665171c58f9b2ef5aafe081ad5a0
+      resources: {}
+      securityContext:
+        runAsUser: 0 # auto
+  # -- Parameters for Engine pod (aka "pipeline" orchestrator).
+  engine:
+    # -- Set image.
+    image:
+      registry: quay.io
+      repository: codefresh/engine
+      tag: 1.176.3
+      pullPolicy: IfNotPresent
+      digest: sha256:f814ae79c68405e00819458e050b58f0b4cb6db7635961c239beec2fc1f90785
+    # -- Set container command.
+    command:
+      - npm
+      - run
+      - start
+    # -- Set resources.
+    resources:
+      requests:
+        cpu: 100m
+        memory: 128Mi
+      limits:
+        cpu: 1000m
+        memory: 2048Mi
+    # -- Set termination grace period.
+    terminationGracePeriodSeconds: 180
+    # -- Set system(base) runtime images.
+    # @default -- See below.
+    runtimeImages:
+      COMPOSE_IMAGE: quay.io/codefresh/compose:v2.32.2-1.5.2@sha256:9177054614f6db006a3500d2b9b8d2cafac4073ce891929d93e117714fccbd4b
+      CONTAINER_LOGGER_IMAGE: quay.io/codefresh/cf-container-logger:1.11.8@sha256:db1e1e7f038262cb6051b01c20cde276150ae731479e5d1e0aef39d08fc72ae5
+      DOCKER_BUILDER_IMAGE: quay.io/codefresh/cf-docker-builder:1.4.1@sha256:d0e4b679ac83d092bc9424d49741ac6153521b4ab72bf6f7603b70de4b7afd12
+      DOCKER_PULLER_IMAGE: quay.io/codefresh/cf-docker-puller:8.0.18@sha256:1a15c3ae0952d3986de7866a3def8ac7e3e39f668fe87fd46c63d886ca06c6d7
+      DOCKER_PUSHER_IMAGE: quay.io/codefresh/cf-docker-pusher:6.0.16@sha256:05efc1af8b1196f1b9b3f0781b4dcc1aa2cdd0ffc1347ee5fa81b16d029ec5c2
+      DOCKER_TAG_PUSHER_IMAGE: quay.io/codefresh/cf-docker-tag-pusher:1.3.15@sha256:3a3e90cd10801c7ec0d3cf3816d0dcc90894d5d1771448c43f67215d90da5eca
+      FS_OPS_IMAGE: quay.io/codefresh/fs-ops:1.2.7@sha256:1e98266ba808f059005e94e8ae072522aeaff632730a8425b8b8849fce8eabd4
+      GIT_CLONE_IMAGE: quay.io/codefresh/cf-git-cloner:10.2.0@sha256:a3ec854823f17d0fd817d978219122e644b1abd6db778fd835688fcb6d88c515
+      KUBE_DEPLOY: quay.io/codefresh/cf-deploy-kubernetes:16.1.11@sha256:b6b3fc6cc5fad3ba9e36055278ce99a74a86876be116574503c6fbb4c1b4aa76
+      PIPELINE_DEBUGGER_IMAGE: quay.io/codefresh/cf-debugger:1.3.7@sha256:3391822b7ad9835cc2a3a0ce5aaa55774ca110a8682d9512205dea24f438718a
+      TEMPLATE_ENGINE: quay.io/codefresh/pikolo:0.14.1@sha256:fb7173cfed7536f7de68e75996106e2ce3a0a204e6c5609cba0d7eb62c9db9e1
+      CR_6177_FIXER: alpine:edge@sha256:115729ec5cb049ba6359c3ab005ac742012d92bbaa5b8bc1a878f1e8f62c0cb8
+      GC_BUILDER_IMAGE: quay.io/codefresh/cf-gc-builder:0.5.3@sha256:33ac914e6b844909f188a208cf90e569358cafa5aaa60f49848f49d99bcaf875
+      COSIGN_IMAGE_SIGNER_IMAGE: quay.io/codefresh/cf-cosign-image-signer:2.4.0-cf.2@sha256:5e0993207aa809c25ed70cf89af444d9720892fb4a29deb82db45618b0cae4a9
+    # -- Set additional env vars.
+    env:
+      # -- Interval to check the exec status in the container-logger
+      CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: 1000
+      # -- Timeout while doing requests to the Docker daemon
+      DOCKER_REQUEST_TIMEOUT_MS: 30000
+      # -- If "true", composition images will be pulled sequentially
+      FORCE_COMPOSE_SERIAL_PULL: false
+      # -- Level of logging for engine
+      LOGGER_LEVEL: debug
+      # -- Enable debug-level logging of outgoing HTTP/HTTPS requests
+      LOG_OUTGOING_HTTP_REQUESTS: false
+      # -- Enable emitting metrics from engine
+      METRICS_PROMETHEUS_ENABLED: true
+      # -- Enable legacy metrics
+      METRICS_PROMETHEUS_ENABLE_LEGACY_METRICS: false
+      # -- Enable collecting process metrics
+      METRICS_PROMETHEUS_COLLECT_PROCESS_METRICS: false
+      # -- Host for Prometheus metrics server
+      METRICS_PROMETHEUS_HOST: '0.0.0.0'
+      # -- Port for Prometheus metrics server
+      METRICS_PROMETHEUS_PORT: 9100
+      # -- The timeout till the engine waits for Prometheus to pull the latest metrics before engine shuts down (in milliseconds)
+      METRICS_PROMETHEUS_SCRAPE_TIMEOUT: '15000'
+      # -- Trusted QEMU images used for docker builds - when left blank only 'tonistiigi/binfmt' is trusted.
+      TRUSTED_QEMU_IMAGES: ''
+    # -- Set workflow limits.
+    workflowLimits:
+      # -- Maximum time allowed to the engine to wait for the pre-steps (aka "Initializing Process") to succeed; seconds.
+      MAXIMUM_ALLOWED_TIME_BEFORE_PRE_STEPS_SUCCESS: 600
+      # -- Maximum time for workflow execution; seconds.
+      MAXIMUM_ALLOWED_WORKFLOW_AGE_BEFORE_TERMINATION: 86400
+      # -- Maximum time allowed to workflow to spend in "elected" state; seconds.
+      MAXIMUM_ELECTED_STATE_AGE_ALLOWED: 900
+      # -- Maximum retry attempts allowed for workflow.
+      MAXIMUM_RETRY_ATTEMPTS_ALLOWED: 20
+      # -- Maximum time allowed to workflow to spend in "terminating" state until force terminated; seconds.
+      MAXIMUM_TERMINATING_STATE_AGE_ALLOWED: 900
+      # -- Maximum time allowed to workflow to spend in "terminating" state without logs activity until force terminated; seconds.
+      MAXIMUM_TERMINATING_STATE_AGE_ALLOWED_WITHOUT_UPDATE: 300
+      # -- Time since the last health check report after which workflow is terminated; seconds.
+      TIME_ENGINE_INACTIVE_UNTIL_TERMINATION: 300
+      # -- Time since the last health check report after which the engine is considered unhealthy; seconds.
+      TIME_ENGINE_INACTIVE_UNTIL_UNHEALTHY: 60
+      # -- Time since the last workflow logs activity after which workflow is terminated; seconds.
+      TIME_INACTIVE_UNTIL_TERMINATION: 2700
+    # -- Set pod annotations.
+    podAnnotations: {}
+    # -- Set pod labels.
+    podLabels: {}
+    # -- Set node selector.
+    nodeSelector: {}
+    # -- Set affinity
+    affinity: {}
+    # -- Set tolerations.
+    tolerations: []
+    # -- Set scheduler name.
+    schedulerName: ""
+    # -- Set service account for pod.
+    serviceAccount: codefresh-engine
+    # -- Set extra env vars
+    userEnvVars: []
+    # E.g.
+    # userEnvVars:
+    # - name: GITHUB_TOKEN
+    #   valueFrom:
+    #     secretKeyRef:
+    #       name: github-token
+    #       key: token
+  # -- Parameters for `runtime-patch` post-upgrade/install hook
+  # @default -- See below
+  patch:
+    enabled: true
+    image:
+      registry: quay.io
+      repository: codefresh/cli
+      tag: 0.88.4-rootless
+      digest: sha256:b256d150ff8a636851ddc1d5fb0490114d5036cc5bff357eac6a9899fea87562
+    rbac:
+      enabled: true
+    annotations: {}
+    affinity: {}
+    nodeSelector: {}
+    podSecurityContext: {}
+    resources: {}
+    tolerations: []
+    ttlSecondsAfterFinished: 180
+    env:
+      HOME: /tmp
+  # -- Parameters for `gencerts-dind` post-upgrade/install hook
+  # @default -- See below
+  gencerts:
+    enabled: true
+    image:
+      registry: quay.io
+      repository: codefresh/kubectl
+      tag: 1.31.2
+      digest: sha256:a30a8810dde249d0198f67792ed9696363f15c8cecbac955ee9bd267b5454ee7
+    rbac:
+      enabled: true
+    annotations: {}
+    affinity: {}
+    nodeSelector: {}
+    podSecurityContext: {}
+    resources: {}
+    tolerations: []
+    ttlSecondsAfterFinished: 180
+  # -- DinD pod daemon config
+  # @default -- See below
+  dindDaemon:
+    hosts:
+      - unix:///var/run/docker.sock
+      - tcp://0.0.0.0:1300
+    tlsverify: true
+    tls: true
+    tlscacert: /etc/ssl/cf-client/ca.pem
+    tlscert: /etc/ssl/cf/server-cert.pem
+    tlskey: /etc/ssl/cf/server-key.pem
+    insecure-registries:
+      - 192.168.99.100:5000
+    metrics-addr: 0.0.0.0:9323
+    experimental: true
+# App-Proxy parameters
+# Ref: https://codefresh.io/docs/docs/installation/codefresh-runner/#app-proxy-installation
+# @default -- See below
+appProxy:
+  # -- Enable app-proxy
+  enabled: false
+  # -- Set number of pods
+  replicasCount: 1
+  # -- Upgrade strategy
+  updateStrategy:
+    type: RollingUpdate
+  # -- Set pod annotations
+  podAnnotations: {}
+  # -- Set image
+  image:
+    registry: quay.io
+    repository: codefresh/cf-app-proxy
+    tag: 0.0.47
+    digest: sha256:324a9b89924152cce195c7239ddd8501c8aa5f901d19bc4d9f3936cbe5dac14f
+  # -- Add additional env vars
+  env: {}
+  # Set app-proxy ingress parameters
+  # @default -- See below
+  ingress:
+    # -- Set path prefix for ingress (keep empty for default `/` path)
+    pathPrefix: ""
+    # -- Set ingress class
+    class: ""
+    # -- Set DNS hostname the ingress will use
+    host: ""
+    # -- Set k8s tls secret for the ingress object
+    tlsSecret: ""
+    # -- Set extra annotations for ingress object
+    annotations: {}
+    # E.g.
+    # ingress:
+    #   pathPrefix: "/cf-app-proxy"
+    #   class: "nginx"
+    #   host: "mydomain.com"
+    #   tlsSecret: "tls-cert-app-proxy"
+    #   annotations:
+    #     nginx.ingress.kubernetes.io/whitelist-source-range: 123.123.123.123/130
+  # -- Service Account parameters
+  serviceAccount:
+    # -- Create service account
+    create: true
+    # -- Override service account name
+    name: ""
+    # -- Use Role(true)/ClusterRole(true)
+    namespaced: true
+    # -- Additional service account annotations
+    annotations: {}
+  # -- RBAC parameters
+  rbac:
+    # -- Create RBAC resources
+    create: true
+    # -- Use Role(true)/ClusterRole(true)
+    namespaced: true
+    # -- Add custom rule to the role
+    rules: []
+  # -- Set security context for the pod
+  podSecurityContext: {}
+  # -- Readiness probe configuration
+  # @default -- See below
+  readinessProbe:
+    failureThreshold: 5
+    initialDelaySeconds: 5
+    periodSeconds: 5
+    successThreshold: 1
+    timeoutSeconds: 5
+  # -- Set requests and limits
+  resources: {}
+  # -- Set node selector
+  nodeSelector: {}
+  # -- Set tolerations
+  tolerations: []
+  # -- Set affinity
+  affinity: {}
+# Monitor parameters
+# @default -- See below
+monitor:
+  # -- Enable monitor
+  # Ref: https://codefresh.io/docs/docs/installation/codefresh-runner/#install-monitoring-component
+  enabled: false
+  # -- Set number of pods
+  replicasCount: 1
+  # -- Upgrade strategy
+  updateStrategy:
+    type: RollingUpdate
+  # -- Set pod annotations
+  podAnnotations: {}
+  # -- Set image
+  image:
+    registry: quay.io
+    repository: codefresh/cf-k8s-agent
+    tag: 1.3.19
+    digest: sha256:5be2b798d583abdae68271f57724dd7f2b0251a238845c466fa7b67f078f59ad
+  # -- Add additional env vars
+  env: {}
+  # -- Service Account parameters
+  serviceAccount:
+    # -- Create service account
+    create: true
+    # -- Override service account name
+    name: ""
+    # -- Additional service account annotations
+    annotations: {}
+  # -- RBAC parameters
+  rbac:
+    # -- Create RBAC resources
+    create: true
+    # -- Use Role(true)/ClusterRole(true)
+    namespaced: true
+    # -- Add custom rule to the role
+    rules: []
+  # -- Readiness probe configuration
+  # @default -- See below
+  readinessProbe:
+    failureThreshold: 5
+    initialDelaySeconds: 5
+    periodSeconds: 5
+    successThreshold: 1
+    timeoutSeconds: 5
+  podSecurityContext: {}
+  # -- Set node selector
+  nodeSelector: {}
+  # -- Set resources
+  resources: {}
+  # -- Set tolerations
+  tolerations: []
+  # -- Set affinity
+  affinity: {}
+# -- Add serviceMonitor
+# @default -- See below
+serviceMonitor:
+  main:
+    # -- Enable service monitor for dind pods
+    enabled: false
+    nameOverride: dind
+    selector:
+      matchLabels:
+        app: dind
+    endpoints:
+      - path: /metrics
+        targetPort: 9100
+        relabelings:
+          - action: labelmap
+            regex: __meta_kubernetes_pod_label_(.+)
+# -- Add podMonitor (for engine pods)
+# @default -- See below
+podMonitor:
+  main:
+    # -- Enable pod monitor for engine pods
+    enabled: false
+    nameOverride: engine
+    selector:
+      matchLabels:
+        app: runtime
+    podMetricsEndpoints:
+      - path: /metrics
+        targetPort: 9100
+  runner:
+    # -- Enable pod monitor for runner pod
+    enabled: false
+    nameOverride: runner
+    selector:
+      matchLabels:
+        codefresh.io/application: runner
+    podMetricsEndpoints:
+      - path: /metrics
+        targetPort: 8080
+  volume-provisioner:
+    # -- Enable pod monitor for volumeProvisioner pod
+    enabled: false
+    nameOverride: volume-provisioner
+    selector:
+      matchLabels:
+        codefresh.io/application: volume-provisioner
+    podMetricsEndpoints:
+      - path: /metrics
+        targetPort: 8080
+# -- Event exporter parameters
+# @default -- See below
+event-exporter:
+  # -- Enable event-exporter
+  enabled: false
+  # -- Set number of pods
+  replicasCount: 1
+  # -- Upgrade strategy
+  updateStrategy:
+    type: Recreate
+  # -- Set pod annotations
+  podAnnotations: {}
+  # -- Set image
+  image:
+    registry: docker.io
+    repository: codefresh/k8s-event-exporter
+    tag: latest
+    digest: sha256:cf52048f1378fb6659dffd1394d68fdf23a7ea709585dc14b5007f3e5a1b7584
+  # -- Add additional env vars
+  env: {}
+  # -- Service Account parameters
+  serviceAccount:
+    # -- Create service account
+    create: true
+    # -- Override service account name
+    name: ""
+    # -- Additional service account annotations
+    annotations: {}
+  # -- RBAC parameters
+  rbac:
+    # -- Create RBAC resources
+    create: true
+    # -- Add custom rule to the role
+    rules: []
+  # -- Set security context for the pod
+  # @default -- See below
+  podSecurityContext:
+    enabled: false
+  # -- Set node selector
+  nodeSelector: {}
+  # -- Set resources
+  resources: {}
+  # -- Set tolerations
+  tolerations: []
+  # -- Set affinity
+  affinity: {}
+# -- Array of extra objects to deploy with the release
+extraResources: []
+# E.g.
+# extraResources:
+# - apiVersion: rbac.authorization.k8s.io/v1
+#   kind: ClusterRole
+#   metadata:
+#     name: codefresh-role
+#   rules:
+#     - apiGroups: [ "*"]
+#       resources: ["*"]
+#       verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+# - apiVersion: v1
+#   kind: ServiceAccount
+#   metadata:
+#     name: codefresh-user
+#     namespace: "{{ .Release.Namespace }}"
+# - apiVersion: rbac.authorization.k8s.io/v1
+#   kind: ClusterRoleBinding
+#   metadata:
+#     name: codefresh-user
+#   roleRef:
+#     apiGroup: rbac.authorization.k8s.io
+#     kind: ClusterRole
+#     name: codefresh-role
+#   subjects:
+#   - kind: ServiceAccount
+#     name: codefresh-user
+#     namespace: "{{ .Release.Namespace }}"
+# - apiVersion: v1
+#   kind: Secret
+#   type: kubernetes.io/service-account-token
+#   metadata:
+#     name: codefresh-user-token
+#     namespace: "{{ .Release.Namespace }}"
+#     annotations:
+#       kubernetes.io/service-account.name: "codefresh-user"
diff --git a/charts/external-secrets/external-secrets/0.13.0/Chart.lock b/charts/external-secrets/external-secrets/0.13.0/Chart.lock
new file mode 100644
index 000000000..f9abae8c1
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: bitwarden-sdk-server
+  repository: oci://ghcr.io/external-secrets/charts
+  version: v0.3.1
+digest: sha256:2d01e9083fc32c18dca4f9614625e0172e338a663138c2670e5b911645b6b8ee
+generated: "2024-09-20T12:57:07.63511+02:00"
diff --git a/charts/external-secrets/external-secrets/0.13.0/Chart.yaml b/charts/external-secrets/external-secrets/0.13.0/Chart.yaml
new file mode 100644
index 000000000..4c3ef9501
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/Chart.yaml
@@ -0,0 +1,25 @@
+annotations:
+  catalog.cattle.io/certified: partner
+  catalog.cattle.io/display-name: External Secrets Operator
+  catalog.cattle.io/kube-version: '>= 1.19.0-0'
+  catalog.cattle.io/release-name: external-secrets
+apiVersion: v2
+appVersion: v0.13.0
+dependencies:
+- condition: bitwarden-sdk-server.enabled
+  name: bitwarden-sdk-server
+  repository: oci://ghcr.io/external-secrets/charts
+  version: v0.3.1
+description: External secret management for Kubernetes
+home: https://github.com/external-secrets/external-secrets
+icon: file://assets/icons/external-secrets.png
+keywords:
+- kubernetes-external-secrets
+- secrets
+kubeVersion: '>= 1.19.0-0'
+maintainers:
+- email: kellinmcavoy@gmail.com
+  name: mcavoyk
+name: external-secrets
+type: application
+version: 0.13.0
diff --git a/charts/external-secrets/external-secrets/0.13.0/README.md b/charts/external-secrets/external-secrets/0.13.0/README.md
new file mode 100644
index 000000000..81e0e019e
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/README.md
@@ -0,0 +1,226 @@
+# External Secrets
+
+<p><img src="https://raw.githubusercontent.com/external-secrets/external-secrets/main/assets/eso-logo-large.png" width="100x"  alt="external-secrets"></p>
+
+[//]: # (README.md generated by gotmpl. DO NOT EDIT.)
+
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.12.1](https://img.shields.io/badge/Version-0.12.1-informational?style=flat-square)
+
+External secret management for Kubernetes
+
+## TL;DR
+```bash
+helm repo add external-secrets https://charts.external-secrets.io
+helm install external-secrets external-secrets/external-secrets
+```
+
+## Installing the Chart
+To install the chart with the release name `external-secrets`:
+```bash
+helm install external-secrets external-secrets/external-secrets
+```
+
+### Custom Resources
+By default, the chart will install external-secrets CRDs, this can be controlled with `installCRDs` value.
+
+## Uninstalling the Chart
+To uninstall the `external-secrets` deployment:
+```bash
+helm uninstall external-secrets
+```
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` |  |
+| bitwarden-sdk-server.enabled | bool | `false` |  |
+| certController.affinity | object | `{}` |  |
+| certController.create | bool | `true` | Specifies whether a certificate controller deployment be created. |
+| certController.deploymentAnnotations | object | `{}` | Annotations to add to Deployment |
+| certController.extraArgs | object | `{}` |  |
+| certController.extraEnv | list | `[]` |  |
+| certController.extraVolumeMounts | list | `[]` |  |
+| certController.extraVolumes | list | `[]` |  |
+| certController.fullnameOverride | string | `""` |  |
+| certController.hostNetwork | bool | `false` | Run the certController on the host network |
+| certController.image.flavour | string | `""` |  |
+| certController.image.pullPolicy | string | `"IfNotPresent"` |  |
+| certController.image.repository | string | `"oci.external-secrets.io/external-secrets/external-secrets"` |  |
+| certController.image.tag | string | `""` |  |
+| certController.imagePullSecrets | list | `[]` |  |
+| certController.log | object | `{"level":"info","timeEncoding":"epoch"}` | Specifices Log Params to the Webhook |
+| certController.metrics.listen.port | int | `8080` |  |
+| certController.metrics.service.annotations | object | `{}` | Additional service annotations |
+| certController.metrics.service.enabled | bool | `false` | Enable if you use another monitoring tool than Prometheus to scrape the metrics |
+| certController.metrics.service.port | int | `8080` | Metrics service port to scrape |
+| certController.nameOverride | string | `""` |  |
+| certController.nodeSelector | object | `{}` |  |
+| certController.podAnnotations | object | `{}` | Annotations to add to Pod |
+| certController.podDisruptionBudget | object | `{"enabled":false,"minAvailable":1}` | Pod disruption budget - for more details see https://kubernetes.io/docs/concepts/workloads/pods/disruptions/ |
+| certController.podLabels | object | `{}` |  |
+| certController.podSecurityContext.enabled | bool | `true` |  |
+| certController.priorityClassName | string | `""` | Pod priority class name. |
+| certController.rbac.create | bool | `true` | Specifies whether role and rolebinding resources should be created. |
+| certController.readinessProbe.address | string | `""` | Address for readiness probe |
+| certController.readinessProbe.port | int | `8081` | ReadinessProbe port for kubelet |
+| certController.replicaCount | int | `1` |  |
+| certController.requeueInterval | string | `"5m"` |  |
+| certController.resources | object | `{}` |  |
+| certController.revisionHistoryLimit | int | `10` | Specifies the amount of historic ReplicaSets k8s should keep (see https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#clean-up-policy) |
+| certController.securityContext.allowPrivilegeEscalation | bool | `false` |  |
+| certController.securityContext.capabilities.drop[0] | string | `"ALL"` |  |
+| certController.securityContext.enabled | bool | `true` |  |
+| certController.securityContext.readOnlyRootFilesystem | bool | `true` |  |
+| certController.securityContext.runAsNonRoot | bool | `true` |  |
+| certController.securityContext.runAsUser | int | `1000` |  |
+| certController.securityContext.seccompProfile.type | string | `"RuntimeDefault"` |  |
+| certController.serviceAccount.annotations | object | `{}` | Annotations to add to the service account. |
+| certController.serviceAccount.automount | bool | `true` | Automounts the service account token in all containers of the pod |
+| certController.serviceAccount.create | bool | `true` | Specifies whether a service account should be created. |
+| certController.serviceAccount.extraLabels | object | `{}` | Extra Labels to add to the service account. |
+| certController.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template. |
+| certController.tolerations | list | `[]` |  |
+| certController.topologySpreadConstraints | list | `[]` |  |
+| commonLabels | object | `{}` | Additional labels added to all helm chart resources. |
+| concurrent | int | `1` | Specifies the number of concurrent ExternalSecret Reconciles external-secret executes at a time. |
+| controllerClass | string | `""` | If set external secrets will filter matching Secret Stores with the appropriate controller values. |
+| crds.annotations | object | `{}` |  |
+| crds.conversion.enabled | bool | `true` | If webhook is set to false this also needs to be set to false otherwise the kubeapi will be hammered because the conversion is looking for a webhook endpoint. |
+| crds.createClusterExternalSecret | bool | `true` | If true, create CRDs for Cluster External Secret. |
+| crds.createClusterGenerator | bool | `true` | If true, create CRDs for Cluster Generator. |
+| crds.createClusterSecretStore | bool | `true` | If true, create CRDs for Cluster Secret Store. |
+| crds.createPushSecret | bool | `true` | If true, create CRDs for Push Secret. |
+| createOperator | bool | `true` | Specifies whether an external secret operator deployment be created. |
+| deploymentAnnotations | object | `{}` | Annotations to add to Deployment |
+| dnsConfig | object | `{}` | Specifies `dnsOptions` to deployment |
+| dnsPolicy | string | `"ClusterFirst"` | Specifies `dnsPolicy` to deployment |
+| extendedMetricLabels | bool | `false` | If true external secrets will use recommended kubernetes annotations as prometheus metric labels. |
+| extraArgs | object | `{}` |  |
+| extraContainers | list | `[]` |  |
+| extraEnv | list | `[]` |  |
+| extraObjects | list | `[]` |  |
+| extraVolumeMounts | list | `[]` |  |
+| extraVolumes | list | `[]` |  |
+| fullnameOverride | string | `""` |  |
+| global.affinity | object | `{}` |  |
+| global.compatibility.openshift.adaptSecurityContext | string | `"auto"` | Manages the securityContext properties to make them compatible with OpenShift. Possible values: auto - Apply configurations if it is detected that OpenShift is the target platform. force - Always apply configurations. disabled - No modification applied. |
+| global.nodeSelector | object | `{}` |  |
+| global.tolerations | list | `[]` |  |
+| global.topologySpreadConstraints | list | `[]` |  |
+| hostNetwork | bool | `false` | Run the controller on the host network |
+| image.flavour | string | `""` | The flavour of tag you want to use There are different image flavours available, like distroless and ubi. Please see GitHub release notes for image tags for these flavors. By default, the distroless image is used. |
+| image.pullPolicy | string | `"IfNotPresent"` |  |
+| image.repository | string | `"oci.external-secrets.io/external-secrets/external-secrets"` |  |
+| image.tag | string | `""` | The image tag to use. The default is the chart appVersion. |
+| imagePullSecrets | list | `[]` |  |
+| installCRDs | bool | `true` | If set, install and upgrade CRDs through helm chart. |
+| leaderElect | bool | `false` | If true, external-secrets will perform leader election between instances to ensure no more than one instance of external-secrets operates at a time. |
+| log | object | `{"level":"info","timeEncoding":"epoch"}` | Specifices Log Params to the Webhook |
+| metrics.listen.port | int | `8080` |  |
+| metrics.service.annotations | object | `{}` | Additional service annotations |
+| metrics.service.enabled | bool | `false` | Enable if you use another monitoring tool than Prometheus to scrape the metrics |
+| metrics.service.port | int | `8080` | Metrics service port to scrape |
+| nameOverride | string | `""` |  |
+| namespaceOverride | string | `""` |  |
+| nodeSelector | object | `{}` |  |
+| podAnnotations | object | `{}` | Annotations to add to Pod |
+| podDisruptionBudget | object | `{"enabled":false,"minAvailable":1}` | Pod disruption budget - for more details see https://kubernetes.io/docs/concepts/workloads/pods/disruptions/ |
+| podLabels | object | `{}` |  |
+| podSecurityContext.enabled | bool | `true` |  |
+| podSpecExtra | object | `{}` | Any extra pod spec on the deployment |
+| priorityClassName | string | `""` | Pod priority class name. |
+| processClusterExternalSecret | bool | `true` | if true, the operator will process cluster external secret. Else, it will ignore them. |
+| processClusterStore | bool | `true` | if true, the operator will process cluster store. Else, it will ignore them. |
+| processPushSecret | bool | `true` | if true, the operator will process push secret. Else, it will ignore them. |
+| rbac.create | bool | `true` | Specifies whether role and rolebinding resources should be created. |
+| rbac.servicebindings.create | bool | `true` | Specifies whether a clusterrole to give servicebindings read access should be created. |
+| replicaCount | int | `1` |  |
+| resources | object | `{}` |  |
+| revisionHistoryLimit | int | `10` | Specifies the amount of historic ReplicaSets k8s should keep (see https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#clean-up-policy) |
+| scopedNamespace | string | `""` | If set external secrets are only reconciled in the provided namespace |
+| scopedRBAC | bool | `false` | Must be used with scopedNamespace. If true, create scoped RBAC roles under the scoped namespace and implicitly disable cluster stores and cluster external secrets |
+| securityContext.allowPrivilegeEscalation | bool | `false` |  |
+| securityContext.capabilities.drop[0] | string | `"ALL"` |  |
+| securityContext.enabled | bool | `true` |  |
+| securityContext.readOnlyRootFilesystem | bool | `true` |  |
+| securityContext.runAsNonRoot | bool | `true` |  |
+| securityContext.runAsUser | int | `1000` |  |
+| securityContext.seccompProfile.type | string | `"RuntimeDefault"` |  |
+| service.ipFamilies | list | `[]` | Sets the families that should be supported and the order in which they should be applied to ClusterIP as well. Can be IPv4 and/or IPv6. |
+| service.ipFamilyPolicy | string | `""` | Set the ip family policy to configure dual-stack see [Configure dual-stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services) |
+| serviceAccount.annotations | object | `{}` | Annotations to add to the service account. |
+| serviceAccount.automount | bool | `true` | Automounts the service account token in all containers of the pod |
+| serviceAccount.create | bool | `true` | Specifies whether a service account should be created. |
+| serviceAccount.extraLabels | object | `{}` | Extra Labels to add to the service account. |
+| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template. |
+| serviceMonitor.additionalLabels | object | `{}` | Additional labels |
+| serviceMonitor.enabled | bool | `false` | Specifies whether to create a ServiceMonitor resource for collecting Prometheus metrics |
+| serviceMonitor.honorLabels | bool | `false` | Let prometheus add an exported_ prefix to conflicting labels |
+| serviceMonitor.interval | string | `"30s"` | Interval to scrape metrics |
+| serviceMonitor.metricRelabelings | list | `[]` | Metric relabel configs to apply to samples before ingestion. [Metric Relabeling](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs) |
+| serviceMonitor.namespace | string | `""` | namespace where you want to install ServiceMonitors |
+| serviceMonitor.relabelings | list | `[]` | Relabel configs to apply to samples before ingestion. [Relabeling](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config) |
+| serviceMonitor.scrapeTimeout | string | `"25s"` | Timeout if metrics can't be retrieved in given time interval |
+| tolerations | list | `[]` |  |
+| topologySpreadConstraints | list | `[]` |  |
+| webhook.affinity | object | `{}` |  |
+| webhook.certCheckInterval | string | `"5m"` | Specifices the time to check if the cert is valid |
+| webhook.certDir | string | `"/tmp/certs"` |  |
+| webhook.certManager.addInjectorAnnotations | bool | `true` | Automatically add the cert-manager.io/inject-ca-from annotation to the webhooks and CRDs. As long as you have the cert-manager CA Injector enabled, this will automatically setup your webhook's CA to the one used by cert-manager. See https://cert-manager.io/docs/concepts/ca-injector |
+| webhook.certManager.cert.annotations | object | `{}` | Add extra annotations to the Certificate resource. |
+| webhook.certManager.cert.create | bool | `true` | Create a certificate resource within this chart. See https://cert-manager.io/docs/usage/certificate/ |
+| webhook.certManager.cert.duration | string | `"8760h"` | Set the requested duration (i.e. lifetime) of the Certificate. See https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.CertificateSpec One year by default. |
+| webhook.certManager.cert.issuerRef | object | `{"group":"cert-manager.io","kind":"Issuer","name":"my-issuer"}` | For the Certificate created by this chart, setup the issuer. See https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.IssuerSpec |
+| webhook.certManager.cert.renewBefore | string | `""` | How long before the currently issued certificate’s expiry cert-manager should renew the certificate. See https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.CertificateSpec Note that renewBefore should be greater than .webhook.lookaheadInterval since the webhook will check this far in advance that the certificate is valid. |
+| webhook.certManager.enabled | bool | `false` | Enabling cert-manager support will disable the built in secret and switch to using cert-manager (installed separately) to automatically issue and renew the webhook certificate. This chart does not install cert-manager for you, See https://cert-manager.io/docs/ |
+| webhook.create | bool | `true` | Specifies whether a webhook deployment be created. |
+| webhook.deploymentAnnotations | object | `{}` | Annotations to add to Deployment |
+| webhook.extraArgs | object | `{}` |  |
+| webhook.extraEnv | list | `[]` |  |
+| webhook.extraVolumeMounts | list | `[]` |  |
+| webhook.extraVolumes | list | `[]` |  |
+| webhook.failurePolicy | string | `"Fail"` | Specifies whether validating webhooks should be created with failurePolicy: Fail or Ignore |
+| webhook.fullnameOverride | string | `""` |  |
+| webhook.hostNetwork | bool | `false` | Specifies if webhook pod should use hostNetwork or not. |
+| webhook.image.flavour | string | `""` | The flavour of tag you want to use |
+| webhook.image.pullPolicy | string | `"IfNotPresent"` |  |
+| webhook.image.repository | string | `"oci.external-secrets.io/external-secrets/external-secrets"` |  |
+| webhook.image.tag | string | `""` | The image tag to use. The default is the chart appVersion. |
+| webhook.imagePullSecrets | list | `[]` |  |
+| webhook.log | object | `{"level":"info","timeEncoding":"epoch"}` | Specifices Log Params to the Webhook |
+| webhook.lookaheadInterval | string | `""` | Specifices the lookaheadInterval for certificate validity |
+| webhook.metrics.listen.port | int | `8080` |  |
+| webhook.metrics.service.annotations | object | `{}` | Additional service annotations |
+| webhook.metrics.service.enabled | bool | `false` | Enable if you use another monitoring tool than Prometheus to scrape the metrics |
+| webhook.metrics.service.port | int | `8080` | Metrics service port to scrape |
+| webhook.nameOverride | string | `""` |  |
+| webhook.nodeSelector | object | `{}` |  |
+| webhook.podAnnotations | object | `{}` | Annotations to add to Pod |
+| webhook.podDisruptionBudget | object | `{"enabled":false,"minAvailable":1}` | Pod disruption budget - for more details see https://kubernetes.io/docs/concepts/workloads/pods/disruptions/ |
+| webhook.podLabels | object | `{}` |  |
+| webhook.podSecurityContext.enabled | bool | `true` |  |
+| webhook.port | int | `10250` | The port the webhook will listen to |
+| webhook.priorityClassName | string | `""` | Pod priority class name. |
+| webhook.rbac.create | bool | `true` | Specifies whether role and rolebinding resources should be created. |
+| webhook.readinessProbe.address | string | `""` | Address for readiness probe |
+| webhook.readinessProbe.port | int | `8081` | ReadinessProbe port for kubelet |
+| webhook.replicaCount | int | `1` |  |
+| webhook.resources | object | `{}` |  |
+| webhook.revisionHistoryLimit | int | `10` | Specifies the amount of historic ReplicaSets k8s should keep (see https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#clean-up-policy) |
+| webhook.secretAnnotations | object | `{}` | Annotations to add to Secret |
+| webhook.securityContext.allowPrivilegeEscalation | bool | `false` |  |
+| webhook.securityContext.capabilities.drop[0] | string | `"ALL"` |  |
+| webhook.securityContext.enabled | bool | `true` |  |
+| webhook.securityContext.readOnlyRootFilesystem | bool | `true` |  |
+| webhook.securityContext.runAsNonRoot | bool | `true` |  |
+| webhook.securityContext.runAsUser | int | `1000` |  |
+| webhook.securityContext.seccompProfile.type | string | `"RuntimeDefault"` |  |
+| webhook.serviceAccount.annotations | object | `{}` | Annotations to add to the service account. |
+| webhook.serviceAccount.automount | bool | `true` | Automounts the service account token in all containers of the pod |
+| webhook.serviceAccount.create | bool | `true` | Specifies whether a service account should be created. |
+| webhook.serviceAccount.extraLabels | object | `{}` | Extra Labels to add to the service account. |
+| webhook.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template. |
+| webhook.tolerations | list | `[]` |  |
+| webhook.topologySpreadConstraints | list | `[]` |  |
diff --git a/charts/external-secrets/external-secrets/0.13.0/app-readme.md b/charts/external-secrets/external-secrets/0.13.0/app-readme.md
new file mode 100644
index 000000000..2a28bc399
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/app-readme.md
@@ -0,0 +1,7 @@
+**External Secrets Operator** is a Kubernetes operator that integrates external secret management systems like [AWS Secrets Manager](https://aws.amazon.com/secrets-manager/), [HashiCorp Vault](https://www.vaultproject.io/), [Google Secrets Manager](https://cloud.google.com/secret-manager), [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/) and many more. 
+The operator reads information from external APIs and automatically injects the values into a [Kubernetes Secret](https://kubernetes.io/docs/concepts/configuration/secret/).
+
+### What is the goal of External Secrets Operator?
+
+The goal of External Secrets Operator is to synchronize secrets from external APIs into Kubernetes. ESO is a collection of custom API resources - `ExternalSecret`, `SecretStore` and `ClusterSecretStore` that provide a user-friendly abstraction for the external API that stores and manages the lifecycle of the secrets for you.
+
diff --git a/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/.helmignore b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/Chart.yaml b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/Chart.yaml
new file mode 100644
index 000000000..64d6f3853
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+appVersion: v0.3.1
+description: A Helm chart for Kubernetes
+name: bitwarden-sdk-server
+type: application
+version: v0.3.1
diff --git a/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/NOTES.txt b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/NOTES.txt
new file mode 100644
index 000000000..46b671c6a
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/NOTES.txt
@@ -0,0 +1,22 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range $host := .Values.ingress.hosts }}
+  {{- range .paths }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
+  {{- end }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "bitwarden-sdk-server.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "bitwarden-sdk-server.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "bitwarden-sdk-server.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "bitwarden-sdk-server.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/_helpers.tpl b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/_helpers.tpl
new file mode 100644
index 000000000..a5e0da3cc
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "bitwarden-sdk-server.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "bitwarden-sdk-server.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "bitwarden-sdk-server.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "bitwarden-sdk-server.labels" -}}
+helm.sh/chart: {{ include "bitwarden-sdk-server.chart" . }}
+{{ include "bitwarden-sdk-server.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "bitwarden-sdk-server.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "bitwarden-sdk-server.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "bitwarden-sdk-server.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "bitwarden-sdk-server.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/deployment.yaml b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/deployment.yaml
new file mode 100644
index 000000000..06e28820a
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/deployment.yaml
@@ -0,0 +1,77 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "bitwarden-sdk-server.fullname" . }}
+  labels:
+    {{- include "bitwarden-sdk-server.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "bitwarden-sdk-server.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "bitwarden-sdk-server.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "bitwarden-sdk-server.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{- if not .Values.image.tls.enabled }}
+          args:
+            - --insecure
+          {{- end }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- if .Values.image.tls.enabled }}
+          volumeMounts:
+          {{- toYaml .Values.image.tls.volumeMounts | nindent 10 }}
+          {{- end}}
+          ports:
+            - name: http
+              containerPort: {{ .Values.service.port }}
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /live
+              port: http
+              {{- if .Values.image.tls.enabled }}
+              scheme: HTTPS
+              {{- end }}
+          readinessProbe:
+            httpGet:
+              path: /ready
+              port: http
+              {{- if .Values.image.tls.enabled }}
+              scheme: HTTPS
+              {{- end }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.image.tls.enabled }}
+      volumes:
+      {{- toYaml .Values.image.tls.volumes | nindent 8 }}
+      {{- end}}
diff --git a/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/service.yaml b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/service.yaml
new file mode 100644
index 000000000..88e2d668b
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/service.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "bitwarden-sdk-server.fullname" . }}
+  labels:
+    {{- include "bitwarden-sdk-server.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      name: http
+  selector:
+    {{- include "bitwarden-sdk-server.selectorLabels" . | nindent 4 }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/serviceaccount.yaml b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/serviceaccount.yaml
new file mode 100644
index 000000000..fef7bad65
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/templates/serviceaccount.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "bitwarden-sdk-server.serviceAccountName" . }}
+  labels:
+    {{- include "bitwarden-sdk-server.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/tests/__snapshot__/deployment_test.yaml.snap b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/tests/__snapshot__/deployment_test.yaml.snap
new file mode 100644
index 000000000..2fbcdb118
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/tests/__snapshot__/deployment_test.yaml.snap
@@ -0,0 +1,60 @@
+deployment should match snapshot:
+  1: |
+    apiVersion: apps/v1
+    kind: Deployment
+    metadata:
+      labels:
+        app.kubernetes.io/instance: RELEASE-NAME
+        app.kubernetes.io/managed-by: Helm
+        app.kubernetes.io/name: bitwarden-sdk-server
+        app.kubernetes.io/version: 1.16.0
+        helm.sh/chart: bitwarden-sdk-server-0.1.0
+      name: bitwarden-sdk-server
+    spec:
+      replicas: 1
+      selector:
+        matchLabels:
+          app.kubernetes.io/instance: RELEASE-NAME
+          app.kubernetes.io/name: bitwarden-sdk-server
+      template:
+        metadata:
+          labels:
+            app.kubernetes.io/instance: RELEASE-NAME
+            app.kubernetes.io/name: bitwarden-sdk-server
+        spec:
+          containers:
+            - image: ghcr.io/external-secrets/bitwarden-sdk-server:v0.8.0
+              imagePullPolicy: IfNotPresent
+              livenessProbe:
+                httpGet:
+                  path: /live
+                  port: http
+                  scheme: HTTPS
+              name: bitwarden-sdk-server
+              ports:
+                - containerPort: 9998
+                  name: http
+                  protocol: TCP
+              readinessProbe:
+                httpGet:
+                  path: /ready
+                  port: http
+                  scheme: HTTPS
+              resources: {}
+              securityContext: {}
+              volumeMounts:
+                - mountPath: /certs
+                  name: bitwarden-tls-certs
+          securityContext: {}
+          serviceAccountName: bitwarden-sdk-server
+          volumes:
+            - name: bitwarden-tls-certs
+              secret:
+                items:
+                  - key: tls.crt
+                    path: cert.pem
+                  - key: tls.key
+                    path: key.pem
+                  - key: ca.crt
+                    path: ca.pem
+                secretName: bitwarden-tls-certs
diff --git a/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/tests/deployment_test.yaml b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/tests/deployment_test.yaml
new file mode 100644
index 000000000..bb4e2f4f5
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/tests/deployment_test.yaml
@@ -0,0 +1,9 @@
+suite: test deployment
+templates:
+  - deployment.yaml
+tests:
+  - it: deployment should match snapshot
+    set:
+      image.tag: v0.8.0
+    asserts:
+      - matchSnapshot: {}
diff --git a/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/values.yaml b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/values.yaml
new file mode 100644
index 000000000..f0424afba
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/charts/bitwarden-sdk-server/values.yaml
@@ -0,0 +1,98 @@
+# Default values for bitwarden-sdk-server.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: ghcr.io/external-secrets/bitwarden-sdk-server
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+  tls:
+    enabled: true
+    volumeMounts:
+      - mountPath: "/certs"
+        name: "bitwarden-tls-certs"
+    volumes:
+      - name: "bitwarden-tls-certs"
+        secret:
+          secretName: "bitwarden-tls-certs"
+          items:
+            - key: "tls.crt"
+              path: "cert.pem"
+            - key: "tls.key"
+              path: "key.pem"
+            - key: "ca.crt"
+              path: "ca.pem"
+
+imagePullSecrets: []
+nameOverride: "bitwarden-sdk-server"
+fullnameOverride: "bitwarden-sdk-server"
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 9998
+
+ingress:
+  enabled: false
+  className: ""
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/charts/external-secrets/external-secrets/0.13.0/questions.yaml b/charts/external-secrets/external-secrets/0.13.0/questions.yaml
new file mode 100644
index 000000000..31008999d
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/questions.yaml
@@ -0,0 +1,8 @@
+questions:
+- variable: installCRDs
+  default: false
+  required: true
+  description: "If true, Install and upgrade CRDs through helm chart"
+  type: boolean
+  label: Install CRDs
+
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/NOTES.txt b/charts/external-secrets/external-secrets/0.13.0/templates/NOTES.txt
new file mode 100644
index 000000000..ffa0fc7e1
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/NOTES.txt
@@ -0,0 +1,7 @@
+external-secrets has been deployed successfully in namespace {{ template "external-secrets.namespace" . }}!
+
+In order to begin using ExternalSecrets, you will need to set up a SecretStore
+or ClusterSecretStore resource (for example, by creating a 'vault' SecretStore).
+
+More information on the different types of SecretStores and how to configure them
+can be found in our Github: {{ .Chart.Home }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/_helpers.tpl b/charts/external-secrets/external-secrets/0.13.0/templates/_helpers.tpl
new file mode 100644
index 000000000..d5eea0759
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/_helpers.tpl
@@ -0,0 +1,198 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "external-secrets.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "external-secrets.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Define namespace of chart, useful for multi-namespace deployments
+*/}}
+{{- define "external-secrets.namespace" -}}
+{{- if .Values.namespaceOverride }}
+{{- .Values.namespaceOverride }}
+{{- else }}
+{{- .Release.Namespace }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "external-secrets.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "external-secrets.labels" -}}
+helm.sh/chart: {{ include "external-secrets.chart" . }}
+{{ include "external-secrets.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- with .Values.commonLabels }}
+{{ toYaml . }}
+{{- end }}
+{{- end }}
+
+{{- define "external-secrets-webhook.labels" -}}
+helm.sh/chart: {{ include "external-secrets.chart" . }}
+{{ include "external-secrets-webhook.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- with .Values.commonLabels }}
+{{ toYaml . }}
+{{- end }}
+{{- end }}
+
+{{- define "external-secrets-webhook-metrics.labels" -}}
+{{ include "external-secrets-webhook.selectorLabels" . }}
+app.kubernetes.io/metrics: "webhook"
+{{- with .Values.commonLabels }}
+{{ toYaml . }}
+{{- end }}
+{{- end }}
+
+{{- define "external-secrets-cert-controller.labels" -}}
+helm.sh/chart: {{ include "external-secrets.chart" . }}
+{{ include "external-secrets-cert-controller.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- with .Values.commonLabels }}
+{{ toYaml . }}
+{{- end }}
+{{- end }}
+
+{{- define "external-secrets-cert-controller-metrics.labels" -}}
+{{ include "external-secrets-cert-controller.selectorLabels" . }}
+app.kubernetes.io/metrics: "cert-controller"
+{{- with .Values.commonLabels }}
+{{ toYaml . }}
+{{- end }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "external-secrets.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "external-secrets.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+{{- define "external-secrets-webhook.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "external-secrets.name" . }}-webhook
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+{{- define "external-secrets-cert-controller.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "external-secrets.name" . }}-cert-controller
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "external-secrets.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "external-secrets.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "external-secrets-webhook.serviceAccountName" -}}
+{{- if .Values.webhook.serviceAccount.create }}
+{{- default "external-secrets-webhook" .Values.webhook.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.webhook.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "external-secrets-cert-controller.serviceAccountName" -}}
+{{- if .Values.certController.serviceAccount.create }}
+{{- default "external-secrets-cert-controller" .Values.certController.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.certController.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Determine the image to use, including if using a flavour.
+*/}}
+{{- define "external-secrets.image" -}}
+{{- if .image.flavour -}}
+{{ printf "%s:%s-%s" .image.repository (.image.tag | default .chartAppVersion) .image.flavour }}
+{{- else }}
+{{ printf "%s:%s" .image.repository (.image.tag | default .chartAppVersion) }}
+{{- end }}
+{{- end }}
+
+{{/*
+Renders a complete tree, even values that contains template.
+*/}}
+{{- define "external-secrets.render" -}}
+  {{- if typeIs "string" .value }}
+    {{- tpl .value .context }}
+  {{ else }}
+    {{- tpl (.value | toYaml) .context }}
+  {{- end }}
+{{- end -}}
+
+{{/*
+Return true if the OpenShift is the detected platform
+Usage:
+{{- include "external-secrets.isOpenShift" . -}}
+*/}}
+{{- define "external-secrets.isOpenShift" -}}
+{{- if .Capabilities.APIVersions.Has "security.openshift.io/v1" -}}
+{{- true -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Render the securityContext based on the provided securityContext
+  {{- include "external-secrets.renderSecurityContext" (dict "securityContext" .Values.securityContext "context" $) -}}
+*/}}
+{{- define "external-secrets.renderSecurityContext" -}}
+{{- $adaptedContext := .securityContext -}}
+{{- if .context.Values.global.compatibility -}}
+  {{- if .context.Values.global.compatibility.openshift -}}
+    {{- if or (eq .context.Values.global.compatibility.openshift.adaptSecurityContext "force") (and (eq .context.Values.global.compatibility.openshift.adaptSecurityContext "auto") (include "external-secrets.isOpenShift" .context)) -}}
+      {{/* Remove OpenShift managed fields */}}
+      {{- $adaptedContext = omit $adaptedContext "fsGroup" "runAsUser" "runAsGroup" -}}
+      {{- if not .securityContext.seLinuxOptions -}}
+        {{- $adaptedContext = omit $adaptedContext "seLinuxOptions" -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+{{- omit $adaptedContext "enabled" | toYaml -}}
+{{- end -}}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-deployment.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-deployment.yaml
new file mode 100644
index 000000000..a843f045a
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-deployment.yaml
@@ -0,0 +1,124 @@
+{{- if and .Values.certController.create (not .Values.webhook.certManager.enabled) }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-cert-controller
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets-cert-controller.labels" . | nindent 4 }}
+  {{- with .Values.certController.deploymentAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  replicas: {{ .Values.certController.replicaCount }}
+  revisionHistoryLimit: {{ .Values.certController.revisionHistoryLimit }}
+  selector:
+    matchLabels:
+      {{- include "external-secrets-cert-controller.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.certController.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "external-secrets-cert-controller.labels" . | nindent 8 }}
+        {{- with .Values.certController.podLabels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.certController.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "external-secrets-cert-controller.serviceAccountName" . }}
+      automountServiceAccountToken: {{ .Values.certController.serviceAccount.automount }}
+      {{- with .Values.certController.podSecurityContext }}
+       {{- if and (.enabled) (gt (keys . | len) 1) }}
+      securityContext:
+        {{- include "external-secrets.renderSecurityContext" (dict "securityContext" . "context" $) | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      hostNetwork: {{ .Values.certController.hostNetwork }}
+      containers:
+        - name: cert-controller
+          {{- with .Values.certController.securityContext }}
+          {{- if and (.enabled) (gt (keys . | len) 1) }}
+          securityContext:
+            {{- include "external-secrets.renderSecurityContext" (dict "securityContext" . "context" $) | nindent 12 }}
+          {{- end }}
+          {{- end }}
+          image: {{ include "external-secrets.image" (dict "chartAppVersion" .Chart.AppVersion "image" .Values.certController.image) | trim }}
+          imagePullPolicy: {{ .Values.certController.image.pullPolicy }}
+          args:
+          - certcontroller
+          - --crd-requeue-interval={{ .Values.certController.requeueInterval }}
+          - --service-name={{ include "external-secrets.fullname" . }}-webhook
+          - --service-namespace={{ template "external-secrets.namespace" . }}
+          - --secret-name={{ include "external-secrets.fullname" . }}-webhook
+          - --secret-namespace={{ template "external-secrets.namespace" . }}
+          - --metrics-addr=:{{ .Values.certController.metrics.listen.port }}
+          - --healthz-addr={{ .Values.certController.readinessProbe.address }}:{{ .Values.certController.readinessProbe.port }}
+          - --loglevel={{ .Values.certController.log.level }}
+          - --zap-time-encoding={{ .Values.certController.log.timeEncoding }}
+          {{- if not .Values.crds.createClusterSecretStore }}
+          - --crd-names=externalsecrets.external-secrets.io
+          - --crd-names=secretstores.external-secrets.io
+          {{- end }}
+          {{- if .Values.installCRDs }}
+          - --enable-partial-cache=true
+          {{- end }}
+          {{- range $key, $value := .Values.certController.extraArgs }}
+            {{- if $value }}
+          - --{{ $key }}={{ $value }}
+            {{- else }}
+          - --{{ $key }}
+            {{- end }}
+          {{- end }}
+          ports:
+            - containerPort: {{ .Values.certController.metrics.listen.port }}
+              protocol: TCP
+              name: metrics
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.certController.readinessProbe.port }}
+              path: /readyz
+            initialDelaySeconds: 20
+            periodSeconds: 5
+          {{- with .Values.certController.extraEnv }}
+          env:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.certController.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- if .Values.certController.extraVolumeMounts }}
+          volumeMounts:
+          {{- toYaml .Values.certController.extraVolumeMounts | nindent 12 }}
+          {{- end }}
+      {{- if .Values.certController.extraVolumes }}
+      volumes:
+      {{- toYaml .Values.certController.extraVolumes | nindent 8 }}
+      {{- end }}
+      {{- with .Values.certController.nodeSelector | default .Values.global.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.certController.affinity | default .Values.global.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.certController.tolerations | default .Values.global.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.certController.topologySpreadConstraints | default .Values.global.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.certController.priorityClassName }}
+      priorityClassName: {{ .Values.certController.priorityClassName }}
+      {{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-poddisruptionbudget.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-poddisruptionbudget.yaml
new file mode 100644
index 000000000..e61cb8ebc
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-poddisruptionbudget.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.certController.create .Values.certController.podDisruptionBudget.enabled (not .Values.webhook.certManager.enabled) }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-cert-controller-pdb
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets-cert-controller.labels" . | nindent 4 }}
+spec:
+  {{- if .Values.certController.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.certController.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{- if .Values.certController.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.certController.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "external-secrets-cert-controller.selectorLabels" . | nindent 6 }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-rbac.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-rbac.yaml
new file mode 100644
index 000000000..84a0c110b
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-rbac.yaml
@@ -0,0 +1,86 @@
+{{- if and .Values.certController.create .Values.certController.rbac.create (not .Values.webhook.certManager.enabled) -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-cert-controller
+  labels:
+    {{- include "external-secrets-cert-controller.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+    - "apiextensions.k8s.io"
+    resources:
+    - "customresourcedefinitions"
+    verbs:
+    - "get"
+    - "list"
+    - "watch"
+    - "update"
+    - "patch"
+  - apiGroups:
+    - "admissionregistration.k8s.io"
+    resources:
+    - "validatingwebhookconfigurations"
+    verbs:
+    - "list"
+    - "watch"
+    - "get"
+  - apiGroups:
+    - "admissionregistration.k8s.io"
+    resources:
+    - "validatingwebhookconfigurations"
+    resourceNames:
+    - "secretstore-validate"
+    - "externalsecret-validate"
+    verbs:
+    - "update"
+    - "patch"
+  - apiGroups:
+    - ""
+    resources:
+    - "endpoints"
+    verbs:
+    - "list"
+    - "get"
+    - "watch"
+  - apiGroups:
+    - ""
+    resources:
+    - "events"
+    verbs:
+    - "create"
+    - "patch"
+  - apiGroups:
+    - ""
+    resources:
+    - "secrets"
+    verbs:
+    - "get"
+    - "list"
+    - "watch"
+    - "update"
+    - "patch"
+  - apiGroups:
+    - "coordination.k8s.io"
+    resources:
+    - "leases"
+    verbs:
+    - "get"
+    - "create"
+    - "update"
+    - "patch"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-cert-controller
+  labels:
+    {{- include "external-secrets-cert-controller.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "external-secrets.fullname" . }}-cert-controller
+subjects:
+  - name: {{ include "external-secrets-cert-controller.serviceAccountName" . }}
+    namespace: {{ template "external-secrets.namespace" . }}
+    kind: ServiceAccount
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-service.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-service.yaml
new file mode 100644
index 000000000..12cb4f4da
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-service.yaml
@@ -0,0 +1,28 @@
+{{- if and .Values.certController.create .Values.certController.metrics.service.enabled (not .Values.webhook.certManager.enabled) }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-cert-controller-metrics
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets.labels" . | nindent 4 }}
+  {{- with .Values.metrics.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  type: ClusterIP
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
+  ports:
+  - port: {{ .Values.certController.metrics.service.port }}
+    protocol: TCP
+    targetPort: metrics
+    name: metrics
+  selector:
+    {{- include "external-secrets-cert-controller.selectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-serviceaccount.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-serviceaccount.yaml
new file mode 100644
index 000000000..6a36f9d71
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/cert-controller-serviceaccount.yaml
@@ -0,0 +1,16 @@
+{{- if and .Values.certController.create .Values.certController.serviceAccount.create (not .Values.webhook.certManager.enabled) -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "external-secrets-cert-controller.serviceAccountName" . }}
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets-cert-controller.labels" . | nindent 4 }}
+    {{- with .Values.certController.serviceAccount.extraLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.certController.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/acraccesstoken.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/acraccesstoken.yaml
new file mode 100644
index 000000000..875206510
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/acraccesstoken.yaml
@@ -0,0 +1,226 @@
+{{- if .Values.installCRDs }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: acraccesstokens.generators.external-secrets.io
+spec:
+  group: generators.external-secrets.io
+  names:
+    categories:
+      - external-secrets
+      - external-secrets-generators
+    kind: ACRAccessToken
+    listKind: ACRAccessTokenList
+    plural: acraccesstokens
+    singular: acraccesstoken
+  scope: Namespaced
+  versions:
+    - name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: |-
+            ACRAccessToken returns a Azure Container Registry token
+            that can be used for pushing/pulling images.
+            Note: by default it will return an ACR Refresh Token with full access
+            (depending on the identity).
+            This can be scoped down to the repository level using .spec.scope.
+            In case scope is defined it will return an ACR Access Token.
+
+            See docs: https://github.com/Azure/acr/blob/main/docs/AAD-OAuth.md
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: |-
+                ACRAccessTokenSpec defines how to generate the access token
+                e.g. how to authenticate and which registry to use.
+                see: https://github.com/Azure/acr/blob/main/docs/AAD-OAuth.md#overview
+              properties:
+                auth:
+                  properties:
+                    managedIdentity:
+                      description: ManagedIdentity uses Azure Managed Identity to authenticate with Azure.
+                      properties:
+                        identityId:
+                          description: If multiple Managed Identity is assigned to the pod, you can select the one to be used
+                          type: string
+                      type: object
+                    servicePrincipal:
+                      description: ServicePrincipal uses Azure Service Principal credentials to authenticate with Azure.
+                      properties:
+                        secretRef:
+                          description: |-
+                            Configuration used to authenticate with Azure using static
+                            credentials stored in a Kind=Secret.
+                          properties:
+                            clientId:
+                              description: The Azure clientId of the service principle used for authentication.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            clientSecret:
+                              description: The Azure ClientSecret of the service principle used for authentication.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                      required:
+                        - secretRef
+                      type: object
+                    workloadIdentity:
+                      description: WorkloadIdentity uses Azure Workload Identity to authenticate with Azure.
+                      properties:
+                        serviceAccountRef:
+                          description: |-
+                            ServiceAccountRef specified the service account
+                            that should be used when authenticating with WorkloadIdentity.
+                          properties:
+                            audiences:
+                              description: |-
+                                Audience specifies the `aud` claim for the service account token
+                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                then this audiences will be appended to the list
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: The name of the ServiceAccount resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                Namespace of the resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          required:
+                            - name
+                          type: object
+                      type: object
+                  type: object
+                environmentType:
+                  default: PublicCloud
+                  description: |-
+                    EnvironmentType specifies the Azure cloud environment endpoints to use for
+                    connecting and authenticating with Azure. By default it points to the public cloud AAD endpoint.
+                    The following endpoints are available, also see here: https://github.com/Azure/go-autorest/blob/main/autorest/azure/environments.go#L152
+                    PublicCloud, USGovernmentCloud, ChinaCloud, GermanCloud
+                  enum:
+                    - PublicCloud
+                    - USGovernmentCloud
+                    - ChinaCloud
+                    - GermanCloud
+                  type: string
+                registry:
+                  description: |-
+                    the domain name of the ACR registry
+                    e.g. foobarexample.azurecr.io
+                  type: string
+                scope:
+                  description: |-
+                    Define the scope for the access token, e.g. pull/push access for a repository.
+                    if not provided it will return a refresh token that has full scope.
+                    Note: you need to pin it down to the repository level, there is no wildcard available.
+
+                    examples:
+                    repository:my-repository:pull,push
+                    repository:my-repository:pull
+
+                    see docs for details: https://docs.docker.com/registry/spec/auth/scope/
+                  type: string
+                tenantId:
+                  description: TenantID configures the Azure Tenant to send requests to. Required for ServicePrincipal auth type.
+                  type: string
+              required:
+                - auth
+                - registry
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/clusterexternalsecret.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/clusterexternalsecret.yaml
new file mode 100644
index 000000000..6fa79fe27
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/clusterexternalsecret.yaml
@@ -0,0 +1,743 @@
+{{- if and (.Values.installCRDs) (.Values.crds.createClusterExternalSecret) }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: clusterexternalsecrets.external-secrets.io
+spec:
+  group: external-secrets.io
+  names:
+    categories:
+      - external-secrets
+    kind: ClusterExternalSecret
+    listKind: ClusterExternalSecretList
+    plural: clusterexternalsecrets
+    shortNames:
+      - ces
+    singular: clusterexternalsecret
+  scope: Cluster
+  versions:
+    - additionalPrinterColumns:
+        - jsonPath: .spec.externalSecretSpec.secretStoreRef.name
+          name: Store
+          type: string
+        - jsonPath: .spec.refreshTime
+          name: Refresh Interval
+          type: string
+        - jsonPath: .status.conditions[?(@.type=="Ready")].status
+          name: Ready
+          type: string
+      name: v1beta1
+      schema:
+        openAPIV3Schema:
+          description: ClusterExternalSecret is the Schema for the clusterexternalsecrets API.
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: ClusterExternalSecretSpec defines the desired state of ClusterExternalSecret.
+              properties:
+                externalSecretMetadata:
+                  description: The metadata of the external secrets to be created
+                  properties:
+                    annotations:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    labels:
+                      additionalProperties:
+                        type: string
+                      type: object
+                  type: object
+                externalSecretName:
+                  description: |-
+                    The name of the external secrets to be created.
+                    Defaults to the name of the ClusterExternalSecret
+                  maxLength: 253
+                  minLength: 1
+                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                  type: string
+                externalSecretSpec:
+                  description: The spec for the ExternalSecrets to be created
+                  properties:
+                    data:
+                      description: Data defines the connection between the Kubernetes Secret keys and the Provider data
+                      items:
+                        description: ExternalSecretData defines the connection between the Kubernetes Secret key (spec.data.<key>) and the Provider data.
+                        properties:
+                          remoteRef:
+                            description: |-
+                              RemoteRef points to the remote secret and defines
+                              which secret (version/property/..) to fetch.
+                            properties:
+                              conversionStrategy:
+                                default: Default
+                                description: Used to define a conversion Strategy
+                                enum:
+                                  - Default
+                                  - Unicode
+                                type: string
+                              decodingStrategy:
+                                default: None
+                                description: Used to define a decoding Strategy
+                                enum:
+                                  - Auto
+                                  - Base64
+                                  - Base64URL
+                                  - None
+                                type: string
+                              key:
+                                description: Key is the key used in the Provider, mandatory
+                                type: string
+                              metadataPolicy:
+                                default: None
+                                description: Policy for fetching tags/labels from provider secrets, possible options are Fetch, None. Defaults to None
+                                enum:
+                                  - None
+                                  - Fetch
+                                type: string
+                              property:
+                                description: Used to select a specific property of the Provider value (if a map), if supported
+                                type: string
+                              version:
+                                description: Used to select a specific version of the Provider value, if supported
+                                type: string
+                            required:
+                              - key
+                            type: object
+                          secretKey:
+                            description: The key in the Kubernetes Secret to store the value.
+                            maxLength: 253
+                            minLength: 1
+                            pattern: ^[-._a-zA-Z0-9]+$
+                            type: string
+                          sourceRef:
+                            description: |-
+                              SourceRef allows you to override the source
+                              from which the value will be pulled.
+                            maxProperties: 1
+                            minProperties: 1
+                            properties:
+                              generatorRef:
+                                description: |-
+                                  GeneratorRef points to a generator custom resource.
+
+                                  Deprecated: The generatorRef is not implemented in .data[].
+                                  this will be removed with v1.
+                                properties:
+                                  apiVersion:
+                                    default: generators.external-secrets.io/v1alpha1
+                                    description: Specify the apiVersion of the generator resource
+                                    type: string
+                                  kind:
+                                    description: Specify the Kind of the generator resource
+                                    enum:
+                                      - ACRAccessToken
+                                      - ClusterGenerator
+                                      - ECRAuthorizationToken
+                                      - Fake
+                                      - GCRAccessToken
+                                      - GithubAccessToken
+                                      - QuayAccessToken
+                                      - Password
+                                      - STSSessionToken
+                                      - UUID
+                                      - VaultDynamicSecret
+                                      - Webhook
+                                    type: string
+                                  name:
+                                    description: Specify the name of the generator resource
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                    type: string
+                                required:
+                                  - kind
+                                  - name
+                                type: object
+                              storeRef:
+                                description: SecretStoreRef defines which SecretStore to fetch the ExternalSecret data.
+                                properties:
+                                  kind:
+                                    description: |-
+                                      Kind of the SecretStore resource (SecretStore or ClusterSecretStore)
+                                      Defaults to `SecretStore`
+                                    enum:
+                                      - SecretStore
+                                      - ClusterSecretStore
+                                    type: string
+                                  name:
+                                    description: Name of the SecretStore resource
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                    type: string
+                                type: object
+                            type: object
+                        required:
+                          - remoteRef
+                          - secretKey
+                        type: object
+                      type: array
+                    dataFrom:
+                      description: |-
+                        DataFrom is used to fetch all properties from a specific Provider data
+                        If multiple entries are specified, the Secret keys are merged in the specified order
+                      items:
+                        properties:
+                          extract:
+                            description: |-
+                              Used to extract multiple key/value pairs from one secret
+                              Note: Extract does not support sourceRef.Generator or sourceRef.GeneratorRef.
+                            properties:
+                              conversionStrategy:
+                                default: Default
+                                description: Used to define a conversion Strategy
+                                enum:
+                                  - Default
+                                  - Unicode
+                                type: string
+                              decodingStrategy:
+                                default: None
+                                description: Used to define a decoding Strategy
+                                enum:
+                                  - Auto
+                                  - Base64
+                                  - Base64URL
+                                  - None
+                                type: string
+                              key:
+                                description: Key is the key used in the Provider, mandatory
+                                type: string
+                              metadataPolicy:
+                                default: None
+                                description: Policy for fetching tags/labels from provider secrets, possible options are Fetch, None. Defaults to None
+                                enum:
+                                  - None
+                                  - Fetch
+                                type: string
+                              property:
+                                description: Used to select a specific property of the Provider value (if a map), if supported
+                                type: string
+                              version:
+                                description: Used to select a specific version of the Provider value, if supported
+                                type: string
+                            required:
+                              - key
+                            type: object
+                          find:
+                            description: |-
+                              Used to find secrets based on tags or regular expressions
+                              Note: Find does not support sourceRef.Generator or sourceRef.GeneratorRef.
+                            properties:
+                              conversionStrategy:
+                                default: Default
+                                description: Used to define a conversion Strategy
+                                enum:
+                                  - Default
+                                  - Unicode
+                                type: string
+                              decodingStrategy:
+                                default: None
+                                description: Used to define a decoding Strategy
+                                enum:
+                                  - Auto
+                                  - Base64
+                                  - Base64URL
+                                  - None
+                                type: string
+                              name:
+                                description: Finds secrets based on the name.
+                                properties:
+                                  regexp:
+                                    description: Finds secrets base
+                                    type: string
+                                type: object
+                              path:
+                                description: A root path to start the find operations.
+                                type: string
+                              tags:
+                                additionalProperties:
+                                  type: string
+                                description: Find secrets based on tags.
+                                type: object
+                            type: object
+                          rewrite:
+                            description: |-
+                              Used to rewrite secret Keys after getting them from the secret Provider
+                              Multiple Rewrite operations can be provided. They are applied in a layered order (first to last)
+                            items:
+                              properties:
+                                regexp:
+                                  description: |-
+                                    Used to rewrite with regular expressions.
+                                    The resulting key will be the output of a regexp.ReplaceAll operation.
+                                  properties:
+                                    source:
+                                      description: Used to define the regular expression of a re.Compiler.
+                                      type: string
+                                    target:
+                                      description: Used to define the target pattern of a ReplaceAll operation.
+                                      type: string
+                                  required:
+                                    - source
+                                    - target
+                                  type: object
+                                transform:
+                                  description: |-
+                                    Used to apply string transformation on the secrets.
+                                    The resulting key will be the output of the template applied by the operation.
+                                  properties:
+                                    template:
+                                      description: |-
+                                        Used to define the template to apply on the secret name.
+                                        `.value ` will specify the secret name in the template.
+                                      type: string
+                                  required:
+                                    - template
+                                  type: object
+                              type: object
+                            type: array
+                          sourceRef:
+                            description: |-
+                              SourceRef points to a store or generator
+                              which contains secret values ready to use.
+                              Use this in combination with Extract or Find pull values out of
+                              a specific SecretStore.
+                              When sourceRef points to a generator Extract or Find is not supported.
+                              The generator returns a static map of values
+                            maxProperties: 1
+                            minProperties: 1
+                            properties:
+                              generatorRef:
+                                description: GeneratorRef points to a generator custom resource.
+                                properties:
+                                  apiVersion:
+                                    default: generators.external-secrets.io/v1alpha1
+                                    description: Specify the apiVersion of the generator resource
+                                    type: string
+                                  kind:
+                                    description: Specify the Kind of the generator resource
+                                    enum:
+                                      - ACRAccessToken
+                                      - ClusterGenerator
+                                      - ECRAuthorizationToken
+                                      - Fake
+                                      - GCRAccessToken
+                                      - GithubAccessToken
+                                      - QuayAccessToken
+                                      - Password
+                                      - STSSessionToken
+                                      - UUID
+                                      - VaultDynamicSecret
+                                      - Webhook
+                                    type: string
+                                  name:
+                                    description: Specify the name of the generator resource
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                    type: string
+                                required:
+                                  - kind
+                                  - name
+                                type: object
+                              storeRef:
+                                description: SecretStoreRef defines which SecretStore to fetch the ExternalSecret data.
+                                properties:
+                                  kind:
+                                    description: |-
+                                      Kind of the SecretStore resource (SecretStore or ClusterSecretStore)
+                                      Defaults to `SecretStore`
+                                    enum:
+                                      - SecretStore
+                                      - ClusterSecretStore
+                                    type: string
+                                  name:
+                                    description: Name of the SecretStore resource
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                    type: string
+                                type: object
+                            type: object
+                        type: object
+                      type: array
+                    refreshInterval:
+                      default: 1h
+                      description: |-
+                        RefreshInterval is the amount of time before the values are read again from the SecretStore provider,
+                        specified as Golang Duration strings.
+                        Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h"
+                        Example values: "1h", "2h30m", "5d", "10s"
+                        May be set to zero to fetch and create it once. Defaults to 1h.
+                      type: string
+                    secretStoreRef:
+                      description: SecretStoreRef defines which SecretStore to fetch the ExternalSecret data.
+                      properties:
+                        kind:
+                          description: |-
+                            Kind of the SecretStore resource (SecretStore or ClusterSecretStore)
+                            Defaults to `SecretStore`
+                          enum:
+                            - SecretStore
+                            - ClusterSecretStore
+                          type: string
+                        name:
+                          description: Name of the SecretStore resource
+                          maxLength: 253
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                          type: string
+                      type: object
+                    target:
+                      default:
+                        creationPolicy: Owner
+                        deletionPolicy: Retain
+                      description: |-
+                        ExternalSecretTarget defines the Kubernetes Secret to be created
+                        There can be only one target per ExternalSecret.
+                      properties:
+                        creationPolicy:
+                          default: Owner
+                          description: |-
+                            CreationPolicy defines rules on how to create the resulting Secret.
+                            Defaults to "Owner"
+                          enum:
+                            - Owner
+                            - Orphan
+                            - Merge
+                            - None
+                          type: string
+                        deletionPolicy:
+                          default: Retain
+                          description: |-
+                            DeletionPolicy defines rules on how to delete the resulting Secret.
+                            Defaults to "Retain"
+                          enum:
+                            - Delete
+                            - Merge
+                            - Retain
+                          type: string
+                        immutable:
+                          description: Immutable defines if the final secret will be immutable
+                          type: boolean
+                        name:
+                          description: |-
+                            The name of the Secret resource to be managed.
+                            Defaults to the .metadata.name of the ExternalSecret resource
+                          maxLength: 253
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                          type: string
+                        template:
+                          description: Template defines a blueprint for the created Secret resource.
+                          properties:
+                            data:
+                              additionalProperties:
+                                type: string
+                              type: object
+                            engineVersion:
+                              default: v2
+                              description: |-
+                                EngineVersion specifies the template engine version
+                                that should be used to compile/execute the
+                                template specified in .data and .templateFrom[].
+                              enum:
+                                - v1
+                                - v2
+                              type: string
+                            mergePolicy:
+                              default: Replace
+                              enum:
+                                - Replace
+                                - Merge
+                              type: string
+                            metadata:
+                              description: ExternalSecretTemplateMetadata defines metadata fields for the Secret blueprint.
+                              properties:
+                                annotations:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                                labels:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                              type: object
+                            templateFrom:
+                              items:
+                                properties:
+                                  configMap:
+                                    properties:
+                                      items:
+                                        description: A list of keys in the ConfigMap/Secret to use as templates for Secret data
+                                        items:
+                                          properties:
+                                            key:
+                                              description: A key in the ConfigMap/Secret
+                                              maxLength: 253
+                                              minLength: 1
+                                              pattern: ^[-._a-zA-Z0-9]+$
+                                              type: string
+                                            templateAs:
+                                              default: Values
+                                              enum:
+                                                - Values
+                                                - KeysAndValues
+                                              type: string
+                                          required:
+                                            - key
+                                          type: object
+                                        type: array
+                                      name:
+                                        description: The name of the ConfigMap/Secret resource
+                                        maxLength: 253
+                                        minLength: 1
+                                        pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                        type: string
+                                    required:
+                                      - items
+                                      - name
+                                    type: object
+                                  literal:
+                                    type: string
+                                  secret:
+                                    properties:
+                                      items:
+                                        description: A list of keys in the ConfigMap/Secret to use as templates for Secret data
+                                        items:
+                                          properties:
+                                            key:
+                                              description: A key in the ConfigMap/Secret
+                                              maxLength: 253
+                                              minLength: 1
+                                              pattern: ^[-._a-zA-Z0-9]+$
+                                              type: string
+                                            templateAs:
+                                              default: Values
+                                              enum:
+                                                - Values
+                                                - KeysAndValues
+                                              type: string
+                                          required:
+                                            - key
+                                          type: object
+                                        type: array
+                                      name:
+                                        description: The name of the ConfigMap/Secret resource
+                                        maxLength: 253
+                                        minLength: 1
+                                        pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                        type: string
+                                    required:
+                                      - items
+                                      - name
+                                    type: object
+                                  target:
+                                    default: Data
+                                    enum:
+                                      - Data
+                                      - Annotations
+                                      - Labels
+                                    type: string
+                                type: object
+                              type: array
+                            type:
+                              type: string
+                          type: object
+                      type: object
+                  type: object
+                namespaceSelector:
+                  description: |-
+                    The labels to select by to find the Namespaces to create the ExternalSecrets in.
+                    Deprecated: Use NamespaceSelectors instead.
+                  properties:
+                    matchExpressions:
+                      description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                      items:
+                        description: |-
+                          A label selector requirement is a selector that contains values, a key, and an operator that
+                          relates the key and values.
+                        properties:
+                          key:
+                            description: key is the label key that the selector applies to.
+                            type: string
+                          operator:
+                            description: |-
+                              operator represents a key's relationship to a set of values.
+                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                            type: string
+                          values:
+                            description: |-
+                              values is an array of string values. If the operator is In or NotIn,
+                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                              the values array must be empty. This array is replaced during a strategic
+                              merge patch.
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        required:
+                          - key
+                          - operator
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    matchLabels:
+                      additionalProperties:
+                        type: string
+                      description: |-
+                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                      type: object
+                  type: object
+                  x-kubernetes-map-type: atomic
+                namespaceSelectors:
+                  description: A list of labels to select by to find the Namespaces to create the ExternalSecrets in. The selectors are ORed.
+                  items:
+                    description: |-
+                      A label selector is a label query over a set of resources. The result of matchLabels and
+                      matchExpressions are ANDed. An empty label selector matches all objects. A null
+                      label selector matches no objects.
+                    properties:
+                      matchExpressions:
+                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                        items:
+                          description: |-
+                            A label selector requirement is a selector that contains values, a key, and an operator that
+                            relates the key and values.
+                          properties:
+                            key:
+                              description: key is the label key that the selector applies to.
+                              type: string
+                            operator:
+                              description: |-
+                                operator represents a key's relationship to a set of values.
+                                Valid operators are In, NotIn, Exists and DoesNotExist.
+                              type: string
+                            values:
+                              description: |-
+                                values is an array of string values. If the operator is In or NotIn,
+                                the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                the values array must be empty. This array is replaced during a strategic
+                                merge patch.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          required:
+                            - key
+                            - operator
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      matchLabels:
+                        additionalProperties:
+                          type: string
+                        description: |-
+                          matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                          map is equivalent to an element of matchExpressions, whose key field is "key", the
+                          operator is "In", and the values array contains only "value". The requirements are ANDed.
+                        type: object
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  type: array
+                namespaces:
+                  description: Choose namespaces by name. This field is ORed with anything that NamespaceSelectors ends up choosing.
+                  items:
+                    maxLength: 63
+                    minLength: 1
+                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                    type: string
+                  type: array
+                refreshTime:
+                  description: The time in which the controller should reconcile its objects and recheck namespaces for labels.
+                  type: string
+              required:
+                - externalSecretSpec
+              type: object
+            status:
+              description: ClusterExternalSecretStatus defines the observed state of ClusterExternalSecret.
+              properties:
+                conditions:
+                  items:
+                    properties:
+                      message:
+                        type: string
+                      status:
+                        type: string
+                      type:
+                        type: string
+                    required:
+                      - status
+                      - type
+                    type: object
+                  type: array
+                externalSecretName:
+                  description: ExternalSecretName is the name of the ExternalSecrets created by the ClusterExternalSecret
+                  type: string
+                failedNamespaces:
+                  description: Failed namespaces are the namespaces that failed to apply an ExternalSecret
+                  items:
+                    description: ClusterExternalSecretNamespaceFailure represents a failed namespace deployment and it's reason.
+                    properties:
+                      namespace:
+                        description: Namespace is the namespace that failed when trying to apply an ExternalSecret
+                        type: string
+                      reason:
+                        description: Reason is why the ExternalSecret failed to apply to the namespace
+                        type: string
+                    required:
+                      - namespace
+                    type: object
+                  type: array
+                provisionedNamespaces:
+                  description: ProvisionedNamespaces are the namespaces where the ClusterExternalSecret has secrets
+                  items:
+                    type: string
+                  type: array
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/clustergenerator.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/clustergenerator.yaml
new file mode 100644
index 000000000..30671172b
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/clustergenerator.yaml
@@ -0,0 +1,1693 @@
+{{- if and (.Values.installCRDs) (.Values.crds.createClusterGenerator) }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: clustergenerators.generators.external-secrets.io
+spec:
+  group: generators.external-secrets.io
+  names:
+    categories:
+      - external-secrets
+      - external-secrets-generators
+    kind: ClusterGenerator
+    listKind: ClusterGeneratorList
+    plural: clustergenerators
+    singular: clustergenerator
+  scope: Cluster
+  versions:
+    - name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: ClusterGenerator represents a cluster-wide generator which can be referenced as part of `generatorRef` fields.
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              properties:
+                generator:
+                  description: Generator the spec for this generator, must match the kind.
+                  maxProperties: 1
+                  minProperties: 1
+                  properties:
+                    acrAccessTokenSpec:
+                      description: |-
+                        ACRAccessTokenSpec defines how to generate the access token
+                        e.g. how to authenticate and which registry to use.
+                        see: https://github.com/Azure/acr/blob/main/docs/AAD-OAuth.md#overview
+                      properties:
+                        auth:
+                          properties:
+                            managedIdentity:
+                              description: ManagedIdentity uses Azure Managed Identity to authenticate with Azure.
+                              properties:
+                                identityId:
+                                  description: If multiple Managed Identity is assigned to the pod, you can select the one to be used
+                                  type: string
+                              type: object
+                            servicePrincipal:
+                              description: ServicePrincipal uses Azure Service Principal credentials to authenticate with Azure.
+                              properties:
+                                secretRef:
+                                  description: |-
+                                    Configuration used to authenticate with Azure using static
+                                    credentials stored in a Kind=Secret.
+                                  properties:
+                                    clientId:
+                                      description: The Azure clientId of the service principle used for authentication.
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                    clientSecret:
+                                      description: The Azure ClientSecret of the service principle used for authentication.
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                  type: object
+                              required:
+                                - secretRef
+                              type: object
+                            workloadIdentity:
+                              description: WorkloadIdentity uses Azure Workload Identity to authenticate with Azure.
+                              properties:
+                                serviceAccountRef:
+                                  description: |-
+                                    ServiceAccountRef specified the service account
+                                    that should be used when authenticating with WorkloadIdentity.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              type: object
+                          type: object
+                        environmentType:
+                          default: PublicCloud
+                          description: |-
+                            EnvironmentType specifies the Azure cloud environment endpoints to use for
+                            connecting and authenticating with Azure. By default it points to the public cloud AAD endpoint.
+                            The following endpoints are available, also see here: https://github.com/Azure/go-autorest/blob/main/autorest/azure/environments.go#L152
+                            PublicCloud, USGovernmentCloud, ChinaCloud, GermanCloud
+                          enum:
+                            - PublicCloud
+                            - USGovernmentCloud
+                            - ChinaCloud
+                            - GermanCloud
+                          type: string
+                        registry:
+                          description: |-
+                            the domain name of the ACR registry
+                            e.g. foobarexample.azurecr.io
+                          type: string
+                        scope:
+                          description: |-
+                            Define the scope for the access token, e.g. pull/push access for a repository.
+                            if not provided it will return a refresh token that has full scope.
+                            Note: you need to pin it down to the repository level, there is no wildcard available.
+
+                            examples:
+                            repository:my-repository:pull,push
+                            repository:my-repository:pull
+
+                            see docs for details: https://docs.docker.com/registry/spec/auth/scope/
+                          type: string
+                        tenantId:
+                          description: TenantID configures the Azure Tenant to send requests to. Required for ServicePrincipal auth type.
+                          type: string
+                      required:
+                        - auth
+                        - registry
+                      type: object
+                    ecrAuthorizationTokenSpec:
+                      properties:
+                        auth:
+                          description: Auth defines how to authenticate with AWS
+                          properties:
+                            jwt:
+                              description: Authenticate against AWS using service account tokens.
+                              properties:
+                                serviceAccountRef:
+                                  description: A reference to a ServiceAccount resource.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              type: object
+                            secretRef:
+                              description: |-
+                                AWSAuthSecretRef holds secret references for AWS credentials
+                                both AccessKeyID and SecretAccessKey must be defined in order to properly authenticate.
+                              properties:
+                                accessKeyIDSecretRef:
+                                  description: The AccessKeyID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                secretAccessKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                sessionTokenSecretRef:
+                                  description: |-
+                                    The SessionToken used for authentication
+                                    This must be defined if AccessKeyID and SecretAccessKey are temporary credentials
+                                    see: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        region:
+                          description: Region specifies the region to operate in.
+                          type: string
+                        role:
+                          description: |-
+                            You can assume a role before making calls to the
+                            desired AWS service.
+                          type: string
+                        scope:
+                          description: |-
+                            Scope specifies the ECR service scope.
+                            Valid options are private and public.
+                          type: string
+                      required:
+                        - region
+                      type: object
+                    fakeSpec:
+                      description: FakeSpec contains the static data.
+                      properties:
+                        controller:
+                          description: |-
+                            Used to select the correct ESO controller (think: ingress.ingressClassName)
+                            The ESO controller is instantiated with a specific controller name and filters VDS based on this property
+                          type: string
+                        data:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Data defines the static data returned
+                            by this generator.
+                          type: object
+                      type: object
+                    gcrAccessTokenSpec:
+                      properties:
+                        auth:
+                          description: Auth defines the means for authenticating with GCP
+                          properties:
+                            secretRef:
+                              properties:
+                                secretAccessKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            workloadIdentity:
+                              properties:
+                                clusterLocation:
+                                  type: string
+                                clusterName:
+                                  type: string
+                                clusterProjectID:
+                                  type: string
+                                serviceAccountRef:
+                                  description: A reference to a ServiceAccount resource.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              required:
+                                - clusterLocation
+                                - clusterName
+                                - serviceAccountRef
+                              type: object
+                          type: object
+                        projectID:
+                          description: ProjectID defines which project to use to authenticate with
+                          type: string
+                      required:
+                        - auth
+                        - projectID
+                      type: object
+                    githubAccessTokenSpec:
+                      properties:
+                        appID:
+                          type: string
+                        auth:
+                          description: Auth configures how ESO authenticates with a Github instance.
+                          properties:
+                            privateKey:
+                              properties:
+                                secretRef:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - secretRef
+                              type: object
+                          required:
+                            - privateKey
+                          type: object
+                        installID:
+                          type: string
+                        permissions:
+                          additionalProperties:
+                            type: string
+                          description: Map of permissions the token will have. If omitted, defaults to all permissions the GitHub App has.
+                          type: object
+                        repositories:
+                          description: |-
+                            List of repositories the token will have access to. If omitted, defaults to all repositories the GitHub App
+                            is installed to.
+                          items:
+                            type: string
+                          type: array
+                        url:
+                          description: URL configures the Github instance URL. Defaults to https://github.com/.
+                          type: string
+                      required:
+                        - appID
+                        - auth
+                        - installID
+                      type: object
+                    passwordSpec:
+                      description: PasswordSpec controls the behavior of the password generator.
+                      properties:
+                        allowRepeat:
+                          default: false
+                          description: set AllowRepeat to true to allow repeating characters.
+                          type: boolean
+                        digits:
+                          description: |-
+                            Digits specifies the number of digits in the generated
+                            password. If omitted it defaults to 25% of the length of the password
+                          type: integer
+                        length:
+                          default: 24
+                          description: |-
+                            Length of the password to be generated.
+                            Defaults to 24
+                          type: integer
+                        noUpper:
+                          default: false
+                          description: Set NoUpper to disable uppercase characters
+                          type: boolean
+                        symbolCharacters:
+                          description: |-
+                            SymbolCharacters specifies the special characters that should be used
+                            in the generated password.
+                          type: string
+                        symbols:
+                          description: |-
+                            Symbols specifies the number of symbol characters in the generated
+                            password. If omitted it defaults to 25% of the length of the password
+                          type: integer
+                      required:
+                        - allowRepeat
+                        - length
+                        - noUpper
+                      type: object
+                    quayAccessTokenSpec:
+                      properties:
+                        robotAccount:
+                          description: Name of the robot account you are federating with
+                          type: string
+                        serviceAccountRef:
+                          description: Name of the service account you are federating with
+                          properties:
+                            audiences:
+                              description: |-
+                                Audience specifies the `aud` claim for the service account token
+                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                then this audiences will be appended to the list
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: The name of the ServiceAccount resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                Namespace of the resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          required:
+                            - name
+                          type: object
+                        url:
+                          description: URL configures the Quay instance URL. Defaults to quay.io.
+                          type: string
+                      required:
+                        - robotAccount
+                        - serviceAccountRef
+                      type: object
+                    stsSessionTokenSpec:
+                      properties:
+                        auth:
+                          description: Auth defines how to authenticate with AWS
+                          properties:
+                            jwt:
+                              description: Authenticate against AWS using service account tokens.
+                              properties:
+                                serviceAccountRef:
+                                  description: A reference to a ServiceAccount resource.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              type: object
+                            secretRef:
+                              description: |-
+                                AWSAuthSecretRef holds secret references for AWS credentials
+                                both AccessKeyID and SecretAccessKey must be defined in order to properly authenticate.
+                              properties:
+                                accessKeyIDSecretRef:
+                                  description: The AccessKeyID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                secretAccessKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                sessionTokenSecretRef:
+                                  description: |-
+                                    The SessionToken used for authentication
+                                    This must be defined if AccessKeyID and SecretAccessKey are temporary credentials
+                                    see: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        region:
+                          description: Region specifies the region to operate in.
+                          type: string
+                        requestParameters:
+                          description: RequestParameters contains parameters that can be passed to the STS service.
+                          properties:
+                            serialNumber:
+                              description: |-
+                                SerialNumber is the identification number of the MFA device that is associated with the IAM user who is making
+                                the GetSessionToken call.
+                                Possible values: hardware device (such as GAHT12345678) or an Amazon Resource Name (ARN) for a virtual device
+                                (such as arn:aws:iam::123456789012:mfa/user)
+                              type: string
+                            sessionDuration:
+                              description: |-
+                                SessionDuration The duration, in seconds, that the credentials should remain valid. Acceptable durations for
+                                IAM user sessions range from 900 seconds (15 minutes) to 129,600 seconds (36 hours), with 43,200 seconds
+                                (12 hours) as the default.
+                              format: int64
+                              type: integer
+                            tokenCode:
+                              description: TokenCode is the value provided by the MFA device, if MFA is required.
+                              type: string
+                          type: object
+                        role:
+                          description: |-
+                            You can assume a role before making calls to the
+                            desired AWS service.
+                          type: string
+                      required:
+                        - region
+                      type: object
+                    uuidSpec:
+                      description: UUIDSpec controls the behavior of the uuid generator.
+                      type: object
+                    vaultDynamicSecretSpec:
+                      properties:
+                        allowEmptyResponse:
+                          default: false
+                          description: Do not fail if no secrets are found. Useful for requests where no data is expected.
+                          type: boolean
+                        controller:
+                          description: |-
+                            Used to select the correct ESO controller (think: ingress.ingressClassName)
+                            The ESO controller is instantiated with a specific controller name and filters VDS based on this property
+                          type: string
+                        method:
+                          description: Vault API method to use (GET/POST/other)
+                          type: string
+                        parameters:
+                          description: Parameters to pass to Vault write (for non-GET methods)
+                          x-kubernetes-preserve-unknown-fields: true
+                        path:
+                          description: Vault path to obtain the dynamic secret from
+                          type: string
+                        provider:
+                          description: Vault provider common spec
+                          properties:
+                            auth:
+                              description: Auth configures how secret-manager authenticates with the Vault server.
+                              properties:
+                                appRole:
+                                  description: |-
+                                    AppRole authenticates with Vault using the App Role auth mechanism,
+                                    with the role and secret stored in a Kubernetes Secret resource.
+                                  properties:
+                                    path:
+                                      default: approle
+                                      description: |-
+                                        Path where the App Role authentication backend is mounted
+                                        in Vault, e.g: "approle"
+                                      type: string
+                                    roleId:
+                                      description: |-
+                                        RoleID configured in the App Role authentication backend when setting
+                                        up the authentication backend in Vault.
+                                      type: string
+                                    roleRef:
+                                      description: |-
+                                        Reference to a key in a Secret that contains the App Role ID used
+                                        to authenticate with Vault.
+                                        The `key` field must be specified and denotes which entry within the Secret
+                                        resource is used as the app role id.
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                    secretRef:
+                                      description: |-
+                                        Reference to a key in a Secret that contains the App Role secret used
+                                        to authenticate with Vault.
+                                        The `key` field must be specified and denotes which entry within the Secret
+                                        resource is used as the app role secret.
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                  required:
+                                    - path
+                                    - secretRef
+                                  type: object
+                                cert:
+                                  description: |-
+                                    Cert authenticates with TLS Certificates by passing client certificate, private key and ca certificate
+                                    Cert authentication method
+                                  properties:
+                                    clientCert:
+                                      description: |-
+                                        ClientCert is a certificate to authenticate using the Cert Vault
+                                        authentication method
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                    secretRef:
+                                      description: |-
+                                        SecretRef to a key in a Secret resource containing client private key to
+                                        authenticate with Vault using the Cert authentication method
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                  type: object
+                                iam:
+                                  description: |-
+                                    Iam authenticates with vault by passing a special AWS request signed with AWS IAM credentials
+                                    AWS IAM authentication method
+                                  properties:
+                                    externalID:
+                                      description: AWS External ID set on assumed IAM roles
+                                      type: string
+                                    jwt:
+                                      description: Specify a service account with IRSA enabled
+                                      properties:
+                                        serviceAccountRef:
+                                          description: A reference to a ServiceAccount resource.
+                                          properties:
+                                            audiences:
+                                              description: |-
+                                                Audience specifies the `aud` claim for the service account token
+                                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                                then this audiences will be appended to the list
+                                              items:
+                                                type: string
+                                              type: array
+                                            name:
+                                              description: The name of the ServiceAccount resource being referred to.
+                                              maxLength: 253
+                                              minLength: 1
+                                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                              type: string
+                                            namespace:
+                                              description: |-
+                                                Namespace of the resource being referred to.
+                                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                              maxLength: 63
+                                              minLength: 1
+                                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                              type: string
+                                          required:
+                                            - name
+                                          type: object
+                                      type: object
+                                    path:
+                                      description: 'Path where the AWS auth method is enabled in Vault, e.g: "aws"'
+                                      type: string
+                                    region:
+                                      description: AWS region
+                                      type: string
+                                    role:
+                                      description: This is the AWS role to be assumed before talking to vault
+                                      type: string
+                                    secretRef:
+                                      description: Specify credentials in a Secret object
+                                      properties:
+                                        accessKeyIDSecretRef:
+                                          description: The AccessKeyID is used for authentication
+                                          properties:
+                                            key:
+                                              description: |-
+                                                A key in the referenced Secret.
+                                                Some instances of this field may be defaulted, in others it may be required.
+                                              maxLength: 253
+                                              minLength: 1
+                                              pattern: ^[-._a-zA-Z0-9]+$
+                                              type: string
+                                            name:
+                                              description: The name of the Secret resource being referred to.
+                                              maxLength: 253
+                                              minLength: 1
+                                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                              type: string
+                                            namespace:
+                                              description: |-
+                                                The namespace of the Secret resource being referred to.
+                                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                              maxLength: 63
+                                              minLength: 1
+                                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                              type: string
+                                          type: object
+                                        secretAccessKeySecretRef:
+                                          description: The SecretAccessKey is used for authentication
+                                          properties:
+                                            key:
+                                              description: |-
+                                                A key in the referenced Secret.
+                                                Some instances of this field may be defaulted, in others it may be required.
+                                              maxLength: 253
+                                              minLength: 1
+                                              pattern: ^[-._a-zA-Z0-9]+$
+                                              type: string
+                                            name:
+                                              description: The name of the Secret resource being referred to.
+                                              maxLength: 253
+                                              minLength: 1
+                                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                              type: string
+                                            namespace:
+                                              description: |-
+                                                The namespace of the Secret resource being referred to.
+                                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                              maxLength: 63
+                                              minLength: 1
+                                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                              type: string
+                                          type: object
+                                        sessionTokenSecretRef:
+                                          description: |-
+                                            The SessionToken used for authentication
+                                            This must be defined if AccessKeyID and SecretAccessKey are temporary credentials
+                                            see: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html
+                                          properties:
+                                            key:
+                                              description: |-
+                                                A key in the referenced Secret.
+                                                Some instances of this field may be defaulted, in others it may be required.
+                                              maxLength: 253
+                                              minLength: 1
+                                              pattern: ^[-._a-zA-Z0-9]+$
+                                              type: string
+                                            name:
+                                              description: The name of the Secret resource being referred to.
+                                              maxLength: 253
+                                              minLength: 1
+                                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                              type: string
+                                            namespace:
+                                              description: |-
+                                                The namespace of the Secret resource being referred to.
+                                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                              maxLength: 63
+                                              minLength: 1
+                                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                              type: string
+                                          type: object
+                                      type: object
+                                    vaultAwsIamServerID:
+                                      description: 'X-Vault-AWS-IAM-Server-ID is an additional header used by Vault IAM auth method to mitigate against different types of replay attacks. More details here: https://developer.hashicorp.com/vault/docs/auth/aws'
+                                      type: string
+                                    vaultRole:
+                                      description: Vault Role. In vault, a role describes an identity with a set of permissions, groups, or policies you want to attach a user of the secrets engine
+                                      type: string
+                                  required:
+                                    - vaultRole
+                                  type: object
+                                jwt:
+                                  description: |-
+                                    Jwt authenticates with Vault by passing role and JWT token using the
+                                    JWT/OIDC authentication method
+                                  properties:
+                                    kubernetesServiceAccountToken:
+                                      description: |-
+                                        Optional ServiceAccountToken specifies the Kubernetes service account for which to request
+                                        a token for with the `TokenRequest` API.
+                                      properties:
+                                        audiences:
+                                          description: |-
+                                            Optional audiences field that will be used to request a temporary Kubernetes service
+                                            account token for the service account referenced by `serviceAccountRef`.
+                                            Defaults to a single audience `vault` it not specified.
+                                            Deprecated: use serviceAccountRef.Audiences instead
+                                          items:
+                                            type: string
+                                          type: array
+                                        expirationSeconds:
+                                          description: |-
+                                            Optional expiration time in seconds that will be used to request a temporary
+                                            Kubernetes service account token for the service account referenced by
+                                            `serviceAccountRef`.
+                                            Deprecated: this will be removed in the future.
+                                            Defaults to 10 minutes.
+                                          format: int64
+                                          type: integer
+                                        serviceAccountRef:
+                                          description: Service account field containing the name of a kubernetes ServiceAccount.
+                                          properties:
+                                            audiences:
+                                              description: |-
+                                                Audience specifies the `aud` claim for the service account token
+                                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                                then this audiences will be appended to the list
+                                              items:
+                                                type: string
+                                              type: array
+                                            name:
+                                              description: The name of the ServiceAccount resource being referred to.
+                                              maxLength: 253
+                                              minLength: 1
+                                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                              type: string
+                                            namespace:
+                                              description: |-
+                                                Namespace of the resource being referred to.
+                                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                              maxLength: 63
+                                              minLength: 1
+                                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                              type: string
+                                          required:
+                                            - name
+                                          type: object
+                                      required:
+                                        - serviceAccountRef
+                                      type: object
+                                    path:
+                                      default: jwt
+                                      description: |-
+                                        Path where the JWT authentication backend is mounted
+                                        in Vault, e.g: "jwt"
+                                      type: string
+                                    role:
+                                      description: |-
+                                        Role is a JWT role to authenticate using the JWT/OIDC Vault
+                                        authentication method
+                                      type: string
+                                    secretRef:
+                                      description: |-
+                                        Optional SecretRef that refers to a key in a Secret resource containing JWT token to
+                                        authenticate with Vault using the JWT/OIDC authentication method.
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                  required:
+                                    - path
+                                  type: object
+                                kubernetes:
+                                  description: |-
+                                    Kubernetes authenticates with Vault by passing the ServiceAccount
+                                    token stored in the named Secret resource to the Vault server.
+                                  properties:
+                                    mountPath:
+                                      default: kubernetes
+                                      description: |-
+                                        Path where the Kubernetes authentication backend is mounted in Vault, e.g:
+                                        "kubernetes"
+                                      type: string
+                                    role:
+                                      description: |-
+                                        A required field containing the Vault Role to assume. A Role binds a
+                                        Kubernetes ServiceAccount with a set of Vault policies.
+                                      type: string
+                                    secretRef:
+                                      description: |-
+                                        Optional secret field containing a Kubernetes ServiceAccount JWT used
+                                        for authenticating with Vault. If a name is specified without a key,
+                                        `token` is the default. If one is not specified, the one bound to
+                                        the controller will be used.
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                    serviceAccountRef:
+                                      description: |-
+                                        Optional service account field containing the name of a kubernetes ServiceAccount.
+                                        If the service account is specified, the service account secret token JWT will be used
+                                        for authenticating with Vault. If the service account selector is not supplied,
+                                        the secretRef will be used instead.
+                                      properties:
+                                        audiences:
+                                          description: |-
+                                            Audience specifies the `aud` claim for the service account token
+                                            If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                            then this audiences will be appended to the list
+                                          items:
+                                            type: string
+                                          type: array
+                                        name:
+                                          description: The name of the ServiceAccount resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            Namespace of the resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      required:
+                                        - name
+                                      type: object
+                                  required:
+                                    - mountPath
+                                    - role
+                                  type: object
+                                ldap:
+                                  description: |-
+                                    Ldap authenticates with Vault by passing username/password pair using
+                                    the LDAP authentication method
+                                  properties:
+                                    path:
+                                      default: ldap
+                                      description: |-
+                                        Path where the LDAP authentication backend is mounted
+                                        in Vault, e.g: "ldap"
+                                      type: string
+                                    secretRef:
+                                      description: |-
+                                        SecretRef to a key in a Secret resource containing password for the LDAP
+                                        user used to authenticate with Vault using the LDAP authentication
+                                        method
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                    username:
+                                      description: |-
+                                        Username is a LDAP user name used to authenticate using the LDAP Vault
+                                        authentication method
+                                      type: string
+                                  required:
+                                    - path
+                                    - username
+                                  type: object
+                                namespace:
+                                  description: |-
+                                    Name of the vault namespace to authenticate to. This can be different than the namespace your secret is in.
+                                    Namespaces is a set of features within Vault Enterprise that allows
+                                    Vault environments to support Secure Multi-tenancy. e.g: "ns1".
+                                    More about namespaces can be found here https://www.vaultproject.io/docs/enterprise/namespaces
+                                    This will default to Vault.Namespace field if set, or empty otherwise
+                                  type: string
+                                tokenSecretRef:
+                                  description: TokenSecretRef authenticates with Vault by presenting a token.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                userPass:
+                                  description: UserPass authenticates with Vault by passing username/password pair
+                                  properties:
+                                    path:
+                                      default: user
+                                      description: |-
+                                        Path where the UserPassword authentication backend is mounted
+                                        in Vault, e.g: "user"
+                                      type: string
+                                    secretRef:
+                                      description: |-
+                                        SecretRef to a key in a Secret resource containing password for the
+                                        user used to authenticate with Vault using the UserPass authentication
+                                        method
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                    username:
+                                      description: |-
+                                        Username is a user name used to authenticate using the UserPass Vault
+                                        authentication method
+                                      type: string
+                                  required:
+                                    - path
+                                    - username
+                                  type: object
+                              type: object
+                            caBundle:
+                              description: |-
+                                PEM encoded CA bundle used to validate Vault server certificate. Only used
+                                if the Server URL is using HTTPS protocol. This parameter is ignored for
+                                plain HTTP protocol connection. If not set the system root certificates
+                                are used to validate the TLS connection.
+                              format: byte
+                              type: string
+                            caProvider:
+                              description: The provider for the CA bundle to use to validate Vault server certificate.
+                              properties:
+                                key:
+                                  description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the object located at the provider type.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace the Provider type is in.
+                                    Can only be defined when used in a ClusterSecretStore.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                                type:
+                                  description: The type of provider to use such as "Secret", or "ConfigMap".
+                                  enum:
+                                    - Secret
+                                    - ConfigMap
+                                  type: string
+                              required:
+                                - name
+                                - type
+                              type: object
+                            forwardInconsistent:
+                              description: |-
+                                ForwardInconsistent tells Vault to forward read-after-write requests to the Vault
+                                leader instead of simply retrying within a loop. This can increase performance if
+                                the option is enabled serverside.
+                                https://www.vaultproject.io/docs/configuration/replication#allow_forwarding_via_header
+                              type: boolean
+                            headers:
+                              additionalProperties:
+                                type: string
+                              description: Headers to be added in Vault request
+                              type: object
+                            namespace:
+                              description: |-
+                                Name of the vault namespace. Namespaces is a set of features within Vault Enterprise that allows
+                                Vault environments to support Secure Multi-tenancy. e.g: "ns1".
+                                More about namespaces can be found here https://www.vaultproject.io/docs/enterprise/namespaces
+                              type: string
+                            path:
+                              description: |-
+                                Path is the mount path of the Vault KV backend endpoint, e.g:
+                                "secret". The v2 KV secret engine version specific "/data" path suffix
+                                for fetching secrets from Vault is optional and will be appended
+                                if not present in specified path.
+                              type: string
+                            readYourWrites:
+                              description: |-
+                                ReadYourWrites ensures isolated read-after-write semantics by
+                                providing discovered cluster replication states in each request.
+                                More information about eventual consistency in Vault can be found here
+                                https://www.vaultproject.io/docs/enterprise/consistency
+                              type: boolean
+                            server:
+                              description: 'Server is the connection address for the Vault server, e.g: "https://vault.example.com:8200".'
+                              type: string
+                            tls:
+                              description: |-
+                                The configuration used for client side related TLS communication, when the Vault server
+                                requires mutual authentication. Only used if the Server URL is using HTTPS protocol.
+                                This parameter is ignored for plain HTTP protocol connection.
+                                It's worth noting this configuration is different from the "TLS certificates auth method",
+                                which is available under the `auth.cert` section.
+                              properties:
+                                certSecretRef:
+                                  description: |-
+                                    CertSecretRef is a certificate added to the transport layer
+                                    when communicating with the Vault server.
+                                    If no key for the Secret is specified, external-secret will default to 'tls.crt'.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                keySecretRef:
+                                  description: |-
+                                    KeySecretRef to a key in a Secret resource containing client private key
+                                    added to the transport layer when communicating with the Vault server.
+                                    If no key for the Secret is specified, external-secret will default to 'tls.key'.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            version:
+                              default: v2
+                              description: |-
+                                Version is the Vault KV secret engine version. This can be either "v1" or
+                                "v2". Version defaults to "v2".
+                              enum:
+                                - v1
+                                - v2
+                              type: string
+                          required:
+                            - auth
+                            - server
+                          type: object
+                        resultType:
+                          default: Data
+                          description: |-
+                            Result type defines which data is returned from the generator.
+                            By default it is the "data" section of the Vault API response.
+                            When using e.g. /auth/token/create the "data" section is empty but
+                            the "auth" section contains the generated token.
+                            Please refer to the vault docs regarding the result data structure.
+                          enum:
+                            - Data
+                            - Auth
+                          type: string
+                        retrySettings:
+                          description: Used to configure http retries if failed
+                          properties:
+                            maxRetries:
+                              format: int32
+                              type: integer
+                            retryInterval:
+                              type: string
+                          type: object
+                      required:
+                        - path
+                        - provider
+                      type: object
+                    webhookSpec:
+                      description: WebhookSpec controls the behavior of the external generator. Any body parameters should be passed to the server through the parameters field.
+                      properties:
+                        body:
+                          description: Body
+                          type: string
+                        caBundle:
+                          description: |-
+                            PEM encoded CA bundle used to validate webhook server certificate. Only used
+                            if the Server URL is using HTTPS protocol. This parameter is ignored for
+                            plain HTTP protocol connection. If not set the system root certificates
+                            are used to validate the TLS connection.
+                          format: byte
+                          type: string
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate webhook server certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: The namespace the Provider type is in.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                        headers:
+                          additionalProperties:
+                            type: string
+                          description: Headers
+                          type: object
+                        method:
+                          description: Webhook Method
+                          type: string
+                        result:
+                          description: Result formatting
+                          properties:
+                            jsonPath:
+                              description: Json path of return value
+                              type: string
+                          type: object
+                        secrets:
+                          description: |-
+                            Secrets to fill in templates
+                            These secrets will be passed to the templating function as key value pairs under the given name
+                          items:
+                            properties:
+                              name:
+                                description: Name of this secret in templates
+                                type: string
+                              secretRef:
+                                description: Secret ref to fill in credentials
+                                properties:
+                                  key:
+                                    description: The key where the token is found.
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[-._a-zA-Z0-9]+$
+                                    type: string
+                                  name:
+                                    description: The name of the Secret resource being referred to.
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                    type: string
+                                type: object
+                            required:
+                              - name
+                              - secretRef
+                            type: object
+                          type: array
+                        timeout:
+                          description: Timeout
+                          type: string
+                        url:
+                          description: Webhook url to call
+                          type: string
+                      required:
+                        - result
+                        - url
+                      type: object
+                  type: object
+                kind:
+                  description: Kind the kind of this generator.
+                  enum:
+                    - ACRAccessToken
+                    - ECRAuthorizationToken
+                    - Fake
+                    - GCRAccessToken
+                    - GithubAccessToken
+                    - QuayAccessToken
+                    - Password
+                    - STSSessionToken
+                    - UUID
+                    - VaultDynamicSecret
+                    - Webhook
+                  type: string
+              required:
+                - generator
+                - kind
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/clustersecretstore.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/clustersecretstore.yaml
new file mode 100644
index 000000000..4bc83e2dc
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/clustersecretstore.yaml
@@ -0,0 +1,5782 @@
+{{- if and (.Values.installCRDs) (.Values.crds.createClusterSecretStore) }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: clustersecretstores.external-secrets.io
+spec:
+  group: external-secrets.io
+  names:
+    categories:
+      - external-secrets
+    kind: ClusterSecretStore
+    listKind: ClusterSecretStoreList
+    plural: clustersecretstores
+    shortNames:
+      - css
+    singular: clustersecretstore
+  scope: Cluster
+  versions:
+    - additionalPrinterColumns:
+        - jsonPath: .metadata.creationTimestamp
+          name: AGE
+          type: date
+        - jsonPath: .status.conditions[?(@.type=="Ready")].reason
+          name: Status
+          type: string
+      deprecated: true
+      name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: ClusterSecretStore represents a secure external location for storing secrets, which can be referenced as part of `storeRef` fields.
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: SecretStoreSpec defines the desired state of SecretStore.
+              properties:
+                controller:
+                  description: |-
+                    Used to select the correct ESO controller (think: ingress.ingressClassName)
+                    The ESO controller is instantiated with a specific controller name and filters ES based on this property
+                  type: string
+                provider:
+                  description: Used to configure the provider. Only one provider may be set
+                  maxProperties: 1
+                  minProperties: 1
+                  properties:
+                    akeyless:
+                      description: Akeyless configures this store to sync secrets using Akeyless Vault provider
+                      properties:
+                        akeylessGWApiURL:
+                          description: Akeyless GW API Url from which the secrets to be fetched from.
+                          type: string
+                        authSecretRef:
+                          description: Auth configures how the operator authenticates with Akeyless.
+                          properties:
+                            kubernetesAuth:
+                              description: |-
+                                Kubernetes authenticates with Akeyless by passing the ServiceAccount
+                                token stored in the named Secret resource.
+                              properties:
+                                accessID:
+                                  description: the Akeyless Kubernetes auth-method access-id
+                                  type: string
+                                k8sConfName:
+                                  description: Kubernetes-auth configuration name in Akeyless-Gateway
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Optional secret field containing a Kubernetes ServiceAccount JWT used
+                                    for authenticating with Akeyless. If a name is specified without a key,
+                                    `token` is the default. If one is not specified, the one bound to
+                                    the controller will be used.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                serviceAccountRef:
+                                  description: |-
+                                    Optional service account field containing the name of a kubernetes ServiceAccount.
+                                    If the service account is specified, the service account secret token JWT will be used
+                                    for authenticating with Akeyless. If the service account selector is not supplied,
+                                    the secretRef will be used instead.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              required:
+                                - accessID
+                                - k8sConfName
+                              type: object
+                            secretRef:
+                              description: |-
+                                Reference to a Secret that contains the details
+                                to authenticate with Akeyless.
+                              properties:
+                                accessID:
+                                  description: The SecretAccessID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                accessType:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                accessTypeParam:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        caBundle:
+                          description: |-
+                            PEM/base64 encoded CA bundle used to validate Akeyless Gateway certificate. Only used
+                            if the AkeylessGWApiURL URL is using HTTPS protocol. If not set the system root certificates
+                            are used to validate the TLS connection.
+                          format: byte
+                          type: string
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate Akeyless Gateway certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: The namespace the Provider type is in.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                      required:
+                        - akeylessGWApiURL
+                        - authSecretRef
+                      type: object
+                    alibaba:
+                      description: Alibaba configures this store to sync secrets using Alibaba Cloud provider
+                      properties:
+                        auth:
+                          description: AlibabaAuth contains a secretRef for credentials.
+                          properties:
+                            rrsa:
+                              description: Authenticate against Alibaba using RRSA.
+                              properties:
+                                oidcProviderArn:
+                                  type: string
+                                oidcTokenFilePath:
+                                  type: string
+                                roleArn:
+                                  type: string
+                                sessionName:
+                                  type: string
+                              required:
+                                - oidcProviderArn
+                                - oidcTokenFilePath
+                                - roleArn
+                                - sessionName
+                              type: object
+                            secretRef:
+                              description: AlibabaAuthSecretRef holds secret references for Alibaba credentials.
+                              properties:
+                                accessKeyIDSecretRef:
+                                  description: The AccessKeyID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                accessKeySecretSecretRef:
+                                  description: The AccessKeySecret is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - accessKeyIDSecretRef
+                                - accessKeySecretSecretRef
+                              type: object
+                          type: object
+                        regionID:
+                          description: Alibaba Region to be used for the provider
+                          type: string
+                      required:
+                        - auth
+                        - regionID
+                      type: object
+                    aws:
+                      description: AWS configures this store to sync secrets using AWS Secret Manager provider
+                      properties:
+                        auth:
+                          description: |-
+                            Auth defines the information necessary to authenticate against AWS
+                            if not set aws sdk will infer credentials from your environment
+                            see: https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials
+                          properties:
+                            jwt:
+                              description: Authenticate against AWS using service account tokens.
+                              properties:
+                                serviceAccountRef:
+                                  description: A reference to a ServiceAccount resource.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              type: object
+                            secretRef:
+                              description: |-
+                                AWSAuthSecretRef holds secret references for AWS credentials
+                                both AccessKeyID and SecretAccessKey must be defined in order to properly authenticate.
+                              properties:
+                                accessKeyIDSecretRef:
+                                  description: The AccessKeyID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                secretAccessKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        region:
+                          description: AWS Region to be used for the provider
+                          type: string
+                        role:
+                          description: Role is a Role ARN which the SecretManager provider will assume
+                          type: string
+                        service:
+                          description: Service defines which service should be used to fetch the secrets
+                          enum:
+                            - SecretsManager
+                            - ParameterStore
+                          type: string
+                      required:
+                        - region
+                        - service
+                      type: object
+                    azurekv:
+                      description: AzureKV configures this store to sync secrets using Azure Key Vault provider
+                      properties:
+                        authSecretRef:
+                          description: Auth configures how the operator authenticates with Azure. Required for ServicePrincipal auth type.
+                          properties:
+                            clientId:
+                              description: The Azure clientId of the service principle used for authentication.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            clientSecret:
+                              description: The Azure ClientSecret of the service principle used for authentication.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        authType:
+                          default: ServicePrincipal
+                          description: |-
+                            Auth type defines how to authenticate to the keyvault service.
+                            Valid values are:
+                            - "ServicePrincipal" (default): Using a service principal (tenantId, clientId, clientSecret)
+                            - "ManagedIdentity": Using Managed Identity assigned to the pod (see aad-pod-identity)
+                          enum:
+                            - ServicePrincipal
+                            - ManagedIdentity
+                            - WorkloadIdentity
+                          type: string
+                        identityId:
+                          description: If multiple Managed Identity is assigned to the pod, you can select the one to be used
+                          type: string
+                        serviceAccountRef:
+                          description: |-
+                            ServiceAccountRef specified the service account
+                            that should be used when authenticating with WorkloadIdentity.
+                          properties:
+                            audiences:
+                              description: |-
+                                Audience specifies the `aud` claim for the service account token
+                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                then this audiences will be appended to the list
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: The name of the ServiceAccount resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                Namespace of the resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          required:
+                            - name
+                          type: object
+                        tenantId:
+                          description: TenantID configures the Azure Tenant to send requests to. Required for ServicePrincipal auth type.
+                          type: string
+                        vaultUrl:
+                          description: Vault Url from which the secrets to be fetched from.
+                          type: string
+                      required:
+                        - vaultUrl
+                      type: object
+                    fake:
+                      description: Fake configures a store with static key/value pairs
+                      properties:
+                        data:
+                          items:
+                            properties:
+                              key:
+                                type: string
+                              value:
+                                type: string
+                              valueMap:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              version:
+                                type: string
+                            required:
+                              - key
+                            type: object
+                          type: array
+                      required:
+                        - data
+                      type: object
+                    gcpsm:
+                      description: GCPSM configures this store to sync secrets using Google Cloud Platform Secret Manager provider
+                      properties:
+                        auth:
+                          description: Auth defines the information necessary to authenticate against GCP
+                          properties:
+                            secretRef:
+                              properties:
+                                secretAccessKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            workloadIdentity:
+                              properties:
+                                clusterLocation:
+                                  type: string
+                                clusterName:
+                                  type: string
+                                clusterProjectID:
+                                  type: string
+                                serviceAccountRef:
+                                  description: A reference to a ServiceAccount resource.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              required:
+                                - clusterLocation
+                                - clusterName
+                                - serviceAccountRef
+                              type: object
+                          type: object
+                        projectID:
+                          description: ProjectID project where secret is located
+                          type: string
+                      type: object
+                    gitlab:
+                      description: GitLab configures this store to sync secrets using GitLab Variables provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with a GitLab instance.
+                          properties:
+                            SecretRef:
+                              properties:
+                                accessToken:
+                                  description: AccessToken is used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          required:
+                            - SecretRef
+                          type: object
+                        projectID:
+                          description: ProjectID specifies a project where secrets are located.
+                          type: string
+                        url:
+                          description: URL configures the GitLab instance URL. Defaults to https://gitlab.com/.
+                          type: string
+                      required:
+                        - auth
+                      type: object
+                    ibm:
+                      description: IBM configures this store to sync secrets using IBM Cloud provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with the IBM secrets manager.
+                          properties:
+                            secretRef:
+                              properties:
+                                secretApiKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        serviceUrl:
+                          description: ServiceURL is the Endpoint URL that is specific to the Secrets Manager service instance
+                          type: string
+                      required:
+                        - auth
+                      type: object
+                    kubernetes:
+                      description: Kubernetes configures this store to sync secrets using a Kubernetes cluster provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with a Kubernetes instance.
+                          maxProperties: 1
+                          minProperties: 1
+                          properties:
+                            cert:
+                              description: has both clientCert and clientKey as secretKeySelector
+                              properties:
+                                clientCert:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                clientKey:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            serviceAccount:
+                              description: points to a service account that should be used for authentication
+                              properties:
+                                serviceAccount:
+                                  description: A reference to a ServiceAccount resource.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              type: object
+                            token:
+                              description: use static token to authenticate with
+                              properties:
+                                bearerToken:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        remoteNamespace:
+                          default: default
+                          description: Remote namespace to fetch the secrets from
+                          maxLength: 63
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                          type: string
+                        server:
+                          description: configures the Kubernetes server Address.
+                          properties:
+                            caBundle:
+                              description: CABundle is a base64-encoded CA certificate
+                              format: byte
+                              type: string
+                            caProvider:
+                              description: 'see: https://external-secrets.io/v0.4.1/spec/#external-secrets.io/v1alpha1.CAProvider'
+                              properties:
+                                key:
+                                  description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the object located at the provider type.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: The namespace the Provider type is in.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                                type:
+                                  description: The type of provider to use such as "Secret", or "ConfigMap".
+                                  enum:
+                                    - Secret
+                                    - ConfigMap
+                                  type: string
+                              required:
+                                - name
+                                - type
+                              type: object
+                            url:
+                              default: kubernetes.default
+                              description: configures the Kubernetes server Address.
+                              type: string
+                          type: object
+                      required:
+                        - auth
+                      type: object
+                    oracle:
+                      description: Oracle configures this store to sync secrets using Oracle Vault provider
+                      properties:
+                        auth:
+                          description: |-
+                            Auth configures how secret-manager authenticates with the Oracle Vault.
+                            If empty, instance principal is used. Optionally, the authenticating principal type
+                            and/or user data may be supplied for the use of workload identity and user principal.
+                          properties:
+                            secretRef:
+                              description: SecretRef to pass through sensitive information.
+                              properties:
+                                fingerprint:
+                                  description: Fingerprint is the fingerprint of the API private key.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                privatekey:
+                                  description: PrivateKey is the user's API Signing Key in PEM format, used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - fingerprint
+                                - privatekey
+                              type: object
+                            tenancy:
+                              description: Tenancy is the tenancy OCID where user is located.
+                              type: string
+                            user:
+                              description: User is an access OCID specific to the account.
+                              type: string
+                          required:
+                            - secretRef
+                            - tenancy
+                            - user
+                          type: object
+                        compartment:
+                          description: |-
+                            Compartment is the vault compartment OCID.
+                            Required for PushSecret
+                          type: string
+                        encryptionKey:
+                          description: |-
+                            EncryptionKey is the OCID of the encryption key within the vault.
+                            Required for PushSecret
+                          type: string
+                        principalType:
+                          description: |-
+                            The type of principal to use for authentication. If left blank, the Auth struct will
+                            determine the principal type. This optional field must be specified if using
+                            workload identity.
+                          enum:
+                            - ""
+                            - UserPrincipal
+                            - InstancePrincipal
+                            - Workload
+                          type: string
+                        region:
+                          description: Region is the region where vault is located.
+                          type: string
+                        serviceAccountRef:
+                          description: |-
+                            ServiceAccountRef specified the service account
+                            that should be used when authenticating with WorkloadIdentity.
+                          properties:
+                            audiences:
+                              description: |-
+                                Audience specifies the `aud` claim for the service account token
+                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                then this audiences will be appended to the list
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: The name of the ServiceAccount resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                Namespace of the resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          required:
+                            - name
+                          type: object
+                        vault:
+                          description: Vault is the vault's OCID of the specific vault where secret is located.
+                          type: string
+                      required:
+                        - region
+                        - vault
+                      type: object
+                    passworddepot:
+                      description: Configures a store to sync secrets with a Password Depot instance.
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with a Password Depot instance.
+                          properties:
+                            secretRef:
+                              properties:
+                                credentials:
+                                  description: Username / Password is used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        database:
+                          description: Database to use as source
+                          type: string
+                        host:
+                          description: URL configures the Password Depot instance URL.
+                          type: string
+                      required:
+                        - auth
+                        - database
+                        - host
+                      type: object
+                    vault:
+                      description: Vault configures this store to sync secrets using Hashi provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with the Vault server.
+                          properties:
+                            appRole:
+                              description: |-
+                                AppRole authenticates with Vault using the App Role auth mechanism,
+                                with the role and secret stored in a Kubernetes Secret resource.
+                              properties:
+                                path:
+                                  default: approle
+                                  description: |-
+                                    Path where the App Role authentication backend is mounted
+                                    in Vault, e.g: "approle"
+                                  type: string
+                                roleId:
+                                  description: |-
+                                    RoleID configured in the App Role authentication backend when setting
+                                    up the authentication backend in Vault.
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Reference to a key in a Secret that contains the App Role secret used
+                                    to authenticate with Vault.
+                                    The `key` field must be specified and denotes which entry within the Secret
+                                    resource is used as the app role secret.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - path
+                                - roleId
+                                - secretRef
+                              type: object
+                            cert:
+                              description: |-
+                                Cert authenticates with TLS Certificates by passing client certificate, private key and ca certificate
+                                Cert authentication method
+                              properties:
+                                clientCert:
+                                  description: |-
+                                    ClientCert is a certificate to authenticate using the Cert Vault
+                                    authentication method
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                secretRef:
+                                  description: |-
+                                    SecretRef to a key in a Secret resource containing client private key to
+                                    authenticate with Vault using the Cert authentication method
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            jwt:
+                              description: |-
+                                Jwt authenticates with Vault by passing role and JWT token using the
+                                JWT/OIDC authentication method
+                              properties:
+                                kubernetesServiceAccountToken:
+                                  description: |-
+                                    Optional ServiceAccountToken specifies the Kubernetes service account for which to request
+                                    a token for with the `TokenRequest` API.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Optional audiences field that will be used to request a temporary Kubernetes service
+                                        account token for the service account referenced by `serviceAccountRef`.
+                                        Defaults to a single audience `vault` it not specified.
+                                      items:
+                                        type: string
+                                      type: array
+                                    expirationSeconds:
+                                      description: |-
+                                        Optional expiration time in seconds that will be used to request a temporary
+                                        Kubernetes service account token for the service account referenced by
+                                        `serviceAccountRef`.
+                                        Defaults to 10 minutes.
+                                      format: int64
+                                      type: integer
+                                    serviceAccountRef:
+                                      description: Service account field containing the name of a kubernetes ServiceAccount.
+                                      properties:
+                                        audiences:
+                                          description: |-
+                                            Audience specifies the `aud` claim for the service account token
+                                            If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                            then this audiences will be appended to the list
+                                          items:
+                                            type: string
+                                          type: array
+                                        name:
+                                          description: The name of the ServiceAccount resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            Namespace of the resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      required:
+                                        - name
+                                      type: object
+                                  required:
+                                    - serviceAccountRef
+                                  type: object
+                                path:
+                                  default: jwt
+                                  description: |-
+                                    Path where the JWT authentication backend is mounted
+                                    in Vault, e.g: "jwt"
+                                  type: string
+                                role:
+                                  description: |-
+                                    Role is a JWT role to authenticate using the JWT/OIDC Vault
+                                    authentication method
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Optional SecretRef that refers to a key in a Secret resource containing JWT token to
+                                    authenticate with Vault using the JWT/OIDC authentication method.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - path
+                              type: object
+                            kubernetes:
+                              description: |-
+                                Kubernetes authenticates with Vault by passing the ServiceAccount
+                                token stored in the named Secret resource to the Vault server.
+                              properties:
+                                mountPath:
+                                  default: kubernetes
+                                  description: |-
+                                    Path where the Kubernetes authentication backend is mounted in Vault, e.g:
+                                    "kubernetes"
+                                  type: string
+                                role:
+                                  description: |-
+                                    A required field containing the Vault Role to assume. A Role binds a
+                                    Kubernetes ServiceAccount with a set of Vault policies.
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Optional secret field containing a Kubernetes ServiceAccount JWT used
+                                    for authenticating with Vault. If a name is specified without a key,
+                                    `token` is the default. If one is not specified, the one bound to
+                                    the controller will be used.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                serviceAccountRef:
+                                  description: |-
+                                    Optional service account field containing the name of a kubernetes ServiceAccount.
+                                    If the service account is specified, the service account secret token JWT will be used
+                                    for authenticating with Vault. If the service account selector is not supplied,
+                                    the secretRef will be used instead.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              required:
+                                - mountPath
+                                - role
+                              type: object
+                            ldap:
+                              description: |-
+                                Ldap authenticates with Vault by passing username/password pair using
+                                the LDAP authentication method
+                              properties:
+                                path:
+                                  default: ldap
+                                  description: |-
+                                    Path where the LDAP authentication backend is mounted
+                                    in Vault, e.g: "ldap"
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    SecretRef to a key in a Secret resource containing password for the LDAP
+                                    user used to authenticate with Vault using the LDAP authentication
+                                    method
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                username:
+                                  description: |-
+                                    Username is a LDAP user name used to authenticate using the LDAP Vault
+                                    authentication method
+                                  type: string
+                              required:
+                                - path
+                                - username
+                              type: object
+                            tokenSecretRef:
+                              description: TokenSecretRef authenticates with Vault by presenting a token.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        caBundle:
+                          description: |-
+                            PEM encoded CA bundle used to validate Vault server certificate. Only used
+                            if the Server URL is using HTTPS protocol. This parameter is ignored for
+                            plain HTTP protocol connection. If not set the system root certificates
+                            are used to validate the TLS connection.
+                          format: byte
+                          type: string
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate Vault server certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: The namespace the Provider type is in.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                        forwardInconsistent:
+                          description: |-
+                            ForwardInconsistent tells Vault to forward read-after-write requests to the Vault
+                            leader instead of simply retrying within a loop. This can increase performance if
+                            the option is enabled serverside.
+                            https://www.vaultproject.io/docs/configuration/replication#allow_forwarding_via_header
+                          type: boolean
+                        namespace:
+                          description: |-
+                            Name of the vault namespace. Namespaces is a set of features within Vault Enterprise that allows
+                            Vault environments to support Secure Multi-tenancy. e.g: "ns1".
+                            More about namespaces can be found here https://www.vaultproject.io/docs/enterprise/namespaces
+                          type: string
+                        path:
+                          description: |-
+                            Path is the mount path of the Vault KV backend endpoint, e.g:
+                            "secret". The v2 KV secret engine version specific "/data" path suffix
+                            for fetching secrets from Vault is optional and will be appended
+                            if not present in specified path.
+                          type: string
+                        readYourWrites:
+                          description: |-
+                            ReadYourWrites ensures isolated read-after-write semantics by
+                            providing discovered cluster replication states in each request.
+                            More information about eventual consistency in Vault can be found here
+                            https://www.vaultproject.io/docs/enterprise/consistency
+                          type: boolean
+                        server:
+                          description: 'Server is the connection address for the Vault server, e.g: "https://vault.example.com:8200".'
+                          type: string
+                        version:
+                          default: v2
+                          description: |-
+                            Version is the Vault KV secret engine version. This can be either "v1" or
+                            "v2". Version defaults to "v2".
+                          enum:
+                            - v1
+                            - v2
+                          type: string
+                      required:
+                        - auth
+                        - server
+                      type: object
+                    webhook:
+                      description: Webhook configures this store to sync secrets using a generic templated webhook
+                      properties:
+                        body:
+                          description: Body
+                          type: string
+                        caBundle:
+                          description: |-
+                            PEM encoded CA bundle used to validate webhook server certificate. Only used
+                            if the Server URL is using HTTPS protocol. This parameter is ignored for
+                            plain HTTP protocol connection. If not set the system root certificates
+                            are used to validate the TLS connection.
+                          format: byte
+                          type: string
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate webhook server certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: The namespace the Provider type is in.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                        headers:
+                          additionalProperties:
+                            type: string
+                          description: Headers
+                          type: object
+                        method:
+                          description: Webhook Method
+                          type: string
+                        result:
+                          description: Result formatting
+                          properties:
+                            jsonPath:
+                              description: Json path of return value
+                              type: string
+                          type: object
+                        secrets:
+                          description: |-
+                            Secrets to fill in templates
+                            These secrets will be passed to the templating function as key value pairs under the given name
+                          items:
+                            properties:
+                              name:
+                                description: Name of this secret in templates
+                                type: string
+                              secretRef:
+                                description: Secret ref to fill in credentials
+                                properties:
+                                  key:
+                                    description: |-
+                                      A key in the referenced Secret.
+                                      Some instances of this field may be defaulted, in others it may be required.
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[-._a-zA-Z0-9]+$
+                                    type: string
+                                  name:
+                                    description: The name of the Secret resource being referred to.
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                    type: string
+                                  namespace:
+                                    description: |-
+                                      The namespace of the Secret resource being referred to.
+                                      Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                    maxLength: 63
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                    type: string
+                                type: object
+                            required:
+                              - name
+                              - secretRef
+                            type: object
+                          type: array
+                        timeout:
+                          description: Timeout
+                          type: string
+                        url:
+                          description: Webhook url to call
+                          type: string
+                      required:
+                        - result
+                        - url
+                      type: object
+                    yandexlockbox:
+                      description: YandexLockbox configures this store to sync secrets using Yandex Lockbox provider
+                      properties:
+                        apiEndpoint:
+                          description: Yandex.Cloud API endpoint (e.g. 'api.cloud.yandex.net:443')
+                          type: string
+                        auth:
+                          description: Auth defines the information necessary to authenticate against Yandex Lockbox
+                          properties:
+                            authorizedKeySecretRef:
+                              description: The authorized key used for authentication
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate Yandex.Cloud server certificate.
+                          properties:
+                            certSecretRef:
+                              description: |-
+                                A reference to a specific 'key' within a Secret resource.
+                                In some instances, `key` is a required field.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                      required:
+                        - auth
+                      type: object
+                  type: object
+                retrySettings:
+                  description: Used to configure http retries if failed
+                  properties:
+                    maxRetries:
+                      format: int32
+                      type: integer
+                    retryInterval:
+                      type: string
+                  type: object
+              required:
+                - provider
+              type: object
+            status:
+              description: SecretStoreStatus defines the observed state of the SecretStore.
+              properties:
+                conditions:
+                  items:
+                    properties:
+                      lastTransitionTime:
+                        format: date-time
+                        type: string
+                      message:
+                        type: string
+                      reason:
+                        type: string
+                      status:
+                        type: string
+                      type:
+                        type: string
+                    required:
+                      - status
+                      - type
+                    type: object
+                  type: array
+              type: object
+          type: object
+      served: true
+      storage: false
+      subresources:
+        status: {}
+    - additionalPrinterColumns:
+        - jsonPath: .metadata.creationTimestamp
+          name: AGE
+          type: date
+        - jsonPath: .status.conditions[?(@.type=="Ready")].reason
+          name: Status
+          type: string
+        - jsonPath: .status.capabilities
+          name: Capabilities
+          type: string
+        - jsonPath: .status.conditions[?(@.type=="Ready")].status
+          name: Ready
+          type: string
+      name: v1beta1
+      schema:
+        openAPIV3Schema:
+          description: ClusterSecretStore represents a secure external location for storing secrets, which can be referenced as part of `storeRef` fields.
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: SecretStoreSpec defines the desired state of SecretStore.
+              properties:
+                conditions:
+                  description: Used to constraint a ClusterSecretStore to specific namespaces. Relevant only to ClusterSecretStore
+                  items:
+                    description: |-
+                      ClusterSecretStoreCondition describes a condition by which to choose namespaces to process ExternalSecrets in
+                      for a ClusterSecretStore instance.
+                    properties:
+                      namespaceRegexes:
+                        description: Choose namespaces by using regex matching
+                        items:
+                          type: string
+                        type: array
+                      namespaceSelector:
+                        description: Choose namespace using a labelSelector
+                        properties:
+                          matchExpressions:
+                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                            items:
+                              description: |-
+                                A label selector requirement is a selector that contains values, a key, and an operator that
+                                relates the key and values.
+                              properties:
+                                key:
+                                  description: key is the label key that the selector applies to.
+                                  type: string
+                                operator:
+                                  description: |-
+                                    operator represents a key's relationship to a set of values.
+                                    Valid operators are In, NotIn, Exists and DoesNotExist.
+                                  type: string
+                                values:
+                                  description: |-
+                                    values is an array of string values. If the operator is In or NotIn,
+                                    the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                    the values array must be empty. This array is replaced during a strategic
+                                    merge patch.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              required:
+                                - key
+                                - operator
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          matchLabels:
+                            additionalProperties:
+                              type: string
+                            description: |-
+                              matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                              map is equivalent to an element of matchExpressions, whose key field is "key", the
+                              operator is "In", and the values array contains only "value". The requirements are ANDed.
+                            type: object
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      namespaces:
+                        description: Choose namespaces by name
+                        items:
+                          maxLength: 63
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                          type: string
+                        type: array
+                    type: object
+                  type: array
+                controller:
+                  description: |-
+                    Used to select the correct ESO controller (think: ingress.ingressClassName)
+                    The ESO controller is instantiated with a specific controller name and filters ES based on this property
+                  type: string
+                provider:
+                  description: Used to configure the provider. Only one provider may be set
+                  maxProperties: 1
+                  minProperties: 1
+                  properties:
+                    akeyless:
+                      description: Akeyless configures this store to sync secrets using Akeyless Vault provider
+                      properties:
+                        akeylessGWApiURL:
+                          description: Akeyless GW API Url from which the secrets to be fetched from.
+                          type: string
+                        authSecretRef:
+                          description: Auth configures how the operator authenticates with Akeyless.
+                          properties:
+                            kubernetesAuth:
+                              description: |-
+                                Kubernetes authenticates with Akeyless by passing the ServiceAccount
+                                token stored in the named Secret resource.
+                              properties:
+                                accessID:
+                                  description: the Akeyless Kubernetes auth-method access-id
+                                  type: string
+                                k8sConfName:
+                                  description: Kubernetes-auth configuration name in Akeyless-Gateway
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Optional secret field containing a Kubernetes ServiceAccount JWT used
+                                    for authenticating with Akeyless. If a name is specified without a key,
+                                    `token` is the default. If one is not specified, the one bound to
+                                    the controller will be used.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                serviceAccountRef:
+                                  description: |-
+                                    Optional service account field containing the name of a kubernetes ServiceAccount.
+                                    If the service account is specified, the service account secret token JWT will be used
+                                    for authenticating with Akeyless. If the service account selector is not supplied,
+                                    the secretRef will be used instead.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              required:
+                                - accessID
+                                - k8sConfName
+                              type: object
+                            secretRef:
+                              description: |-
+                                Reference to a Secret that contains the details
+                                to authenticate with Akeyless.
+                              properties:
+                                accessID:
+                                  description: The SecretAccessID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                accessType:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                accessTypeParam:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        caBundle:
+                          description: |-
+                            PEM/base64 encoded CA bundle used to validate Akeyless Gateway certificate. Only used
+                            if the AkeylessGWApiURL URL is using HTTPS protocol. If not set the system root certificates
+                            are used to validate the TLS connection.
+                          format: byte
+                          type: string
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate Akeyless Gateway certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace the Provider type is in.
+                                Can only be defined when used in a ClusterSecretStore.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                      required:
+                        - akeylessGWApiURL
+                        - authSecretRef
+                      type: object
+                    alibaba:
+                      description: Alibaba configures this store to sync secrets using Alibaba Cloud provider
+                      properties:
+                        auth:
+                          description: AlibabaAuth contains a secretRef for credentials.
+                          properties:
+                            rrsa:
+                              description: Authenticate against Alibaba using RRSA.
+                              properties:
+                                oidcProviderArn:
+                                  type: string
+                                oidcTokenFilePath:
+                                  type: string
+                                roleArn:
+                                  type: string
+                                sessionName:
+                                  type: string
+                              required:
+                                - oidcProviderArn
+                                - oidcTokenFilePath
+                                - roleArn
+                                - sessionName
+                              type: object
+                            secretRef:
+                              description: AlibabaAuthSecretRef holds secret references for Alibaba credentials.
+                              properties:
+                                accessKeyIDSecretRef:
+                                  description: The AccessKeyID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                accessKeySecretSecretRef:
+                                  description: The AccessKeySecret is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - accessKeyIDSecretRef
+                                - accessKeySecretSecretRef
+                              type: object
+                          type: object
+                        regionID:
+                          description: Alibaba Region to be used for the provider
+                          type: string
+                      required:
+                        - auth
+                        - regionID
+                      type: object
+                    aws:
+                      description: AWS configures this store to sync secrets using AWS Secret Manager provider
+                      properties:
+                        additionalRoles:
+                          description: AdditionalRoles is a chained list of Role ARNs which the provider will sequentially assume before assuming the Role
+                          items:
+                            type: string
+                          type: array
+                        auth:
+                          description: |-
+                            Auth defines the information necessary to authenticate against AWS
+                            if not set aws sdk will infer credentials from your environment
+                            see: https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials
+                          properties:
+                            jwt:
+                              description: Authenticate against AWS using service account tokens.
+                              properties:
+                                serviceAccountRef:
+                                  description: A reference to a ServiceAccount resource.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              type: object
+                            secretRef:
+                              description: |-
+                                AWSAuthSecretRef holds secret references for AWS credentials
+                                both AccessKeyID and SecretAccessKey must be defined in order to properly authenticate.
+                              properties:
+                                accessKeyIDSecretRef:
+                                  description: The AccessKeyID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                secretAccessKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                sessionTokenSecretRef:
+                                  description: |-
+                                    The SessionToken used for authentication
+                                    This must be defined if AccessKeyID and SecretAccessKey are temporary credentials
+                                    see: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        externalID:
+                          description: AWS External ID set on assumed IAM roles
+                          type: string
+                        prefix:
+                          description: Prefix adds a prefix to all retrieved values.
+                          type: string
+                        region:
+                          description: AWS Region to be used for the provider
+                          type: string
+                        role:
+                          description: Role is a Role ARN which the provider will assume
+                          type: string
+                        secretsManager:
+                          description: SecretsManager defines how the provider behaves when interacting with AWS SecretsManager
+                          properties:
+                            forceDeleteWithoutRecovery:
+                              description: |-
+                                Specifies whether to delete the secret without any recovery window. You
+                                can't use both this parameter and RecoveryWindowInDays in the same call.
+                                If you don't use either, then by default Secrets Manager uses a 30 day
+                                recovery window.
+                                see: https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_DeleteSecret.html#SecretsManager-DeleteSecret-request-ForceDeleteWithoutRecovery
+                              type: boolean
+                            recoveryWindowInDays:
+                              description: |-
+                                The number of days from 7 to 30 that Secrets Manager waits before
+                                permanently deleting the secret. You can't use both this parameter and
+                                ForceDeleteWithoutRecovery in the same call. If you don't use either,
+                                then by default Secrets Manager uses a 30 day recovery window.
+                                see: https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_DeleteSecret.html#SecretsManager-DeleteSecret-request-RecoveryWindowInDays
+                              format: int64
+                              type: integer
+                          type: object
+                        service:
+                          description: Service defines which service should be used to fetch the secrets
+                          enum:
+                            - SecretsManager
+                            - ParameterStore
+                          type: string
+                        sessionTags:
+                          description: AWS STS assume role session tags
+                          items:
+                            properties:
+                              key:
+                                type: string
+                              value:
+                                type: string
+                            required:
+                              - key
+                              - value
+                            type: object
+                          type: array
+                        transitiveTagKeys:
+                          description: AWS STS assume role transitive session tags. Required when multiple rules are used with the provider
+                          items:
+                            type: string
+                          type: array
+                      required:
+                        - region
+                        - service
+                      type: object
+                    azurekv:
+                      description: AzureKV configures this store to sync secrets using Azure Key Vault provider
+                      properties:
+                        authSecretRef:
+                          description: Auth configures how the operator authenticates with Azure. Required for ServicePrincipal auth type. Optional for WorkloadIdentity.
+                          properties:
+                            clientCertificate:
+                              description: The Azure ClientCertificate of the service principle used for authentication.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            clientId:
+                              description: The Azure clientId of the service principle or managed identity used for authentication.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            clientSecret:
+                              description: The Azure ClientSecret of the service principle used for authentication.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            tenantId:
+                              description: The Azure tenantId of the managed identity used for authentication.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        authType:
+                          default: ServicePrincipal
+                          description: |-
+                            Auth type defines how to authenticate to the keyvault service.
+                            Valid values are:
+                            - "ServicePrincipal" (default): Using a service principal (tenantId, clientId, clientSecret)
+                            - "ManagedIdentity": Using Managed Identity assigned to the pod (see aad-pod-identity)
+                          enum:
+                            - ServicePrincipal
+                            - ManagedIdentity
+                            - WorkloadIdentity
+                          type: string
+                        environmentType:
+                          default: PublicCloud
+                          description: |-
+                            EnvironmentType specifies the Azure cloud environment endpoints to use for
+                            connecting and authenticating with Azure. By default it points to the public cloud AAD endpoint.
+                            The following endpoints are available, also see here: https://github.com/Azure/go-autorest/blob/main/autorest/azure/environments.go#L152
+                            PublicCloud, USGovernmentCloud, ChinaCloud, GermanCloud
+                          enum:
+                            - PublicCloud
+                            - USGovernmentCloud
+                            - ChinaCloud
+                            - GermanCloud
+                          type: string
+                        identityId:
+                          description: If multiple Managed Identity is assigned to the pod, you can select the one to be used
+                          type: string
+                        serviceAccountRef:
+                          description: |-
+                            ServiceAccountRef specified the service account
+                            that should be used when authenticating with WorkloadIdentity.
+                          properties:
+                            audiences:
+                              description: |-
+                                Audience specifies the `aud` claim for the service account token
+                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                then this audiences will be appended to the list
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: The name of the ServiceAccount resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                Namespace of the resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          required:
+                            - name
+                          type: object
+                        tenantId:
+                          description: TenantID configures the Azure Tenant to send requests to. Required for ServicePrincipal auth type. Optional for WorkloadIdentity.
+                          type: string
+                        vaultUrl:
+                          description: Vault Url from which the secrets to be fetched from.
+                          type: string
+                      required:
+                        - vaultUrl
+                      type: object
+                    beyondtrust:
+                      description: Beyondtrust configures this store to sync secrets using Password Safe provider.
+                      properties:
+                        auth:
+                          description: Auth configures how the operator authenticates with Beyondtrust.
+                          properties:
+                            apiKey:
+                              description: APIKey If not provided then ClientID/ClientSecret become required.
+                              properties:
+                                secretRef:
+                                  description: SecretRef references a key in a secret that will be used as value.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                value:
+                                  description: Value can be specified directly to set a value without using a secret.
+                                  type: string
+                              type: object
+                            certificate:
+                              description: Certificate (cert.pem) for use when authenticating with an OAuth client Id using a Client Certificate.
+                              properties:
+                                secretRef:
+                                  description: SecretRef references a key in a secret that will be used as value.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                value:
+                                  description: Value can be specified directly to set a value without using a secret.
+                                  type: string
+                              type: object
+                            certificateKey:
+                              description: Certificate private key (key.pem). For use when authenticating with an OAuth client Id
+                              properties:
+                                secretRef:
+                                  description: SecretRef references a key in a secret that will be used as value.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                value:
+                                  description: Value can be specified directly to set a value without using a secret.
+                                  type: string
+                              type: object
+                            clientId:
+                              description: ClientID is the API OAuth Client ID.
+                              properties:
+                                secretRef:
+                                  description: SecretRef references a key in a secret that will be used as value.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                value:
+                                  description: Value can be specified directly to set a value without using a secret.
+                                  type: string
+                              type: object
+                            clientSecret:
+                              description: ClientSecret is the API OAuth Client Secret.
+                              properties:
+                                secretRef:
+                                  description: SecretRef references a key in a secret that will be used as value.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                value:
+                                  description: Value can be specified directly to set a value without using a secret.
+                                  type: string
+                              type: object
+                          type: object
+                        server:
+                          description: Auth configures how API server works.
+                          properties:
+                            apiUrl:
+                              type: string
+                            clientTimeOutSeconds:
+                              description: Timeout specifies a time limit for requests made by this Client. The timeout includes connection time, any redirects, and reading the response body. Defaults to 45 seconds.
+                              type: integer
+                            retrievalType:
+                              description: The secret retrieval type. SECRET = Secrets Safe (credential, text, file). MANAGED_ACCOUNT = Password Safe account associated with a system.
+                              type: string
+                            separator:
+                              description: A character that separates the folder names.
+                              type: string
+                            verifyCA:
+                              type: boolean
+                          required:
+                            - apiUrl
+                            - verifyCA
+                          type: object
+                      required:
+                        - auth
+                        - server
+                      type: object
+                    bitwardensecretsmanager:
+                      description: BitwardenSecretsManager configures this store to sync secrets using BitwardenSecretsManager provider
+                      properties:
+                        apiURL:
+                          type: string
+                        auth:
+                          description: |-
+                            Auth configures how secret-manager authenticates with a bitwarden machine account instance.
+                            Make sure that the token being used has permissions on the given secret.
+                          properties:
+                            secretRef:
+                              description: BitwardenSecretsManagerSecretRef contains the credential ref to the bitwarden instance.
+                              properties:
+                                credentials:
+                                  description: AccessToken used for the bitwarden instance.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - credentials
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        bitwardenServerSDKURL:
+                          type: string
+                        caBundle:
+                          description: |-
+                            Base64 encoded certificate for the bitwarden server sdk. The sdk MUST run with HTTPS to make sure no MITM attack
+                            can be performed.
+                          type: string
+                        caProvider:
+                          description: 'see: https://external-secrets.io/latest/spec/#external-secrets.io/v1alpha1.CAProvider'
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace the Provider type is in.
+                                Can only be defined when used in a ClusterSecretStore.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                        identityURL:
+                          type: string
+                        organizationID:
+                          description: OrganizationID determines which organization this secret store manages.
+                          type: string
+                        projectID:
+                          description: ProjectID determines which project this secret store manages.
+                          type: string
+                      required:
+                        - auth
+                        - organizationID
+                        - projectID
+                      type: object
+                    chef:
+                      description: Chef configures this store to sync secrets with chef server
+                      properties:
+                        auth:
+                          description: Auth defines the information necessary to authenticate against chef Server
+                          properties:
+                            secretRef:
+                              description: ChefAuthSecretRef holds secret references for chef server login credentials.
+                              properties:
+                                privateKeySecretRef:
+                                  description: SecretKey is the Signing Key in PEM format, used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - privateKeySecretRef
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        serverUrl:
+                          description: ServerURL is the chef server URL used to connect to. If using orgs you should include your org in the url and terminate the url with a "/"
+                          type: string
+                        username:
+                          description: UserName should be the user ID on the chef server
+                          type: string
+                      required:
+                        - auth
+                        - serverUrl
+                        - username
+                      type: object
+                    conjur:
+                      description: Conjur configures this store to sync secrets using conjur provider
+                      properties:
+                        auth:
+                          properties:
+                            apikey:
+                              properties:
+                                account:
+                                  type: string
+                                apiKeyRef:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                userRef:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - account
+                                - apiKeyRef
+                                - userRef
+                              type: object
+                            jwt:
+                              properties:
+                                account:
+                                  type: string
+                                hostId:
+                                  description: |-
+                                    Optional HostID for JWT authentication. This may be used depending
+                                    on how the Conjur JWT authenticator policy is configured.
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Optional SecretRef that refers to a key in a Secret resource containing JWT token to
+                                    authenticate with Conjur using the JWT authentication method.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                serviceAccountRef:
+                                  description: |-
+                                    Optional ServiceAccountRef specifies the Kubernetes service account for which to request
+                                    a token for with the `TokenRequest` API.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                                serviceID:
+                                  description: The conjur authn jwt webservice id
+                                  type: string
+                              required:
+                                - account
+                                - serviceID
+                              type: object
+                          type: object
+                        caBundle:
+                          type: string
+                        caProvider:
+                          description: |-
+                            Used to provide custom certificate authority (CA) certificates
+                            for a secret store. The CAProvider points to a Secret or ConfigMap resource
+                            that contains a PEM-encoded certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace the Provider type is in.
+                                Can only be defined when used in a ClusterSecretStore.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                        url:
+                          type: string
+                      required:
+                        - auth
+                        - url
+                      type: object
+                    delinea:
+                      description: |-
+                        Delinea DevOps Secrets Vault
+                        https://docs.delinea.com/online-help/products/devops-secrets-vault/current
+                      properties:
+                        clientId:
+                          description: ClientID is the non-secret part of the credential.
+                          properties:
+                            secretRef:
+                              description: SecretRef references a key in a secret that will be used as value.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            value:
+                              description: Value can be specified directly to set a value without using a secret.
+                              type: string
+                          type: object
+                        clientSecret:
+                          description: ClientSecret is the secret part of the credential.
+                          properties:
+                            secretRef:
+                              description: SecretRef references a key in a secret that will be used as value.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            value:
+                              description: Value can be specified directly to set a value without using a secret.
+                              type: string
+                          type: object
+                        tenant:
+                          description: Tenant is the chosen hostname / site name.
+                          type: string
+                        tld:
+                          description: |-
+                            TLD is based on the server location that was chosen during provisioning.
+                            If unset, defaults to "com".
+                          type: string
+                        urlTemplate:
+                          description: |-
+                            URLTemplate
+                            If unset, defaults to "https://%s.secretsvaultcloud.%s/v1/%s%s".
+                          type: string
+                      required:
+                        - clientId
+                        - clientSecret
+                        - tenant
+                      type: object
+                    device42:
+                      description: Device42 configures this store to sync secrets using the Device42 provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with a Device42 instance.
+                          properties:
+                            secretRef:
+                              properties:
+                                credentials:
+                                  description: Username / Password is used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        host:
+                          description: URL configures the Device42 instance URL.
+                          type: string
+                      required:
+                        - auth
+                        - host
+                      type: object
+                    doppler:
+                      description: Doppler configures this store to sync secrets using the Doppler provider
+                      properties:
+                        auth:
+                          description: Auth configures how the Operator authenticates with the Doppler API
+                          properties:
+                            secretRef:
+                              properties:
+                                dopplerToken:
+                                  description: |-
+                                    The DopplerToken is used for authentication.
+                                    See https://docs.doppler.com/reference/api#authentication for auth token types.
+                                    The Key attribute defaults to dopplerToken if not specified.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - dopplerToken
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        config:
+                          description: Doppler config (required if not using a Service Token)
+                          type: string
+                        format:
+                          description: Format enables the downloading of secrets as a file (string)
+                          enum:
+                            - json
+                            - dotnet-json
+                            - env
+                            - yaml
+                            - docker
+                          type: string
+                        nameTransformer:
+                          description: Environment variable compatible name transforms that change secret names to a different format
+                          enum:
+                            - upper-camel
+                            - camel
+                            - lower-snake
+                            - tf-var
+                            - dotnet-env
+                            - lower-kebab
+                          type: string
+                        project:
+                          description: Doppler project (required if not using a Service Token)
+                          type: string
+                      required:
+                        - auth
+                      type: object
+                    fake:
+                      description: Fake configures a store with static key/value pairs
+                      properties:
+                        data:
+                          items:
+                            properties:
+                              key:
+                                type: string
+                              value:
+                                type: string
+                              valueMap:
+                                additionalProperties:
+                                  type: string
+                                description: 'Deprecated: ValueMap is deprecated and is intended to be removed in the future, use the `value` field instead.'
+                                type: object
+                              version:
+                                type: string
+                            required:
+                              - key
+                            type: object
+                          type: array
+                      required:
+                        - data
+                      type: object
+                    fortanix:
+                      description: Fortanix configures this store to sync secrets using the Fortanix provider
+                      properties:
+                        apiKey:
+                          description: APIKey is the API token to access SDKMS Applications.
+                          properties:
+                            secretRef:
+                              description: SecretRef is a reference to a secret containing the SDKMS API Key.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        apiUrl:
+                          description: APIURL is the URL of SDKMS API. Defaults to `sdkms.fortanix.com`.
+                          type: string
+                      type: object
+                    gcpsm:
+                      description: GCPSM configures this store to sync secrets using Google Cloud Platform Secret Manager provider
+                      properties:
+                        auth:
+                          description: Auth defines the information necessary to authenticate against GCP
+                          properties:
+                            secretRef:
+                              properties:
+                                secretAccessKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            workloadIdentity:
+                              properties:
+                                clusterLocation:
+                                  type: string
+                                clusterName:
+                                  type: string
+                                clusterProjectID:
+                                  type: string
+                                serviceAccountRef:
+                                  description: A reference to a ServiceAccount resource.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              required:
+                                - clusterLocation
+                                - clusterName
+                                - serviceAccountRef
+                              type: object
+                          type: object
+                        location:
+                          description: Location optionally defines a location for a secret
+                          type: string
+                        projectID:
+                          description: ProjectID project where secret is located
+                          type: string
+                      type: object
+                    gitlab:
+                      description: GitLab configures this store to sync secrets using GitLab Variables provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with a GitLab instance.
+                          properties:
+                            SecretRef:
+                              properties:
+                                accessToken:
+                                  description: AccessToken is used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          required:
+                            - SecretRef
+                          type: object
+                        environment:
+                          description: Environment environment_scope of gitlab CI/CD variables (Please see https://docs.gitlab.com/ee/ci/environments/#create-a-static-environment on how to create environments)
+                          type: string
+                        groupIDs:
+                          description: GroupIDs specify, which gitlab groups to pull secrets from. Group secrets are read from left to right followed by the project variables.
+                          items:
+                            type: string
+                          type: array
+                        inheritFromGroups:
+                          description: InheritFromGroups specifies whether parent groups should be discovered and checked for secrets.
+                          type: boolean
+                        projectID:
+                          description: ProjectID specifies a project where secrets are located.
+                          type: string
+                        url:
+                          description: URL configures the GitLab instance URL. Defaults to https://gitlab.com/.
+                          type: string
+                      required:
+                        - auth
+                      type: object
+                    ibm:
+                      description: IBM configures this store to sync secrets using IBM Cloud provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with the IBM secrets manager.
+                          maxProperties: 1
+                          minProperties: 1
+                          properties:
+                            containerAuth:
+                              description: IBM Container-based auth with IAM Trusted Profile.
+                              properties:
+                                iamEndpoint:
+                                  type: string
+                                profile:
+                                  description: the IBM Trusted Profile
+                                  type: string
+                                tokenLocation:
+                                  description: Location the token is mounted on the pod
+                                  type: string
+                              required:
+                                - profile
+                              type: object
+                            secretRef:
+                              properties:
+                                secretApiKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        serviceUrl:
+                          description: ServiceURL is the Endpoint URL that is specific to the Secrets Manager service instance
+                          type: string
+                      required:
+                        - auth
+                      type: object
+                    infisical:
+                      description: Infisical configures this store to sync secrets using the Infisical provider
+                      properties:
+                        auth:
+                          description: Auth configures how the Operator authenticates with the Infisical API
+                          properties:
+                            universalAuthCredentials:
+                              properties:
+                                clientId:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                clientSecret:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - clientId
+                                - clientSecret
+                              type: object
+                          type: object
+                        hostAPI:
+                          default: https://app.infisical.com/api
+                          type: string
+                        secretsScope:
+                          properties:
+                            environmentSlug:
+                              type: string
+                            projectSlug:
+                              type: string
+                            recursive:
+                              default: false
+                              type: boolean
+                            secretsPath:
+                              default: /
+                              type: string
+                          required:
+                            - environmentSlug
+                            - projectSlug
+                          type: object
+                      required:
+                        - auth
+                        - secretsScope
+                      type: object
+                    keepersecurity:
+                      description: KeeperSecurity configures this store to sync secrets using the KeeperSecurity provider
+                      properties:
+                        authRef:
+                          description: |-
+                            A reference to a specific 'key' within a Secret resource.
+                            In some instances, `key` is a required field.
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                        folderID:
+                          type: string
+                      required:
+                        - authRef
+                        - folderID
+                      type: object
+                    kubernetes:
+                      description: Kubernetes configures this store to sync secrets using a Kubernetes cluster provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with a Kubernetes instance.
+                          maxProperties: 1
+                          minProperties: 1
+                          properties:
+                            cert:
+                              description: has both clientCert and clientKey as secretKeySelector
+                              properties:
+                                clientCert:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                clientKey:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            serviceAccount:
+                              description: points to a service account that should be used for authentication
+                              properties:
+                                audiences:
+                                  description: |-
+                                    Audience specifies the `aud` claim for the service account token
+                                    If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                    then this audiences will be appended to the list
+                                  items:
+                                    type: string
+                                  type: array
+                                name:
+                                  description: The name of the ServiceAccount resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    Namespace of the resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              required:
+                                - name
+                              type: object
+                            token:
+                              description: use static token to authenticate with
+                              properties:
+                                bearerToken:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        authRef:
+                          description: A reference to a secret that contains the auth information.
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                        remoteNamespace:
+                          default: default
+                          description: Remote namespace to fetch the secrets from
+                          maxLength: 63
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                          type: string
+                        server:
+                          description: configures the Kubernetes server Address.
+                          properties:
+                            caBundle:
+                              description: CABundle is a base64-encoded CA certificate
+                              format: byte
+                              type: string
+                            caProvider:
+                              description: 'see: https://external-secrets.io/v0.4.1/spec/#external-secrets.io/v1alpha1.CAProvider'
+                              properties:
+                                key:
+                                  description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the object located at the provider type.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace the Provider type is in.
+                                    Can only be defined when used in a ClusterSecretStore.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                                type:
+                                  description: The type of provider to use such as "Secret", or "ConfigMap".
+                                  enum:
+                                    - Secret
+                                    - ConfigMap
+                                  type: string
+                              required:
+                                - name
+                                - type
+                              type: object
+                            url:
+                              default: kubernetes.default
+                              description: configures the Kubernetes server Address.
+                              type: string
+                          type: object
+                      type: object
+                    onboardbase:
+                      description: Onboardbase configures this store to sync secrets using the Onboardbase provider
+                      properties:
+                        apiHost:
+                          default: https://public.onboardbase.com/api/v1/
+                          description: APIHost use this to configure the host url for the API for selfhosted installation, default is https://public.onboardbase.com/api/v1/
+                          type: string
+                        auth:
+                          description: Auth configures how the Operator authenticates with the Onboardbase API
+                          properties:
+                            apiKeyRef:
+                              description: |-
+                                OnboardbaseAPIKey is the APIKey generated by an admin account.
+                                It is used to recognize and authorize access to a project and environment within onboardbase
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            passcodeRef:
+                              description: OnboardbasePasscode is the passcode attached to the API Key
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          required:
+                            - apiKeyRef
+                            - passcodeRef
+                          type: object
+                        environment:
+                          default: development
+                          description: Environment is the name of an environmnent within a project to pull the secrets from
+                          type: string
+                        project:
+                          default: development
+                          description: Project is an onboardbase project that the secrets should be pulled from
+                          type: string
+                      required:
+                        - apiHost
+                        - auth
+                        - environment
+                        - project
+                      type: object
+                    onepassword:
+                      description: OnePassword configures this store to sync secrets using the 1Password Cloud provider
+                      properties:
+                        auth:
+                          description: Auth defines the information necessary to authenticate against OnePassword Connect Server
+                          properties:
+                            secretRef:
+                              description: OnePasswordAuthSecretRef holds secret references for 1Password credentials.
+                              properties:
+                                connectTokenSecretRef:
+                                  description: The ConnectToken is used for authentication to a 1Password Connect Server.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - connectTokenSecretRef
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        connectHost:
+                          description: ConnectHost defines the OnePassword Connect Server to connect to
+                          type: string
+                        vaults:
+                          additionalProperties:
+                            type: integer
+                          description: Vaults defines which OnePassword vaults to search in which order
+                          type: object
+                      required:
+                        - auth
+                        - connectHost
+                        - vaults
+                      type: object
+                    oracle:
+                      description: Oracle configures this store to sync secrets using Oracle Vault provider
+                      properties:
+                        auth:
+                          description: |-
+                            Auth configures how secret-manager authenticates with the Oracle Vault.
+                            If empty, use the instance principal, otherwise the user credentials specified in Auth.
+                          properties:
+                            secretRef:
+                              description: SecretRef to pass through sensitive information.
+                              properties:
+                                fingerprint:
+                                  description: Fingerprint is the fingerprint of the API private key.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                privatekey:
+                                  description: PrivateKey is the user's API Signing Key in PEM format, used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - fingerprint
+                                - privatekey
+                              type: object
+                            tenancy:
+                              description: Tenancy is the tenancy OCID where user is located.
+                              type: string
+                            user:
+                              description: User is an access OCID specific to the account.
+                              type: string
+                          required:
+                            - secretRef
+                            - tenancy
+                            - user
+                          type: object
+                        compartment:
+                          description: |-
+                            Compartment is the vault compartment OCID.
+                            Required for PushSecret
+                          type: string
+                        encryptionKey:
+                          description: |-
+                            EncryptionKey is the OCID of the encryption key within the vault.
+                            Required for PushSecret
+                          type: string
+                        principalType:
+                          description: |-
+                            The type of principal to use for authentication. If left blank, the Auth struct will
+                            determine the principal type. This optional field must be specified if using
+                            workload identity.
+                          enum:
+                            - ""
+                            - UserPrincipal
+                            - InstancePrincipal
+                            - Workload
+                          type: string
+                        region:
+                          description: Region is the region where vault is located.
+                          type: string
+                        serviceAccountRef:
+                          description: |-
+                            ServiceAccountRef specified the service account
+                            that should be used when authenticating with WorkloadIdentity.
+                          properties:
+                            audiences:
+                              description: |-
+                                Audience specifies the `aud` claim for the service account token
+                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                then this audiences will be appended to the list
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: The name of the ServiceAccount resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                Namespace of the resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          required:
+                            - name
+                          type: object
+                        vault:
+                          description: Vault is the vault's OCID of the specific vault where secret is located.
+                          type: string
+                      required:
+                        - region
+                        - vault
+                      type: object
+                    passbolt:
+                      properties:
+                        auth:
+                          description: Auth defines the information necessary to authenticate against Passbolt Server
+                          properties:
+                            passwordSecretRef:
+                              description: |-
+                                A reference to a specific 'key' within a Secret resource.
+                                In some instances, `key` is a required field.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            privateKeySecretRef:
+                              description: |-
+                                A reference to a specific 'key' within a Secret resource.
+                                In some instances, `key` is a required field.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          required:
+                            - passwordSecretRef
+                            - privateKeySecretRef
+                          type: object
+                        host:
+                          description: Host defines the Passbolt Server to connect to
+                          type: string
+                      required:
+                        - auth
+                        - host
+                      type: object
+                    passworddepot:
+                      description: Configures a store to sync secrets with a Password Depot instance.
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with a Password Depot instance.
+                          properties:
+                            secretRef:
+                              properties:
+                                credentials:
+                                  description: Username / Password is used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        database:
+                          description: Database to use as source
+                          type: string
+                        host:
+                          description: URL configures the Password Depot instance URL.
+                          type: string
+                      required:
+                        - auth
+                        - database
+                        - host
+                      type: object
+                    previder:
+                      description: Previder configures this store to sync secrets using the Previder provider
+                      properties:
+                        auth:
+                          description: PreviderAuth contains a secretRef for credentials.
+                          properties:
+                            secretRef:
+                              description: PreviderAuthSecretRef holds secret references for Previder Vault credentials.
+                              properties:
+                                accessToken:
+                                  description: The AccessToken is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - accessToken
+                              type: object
+                          type: object
+                        baseUri:
+                          type: string
+                      required:
+                        - auth
+                      type: object
+                    pulumi:
+                      description: Pulumi configures this store to sync secrets using the Pulumi provider
+                      properties:
+                        accessToken:
+                          description: AccessToken is the access tokens to sign in to the Pulumi Cloud Console.
+                          properties:
+                            secretRef:
+                              description: SecretRef is a reference to a secret containing the Pulumi API token.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        apiUrl:
+                          default: https://api.pulumi.com/api/esc
+                          description: APIURL is the URL of the Pulumi API.
+                          type: string
+                        environment:
+                          description: |-
+                            Environment are YAML documents composed of static key-value pairs, programmatic expressions,
+                            dynamically retrieved values from supported providers including all major clouds,
+                            and other Pulumi ESC environments.
+                            To create a new environment, visit https://www.pulumi.com/docs/esc/environments/ for more information.
+                          type: string
+                        organization:
+                          description: |-
+                            Organization are a space to collaborate on shared projects and stacks.
+                            To create a new organization, visit https://app.pulumi.com/ and click "New Organization".
+                          type: string
+                        project:
+                          description: Project is the name of the Pulumi ESC project the environment belongs to.
+                          type: string
+                      required:
+                        - accessToken
+                        - environment
+                        - organization
+                        - project
+                      type: object
+                    scaleway:
+                      description: Scaleway
+                      properties:
+                        accessKey:
+                          description: AccessKey is the non-secret part of the api key.
+                          properties:
+                            secretRef:
+                              description: SecretRef references a key in a secret that will be used as value.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            value:
+                              description: Value can be specified directly to set a value without using a secret.
+                              type: string
+                          type: object
+                        apiUrl:
+                          description: APIURL is the url of the api to use. Defaults to https://api.scaleway.com
+                          type: string
+                        projectId:
+                          description: 'ProjectID is the id of your project, which you can find in the console: https://console.scaleway.com/project/settings'
+                          type: string
+                        region:
+                          description: 'Region where your secrets are located: https://developers.scaleway.com/en/quickstart/#region-and-zone'
+                          type: string
+                        secretKey:
+                          description: SecretKey is the non-secret part of the api key.
+                          properties:
+                            secretRef:
+                              description: SecretRef references a key in a secret that will be used as value.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            value:
+                              description: Value can be specified directly to set a value without using a secret.
+                              type: string
+                          type: object
+                      required:
+                        - accessKey
+                        - projectId
+                        - region
+                        - secretKey
+                      type: object
+                    secretserver:
+                      description: |-
+                        SecretServer configures this store to sync secrets using SecretServer provider
+                        https://docs.delinea.com/online-help/secret-server/start.htm
+                      properties:
+                        password:
+                          description: Password is the secret server account password.
+                          properties:
+                            secretRef:
+                              description: SecretRef references a key in a secret that will be used as value.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            value:
+                              description: Value can be specified directly to set a value without using a secret.
+                              type: string
+                          type: object
+                        serverURL:
+                          description: |-
+                            ServerURL
+                            URL to your secret server installation
+                          type: string
+                        username:
+                          description: Username is the secret server account username.
+                          properties:
+                            secretRef:
+                              description: SecretRef references a key in a secret that will be used as value.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            value:
+                              description: Value can be specified directly to set a value without using a secret.
+                              type: string
+                          type: object
+                      required:
+                        - password
+                        - serverURL
+                        - username
+                      type: object
+                    senhasegura:
+                      description: Senhasegura configures this store to sync secrets using senhasegura provider
+                      properties:
+                        auth:
+                          description: Auth defines parameters to authenticate in senhasegura
+                          properties:
+                            clientId:
+                              type: string
+                            clientSecretSecretRef:
+                              description: |-
+                                A reference to a specific 'key' within a Secret resource.
+                                In some instances, `key` is a required field.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          required:
+                            - clientId
+                            - clientSecretSecretRef
+                          type: object
+                        ignoreSslCertificate:
+                          default: false
+                          description: IgnoreSslCertificate defines if SSL certificate must be ignored
+                          type: boolean
+                        module:
+                          description: Module defines which senhasegura module should be used to get secrets
+                          type: string
+                        url:
+                          description: URL of senhasegura
+                          type: string
+                      required:
+                        - auth
+                        - module
+                        - url
+                      type: object
+                    vault:
+                      description: Vault configures this store to sync secrets using Hashi provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with the Vault server.
+                          properties:
+                            appRole:
+                              description: |-
+                                AppRole authenticates with Vault using the App Role auth mechanism,
+                                with the role and secret stored in a Kubernetes Secret resource.
+                              properties:
+                                path:
+                                  default: approle
+                                  description: |-
+                                    Path where the App Role authentication backend is mounted
+                                    in Vault, e.g: "approle"
+                                  type: string
+                                roleId:
+                                  description: |-
+                                    RoleID configured in the App Role authentication backend when setting
+                                    up the authentication backend in Vault.
+                                  type: string
+                                roleRef:
+                                  description: |-
+                                    Reference to a key in a Secret that contains the App Role ID used
+                                    to authenticate with Vault.
+                                    The `key` field must be specified and denotes which entry within the Secret
+                                    resource is used as the app role id.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                secretRef:
+                                  description: |-
+                                    Reference to a key in a Secret that contains the App Role secret used
+                                    to authenticate with Vault.
+                                    The `key` field must be specified and denotes which entry within the Secret
+                                    resource is used as the app role secret.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - path
+                                - secretRef
+                              type: object
+                            cert:
+                              description: |-
+                                Cert authenticates with TLS Certificates by passing client certificate, private key and ca certificate
+                                Cert authentication method
+                              properties:
+                                clientCert:
+                                  description: |-
+                                    ClientCert is a certificate to authenticate using the Cert Vault
+                                    authentication method
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                secretRef:
+                                  description: |-
+                                    SecretRef to a key in a Secret resource containing client private key to
+                                    authenticate with Vault using the Cert authentication method
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            iam:
+                              description: |-
+                                Iam authenticates with vault by passing a special AWS request signed with AWS IAM credentials
+                                AWS IAM authentication method
+                              properties:
+                                externalID:
+                                  description: AWS External ID set on assumed IAM roles
+                                  type: string
+                                jwt:
+                                  description: Specify a service account with IRSA enabled
+                                  properties:
+                                    serviceAccountRef:
+                                      description: A reference to a ServiceAccount resource.
+                                      properties:
+                                        audiences:
+                                          description: |-
+                                            Audience specifies the `aud` claim for the service account token
+                                            If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                            then this audiences will be appended to the list
+                                          items:
+                                            type: string
+                                          type: array
+                                        name:
+                                          description: The name of the ServiceAccount resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            Namespace of the resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      required:
+                                        - name
+                                      type: object
+                                  type: object
+                                path:
+                                  description: 'Path where the AWS auth method is enabled in Vault, e.g: "aws"'
+                                  type: string
+                                region:
+                                  description: AWS region
+                                  type: string
+                                role:
+                                  description: This is the AWS role to be assumed before talking to vault
+                                  type: string
+                                secretRef:
+                                  description: Specify credentials in a Secret object
+                                  properties:
+                                    accessKeyIDSecretRef:
+                                      description: The AccessKeyID is used for authentication
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                    secretAccessKeySecretRef:
+                                      description: The SecretAccessKey is used for authentication
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                    sessionTokenSecretRef:
+                                      description: |-
+                                        The SessionToken used for authentication
+                                        This must be defined if AccessKeyID and SecretAccessKey are temporary credentials
+                                        see: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                  type: object
+                                vaultAwsIamServerID:
+                                  description: 'X-Vault-AWS-IAM-Server-ID is an additional header used by Vault IAM auth method to mitigate against different types of replay attacks. More details here: https://developer.hashicorp.com/vault/docs/auth/aws'
+                                  type: string
+                                vaultRole:
+                                  description: Vault Role. In vault, a role describes an identity with a set of permissions, groups, or policies you want to attach a user of the secrets engine
+                                  type: string
+                              required:
+                                - vaultRole
+                              type: object
+                            jwt:
+                              description: |-
+                                Jwt authenticates with Vault by passing role and JWT token using the
+                                JWT/OIDC authentication method
+                              properties:
+                                kubernetesServiceAccountToken:
+                                  description: |-
+                                    Optional ServiceAccountToken specifies the Kubernetes service account for which to request
+                                    a token for with the `TokenRequest` API.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Optional audiences field that will be used to request a temporary Kubernetes service
+                                        account token for the service account referenced by `serviceAccountRef`.
+                                        Defaults to a single audience `vault` it not specified.
+                                        Deprecated: use serviceAccountRef.Audiences instead
+                                      items:
+                                        type: string
+                                      type: array
+                                    expirationSeconds:
+                                      description: |-
+                                        Optional expiration time in seconds that will be used to request a temporary
+                                        Kubernetes service account token for the service account referenced by
+                                        `serviceAccountRef`.
+                                        Deprecated: this will be removed in the future.
+                                        Defaults to 10 minutes.
+                                      format: int64
+                                      type: integer
+                                    serviceAccountRef:
+                                      description: Service account field containing the name of a kubernetes ServiceAccount.
+                                      properties:
+                                        audiences:
+                                          description: |-
+                                            Audience specifies the `aud` claim for the service account token
+                                            If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                            then this audiences will be appended to the list
+                                          items:
+                                            type: string
+                                          type: array
+                                        name:
+                                          description: The name of the ServiceAccount resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            Namespace of the resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      required:
+                                        - name
+                                      type: object
+                                  required:
+                                    - serviceAccountRef
+                                  type: object
+                                path:
+                                  default: jwt
+                                  description: |-
+                                    Path where the JWT authentication backend is mounted
+                                    in Vault, e.g: "jwt"
+                                  type: string
+                                role:
+                                  description: |-
+                                    Role is a JWT role to authenticate using the JWT/OIDC Vault
+                                    authentication method
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Optional SecretRef that refers to a key in a Secret resource containing JWT token to
+                                    authenticate with Vault using the JWT/OIDC authentication method.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - path
+                              type: object
+                            kubernetes:
+                              description: |-
+                                Kubernetes authenticates with Vault by passing the ServiceAccount
+                                token stored in the named Secret resource to the Vault server.
+                              properties:
+                                mountPath:
+                                  default: kubernetes
+                                  description: |-
+                                    Path where the Kubernetes authentication backend is mounted in Vault, e.g:
+                                    "kubernetes"
+                                  type: string
+                                role:
+                                  description: |-
+                                    A required field containing the Vault Role to assume. A Role binds a
+                                    Kubernetes ServiceAccount with a set of Vault policies.
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Optional secret field containing a Kubernetes ServiceAccount JWT used
+                                    for authenticating with Vault. If a name is specified without a key,
+                                    `token` is the default. If one is not specified, the one bound to
+                                    the controller will be used.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                serviceAccountRef:
+                                  description: |-
+                                    Optional service account field containing the name of a kubernetes ServiceAccount.
+                                    If the service account is specified, the service account secret token JWT will be used
+                                    for authenticating with Vault. If the service account selector is not supplied,
+                                    the secretRef will be used instead.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              required:
+                                - mountPath
+                                - role
+                              type: object
+                            ldap:
+                              description: |-
+                                Ldap authenticates with Vault by passing username/password pair using
+                                the LDAP authentication method
+                              properties:
+                                path:
+                                  default: ldap
+                                  description: |-
+                                    Path where the LDAP authentication backend is mounted
+                                    in Vault, e.g: "ldap"
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    SecretRef to a key in a Secret resource containing password for the LDAP
+                                    user used to authenticate with Vault using the LDAP authentication
+                                    method
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                username:
+                                  description: |-
+                                    Username is a LDAP user name used to authenticate using the LDAP Vault
+                                    authentication method
+                                  type: string
+                              required:
+                                - path
+                                - username
+                              type: object
+                            namespace:
+                              description: |-
+                                Name of the vault namespace to authenticate to. This can be different than the namespace your secret is in.
+                                Namespaces is a set of features within Vault Enterprise that allows
+                                Vault environments to support Secure Multi-tenancy. e.g: "ns1".
+                                More about namespaces can be found here https://www.vaultproject.io/docs/enterprise/namespaces
+                                This will default to Vault.Namespace field if set, or empty otherwise
+                              type: string
+                            tokenSecretRef:
+                              description: TokenSecretRef authenticates with Vault by presenting a token.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            userPass:
+                              description: UserPass authenticates with Vault by passing username/password pair
+                              properties:
+                                path:
+                                  default: user
+                                  description: |-
+                                    Path where the UserPassword authentication backend is mounted
+                                    in Vault, e.g: "user"
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    SecretRef to a key in a Secret resource containing password for the
+                                    user used to authenticate with Vault using the UserPass authentication
+                                    method
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                username:
+                                  description: |-
+                                    Username is a user name used to authenticate using the UserPass Vault
+                                    authentication method
+                                  type: string
+                              required:
+                                - path
+                                - username
+                              type: object
+                          type: object
+                        caBundle:
+                          description: |-
+                            PEM encoded CA bundle used to validate Vault server certificate. Only used
+                            if the Server URL is using HTTPS protocol. This parameter is ignored for
+                            plain HTTP protocol connection. If not set the system root certificates
+                            are used to validate the TLS connection.
+                          format: byte
+                          type: string
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate Vault server certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace the Provider type is in.
+                                Can only be defined when used in a ClusterSecretStore.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                        forwardInconsistent:
+                          description: |-
+                            ForwardInconsistent tells Vault to forward read-after-write requests to the Vault
+                            leader instead of simply retrying within a loop. This can increase performance if
+                            the option is enabled serverside.
+                            https://www.vaultproject.io/docs/configuration/replication#allow_forwarding_via_header
+                          type: boolean
+                        headers:
+                          additionalProperties:
+                            type: string
+                          description: Headers to be added in Vault request
+                          type: object
+                        namespace:
+                          description: |-
+                            Name of the vault namespace. Namespaces is a set of features within Vault Enterprise that allows
+                            Vault environments to support Secure Multi-tenancy. e.g: "ns1".
+                            More about namespaces can be found here https://www.vaultproject.io/docs/enterprise/namespaces
+                          type: string
+                        path:
+                          description: |-
+                            Path is the mount path of the Vault KV backend endpoint, e.g:
+                            "secret". The v2 KV secret engine version specific "/data" path suffix
+                            for fetching secrets from Vault is optional and will be appended
+                            if not present in specified path.
+                          type: string
+                        readYourWrites:
+                          description: |-
+                            ReadYourWrites ensures isolated read-after-write semantics by
+                            providing discovered cluster replication states in each request.
+                            More information about eventual consistency in Vault can be found here
+                            https://www.vaultproject.io/docs/enterprise/consistency
+                          type: boolean
+                        server:
+                          description: 'Server is the connection address for the Vault server, e.g: "https://vault.example.com:8200".'
+                          type: string
+                        tls:
+                          description: |-
+                            The configuration used for client side related TLS communication, when the Vault server
+                            requires mutual authentication. Only used if the Server URL is using HTTPS protocol.
+                            This parameter is ignored for plain HTTP protocol connection.
+                            It's worth noting this configuration is different from the "TLS certificates auth method",
+                            which is available under the `auth.cert` section.
+                          properties:
+                            certSecretRef:
+                              description: |-
+                                CertSecretRef is a certificate added to the transport layer
+                                when communicating with the Vault server.
+                                If no key for the Secret is specified, external-secret will default to 'tls.crt'.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            keySecretRef:
+                              description: |-
+                                KeySecretRef to a key in a Secret resource containing client private key
+                                added to the transport layer when communicating with the Vault server.
+                                If no key for the Secret is specified, external-secret will default to 'tls.key'.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        version:
+                          default: v2
+                          description: |-
+                            Version is the Vault KV secret engine version. This can be either "v1" or
+                            "v2". Version defaults to "v2".
+                          enum:
+                            - v1
+                            - v2
+                          type: string
+                      required:
+                        - auth
+                        - server
+                      type: object
+                    webhook:
+                      description: Webhook configures this store to sync secrets using a generic templated webhook
+                      properties:
+                        body:
+                          description: Body
+                          type: string
+                        caBundle:
+                          description: |-
+                            PEM encoded CA bundle used to validate webhook server certificate. Only used
+                            if the Server URL is using HTTPS protocol. This parameter is ignored for
+                            plain HTTP protocol connection. If not set the system root certificates
+                            are used to validate the TLS connection.
+                          format: byte
+                          type: string
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate webhook server certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: The namespace the Provider type is in.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                        headers:
+                          additionalProperties:
+                            type: string
+                          description: Headers
+                          type: object
+                        method:
+                          description: Webhook Method
+                          type: string
+                        result:
+                          description: Result formatting
+                          properties:
+                            jsonPath:
+                              description: Json path of return value
+                              type: string
+                          type: object
+                        secrets:
+                          description: |-
+                            Secrets to fill in templates
+                            These secrets will be passed to the templating function as key value pairs under the given name
+                          items:
+                            properties:
+                              name:
+                                description: Name of this secret in templates
+                                type: string
+                              secretRef:
+                                description: Secret ref to fill in credentials
+                                properties:
+                                  key:
+                                    description: |-
+                                      A key in the referenced Secret.
+                                      Some instances of this field may be defaulted, in others it may be required.
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[-._a-zA-Z0-9]+$
+                                    type: string
+                                  name:
+                                    description: The name of the Secret resource being referred to.
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                    type: string
+                                  namespace:
+                                    description: |-
+                                      The namespace of the Secret resource being referred to.
+                                      Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                    maxLength: 63
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                    type: string
+                                type: object
+                            required:
+                              - name
+                              - secretRef
+                            type: object
+                          type: array
+                        timeout:
+                          description: Timeout
+                          type: string
+                        url:
+                          description: Webhook url to call
+                          type: string
+                      required:
+                        - result
+                        - url
+                      type: object
+                    yandexcertificatemanager:
+                      description: YandexCertificateManager configures this store to sync secrets using Yandex Certificate Manager provider
+                      properties:
+                        apiEndpoint:
+                          description: Yandex.Cloud API endpoint (e.g. 'api.cloud.yandex.net:443')
+                          type: string
+                        auth:
+                          description: Auth defines the information necessary to authenticate against Yandex Certificate Manager
+                          properties:
+                            authorizedKeySecretRef:
+                              description: The authorized key used for authentication
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate Yandex.Cloud server certificate.
+                          properties:
+                            certSecretRef:
+                              description: |-
+                                A reference to a specific 'key' within a Secret resource.
+                                In some instances, `key` is a required field.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                      required:
+                        - auth
+                      type: object
+                    yandexlockbox:
+                      description: YandexLockbox configures this store to sync secrets using Yandex Lockbox provider
+                      properties:
+                        apiEndpoint:
+                          description: Yandex.Cloud API endpoint (e.g. 'api.cloud.yandex.net:443')
+                          type: string
+                        auth:
+                          description: Auth defines the information necessary to authenticate against Yandex Lockbox
+                          properties:
+                            authorizedKeySecretRef:
+                              description: The authorized key used for authentication
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate Yandex.Cloud server certificate.
+                          properties:
+                            certSecretRef:
+                              description: |-
+                                A reference to a specific 'key' within a Secret resource.
+                                In some instances, `key` is a required field.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                      required:
+                        - auth
+                      type: object
+                  type: object
+                refreshInterval:
+                  description: Used to configure store refresh interval in seconds. Empty or 0 will default to the controller config.
+                  type: integer
+                retrySettings:
+                  description: Used to configure http retries if failed
+                  properties:
+                    maxRetries:
+                      format: int32
+                      type: integer
+                    retryInterval:
+                      type: string
+                  type: object
+              required:
+                - provider
+              type: object
+            status:
+              description: SecretStoreStatus defines the observed state of the SecretStore.
+              properties:
+                capabilities:
+                  description: SecretStoreCapabilities defines the possible operations a SecretStore can do.
+                  type: string
+                conditions:
+                  items:
+                    properties:
+                      lastTransitionTime:
+                        format: date-time
+                        type: string
+                      message:
+                        type: string
+                      reason:
+                        type: string
+                      status:
+                        type: string
+                      type:
+                        type: string
+                    required:
+                      - status
+                      - type
+                    type: object
+                  type: array
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/ecrauthorizationtoken.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/ecrauthorizationtoken.yaml
new file mode 100644
index 000000000..56a06ada2
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/ecrauthorizationtoken.yaml
@@ -0,0 +1,214 @@
+{{- if .Values.installCRDs }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: ecrauthorizationtokens.generators.external-secrets.io
+spec:
+  group: generators.external-secrets.io
+  names:
+    categories:
+      - external-secrets
+      - external-secrets-generators
+    kind: ECRAuthorizationToken
+    listKind: ECRAuthorizationTokenList
+    plural: ecrauthorizationtokens
+    singular: ecrauthorizationtoken
+  scope: Namespaced
+  versions:
+    - name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: |-
+            ECRAuthorizationTokenSpec uses the GetAuthorizationToken API to retrieve an
+            authorization token.
+            The authorization token is valid for 12 hours.
+            The authorizationToken returned is a base64 encoded string that can be decoded
+            and used in a docker login command to authenticate to a registry.
+            For more information, see Registry authentication (https://docs.aws.amazon.com/AmazonECR/latest/userguide/Registries.html#registry_auth) in the Amazon Elastic Container Registry User Guide.
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              properties:
+                auth:
+                  description: Auth defines how to authenticate with AWS
+                  properties:
+                    jwt:
+                      description: Authenticate against AWS using service account tokens.
+                      properties:
+                        serviceAccountRef:
+                          description: A reference to a ServiceAccount resource.
+                          properties:
+                            audiences:
+                              description: |-
+                                Audience specifies the `aud` claim for the service account token
+                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                then this audiences will be appended to the list
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: The name of the ServiceAccount resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                Namespace of the resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          required:
+                            - name
+                          type: object
+                      type: object
+                    secretRef:
+                      description: |-
+                        AWSAuthSecretRef holds secret references for AWS credentials
+                        both AccessKeyID and SecretAccessKey must be defined in order to properly authenticate.
+                      properties:
+                        accessKeyIDSecretRef:
+                          description: The AccessKeyID is used for authentication
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                        secretAccessKeySecretRef:
+                          description: The SecretAccessKey is used for authentication
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                        sessionTokenSecretRef:
+                          description: |-
+                            The SessionToken used for authentication
+                            This must be defined if AccessKeyID and SecretAccessKey are temporary credentials
+                            see: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                      type: object
+                  type: object
+                region:
+                  description: Region specifies the region to operate in.
+                  type: string
+                role:
+                  description: |-
+                    You can assume a role before making calls to the
+                    desired AWS service.
+                  type: string
+                scope:
+                  description: |-
+                    Scope specifies the ECR service scope.
+                    Valid options are private and public.
+                  type: string
+              required:
+                - region
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/externalsecret.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/externalsecret.yaml
new file mode 100644
index 000000000..68b0acba7
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/externalsecret.yaml
@@ -0,0 +1,917 @@
+{{- if .Values.installCRDs }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: externalsecrets.external-secrets.io
+spec:
+  group: external-secrets.io
+  names:
+    categories:
+      - external-secrets
+    kind: ExternalSecret
+    listKind: ExternalSecretList
+    plural: externalsecrets
+    shortNames:
+      - es
+    singular: externalsecret
+  scope: Namespaced
+  versions:
+    - additionalPrinterColumns:
+        - jsonPath: .spec.secretStoreRef.name
+          name: Store
+          type: string
+        - jsonPath: .spec.refreshInterval
+          name: Refresh Interval
+          type: string
+        - jsonPath: .status.conditions[?(@.type=="Ready")].reason
+          name: Status
+          type: string
+      deprecated: true
+      name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: ExternalSecret is the Schema for the external-secrets API.
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: ExternalSecretSpec defines the desired state of ExternalSecret.
+              properties:
+                data:
+                  description: Data defines the connection between the Kubernetes Secret keys and the Provider data
+                  items:
+                    description: ExternalSecretData defines the connection between the Kubernetes Secret key (spec.data.<key>) and the Provider data.
+                    properties:
+                      remoteRef:
+                        description: ExternalSecretDataRemoteRef defines Provider data location.
+                        properties:
+                          conversionStrategy:
+                            default: Default
+                            description: Used to define a conversion Strategy
+                            enum:
+                              - Default
+                              - Unicode
+                            type: string
+                          key:
+                            description: Key is the key used in the Provider, mandatory
+                            type: string
+                          property:
+                            description: Used to select a specific property of the Provider value (if a map), if supported
+                            type: string
+                          version:
+                            description: Used to select a specific version of the Provider value, if supported
+                            type: string
+                        required:
+                          - key
+                        type: object
+                      secretKey:
+                        description: The key in the Kubernetes Secret to store the value.
+                        maxLength: 253
+                        minLength: 1
+                        pattern: ^[-._a-zA-Z0-9]+$
+                        type: string
+                    required:
+                      - remoteRef
+                      - secretKey
+                    type: object
+                  type: array
+                dataFrom:
+                  description: |-
+                    DataFrom is used to fetch all properties from a specific Provider data
+                    If multiple entries are specified, the Secret keys are merged in the specified order
+                  items:
+                    description: ExternalSecretDataRemoteRef defines Provider data location.
+                    properties:
+                      conversionStrategy:
+                        default: Default
+                        description: Used to define a conversion Strategy
+                        enum:
+                          - Default
+                          - Unicode
+                        type: string
+                      key:
+                        description: Key is the key used in the Provider, mandatory
+                        type: string
+                      property:
+                        description: Used to select a specific property of the Provider value (if a map), if supported
+                        type: string
+                      version:
+                        description: Used to select a specific version of the Provider value, if supported
+                        type: string
+                    required:
+                      - key
+                    type: object
+                  type: array
+                refreshInterval:
+                  default: 1h
+                  description: |-
+                    RefreshInterval is the amount of time before the values are read again from the SecretStore provider
+                    Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h"
+                    May be set to zero to fetch and create it once. Defaults to 1h.
+                  type: string
+                secretStoreRef:
+                  description: SecretStoreRef defines which SecretStore to fetch the ExternalSecret data.
+                  properties:
+                    kind:
+                      description: |-
+                        Kind of the SecretStore resource (SecretStore or ClusterSecretStore)
+                        Defaults to `SecretStore`
+                      enum:
+                        - SecretStore
+                        - ClusterSecretStore
+                      type: string
+                    name:
+                      description: Name of the SecretStore resource
+                      maxLength: 253
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                      type: string
+                  type: object
+                target:
+                  description: |-
+                    ExternalSecretTarget defines the Kubernetes Secret to be created
+                    There can be only one target per ExternalSecret.
+                  properties:
+                    creationPolicy:
+                      default: Owner
+                      description: |-
+                        CreationPolicy defines rules on how to create the resulting Secret.
+                        Defaults to "Owner"
+                      enum:
+                        - Owner
+                        - Merge
+                        - None
+                      type: string
+                    immutable:
+                      description: Immutable defines if the final secret will be immutable
+                      type: boolean
+                    name:
+                      description: |-
+                        The name of the Secret resource to be managed.
+                        Defaults to the .metadata.name of the ExternalSecret resource
+                      maxLength: 253
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                      type: string
+                    template:
+                      description: Template defines a blueprint for the created Secret resource.
+                      properties:
+                        data:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        engineVersion:
+                          default: v1
+                          description: |-
+                            EngineVersion specifies the template engine version
+                            that should be used to compile/execute the
+                            template specified in .data and .templateFrom[].
+                          enum:
+                            - v1
+                            - v2
+                          type: string
+                        metadata:
+                          description: ExternalSecretTemplateMetadata defines metadata fields for the Secret blueprint.
+                          properties:
+                            annotations:
+                              additionalProperties:
+                                type: string
+                              type: object
+                            labels:
+                              additionalProperties:
+                                type: string
+                              type: object
+                          type: object
+                        templateFrom:
+                          items:
+                            maxProperties: 1
+                            minProperties: 1
+                            properties:
+                              configMap:
+                                properties:
+                                  items:
+                                    description: A list of keys in the ConfigMap/Secret to use as templates for Secret data
+                                    items:
+                                      properties:
+                                        key:
+                                          description: A key in the ConfigMap/Secret
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                      required:
+                                        - key
+                                      type: object
+                                    type: array
+                                  name:
+                                    description: The name of the ConfigMap/Secret resource
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                    type: string
+                                required:
+                                  - items
+                                  - name
+                                type: object
+                              secret:
+                                properties:
+                                  items:
+                                    description: A list of keys in the ConfigMap/Secret to use as templates for Secret data
+                                    items:
+                                      properties:
+                                        key:
+                                          description: A key in the ConfigMap/Secret
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                      required:
+                                        - key
+                                      type: object
+                                    type: array
+                                  name:
+                                    description: The name of the ConfigMap/Secret resource
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                    type: string
+                                required:
+                                  - items
+                                  - name
+                                type: object
+                            type: object
+                          type: array
+                        type:
+                          type: string
+                      type: object
+                  type: object
+              required:
+                - secretStoreRef
+                - target
+              type: object
+            status:
+              properties:
+                binding:
+                  description: Binding represents a servicebinding.io Provisioned Service reference to the secret
+                  properties:
+                    name:
+                      default: ""
+                      description: |-
+                        Name of the referent.
+                        This field is effectively required, but due to backwards compatibility is
+                        allowed to be empty. Instances of this type with an empty value here are
+                        almost certainly wrong.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                  type: object
+                  x-kubernetes-map-type: atomic
+                conditions:
+                  items:
+                    properties:
+                      lastTransitionTime:
+                        format: date-time
+                        type: string
+                      message:
+                        type: string
+                      reason:
+                        type: string
+                      status:
+                        type: string
+                      type:
+                        type: string
+                    required:
+                      - status
+                      - type
+                    type: object
+                  type: array
+                refreshTime:
+                  description: |-
+                    refreshTime is the time and date the external secret was fetched and
+                    the target secret updated
+                  format: date-time
+                  nullable: true
+                  type: string
+                syncedResourceVersion:
+                  description: SyncedResourceVersion keeps track of the last synced version
+                  type: string
+              type: object
+          type: object
+      served: true
+      storage: false
+      subresources:
+        status: {}
+    - additionalPrinterColumns:
+        - jsonPath: .spec.secretStoreRef.name
+          name: Store
+          type: string
+        - jsonPath: .spec.refreshInterval
+          name: Refresh Interval
+          type: string
+        - jsonPath: .status.conditions[?(@.type=="Ready")].reason
+          name: Status
+          type: string
+        - jsonPath: .status.conditions[?(@.type=="Ready")].status
+          name: Ready
+          type: string
+      name: v1beta1
+      schema:
+        openAPIV3Schema:
+          description: ExternalSecret is the Schema for the external-secrets API.
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: ExternalSecretSpec defines the desired state of ExternalSecret.
+              properties:
+                data:
+                  description: Data defines the connection between the Kubernetes Secret keys and the Provider data
+                  items:
+                    description: ExternalSecretData defines the connection between the Kubernetes Secret key (spec.data.<key>) and the Provider data.
+                    properties:
+                      remoteRef:
+                        description: |-
+                          RemoteRef points to the remote secret and defines
+                          which secret (version/property/..) to fetch.
+                        properties:
+                          conversionStrategy:
+                            default: Default
+                            description: Used to define a conversion Strategy
+                            enum:
+                              - Default
+                              - Unicode
+                            type: string
+                          decodingStrategy:
+                            default: None
+                            description: Used to define a decoding Strategy
+                            enum:
+                              - Auto
+                              - Base64
+                              - Base64URL
+                              - None
+                            type: string
+                          key:
+                            description: Key is the key used in the Provider, mandatory
+                            type: string
+                          metadataPolicy:
+                            default: None
+                            description: Policy for fetching tags/labels from provider secrets, possible options are Fetch, None. Defaults to None
+                            enum:
+                              - None
+                              - Fetch
+                            type: string
+                          property:
+                            description: Used to select a specific property of the Provider value (if a map), if supported
+                            type: string
+                          version:
+                            description: Used to select a specific version of the Provider value, if supported
+                            type: string
+                        required:
+                          - key
+                        type: object
+                      secretKey:
+                        description: The key in the Kubernetes Secret to store the value.
+                        maxLength: 253
+                        minLength: 1
+                        pattern: ^[-._a-zA-Z0-9]+$
+                        type: string
+                      sourceRef:
+                        description: |-
+                          SourceRef allows you to override the source
+                          from which the value will be pulled.
+                        maxProperties: 1
+                        minProperties: 1
+                        properties:
+                          generatorRef:
+                            description: |-
+                              GeneratorRef points to a generator custom resource.
+
+                              Deprecated: The generatorRef is not implemented in .data[].
+                              this will be removed with v1.
+                            properties:
+                              apiVersion:
+                                default: generators.external-secrets.io/v1alpha1
+                                description: Specify the apiVersion of the generator resource
+                                type: string
+                              kind:
+                                description: Specify the Kind of the generator resource
+                                enum:
+                                  - ACRAccessToken
+                                  - ClusterGenerator
+                                  - ECRAuthorizationToken
+                                  - Fake
+                                  - GCRAccessToken
+                                  - GithubAccessToken
+                                  - QuayAccessToken
+                                  - Password
+                                  - STSSessionToken
+                                  - UUID
+                                  - VaultDynamicSecret
+                                  - Webhook
+                                type: string
+                              name:
+                                description: Specify the name of the generator resource
+                                maxLength: 253
+                                minLength: 1
+                                pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                type: string
+                            required:
+                              - kind
+                              - name
+                            type: object
+                          storeRef:
+                            description: SecretStoreRef defines which SecretStore to fetch the ExternalSecret data.
+                            properties:
+                              kind:
+                                description: |-
+                                  Kind of the SecretStore resource (SecretStore or ClusterSecretStore)
+                                  Defaults to `SecretStore`
+                                enum:
+                                  - SecretStore
+                                  - ClusterSecretStore
+                                type: string
+                              name:
+                                description: Name of the SecretStore resource
+                                maxLength: 253
+                                minLength: 1
+                                pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                type: string
+                            type: object
+                        type: object
+                    required:
+                      - remoteRef
+                      - secretKey
+                    type: object
+                  type: array
+                dataFrom:
+                  description: |-
+                    DataFrom is used to fetch all properties from a specific Provider data
+                    If multiple entries are specified, the Secret keys are merged in the specified order
+                  items:
+                    properties:
+                      extract:
+                        description: |-
+                          Used to extract multiple key/value pairs from one secret
+                          Note: Extract does not support sourceRef.Generator or sourceRef.GeneratorRef.
+                        properties:
+                          conversionStrategy:
+                            default: Default
+                            description: Used to define a conversion Strategy
+                            enum:
+                              - Default
+                              - Unicode
+                            type: string
+                          decodingStrategy:
+                            default: None
+                            description: Used to define a decoding Strategy
+                            enum:
+                              - Auto
+                              - Base64
+                              - Base64URL
+                              - None
+                            type: string
+                          key:
+                            description: Key is the key used in the Provider, mandatory
+                            type: string
+                          metadataPolicy:
+                            default: None
+                            description: Policy for fetching tags/labels from provider secrets, possible options are Fetch, None. Defaults to None
+                            enum:
+                              - None
+                              - Fetch
+                            type: string
+                          property:
+                            description: Used to select a specific property of the Provider value (if a map), if supported
+                            type: string
+                          version:
+                            description: Used to select a specific version of the Provider value, if supported
+                            type: string
+                        required:
+                          - key
+                        type: object
+                      find:
+                        description: |-
+                          Used to find secrets based on tags or regular expressions
+                          Note: Find does not support sourceRef.Generator or sourceRef.GeneratorRef.
+                        properties:
+                          conversionStrategy:
+                            default: Default
+                            description: Used to define a conversion Strategy
+                            enum:
+                              - Default
+                              - Unicode
+                            type: string
+                          decodingStrategy:
+                            default: None
+                            description: Used to define a decoding Strategy
+                            enum:
+                              - Auto
+                              - Base64
+                              - Base64URL
+                              - None
+                            type: string
+                          name:
+                            description: Finds secrets based on the name.
+                            properties:
+                              regexp:
+                                description: Finds secrets base
+                                type: string
+                            type: object
+                          path:
+                            description: A root path to start the find operations.
+                            type: string
+                          tags:
+                            additionalProperties:
+                              type: string
+                            description: Find secrets based on tags.
+                            type: object
+                        type: object
+                      rewrite:
+                        description: |-
+                          Used to rewrite secret Keys after getting them from the secret Provider
+                          Multiple Rewrite operations can be provided. They are applied in a layered order (first to last)
+                        items:
+                          properties:
+                            regexp:
+                              description: |-
+                                Used to rewrite with regular expressions.
+                                The resulting key will be the output of a regexp.ReplaceAll operation.
+                              properties:
+                                source:
+                                  description: Used to define the regular expression of a re.Compiler.
+                                  type: string
+                                target:
+                                  description: Used to define the target pattern of a ReplaceAll operation.
+                                  type: string
+                              required:
+                                - source
+                                - target
+                              type: object
+                            transform:
+                              description: |-
+                                Used to apply string transformation on the secrets.
+                                The resulting key will be the output of the template applied by the operation.
+                              properties:
+                                template:
+                                  description: |-
+                                    Used to define the template to apply on the secret name.
+                                    `.value ` will specify the secret name in the template.
+                                  type: string
+                              required:
+                                - template
+                              type: object
+                          type: object
+                        type: array
+                      sourceRef:
+                        description: |-
+                          SourceRef points to a store or generator
+                          which contains secret values ready to use.
+                          Use this in combination with Extract or Find pull values out of
+                          a specific SecretStore.
+                          When sourceRef points to a generator Extract or Find is not supported.
+                          The generator returns a static map of values
+                        maxProperties: 1
+                        minProperties: 1
+                        properties:
+                          generatorRef:
+                            description: GeneratorRef points to a generator custom resource.
+                            properties:
+                              apiVersion:
+                                default: generators.external-secrets.io/v1alpha1
+                                description: Specify the apiVersion of the generator resource
+                                type: string
+                              kind:
+                                description: Specify the Kind of the generator resource
+                                enum:
+                                  - ACRAccessToken
+                                  - ClusterGenerator
+                                  - ECRAuthorizationToken
+                                  - Fake
+                                  - GCRAccessToken
+                                  - GithubAccessToken
+                                  - QuayAccessToken
+                                  - Password
+                                  - STSSessionToken
+                                  - UUID
+                                  - VaultDynamicSecret
+                                  - Webhook
+                                type: string
+                              name:
+                                description: Specify the name of the generator resource
+                                maxLength: 253
+                                minLength: 1
+                                pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                type: string
+                            required:
+                              - kind
+                              - name
+                            type: object
+                          storeRef:
+                            description: SecretStoreRef defines which SecretStore to fetch the ExternalSecret data.
+                            properties:
+                              kind:
+                                description: |-
+                                  Kind of the SecretStore resource (SecretStore or ClusterSecretStore)
+                                  Defaults to `SecretStore`
+                                enum:
+                                  - SecretStore
+                                  - ClusterSecretStore
+                                type: string
+                              name:
+                                description: Name of the SecretStore resource
+                                maxLength: 253
+                                minLength: 1
+                                pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                type: string
+                            type: object
+                        type: object
+                    type: object
+                  type: array
+                refreshInterval:
+                  default: 1h
+                  description: |-
+                    RefreshInterval is the amount of time before the values are read again from the SecretStore provider,
+                    specified as Golang Duration strings.
+                    Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h"
+                    Example values: "1h", "2h30m", "5d", "10s"
+                    May be set to zero to fetch and create it once. Defaults to 1h.
+                  type: string
+                secretStoreRef:
+                  description: SecretStoreRef defines which SecretStore to fetch the ExternalSecret data.
+                  properties:
+                    kind:
+                      description: |-
+                        Kind of the SecretStore resource (SecretStore or ClusterSecretStore)
+                        Defaults to `SecretStore`
+                      enum:
+                        - SecretStore
+                        - ClusterSecretStore
+                      type: string
+                    name:
+                      description: Name of the SecretStore resource
+                      maxLength: 253
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                      type: string
+                  type: object
+                target:
+                  default:
+                    creationPolicy: Owner
+                    deletionPolicy: Retain
+                  description: |-
+                    ExternalSecretTarget defines the Kubernetes Secret to be created
+                    There can be only one target per ExternalSecret.
+                  properties:
+                    creationPolicy:
+                      default: Owner
+                      description: |-
+                        CreationPolicy defines rules on how to create the resulting Secret.
+                        Defaults to "Owner"
+                      enum:
+                        - Owner
+                        - Orphan
+                        - Merge
+                        - None
+                      type: string
+                    deletionPolicy:
+                      default: Retain
+                      description: |-
+                        DeletionPolicy defines rules on how to delete the resulting Secret.
+                        Defaults to "Retain"
+                      enum:
+                        - Delete
+                        - Merge
+                        - Retain
+                      type: string
+                    immutable:
+                      description: Immutable defines if the final secret will be immutable
+                      type: boolean
+                    name:
+                      description: |-
+                        The name of the Secret resource to be managed.
+                        Defaults to the .metadata.name of the ExternalSecret resource
+                      maxLength: 253
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                      type: string
+                    template:
+                      description: Template defines a blueprint for the created Secret resource.
+                      properties:
+                        data:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        engineVersion:
+                          default: v2
+                          description: |-
+                            EngineVersion specifies the template engine version
+                            that should be used to compile/execute the
+                            template specified in .data and .templateFrom[].
+                          enum:
+                            - v1
+                            - v2
+                          type: string
+                        mergePolicy:
+                          default: Replace
+                          enum:
+                            - Replace
+                            - Merge
+                          type: string
+                        metadata:
+                          description: ExternalSecretTemplateMetadata defines metadata fields for the Secret blueprint.
+                          properties:
+                            annotations:
+                              additionalProperties:
+                                type: string
+                              type: object
+                            labels:
+                              additionalProperties:
+                                type: string
+                              type: object
+                          type: object
+                        templateFrom:
+                          items:
+                            properties:
+                              configMap:
+                                properties:
+                                  items:
+                                    description: A list of keys in the ConfigMap/Secret to use as templates for Secret data
+                                    items:
+                                      properties:
+                                        key:
+                                          description: A key in the ConfigMap/Secret
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        templateAs:
+                                          default: Values
+                                          enum:
+                                            - Values
+                                            - KeysAndValues
+                                          type: string
+                                      required:
+                                        - key
+                                      type: object
+                                    type: array
+                                  name:
+                                    description: The name of the ConfigMap/Secret resource
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                    type: string
+                                required:
+                                  - items
+                                  - name
+                                type: object
+                              literal:
+                                type: string
+                              secret:
+                                properties:
+                                  items:
+                                    description: A list of keys in the ConfigMap/Secret to use as templates for Secret data
+                                    items:
+                                      properties:
+                                        key:
+                                          description: A key in the ConfigMap/Secret
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        templateAs:
+                                          default: Values
+                                          enum:
+                                            - Values
+                                            - KeysAndValues
+                                          type: string
+                                      required:
+                                        - key
+                                      type: object
+                                    type: array
+                                  name:
+                                    description: The name of the ConfigMap/Secret resource
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                    type: string
+                                required:
+                                  - items
+                                  - name
+                                type: object
+                              target:
+                                default: Data
+                                enum:
+                                  - Data
+                                  - Annotations
+                                  - Labels
+                                type: string
+                            type: object
+                          type: array
+                        type:
+                          type: string
+                      type: object
+                  type: object
+              type: object
+            status:
+              properties:
+                binding:
+                  description: Binding represents a servicebinding.io Provisioned Service reference to the secret
+                  properties:
+                    name:
+                      default: ""
+                      description: |-
+                        Name of the referent.
+                        This field is effectively required, but due to backwards compatibility is
+                        allowed to be empty. Instances of this type with an empty value here are
+                        almost certainly wrong.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                  type: object
+                  x-kubernetes-map-type: atomic
+                conditions:
+                  items:
+                    properties:
+                      lastTransitionTime:
+                        format: date-time
+                        type: string
+                      message:
+                        type: string
+                      reason:
+                        type: string
+                      status:
+                        type: string
+                      type:
+                        type: string
+                    required:
+                      - status
+                      - type
+                    type: object
+                  type: array
+                refreshTime:
+                  description: |-
+                    refreshTime is the time and date the external secret was fetched and
+                    the target secret updated
+                  format: date-time
+                  nullable: true
+                  type: string
+                syncedResourceVersion:
+                  description: SyncedResourceVersion keeps track of the last synced version
+                  type: string
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/fake.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/fake.yaml
new file mode 100644
index 000000000..51047c17a
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/fake.yaml
@@ -0,0 +1,85 @@
+{{- if .Values.installCRDs }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: fakes.generators.external-secrets.io
+spec:
+  group: generators.external-secrets.io
+  names:
+    categories:
+      - external-secrets
+      - external-secrets-generators
+    kind: Fake
+    listKind: FakeList
+    plural: fakes
+    singular: fake
+  scope: Namespaced
+  versions:
+    - name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: |-
+            Fake generator is used for testing. It lets you define
+            a static set of credentials that is always returned.
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: FakeSpec contains the static data.
+              properties:
+                controller:
+                  description: |-
+                    Used to select the correct ESO controller (think: ingress.ingressClassName)
+                    The ESO controller is instantiated with a specific controller name and filters VDS based on this property
+                  type: string
+                data:
+                  additionalProperties:
+                    type: string
+                  description: |-
+                    Data defines the static data returned
+                    by this generator.
+                  type: object
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/gcraccesstoken.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/gcraccesstoken.yaml
new file mode 100644
index 000000000..192fb5d2c
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/gcraccesstoken.yaml
@@ -0,0 +1,152 @@
+{{- if .Values.installCRDs }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: gcraccesstokens.generators.external-secrets.io
+spec:
+  group: generators.external-secrets.io
+  names:
+    categories:
+      - external-secrets
+      - external-secrets-generators
+    kind: GCRAccessToken
+    listKind: GCRAccessTokenList
+    plural: gcraccesstokens
+    singular: gcraccesstoken
+  scope: Namespaced
+  versions:
+    - name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: |-
+            GCRAccessToken generates an GCP access token
+            that can be used to authenticate with GCR.
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              properties:
+                auth:
+                  description: Auth defines the means for authenticating with GCP
+                  properties:
+                    secretRef:
+                      properties:
+                        secretAccessKeySecretRef:
+                          description: The SecretAccessKey is used for authentication
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                      type: object
+                    workloadIdentity:
+                      properties:
+                        clusterLocation:
+                          type: string
+                        clusterName:
+                          type: string
+                        clusterProjectID:
+                          type: string
+                        serviceAccountRef:
+                          description: A reference to a ServiceAccount resource.
+                          properties:
+                            audiences:
+                              description: |-
+                                Audience specifies the `aud` claim for the service account token
+                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                then this audiences will be appended to the list
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: The name of the ServiceAccount resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                Namespace of the resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          required:
+                            - name
+                          type: object
+                      required:
+                        - clusterLocation
+                        - clusterName
+                        - serviceAccountRef
+                      type: object
+                  type: object
+                projectID:
+                  description: ProjectID defines which project to use to authenticate with
+                  type: string
+              required:
+                - auth
+                - projectID
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/githubaccesstoken.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/githubaccesstoken.yaml
new file mode 100644
index 000000000..9e7096169
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/githubaccesstoken.yaml
@@ -0,0 +1,132 @@
+{{- if .Values.installCRDs }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: githubaccesstokens.generators.external-secrets.io
+spec:
+  group: generators.external-secrets.io
+  names:
+    categories:
+      - external-secrets
+      - external-secrets-generators
+    kind: GithubAccessToken
+    listKind: GithubAccessTokenList
+    plural: githubaccesstokens
+    singular: githubaccesstoken
+  scope: Namespaced
+  versions:
+    - name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: GithubAccessToken generates ghs_ accessToken
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              properties:
+                appID:
+                  type: string
+                auth:
+                  description: Auth configures how ESO authenticates with a Github instance.
+                  properties:
+                    privateKey:
+                      properties:
+                        secretRef:
+                          description: |-
+                            A reference to a specific 'key' within a Secret resource.
+                            In some instances, `key` is a required field.
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                      required:
+                        - secretRef
+                      type: object
+                  required:
+                    - privateKey
+                  type: object
+                installID:
+                  type: string
+                permissions:
+                  additionalProperties:
+                    type: string
+                  description: Map of permissions the token will have. If omitted, defaults to all permissions the GitHub App has.
+                  type: object
+                repositories:
+                  description: |-
+                    List of repositories the token will have access to. If omitted, defaults to all repositories the GitHub App
+                    is installed to.
+                  items:
+                    type: string
+                  type: array
+                url:
+                  description: URL configures the Github instance URL. Defaults to https://github.com/.
+                  type: string
+              required:
+                - appID
+                - auth
+                - installID
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/password.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/password.yaml
new file mode 100644
index 000000000..c10c6b069
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/password.yaml
@@ -0,0 +1,107 @@
+{{- if .Values.installCRDs }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: passwords.generators.external-secrets.io
+spec:
+  group: generators.external-secrets.io
+  names:
+    categories:
+      - external-secrets
+      - external-secrets-generators
+    kind: Password
+    listKind: PasswordList
+    plural: passwords
+    singular: password
+  scope: Namespaced
+  versions:
+    - name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: |-
+            Password generates a random password based on the
+            configuration parameters in spec.
+            You can specify the length, characterset and other attributes.
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: PasswordSpec controls the behavior of the password generator.
+              properties:
+                allowRepeat:
+                  default: false
+                  description: set AllowRepeat to true to allow repeating characters.
+                  type: boolean
+                digits:
+                  description: |-
+                    Digits specifies the number of digits in the generated
+                    password. If omitted it defaults to 25% of the length of the password
+                  type: integer
+                length:
+                  default: 24
+                  description: |-
+                    Length of the password to be generated.
+                    Defaults to 24
+                  type: integer
+                noUpper:
+                  default: false
+                  description: Set NoUpper to disable uppercase characters
+                  type: boolean
+                symbolCharacters:
+                  description: |-
+                    SymbolCharacters specifies the special characters that should be used
+                    in the generated password.
+                  type: string
+                symbols:
+                  description: |-
+                    Symbols specifies the number of symbol characters in the generated
+                    password. If omitted it defaults to 25% of the length of the password
+                  type: integer
+              required:
+                - allowRepeat
+                - length
+                - noUpper
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/pushsecret.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/pushsecret.yaml
new file mode 100644
index 000000000..7b4c8ee86
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/pushsecret.yaml
@@ -0,0 +1,448 @@
+{{- if and (.Values.installCRDs) (.Values.crds.createPushSecret) }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: pushsecrets.external-secrets.io
+spec:
+  group: external-secrets.io
+  names:
+    categories:
+      - external-secrets
+    kind: PushSecret
+    listKind: PushSecretList
+    plural: pushsecrets
+    singular: pushsecret
+  scope: Namespaced
+  versions:
+    - additionalPrinterColumns:
+        - jsonPath: .metadata.creationTimestamp
+          name: AGE
+          type: date
+        - jsonPath: .status.conditions[?(@.type=="Ready")].reason
+          name: Status
+          type: string
+      name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: PushSecretSpec configures the behavior of the PushSecret.
+              properties:
+                data:
+                  description: Secret Data that should be pushed to providers
+                  items:
+                    properties:
+                      conversionStrategy:
+                        default: None
+                        description: Used to define a conversion Strategy for the secret keys
+                        enum:
+                          - None
+                          - ReverseUnicode
+                        type: string
+                      match:
+                        description: Match a given Secret Key to be pushed to the provider.
+                        properties:
+                          remoteRef:
+                            description: Remote Refs to push to providers.
+                            properties:
+                              property:
+                                description: Name of the property in the resulting secret
+                                type: string
+                              remoteKey:
+                                description: Name of the resulting provider secret.
+                                type: string
+                            required:
+                              - remoteKey
+                            type: object
+                          secretKey:
+                            description: Secret Key to be pushed
+                            type: string
+                        required:
+                          - remoteRef
+                        type: object
+                      metadata:
+                        description: |-
+                          Metadata is metadata attached to the secret.
+                          The structure of metadata is provider specific, please look it up in the provider documentation.
+                        x-kubernetes-preserve-unknown-fields: true
+                    required:
+                      - match
+                    type: object
+                  type: array
+                deletionPolicy:
+                  default: None
+                  description: Deletion Policy to handle Secrets in the provider.
+                  enum:
+                    - Delete
+                    - None
+                  type: string
+                refreshInterval:
+                  description: The Interval to which External Secrets will try to push a secret definition
+                  type: string
+                secretStoreRefs:
+                  items:
+                    properties:
+                      kind:
+                        default: SecretStore
+                        description: Kind of the SecretStore resource (SecretStore or ClusterSecretStore)
+                        enum:
+                          - SecretStore
+                          - ClusterSecretStore
+                        type: string
+                      labelSelector:
+                        description: Optionally, sync to secret stores with label selector
+                        properties:
+                          matchExpressions:
+                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                            items:
+                              description: |-
+                                A label selector requirement is a selector that contains values, a key, and an operator that
+                                relates the key and values.
+                              properties:
+                                key:
+                                  description: key is the label key that the selector applies to.
+                                  type: string
+                                operator:
+                                  description: |-
+                                    operator represents a key's relationship to a set of values.
+                                    Valid operators are In, NotIn, Exists and DoesNotExist.
+                                  type: string
+                                values:
+                                  description: |-
+                                    values is an array of string values. If the operator is In or NotIn,
+                                    the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                    the values array must be empty. This array is replaced during a strategic
+                                    merge patch.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              required:
+                                - key
+                                - operator
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          matchLabels:
+                            additionalProperties:
+                              type: string
+                            description: |-
+                              matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                              map is equivalent to an element of matchExpressions, whose key field is "key", the
+                              operator is "In", and the values array contains only "value". The requirements are ANDed.
+                            type: object
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      name:
+                        description: Optionally, sync to the SecretStore of the given name
+                        maxLength: 253
+                        minLength: 1
+                        pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                        type: string
+                    type: object
+                  type: array
+                selector:
+                  description: The Secret Selector (k8s source) for the Push Secret
+                  maxProperties: 1
+                  minProperties: 1
+                  properties:
+                    generatorRef:
+                      description: Point to a generator to create a Secret.
+                      properties:
+                        apiVersion:
+                          default: generators.external-secrets.io/v1alpha1
+                          description: Specify the apiVersion of the generator resource
+                          type: string
+                        kind:
+                          description: Specify the Kind of the generator resource
+                          enum:
+                            - ACRAccessToken
+                            - ClusterGenerator
+                            - ECRAuthorizationToken
+                            - Fake
+                            - GCRAccessToken
+                            - GithubAccessToken
+                            - QuayAccessToken
+                            - Password
+                            - STSSessionToken
+                            - UUID
+                            - VaultDynamicSecret
+                            - Webhook
+                          type: string
+                        name:
+                          description: Specify the name of the generator resource
+                          maxLength: 253
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                          type: string
+                      required:
+                        - kind
+                        - name
+                      type: object
+                    secret:
+                      description: Select a Secret to Push.
+                      properties:
+                        name:
+                          description: |-
+                            Name of the Secret.
+                            The Secret must exist in the same namespace as the PushSecret manifest.
+                          maxLength: 253
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                          type: string
+                      required:
+                        - name
+                      type: object
+                  type: object
+                template:
+                  description: Template defines a blueprint for the created Secret resource.
+                  properties:
+                    data:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    engineVersion:
+                      default: v2
+                      description: |-
+                        EngineVersion specifies the template engine version
+                        that should be used to compile/execute the
+                        template specified in .data and .templateFrom[].
+                      enum:
+                        - v1
+                        - v2
+                      type: string
+                    mergePolicy:
+                      default: Replace
+                      enum:
+                        - Replace
+                        - Merge
+                      type: string
+                    metadata:
+                      description: ExternalSecretTemplateMetadata defines metadata fields for the Secret blueprint.
+                      properties:
+                        annotations:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        labels:
+                          additionalProperties:
+                            type: string
+                          type: object
+                      type: object
+                    templateFrom:
+                      items:
+                        properties:
+                          configMap:
+                            properties:
+                              items:
+                                description: A list of keys in the ConfigMap/Secret to use as templates for Secret data
+                                items:
+                                  properties:
+                                    key:
+                                      description: A key in the ConfigMap/Secret
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    templateAs:
+                                      default: Values
+                                      enum:
+                                        - Values
+                                        - KeysAndValues
+                                      type: string
+                                  required:
+                                    - key
+                                  type: object
+                                type: array
+                              name:
+                                description: The name of the ConfigMap/Secret resource
+                                maxLength: 253
+                                minLength: 1
+                                pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                type: string
+                            required:
+                              - items
+                              - name
+                            type: object
+                          literal:
+                            type: string
+                          secret:
+                            properties:
+                              items:
+                                description: A list of keys in the ConfigMap/Secret to use as templates for Secret data
+                                items:
+                                  properties:
+                                    key:
+                                      description: A key in the ConfigMap/Secret
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    templateAs:
+                                      default: Values
+                                      enum:
+                                        - Values
+                                        - KeysAndValues
+                                      type: string
+                                  required:
+                                    - key
+                                  type: object
+                                type: array
+                              name:
+                                description: The name of the ConfigMap/Secret resource
+                                maxLength: 253
+                                minLength: 1
+                                pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                type: string
+                            required:
+                              - items
+                              - name
+                            type: object
+                          target:
+                            default: Data
+                            enum:
+                              - Data
+                              - Annotations
+                              - Labels
+                            type: string
+                        type: object
+                      type: array
+                    type:
+                      type: string
+                  type: object
+                updatePolicy:
+                  default: Replace
+                  description: UpdatePolicy to handle Secrets in the provider.
+                  enum:
+                    - Replace
+                    - IfNotExists
+                  type: string
+              required:
+                - secretStoreRefs
+                - selector
+              type: object
+            status:
+              description: PushSecretStatus indicates the history of the status of PushSecret.
+              properties:
+                conditions:
+                  items:
+                    description: PushSecretStatusCondition indicates the status of the PushSecret.
+                    properties:
+                      lastTransitionTime:
+                        format: date-time
+                        type: string
+                      message:
+                        type: string
+                      reason:
+                        type: string
+                      status:
+                        type: string
+                      type:
+                        description: PushSecretConditionType indicates the condition of the PushSecret.
+                        type: string
+                    required:
+                      - status
+                      - type
+                    type: object
+                  type: array
+                refreshTime:
+                  description: |-
+                    refreshTime is the time and date the external secret was fetched and
+                    the target secret updated
+                  format: date-time
+                  nullable: true
+                  type: string
+                syncedPushSecrets:
+                  additionalProperties:
+                    additionalProperties:
+                      properties:
+                        conversionStrategy:
+                          default: None
+                          description: Used to define a conversion Strategy for the secret keys
+                          enum:
+                            - None
+                            - ReverseUnicode
+                          type: string
+                        match:
+                          description: Match a given Secret Key to be pushed to the provider.
+                          properties:
+                            remoteRef:
+                              description: Remote Refs to push to providers.
+                              properties:
+                                property:
+                                  description: Name of the property in the resulting secret
+                                  type: string
+                                remoteKey:
+                                  description: Name of the resulting provider secret.
+                                  type: string
+                              required:
+                                - remoteKey
+                              type: object
+                            secretKey:
+                              description: Secret Key to be pushed
+                              type: string
+                          required:
+                            - remoteRef
+                          type: object
+                        metadata:
+                          description: |-
+                            Metadata is metadata attached to the secret.
+                            The structure of metadata is provider specific, please look it up in the provider documentation.
+                          x-kubernetes-preserve-unknown-fields: true
+                      required:
+                        - match
+                      type: object
+                    type: object
+                  description: |-
+                    Synced PushSecrets, including secrets that already exist in provider.
+                    Matches secret stores to PushSecretData that was stored to that secret store.
+                  type: object
+                syncedResourceVersion:
+                  description: SyncedResourceVersion keeps track of the last synced version.
+                  type: string
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/quayaccesstoken.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/quayaccesstoken.yaml
new file mode 100644
index 000000000..196ec3d35
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/quayaccesstoken.yaml
@@ -0,0 +1,107 @@
+{{- if .Values.installCRDs }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: quayaccesstokens.generators.external-secrets.io
+spec:
+  group: generators.external-secrets.io
+  names:
+    categories:
+      - external-secrets
+      - external-secrets-generators
+    kind: QuayAccessToken
+    listKind: QuayAccessTokenList
+    plural: quayaccesstokens
+    singular: quayaccesstoken
+  scope: Namespaced
+  versions:
+    - name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: QuayAccessToken generates Quay oauth token for pulling/pushing images
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              properties:
+                robotAccount:
+                  description: Name of the robot account you are federating with
+                  type: string
+                serviceAccountRef:
+                  description: Name of the service account you are federating with
+                  properties:
+                    audiences:
+                      description: |-
+                        Audience specifies the `aud` claim for the service account token
+                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                        then this audiences will be appended to the list
+                      items:
+                        type: string
+                      type: array
+                    name:
+                      description: The name of the ServiceAccount resource being referred to.
+                      maxLength: 253
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                      type: string
+                    namespace:
+                      description: |-
+                        Namespace of the resource being referred to.
+                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                      maxLength: 63
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                      type: string
+                  required:
+                    - name
+                  type: object
+                url:
+                  description: URL configures the Quay instance URL. Defaults to quay.io.
+                  type: string
+              required:
+                - robotAccount
+                - serviceAccountRef
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/secretstore.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/secretstore.yaml
new file mode 100644
index 000000000..d16c7d7ea
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/secretstore.yaml
@@ -0,0 +1,5782 @@
+{{- if .Values.installCRDs }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: secretstores.external-secrets.io
+spec:
+  group: external-secrets.io
+  names:
+    categories:
+      - external-secrets
+    kind: SecretStore
+    listKind: SecretStoreList
+    plural: secretstores
+    shortNames:
+      - ss
+    singular: secretstore
+  scope: Namespaced
+  versions:
+    - additionalPrinterColumns:
+        - jsonPath: .metadata.creationTimestamp
+          name: AGE
+          type: date
+        - jsonPath: .status.conditions[?(@.type=="Ready")].reason
+          name: Status
+          type: string
+      deprecated: true
+      name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: SecretStore represents a secure external location for storing secrets, which can be referenced as part of `storeRef` fields.
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: SecretStoreSpec defines the desired state of SecretStore.
+              properties:
+                controller:
+                  description: |-
+                    Used to select the correct ESO controller (think: ingress.ingressClassName)
+                    The ESO controller is instantiated with a specific controller name and filters ES based on this property
+                  type: string
+                provider:
+                  description: Used to configure the provider. Only one provider may be set
+                  maxProperties: 1
+                  minProperties: 1
+                  properties:
+                    akeyless:
+                      description: Akeyless configures this store to sync secrets using Akeyless Vault provider
+                      properties:
+                        akeylessGWApiURL:
+                          description: Akeyless GW API Url from which the secrets to be fetched from.
+                          type: string
+                        authSecretRef:
+                          description: Auth configures how the operator authenticates with Akeyless.
+                          properties:
+                            kubernetesAuth:
+                              description: |-
+                                Kubernetes authenticates with Akeyless by passing the ServiceAccount
+                                token stored in the named Secret resource.
+                              properties:
+                                accessID:
+                                  description: the Akeyless Kubernetes auth-method access-id
+                                  type: string
+                                k8sConfName:
+                                  description: Kubernetes-auth configuration name in Akeyless-Gateway
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Optional secret field containing a Kubernetes ServiceAccount JWT used
+                                    for authenticating with Akeyless. If a name is specified without a key,
+                                    `token` is the default. If one is not specified, the one bound to
+                                    the controller will be used.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                serviceAccountRef:
+                                  description: |-
+                                    Optional service account field containing the name of a kubernetes ServiceAccount.
+                                    If the service account is specified, the service account secret token JWT will be used
+                                    for authenticating with Akeyless. If the service account selector is not supplied,
+                                    the secretRef will be used instead.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              required:
+                                - accessID
+                                - k8sConfName
+                              type: object
+                            secretRef:
+                              description: |-
+                                Reference to a Secret that contains the details
+                                to authenticate with Akeyless.
+                              properties:
+                                accessID:
+                                  description: The SecretAccessID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                accessType:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                accessTypeParam:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        caBundle:
+                          description: |-
+                            PEM/base64 encoded CA bundle used to validate Akeyless Gateway certificate. Only used
+                            if the AkeylessGWApiURL URL is using HTTPS protocol. If not set the system root certificates
+                            are used to validate the TLS connection.
+                          format: byte
+                          type: string
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate Akeyless Gateway certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: The namespace the Provider type is in.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                      required:
+                        - akeylessGWApiURL
+                        - authSecretRef
+                      type: object
+                    alibaba:
+                      description: Alibaba configures this store to sync secrets using Alibaba Cloud provider
+                      properties:
+                        auth:
+                          description: AlibabaAuth contains a secretRef for credentials.
+                          properties:
+                            rrsa:
+                              description: Authenticate against Alibaba using RRSA.
+                              properties:
+                                oidcProviderArn:
+                                  type: string
+                                oidcTokenFilePath:
+                                  type: string
+                                roleArn:
+                                  type: string
+                                sessionName:
+                                  type: string
+                              required:
+                                - oidcProviderArn
+                                - oidcTokenFilePath
+                                - roleArn
+                                - sessionName
+                              type: object
+                            secretRef:
+                              description: AlibabaAuthSecretRef holds secret references for Alibaba credentials.
+                              properties:
+                                accessKeyIDSecretRef:
+                                  description: The AccessKeyID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                accessKeySecretSecretRef:
+                                  description: The AccessKeySecret is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - accessKeyIDSecretRef
+                                - accessKeySecretSecretRef
+                              type: object
+                          type: object
+                        regionID:
+                          description: Alibaba Region to be used for the provider
+                          type: string
+                      required:
+                        - auth
+                        - regionID
+                      type: object
+                    aws:
+                      description: AWS configures this store to sync secrets using AWS Secret Manager provider
+                      properties:
+                        auth:
+                          description: |-
+                            Auth defines the information necessary to authenticate against AWS
+                            if not set aws sdk will infer credentials from your environment
+                            see: https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials
+                          properties:
+                            jwt:
+                              description: Authenticate against AWS using service account tokens.
+                              properties:
+                                serviceAccountRef:
+                                  description: A reference to a ServiceAccount resource.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              type: object
+                            secretRef:
+                              description: |-
+                                AWSAuthSecretRef holds secret references for AWS credentials
+                                both AccessKeyID and SecretAccessKey must be defined in order to properly authenticate.
+                              properties:
+                                accessKeyIDSecretRef:
+                                  description: The AccessKeyID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                secretAccessKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        region:
+                          description: AWS Region to be used for the provider
+                          type: string
+                        role:
+                          description: Role is a Role ARN which the SecretManager provider will assume
+                          type: string
+                        service:
+                          description: Service defines which service should be used to fetch the secrets
+                          enum:
+                            - SecretsManager
+                            - ParameterStore
+                          type: string
+                      required:
+                        - region
+                        - service
+                      type: object
+                    azurekv:
+                      description: AzureKV configures this store to sync secrets using Azure Key Vault provider
+                      properties:
+                        authSecretRef:
+                          description: Auth configures how the operator authenticates with Azure. Required for ServicePrincipal auth type.
+                          properties:
+                            clientId:
+                              description: The Azure clientId of the service principle used for authentication.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            clientSecret:
+                              description: The Azure ClientSecret of the service principle used for authentication.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        authType:
+                          default: ServicePrincipal
+                          description: |-
+                            Auth type defines how to authenticate to the keyvault service.
+                            Valid values are:
+                            - "ServicePrincipal" (default): Using a service principal (tenantId, clientId, clientSecret)
+                            - "ManagedIdentity": Using Managed Identity assigned to the pod (see aad-pod-identity)
+                          enum:
+                            - ServicePrincipal
+                            - ManagedIdentity
+                            - WorkloadIdentity
+                          type: string
+                        identityId:
+                          description: If multiple Managed Identity is assigned to the pod, you can select the one to be used
+                          type: string
+                        serviceAccountRef:
+                          description: |-
+                            ServiceAccountRef specified the service account
+                            that should be used when authenticating with WorkloadIdentity.
+                          properties:
+                            audiences:
+                              description: |-
+                                Audience specifies the `aud` claim for the service account token
+                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                then this audiences will be appended to the list
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: The name of the ServiceAccount resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                Namespace of the resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          required:
+                            - name
+                          type: object
+                        tenantId:
+                          description: TenantID configures the Azure Tenant to send requests to. Required for ServicePrincipal auth type.
+                          type: string
+                        vaultUrl:
+                          description: Vault Url from which the secrets to be fetched from.
+                          type: string
+                      required:
+                        - vaultUrl
+                      type: object
+                    fake:
+                      description: Fake configures a store with static key/value pairs
+                      properties:
+                        data:
+                          items:
+                            properties:
+                              key:
+                                type: string
+                              value:
+                                type: string
+                              valueMap:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              version:
+                                type: string
+                            required:
+                              - key
+                            type: object
+                          type: array
+                      required:
+                        - data
+                      type: object
+                    gcpsm:
+                      description: GCPSM configures this store to sync secrets using Google Cloud Platform Secret Manager provider
+                      properties:
+                        auth:
+                          description: Auth defines the information necessary to authenticate against GCP
+                          properties:
+                            secretRef:
+                              properties:
+                                secretAccessKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            workloadIdentity:
+                              properties:
+                                clusterLocation:
+                                  type: string
+                                clusterName:
+                                  type: string
+                                clusterProjectID:
+                                  type: string
+                                serviceAccountRef:
+                                  description: A reference to a ServiceAccount resource.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              required:
+                                - clusterLocation
+                                - clusterName
+                                - serviceAccountRef
+                              type: object
+                          type: object
+                        projectID:
+                          description: ProjectID project where secret is located
+                          type: string
+                      type: object
+                    gitlab:
+                      description: GitLab configures this store to sync secrets using GitLab Variables provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with a GitLab instance.
+                          properties:
+                            SecretRef:
+                              properties:
+                                accessToken:
+                                  description: AccessToken is used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          required:
+                            - SecretRef
+                          type: object
+                        projectID:
+                          description: ProjectID specifies a project where secrets are located.
+                          type: string
+                        url:
+                          description: URL configures the GitLab instance URL. Defaults to https://gitlab.com/.
+                          type: string
+                      required:
+                        - auth
+                      type: object
+                    ibm:
+                      description: IBM configures this store to sync secrets using IBM Cloud provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with the IBM secrets manager.
+                          properties:
+                            secretRef:
+                              properties:
+                                secretApiKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        serviceUrl:
+                          description: ServiceURL is the Endpoint URL that is specific to the Secrets Manager service instance
+                          type: string
+                      required:
+                        - auth
+                      type: object
+                    kubernetes:
+                      description: Kubernetes configures this store to sync secrets using a Kubernetes cluster provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with a Kubernetes instance.
+                          maxProperties: 1
+                          minProperties: 1
+                          properties:
+                            cert:
+                              description: has both clientCert and clientKey as secretKeySelector
+                              properties:
+                                clientCert:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                clientKey:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            serviceAccount:
+                              description: points to a service account that should be used for authentication
+                              properties:
+                                serviceAccount:
+                                  description: A reference to a ServiceAccount resource.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              type: object
+                            token:
+                              description: use static token to authenticate with
+                              properties:
+                                bearerToken:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        remoteNamespace:
+                          default: default
+                          description: Remote namespace to fetch the secrets from
+                          maxLength: 63
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                          type: string
+                        server:
+                          description: configures the Kubernetes server Address.
+                          properties:
+                            caBundle:
+                              description: CABundle is a base64-encoded CA certificate
+                              format: byte
+                              type: string
+                            caProvider:
+                              description: 'see: https://external-secrets.io/v0.4.1/spec/#external-secrets.io/v1alpha1.CAProvider'
+                              properties:
+                                key:
+                                  description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the object located at the provider type.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: The namespace the Provider type is in.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                                type:
+                                  description: The type of provider to use such as "Secret", or "ConfigMap".
+                                  enum:
+                                    - Secret
+                                    - ConfigMap
+                                  type: string
+                              required:
+                                - name
+                                - type
+                              type: object
+                            url:
+                              default: kubernetes.default
+                              description: configures the Kubernetes server Address.
+                              type: string
+                          type: object
+                      required:
+                        - auth
+                      type: object
+                    oracle:
+                      description: Oracle configures this store to sync secrets using Oracle Vault provider
+                      properties:
+                        auth:
+                          description: |-
+                            Auth configures how secret-manager authenticates with the Oracle Vault.
+                            If empty, instance principal is used. Optionally, the authenticating principal type
+                            and/or user data may be supplied for the use of workload identity and user principal.
+                          properties:
+                            secretRef:
+                              description: SecretRef to pass through sensitive information.
+                              properties:
+                                fingerprint:
+                                  description: Fingerprint is the fingerprint of the API private key.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                privatekey:
+                                  description: PrivateKey is the user's API Signing Key in PEM format, used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - fingerprint
+                                - privatekey
+                              type: object
+                            tenancy:
+                              description: Tenancy is the tenancy OCID where user is located.
+                              type: string
+                            user:
+                              description: User is an access OCID specific to the account.
+                              type: string
+                          required:
+                            - secretRef
+                            - tenancy
+                            - user
+                          type: object
+                        compartment:
+                          description: |-
+                            Compartment is the vault compartment OCID.
+                            Required for PushSecret
+                          type: string
+                        encryptionKey:
+                          description: |-
+                            EncryptionKey is the OCID of the encryption key within the vault.
+                            Required for PushSecret
+                          type: string
+                        principalType:
+                          description: |-
+                            The type of principal to use for authentication. If left blank, the Auth struct will
+                            determine the principal type. This optional field must be specified if using
+                            workload identity.
+                          enum:
+                            - ""
+                            - UserPrincipal
+                            - InstancePrincipal
+                            - Workload
+                          type: string
+                        region:
+                          description: Region is the region where vault is located.
+                          type: string
+                        serviceAccountRef:
+                          description: |-
+                            ServiceAccountRef specified the service account
+                            that should be used when authenticating with WorkloadIdentity.
+                          properties:
+                            audiences:
+                              description: |-
+                                Audience specifies the `aud` claim for the service account token
+                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                then this audiences will be appended to the list
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: The name of the ServiceAccount resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                Namespace of the resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          required:
+                            - name
+                          type: object
+                        vault:
+                          description: Vault is the vault's OCID of the specific vault where secret is located.
+                          type: string
+                      required:
+                        - region
+                        - vault
+                      type: object
+                    passworddepot:
+                      description: Configures a store to sync secrets with a Password Depot instance.
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with a Password Depot instance.
+                          properties:
+                            secretRef:
+                              properties:
+                                credentials:
+                                  description: Username / Password is used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        database:
+                          description: Database to use as source
+                          type: string
+                        host:
+                          description: URL configures the Password Depot instance URL.
+                          type: string
+                      required:
+                        - auth
+                        - database
+                        - host
+                      type: object
+                    vault:
+                      description: Vault configures this store to sync secrets using Hashi provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with the Vault server.
+                          properties:
+                            appRole:
+                              description: |-
+                                AppRole authenticates with Vault using the App Role auth mechanism,
+                                with the role and secret stored in a Kubernetes Secret resource.
+                              properties:
+                                path:
+                                  default: approle
+                                  description: |-
+                                    Path where the App Role authentication backend is mounted
+                                    in Vault, e.g: "approle"
+                                  type: string
+                                roleId:
+                                  description: |-
+                                    RoleID configured in the App Role authentication backend when setting
+                                    up the authentication backend in Vault.
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Reference to a key in a Secret that contains the App Role secret used
+                                    to authenticate with Vault.
+                                    The `key` field must be specified and denotes which entry within the Secret
+                                    resource is used as the app role secret.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - path
+                                - roleId
+                                - secretRef
+                              type: object
+                            cert:
+                              description: |-
+                                Cert authenticates with TLS Certificates by passing client certificate, private key and ca certificate
+                                Cert authentication method
+                              properties:
+                                clientCert:
+                                  description: |-
+                                    ClientCert is a certificate to authenticate using the Cert Vault
+                                    authentication method
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                secretRef:
+                                  description: |-
+                                    SecretRef to a key in a Secret resource containing client private key to
+                                    authenticate with Vault using the Cert authentication method
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            jwt:
+                              description: |-
+                                Jwt authenticates with Vault by passing role and JWT token using the
+                                JWT/OIDC authentication method
+                              properties:
+                                kubernetesServiceAccountToken:
+                                  description: |-
+                                    Optional ServiceAccountToken specifies the Kubernetes service account for which to request
+                                    a token for with the `TokenRequest` API.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Optional audiences field that will be used to request a temporary Kubernetes service
+                                        account token for the service account referenced by `serviceAccountRef`.
+                                        Defaults to a single audience `vault` it not specified.
+                                      items:
+                                        type: string
+                                      type: array
+                                    expirationSeconds:
+                                      description: |-
+                                        Optional expiration time in seconds that will be used to request a temporary
+                                        Kubernetes service account token for the service account referenced by
+                                        `serviceAccountRef`.
+                                        Defaults to 10 minutes.
+                                      format: int64
+                                      type: integer
+                                    serviceAccountRef:
+                                      description: Service account field containing the name of a kubernetes ServiceAccount.
+                                      properties:
+                                        audiences:
+                                          description: |-
+                                            Audience specifies the `aud` claim for the service account token
+                                            If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                            then this audiences will be appended to the list
+                                          items:
+                                            type: string
+                                          type: array
+                                        name:
+                                          description: The name of the ServiceAccount resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            Namespace of the resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      required:
+                                        - name
+                                      type: object
+                                  required:
+                                    - serviceAccountRef
+                                  type: object
+                                path:
+                                  default: jwt
+                                  description: |-
+                                    Path where the JWT authentication backend is mounted
+                                    in Vault, e.g: "jwt"
+                                  type: string
+                                role:
+                                  description: |-
+                                    Role is a JWT role to authenticate using the JWT/OIDC Vault
+                                    authentication method
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Optional SecretRef that refers to a key in a Secret resource containing JWT token to
+                                    authenticate with Vault using the JWT/OIDC authentication method.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - path
+                              type: object
+                            kubernetes:
+                              description: |-
+                                Kubernetes authenticates with Vault by passing the ServiceAccount
+                                token stored in the named Secret resource to the Vault server.
+                              properties:
+                                mountPath:
+                                  default: kubernetes
+                                  description: |-
+                                    Path where the Kubernetes authentication backend is mounted in Vault, e.g:
+                                    "kubernetes"
+                                  type: string
+                                role:
+                                  description: |-
+                                    A required field containing the Vault Role to assume. A Role binds a
+                                    Kubernetes ServiceAccount with a set of Vault policies.
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Optional secret field containing a Kubernetes ServiceAccount JWT used
+                                    for authenticating with Vault. If a name is specified without a key,
+                                    `token` is the default. If one is not specified, the one bound to
+                                    the controller will be used.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                serviceAccountRef:
+                                  description: |-
+                                    Optional service account field containing the name of a kubernetes ServiceAccount.
+                                    If the service account is specified, the service account secret token JWT will be used
+                                    for authenticating with Vault. If the service account selector is not supplied,
+                                    the secretRef will be used instead.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              required:
+                                - mountPath
+                                - role
+                              type: object
+                            ldap:
+                              description: |-
+                                Ldap authenticates with Vault by passing username/password pair using
+                                the LDAP authentication method
+                              properties:
+                                path:
+                                  default: ldap
+                                  description: |-
+                                    Path where the LDAP authentication backend is mounted
+                                    in Vault, e.g: "ldap"
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    SecretRef to a key in a Secret resource containing password for the LDAP
+                                    user used to authenticate with Vault using the LDAP authentication
+                                    method
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                username:
+                                  description: |-
+                                    Username is a LDAP user name used to authenticate using the LDAP Vault
+                                    authentication method
+                                  type: string
+                              required:
+                                - path
+                                - username
+                              type: object
+                            tokenSecretRef:
+                              description: TokenSecretRef authenticates with Vault by presenting a token.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        caBundle:
+                          description: |-
+                            PEM encoded CA bundle used to validate Vault server certificate. Only used
+                            if the Server URL is using HTTPS protocol. This parameter is ignored for
+                            plain HTTP protocol connection. If not set the system root certificates
+                            are used to validate the TLS connection.
+                          format: byte
+                          type: string
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate Vault server certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: The namespace the Provider type is in.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                        forwardInconsistent:
+                          description: |-
+                            ForwardInconsistent tells Vault to forward read-after-write requests to the Vault
+                            leader instead of simply retrying within a loop. This can increase performance if
+                            the option is enabled serverside.
+                            https://www.vaultproject.io/docs/configuration/replication#allow_forwarding_via_header
+                          type: boolean
+                        namespace:
+                          description: |-
+                            Name of the vault namespace. Namespaces is a set of features within Vault Enterprise that allows
+                            Vault environments to support Secure Multi-tenancy. e.g: "ns1".
+                            More about namespaces can be found here https://www.vaultproject.io/docs/enterprise/namespaces
+                          type: string
+                        path:
+                          description: |-
+                            Path is the mount path of the Vault KV backend endpoint, e.g:
+                            "secret". The v2 KV secret engine version specific "/data" path suffix
+                            for fetching secrets from Vault is optional and will be appended
+                            if not present in specified path.
+                          type: string
+                        readYourWrites:
+                          description: |-
+                            ReadYourWrites ensures isolated read-after-write semantics by
+                            providing discovered cluster replication states in each request.
+                            More information about eventual consistency in Vault can be found here
+                            https://www.vaultproject.io/docs/enterprise/consistency
+                          type: boolean
+                        server:
+                          description: 'Server is the connection address for the Vault server, e.g: "https://vault.example.com:8200".'
+                          type: string
+                        version:
+                          default: v2
+                          description: |-
+                            Version is the Vault KV secret engine version. This can be either "v1" or
+                            "v2". Version defaults to "v2".
+                          enum:
+                            - v1
+                            - v2
+                          type: string
+                      required:
+                        - auth
+                        - server
+                      type: object
+                    webhook:
+                      description: Webhook configures this store to sync secrets using a generic templated webhook
+                      properties:
+                        body:
+                          description: Body
+                          type: string
+                        caBundle:
+                          description: |-
+                            PEM encoded CA bundle used to validate webhook server certificate. Only used
+                            if the Server URL is using HTTPS protocol. This parameter is ignored for
+                            plain HTTP protocol connection. If not set the system root certificates
+                            are used to validate the TLS connection.
+                          format: byte
+                          type: string
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate webhook server certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: The namespace the Provider type is in.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                        headers:
+                          additionalProperties:
+                            type: string
+                          description: Headers
+                          type: object
+                        method:
+                          description: Webhook Method
+                          type: string
+                        result:
+                          description: Result formatting
+                          properties:
+                            jsonPath:
+                              description: Json path of return value
+                              type: string
+                          type: object
+                        secrets:
+                          description: |-
+                            Secrets to fill in templates
+                            These secrets will be passed to the templating function as key value pairs under the given name
+                          items:
+                            properties:
+                              name:
+                                description: Name of this secret in templates
+                                type: string
+                              secretRef:
+                                description: Secret ref to fill in credentials
+                                properties:
+                                  key:
+                                    description: |-
+                                      A key in the referenced Secret.
+                                      Some instances of this field may be defaulted, in others it may be required.
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[-._a-zA-Z0-9]+$
+                                    type: string
+                                  name:
+                                    description: The name of the Secret resource being referred to.
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                    type: string
+                                  namespace:
+                                    description: |-
+                                      The namespace of the Secret resource being referred to.
+                                      Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                    maxLength: 63
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                    type: string
+                                type: object
+                            required:
+                              - name
+                              - secretRef
+                            type: object
+                          type: array
+                        timeout:
+                          description: Timeout
+                          type: string
+                        url:
+                          description: Webhook url to call
+                          type: string
+                      required:
+                        - result
+                        - url
+                      type: object
+                    yandexlockbox:
+                      description: YandexLockbox configures this store to sync secrets using Yandex Lockbox provider
+                      properties:
+                        apiEndpoint:
+                          description: Yandex.Cloud API endpoint (e.g. 'api.cloud.yandex.net:443')
+                          type: string
+                        auth:
+                          description: Auth defines the information necessary to authenticate against Yandex Lockbox
+                          properties:
+                            authorizedKeySecretRef:
+                              description: The authorized key used for authentication
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate Yandex.Cloud server certificate.
+                          properties:
+                            certSecretRef:
+                              description: |-
+                                A reference to a specific 'key' within a Secret resource.
+                                In some instances, `key` is a required field.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                      required:
+                        - auth
+                      type: object
+                  type: object
+                retrySettings:
+                  description: Used to configure http retries if failed
+                  properties:
+                    maxRetries:
+                      format: int32
+                      type: integer
+                    retryInterval:
+                      type: string
+                  type: object
+              required:
+                - provider
+              type: object
+            status:
+              description: SecretStoreStatus defines the observed state of the SecretStore.
+              properties:
+                conditions:
+                  items:
+                    properties:
+                      lastTransitionTime:
+                        format: date-time
+                        type: string
+                      message:
+                        type: string
+                      reason:
+                        type: string
+                      status:
+                        type: string
+                      type:
+                        type: string
+                    required:
+                      - status
+                      - type
+                    type: object
+                  type: array
+              type: object
+          type: object
+      served: true
+      storage: false
+      subresources:
+        status: {}
+    - additionalPrinterColumns:
+        - jsonPath: .metadata.creationTimestamp
+          name: AGE
+          type: date
+        - jsonPath: .status.conditions[?(@.type=="Ready")].reason
+          name: Status
+          type: string
+        - jsonPath: .status.capabilities
+          name: Capabilities
+          type: string
+        - jsonPath: .status.conditions[?(@.type=="Ready")].status
+          name: Ready
+          type: string
+      name: v1beta1
+      schema:
+        openAPIV3Schema:
+          description: SecretStore represents a secure external location for storing secrets, which can be referenced as part of `storeRef` fields.
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: SecretStoreSpec defines the desired state of SecretStore.
+              properties:
+                conditions:
+                  description: Used to constraint a ClusterSecretStore to specific namespaces. Relevant only to ClusterSecretStore
+                  items:
+                    description: |-
+                      ClusterSecretStoreCondition describes a condition by which to choose namespaces to process ExternalSecrets in
+                      for a ClusterSecretStore instance.
+                    properties:
+                      namespaceRegexes:
+                        description: Choose namespaces by using regex matching
+                        items:
+                          type: string
+                        type: array
+                      namespaceSelector:
+                        description: Choose namespace using a labelSelector
+                        properties:
+                          matchExpressions:
+                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                            items:
+                              description: |-
+                                A label selector requirement is a selector that contains values, a key, and an operator that
+                                relates the key and values.
+                              properties:
+                                key:
+                                  description: key is the label key that the selector applies to.
+                                  type: string
+                                operator:
+                                  description: |-
+                                    operator represents a key's relationship to a set of values.
+                                    Valid operators are In, NotIn, Exists and DoesNotExist.
+                                  type: string
+                                values:
+                                  description: |-
+                                    values is an array of string values. If the operator is In or NotIn,
+                                    the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                    the values array must be empty. This array is replaced during a strategic
+                                    merge patch.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              required:
+                                - key
+                                - operator
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          matchLabels:
+                            additionalProperties:
+                              type: string
+                            description: |-
+                              matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                              map is equivalent to an element of matchExpressions, whose key field is "key", the
+                              operator is "In", and the values array contains only "value". The requirements are ANDed.
+                            type: object
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      namespaces:
+                        description: Choose namespaces by name
+                        items:
+                          maxLength: 63
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                          type: string
+                        type: array
+                    type: object
+                  type: array
+                controller:
+                  description: |-
+                    Used to select the correct ESO controller (think: ingress.ingressClassName)
+                    The ESO controller is instantiated with a specific controller name and filters ES based on this property
+                  type: string
+                provider:
+                  description: Used to configure the provider. Only one provider may be set
+                  maxProperties: 1
+                  minProperties: 1
+                  properties:
+                    akeyless:
+                      description: Akeyless configures this store to sync secrets using Akeyless Vault provider
+                      properties:
+                        akeylessGWApiURL:
+                          description: Akeyless GW API Url from which the secrets to be fetched from.
+                          type: string
+                        authSecretRef:
+                          description: Auth configures how the operator authenticates with Akeyless.
+                          properties:
+                            kubernetesAuth:
+                              description: |-
+                                Kubernetes authenticates with Akeyless by passing the ServiceAccount
+                                token stored in the named Secret resource.
+                              properties:
+                                accessID:
+                                  description: the Akeyless Kubernetes auth-method access-id
+                                  type: string
+                                k8sConfName:
+                                  description: Kubernetes-auth configuration name in Akeyless-Gateway
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Optional secret field containing a Kubernetes ServiceAccount JWT used
+                                    for authenticating with Akeyless. If a name is specified without a key,
+                                    `token` is the default. If one is not specified, the one bound to
+                                    the controller will be used.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                serviceAccountRef:
+                                  description: |-
+                                    Optional service account field containing the name of a kubernetes ServiceAccount.
+                                    If the service account is specified, the service account secret token JWT will be used
+                                    for authenticating with Akeyless. If the service account selector is not supplied,
+                                    the secretRef will be used instead.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              required:
+                                - accessID
+                                - k8sConfName
+                              type: object
+                            secretRef:
+                              description: |-
+                                Reference to a Secret that contains the details
+                                to authenticate with Akeyless.
+                              properties:
+                                accessID:
+                                  description: The SecretAccessID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                accessType:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                accessTypeParam:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        caBundle:
+                          description: |-
+                            PEM/base64 encoded CA bundle used to validate Akeyless Gateway certificate. Only used
+                            if the AkeylessGWApiURL URL is using HTTPS protocol. If not set the system root certificates
+                            are used to validate the TLS connection.
+                          format: byte
+                          type: string
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate Akeyless Gateway certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace the Provider type is in.
+                                Can only be defined when used in a ClusterSecretStore.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                      required:
+                        - akeylessGWApiURL
+                        - authSecretRef
+                      type: object
+                    alibaba:
+                      description: Alibaba configures this store to sync secrets using Alibaba Cloud provider
+                      properties:
+                        auth:
+                          description: AlibabaAuth contains a secretRef for credentials.
+                          properties:
+                            rrsa:
+                              description: Authenticate against Alibaba using RRSA.
+                              properties:
+                                oidcProviderArn:
+                                  type: string
+                                oidcTokenFilePath:
+                                  type: string
+                                roleArn:
+                                  type: string
+                                sessionName:
+                                  type: string
+                              required:
+                                - oidcProviderArn
+                                - oidcTokenFilePath
+                                - roleArn
+                                - sessionName
+                              type: object
+                            secretRef:
+                              description: AlibabaAuthSecretRef holds secret references for Alibaba credentials.
+                              properties:
+                                accessKeyIDSecretRef:
+                                  description: The AccessKeyID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                accessKeySecretSecretRef:
+                                  description: The AccessKeySecret is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - accessKeyIDSecretRef
+                                - accessKeySecretSecretRef
+                              type: object
+                          type: object
+                        regionID:
+                          description: Alibaba Region to be used for the provider
+                          type: string
+                      required:
+                        - auth
+                        - regionID
+                      type: object
+                    aws:
+                      description: AWS configures this store to sync secrets using AWS Secret Manager provider
+                      properties:
+                        additionalRoles:
+                          description: AdditionalRoles is a chained list of Role ARNs which the provider will sequentially assume before assuming the Role
+                          items:
+                            type: string
+                          type: array
+                        auth:
+                          description: |-
+                            Auth defines the information necessary to authenticate against AWS
+                            if not set aws sdk will infer credentials from your environment
+                            see: https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials
+                          properties:
+                            jwt:
+                              description: Authenticate against AWS using service account tokens.
+                              properties:
+                                serviceAccountRef:
+                                  description: A reference to a ServiceAccount resource.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              type: object
+                            secretRef:
+                              description: |-
+                                AWSAuthSecretRef holds secret references for AWS credentials
+                                both AccessKeyID and SecretAccessKey must be defined in order to properly authenticate.
+                              properties:
+                                accessKeyIDSecretRef:
+                                  description: The AccessKeyID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                secretAccessKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                sessionTokenSecretRef:
+                                  description: |-
+                                    The SessionToken used for authentication
+                                    This must be defined if AccessKeyID and SecretAccessKey are temporary credentials
+                                    see: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        externalID:
+                          description: AWS External ID set on assumed IAM roles
+                          type: string
+                        prefix:
+                          description: Prefix adds a prefix to all retrieved values.
+                          type: string
+                        region:
+                          description: AWS Region to be used for the provider
+                          type: string
+                        role:
+                          description: Role is a Role ARN which the provider will assume
+                          type: string
+                        secretsManager:
+                          description: SecretsManager defines how the provider behaves when interacting with AWS SecretsManager
+                          properties:
+                            forceDeleteWithoutRecovery:
+                              description: |-
+                                Specifies whether to delete the secret without any recovery window. You
+                                can't use both this parameter and RecoveryWindowInDays in the same call.
+                                If you don't use either, then by default Secrets Manager uses a 30 day
+                                recovery window.
+                                see: https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_DeleteSecret.html#SecretsManager-DeleteSecret-request-ForceDeleteWithoutRecovery
+                              type: boolean
+                            recoveryWindowInDays:
+                              description: |-
+                                The number of days from 7 to 30 that Secrets Manager waits before
+                                permanently deleting the secret. You can't use both this parameter and
+                                ForceDeleteWithoutRecovery in the same call. If you don't use either,
+                                then by default Secrets Manager uses a 30 day recovery window.
+                                see: https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_DeleteSecret.html#SecretsManager-DeleteSecret-request-RecoveryWindowInDays
+                              format: int64
+                              type: integer
+                          type: object
+                        service:
+                          description: Service defines which service should be used to fetch the secrets
+                          enum:
+                            - SecretsManager
+                            - ParameterStore
+                          type: string
+                        sessionTags:
+                          description: AWS STS assume role session tags
+                          items:
+                            properties:
+                              key:
+                                type: string
+                              value:
+                                type: string
+                            required:
+                              - key
+                              - value
+                            type: object
+                          type: array
+                        transitiveTagKeys:
+                          description: AWS STS assume role transitive session tags. Required when multiple rules are used with the provider
+                          items:
+                            type: string
+                          type: array
+                      required:
+                        - region
+                        - service
+                      type: object
+                    azurekv:
+                      description: AzureKV configures this store to sync secrets using Azure Key Vault provider
+                      properties:
+                        authSecretRef:
+                          description: Auth configures how the operator authenticates with Azure. Required for ServicePrincipal auth type. Optional for WorkloadIdentity.
+                          properties:
+                            clientCertificate:
+                              description: The Azure ClientCertificate of the service principle used for authentication.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            clientId:
+                              description: The Azure clientId of the service principle or managed identity used for authentication.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            clientSecret:
+                              description: The Azure ClientSecret of the service principle used for authentication.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            tenantId:
+                              description: The Azure tenantId of the managed identity used for authentication.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        authType:
+                          default: ServicePrincipal
+                          description: |-
+                            Auth type defines how to authenticate to the keyvault service.
+                            Valid values are:
+                            - "ServicePrincipal" (default): Using a service principal (tenantId, clientId, clientSecret)
+                            - "ManagedIdentity": Using Managed Identity assigned to the pod (see aad-pod-identity)
+                          enum:
+                            - ServicePrincipal
+                            - ManagedIdentity
+                            - WorkloadIdentity
+                          type: string
+                        environmentType:
+                          default: PublicCloud
+                          description: |-
+                            EnvironmentType specifies the Azure cloud environment endpoints to use for
+                            connecting and authenticating with Azure. By default it points to the public cloud AAD endpoint.
+                            The following endpoints are available, also see here: https://github.com/Azure/go-autorest/blob/main/autorest/azure/environments.go#L152
+                            PublicCloud, USGovernmentCloud, ChinaCloud, GermanCloud
+                          enum:
+                            - PublicCloud
+                            - USGovernmentCloud
+                            - ChinaCloud
+                            - GermanCloud
+                          type: string
+                        identityId:
+                          description: If multiple Managed Identity is assigned to the pod, you can select the one to be used
+                          type: string
+                        serviceAccountRef:
+                          description: |-
+                            ServiceAccountRef specified the service account
+                            that should be used when authenticating with WorkloadIdentity.
+                          properties:
+                            audiences:
+                              description: |-
+                                Audience specifies the `aud` claim for the service account token
+                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                then this audiences will be appended to the list
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: The name of the ServiceAccount resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                Namespace of the resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          required:
+                            - name
+                          type: object
+                        tenantId:
+                          description: TenantID configures the Azure Tenant to send requests to. Required for ServicePrincipal auth type. Optional for WorkloadIdentity.
+                          type: string
+                        vaultUrl:
+                          description: Vault Url from which the secrets to be fetched from.
+                          type: string
+                      required:
+                        - vaultUrl
+                      type: object
+                    beyondtrust:
+                      description: Beyondtrust configures this store to sync secrets using Password Safe provider.
+                      properties:
+                        auth:
+                          description: Auth configures how the operator authenticates with Beyondtrust.
+                          properties:
+                            apiKey:
+                              description: APIKey If not provided then ClientID/ClientSecret become required.
+                              properties:
+                                secretRef:
+                                  description: SecretRef references a key in a secret that will be used as value.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                value:
+                                  description: Value can be specified directly to set a value without using a secret.
+                                  type: string
+                              type: object
+                            certificate:
+                              description: Certificate (cert.pem) for use when authenticating with an OAuth client Id using a Client Certificate.
+                              properties:
+                                secretRef:
+                                  description: SecretRef references a key in a secret that will be used as value.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                value:
+                                  description: Value can be specified directly to set a value without using a secret.
+                                  type: string
+                              type: object
+                            certificateKey:
+                              description: Certificate private key (key.pem). For use when authenticating with an OAuth client Id
+                              properties:
+                                secretRef:
+                                  description: SecretRef references a key in a secret that will be used as value.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                value:
+                                  description: Value can be specified directly to set a value without using a secret.
+                                  type: string
+                              type: object
+                            clientId:
+                              description: ClientID is the API OAuth Client ID.
+                              properties:
+                                secretRef:
+                                  description: SecretRef references a key in a secret that will be used as value.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                value:
+                                  description: Value can be specified directly to set a value without using a secret.
+                                  type: string
+                              type: object
+                            clientSecret:
+                              description: ClientSecret is the API OAuth Client Secret.
+                              properties:
+                                secretRef:
+                                  description: SecretRef references a key in a secret that will be used as value.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                value:
+                                  description: Value can be specified directly to set a value without using a secret.
+                                  type: string
+                              type: object
+                          type: object
+                        server:
+                          description: Auth configures how API server works.
+                          properties:
+                            apiUrl:
+                              type: string
+                            clientTimeOutSeconds:
+                              description: Timeout specifies a time limit for requests made by this Client. The timeout includes connection time, any redirects, and reading the response body. Defaults to 45 seconds.
+                              type: integer
+                            retrievalType:
+                              description: The secret retrieval type. SECRET = Secrets Safe (credential, text, file). MANAGED_ACCOUNT = Password Safe account associated with a system.
+                              type: string
+                            separator:
+                              description: A character that separates the folder names.
+                              type: string
+                            verifyCA:
+                              type: boolean
+                          required:
+                            - apiUrl
+                            - verifyCA
+                          type: object
+                      required:
+                        - auth
+                        - server
+                      type: object
+                    bitwardensecretsmanager:
+                      description: BitwardenSecretsManager configures this store to sync secrets using BitwardenSecretsManager provider
+                      properties:
+                        apiURL:
+                          type: string
+                        auth:
+                          description: |-
+                            Auth configures how secret-manager authenticates with a bitwarden machine account instance.
+                            Make sure that the token being used has permissions on the given secret.
+                          properties:
+                            secretRef:
+                              description: BitwardenSecretsManagerSecretRef contains the credential ref to the bitwarden instance.
+                              properties:
+                                credentials:
+                                  description: AccessToken used for the bitwarden instance.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - credentials
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        bitwardenServerSDKURL:
+                          type: string
+                        caBundle:
+                          description: |-
+                            Base64 encoded certificate for the bitwarden server sdk. The sdk MUST run with HTTPS to make sure no MITM attack
+                            can be performed.
+                          type: string
+                        caProvider:
+                          description: 'see: https://external-secrets.io/latest/spec/#external-secrets.io/v1alpha1.CAProvider'
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace the Provider type is in.
+                                Can only be defined when used in a ClusterSecretStore.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                        identityURL:
+                          type: string
+                        organizationID:
+                          description: OrganizationID determines which organization this secret store manages.
+                          type: string
+                        projectID:
+                          description: ProjectID determines which project this secret store manages.
+                          type: string
+                      required:
+                        - auth
+                        - organizationID
+                        - projectID
+                      type: object
+                    chef:
+                      description: Chef configures this store to sync secrets with chef server
+                      properties:
+                        auth:
+                          description: Auth defines the information necessary to authenticate against chef Server
+                          properties:
+                            secretRef:
+                              description: ChefAuthSecretRef holds secret references for chef server login credentials.
+                              properties:
+                                privateKeySecretRef:
+                                  description: SecretKey is the Signing Key in PEM format, used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - privateKeySecretRef
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        serverUrl:
+                          description: ServerURL is the chef server URL used to connect to. If using orgs you should include your org in the url and terminate the url with a "/"
+                          type: string
+                        username:
+                          description: UserName should be the user ID on the chef server
+                          type: string
+                      required:
+                        - auth
+                        - serverUrl
+                        - username
+                      type: object
+                    conjur:
+                      description: Conjur configures this store to sync secrets using conjur provider
+                      properties:
+                        auth:
+                          properties:
+                            apikey:
+                              properties:
+                                account:
+                                  type: string
+                                apiKeyRef:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                userRef:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - account
+                                - apiKeyRef
+                                - userRef
+                              type: object
+                            jwt:
+                              properties:
+                                account:
+                                  type: string
+                                hostId:
+                                  description: |-
+                                    Optional HostID for JWT authentication. This may be used depending
+                                    on how the Conjur JWT authenticator policy is configured.
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Optional SecretRef that refers to a key in a Secret resource containing JWT token to
+                                    authenticate with Conjur using the JWT authentication method.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                serviceAccountRef:
+                                  description: |-
+                                    Optional ServiceAccountRef specifies the Kubernetes service account for which to request
+                                    a token for with the `TokenRequest` API.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                                serviceID:
+                                  description: The conjur authn jwt webservice id
+                                  type: string
+                              required:
+                                - account
+                                - serviceID
+                              type: object
+                          type: object
+                        caBundle:
+                          type: string
+                        caProvider:
+                          description: |-
+                            Used to provide custom certificate authority (CA) certificates
+                            for a secret store. The CAProvider points to a Secret or ConfigMap resource
+                            that contains a PEM-encoded certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace the Provider type is in.
+                                Can only be defined when used in a ClusterSecretStore.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                        url:
+                          type: string
+                      required:
+                        - auth
+                        - url
+                      type: object
+                    delinea:
+                      description: |-
+                        Delinea DevOps Secrets Vault
+                        https://docs.delinea.com/online-help/products/devops-secrets-vault/current
+                      properties:
+                        clientId:
+                          description: ClientID is the non-secret part of the credential.
+                          properties:
+                            secretRef:
+                              description: SecretRef references a key in a secret that will be used as value.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            value:
+                              description: Value can be specified directly to set a value without using a secret.
+                              type: string
+                          type: object
+                        clientSecret:
+                          description: ClientSecret is the secret part of the credential.
+                          properties:
+                            secretRef:
+                              description: SecretRef references a key in a secret that will be used as value.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            value:
+                              description: Value can be specified directly to set a value without using a secret.
+                              type: string
+                          type: object
+                        tenant:
+                          description: Tenant is the chosen hostname / site name.
+                          type: string
+                        tld:
+                          description: |-
+                            TLD is based on the server location that was chosen during provisioning.
+                            If unset, defaults to "com".
+                          type: string
+                        urlTemplate:
+                          description: |-
+                            URLTemplate
+                            If unset, defaults to "https://%s.secretsvaultcloud.%s/v1/%s%s".
+                          type: string
+                      required:
+                        - clientId
+                        - clientSecret
+                        - tenant
+                      type: object
+                    device42:
+                      description: Device42 configures this store to sync secrets using the Device42 provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with a Device42 instance.
+                          properties:
+                            secretRef:
+                              properties:
+                                credentials:
+                                  description: Username / Password is used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        host:
+                          description: URL configures the Device42 instance URL.
+                          type: string
+                      required:
+                        - auth
+                        - host
+                      type: object
+                    doppler:
+                      description: Doppler configures this store to sync secrets using the Doppler provider
+                      properties:
+                        auth:
+                          description: Auth configures how the Operator authenticates with the Doppler API
+                          properties:
+                            secretRef:
+                              properties:
+                                dopplerToken:
+                                  description: |-
+                                    The DopplerToken is used for authentication.
+                                    See https://docs.doppler.com/reference/api#authentication for auth token types.
+                                    The Key attribute defaults to dopplerToken if not specified.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - dopplerToken
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        config:
+                          description: Doppler config (required if not using a Service Token)
+                          type: string
+                        format:
+                          description: Format enables the downloading of secrets as a file (string)
+                          enum:
+                            - json
+                            - dotnet-json
+                            - env
+                            - yaml
+                            - docker
+                          type: string
+                        nameTransformer:
+                          description: Environment variable compatible name transforms that change secret names to a different format
+                          enum:
+                            - upper-camel
+                            - camel
+                            - lower-snake
+                            - tf-var
+                            - dotnet-env
+                            - lower-kebab
+                          type: string
+                        project:
+                          description: Doppler project (required if not using a Service Token)
+                          type: string
+                      required:
+                        - auth
+                      type: object
+                    fake:
+                      description: Fake configures a store with static key/value pairs
+                      properties:
+                        data:
+                          items:
+                            properties:
+                              key:
+                                type: string
+                              value:
+                                type: string
+                              valueMap:
+                                additionalProperties:
+                                  type: string
+                                description: 'Deprecated: ValueMap is deprecated and is intended to be removed in the future, use the `value` field instead.'
+                                type: object
+                              version:
+                                type: string
+                            required:
+                              - key
+                            type: object
+                          type: array
+                      required:
+                        - data
+                      type: object
+                    fortanix:
+                      description: Fortanix configures this store to sync secrets using the Fortanix provider
+                      properties:
+                        apiKey:
+                          description: APIKey is the API token to access SDKMS Applications.
+                          properties:
+                            secretRef:
+                              description: SecretRef is a reference to a secret containing the SDKMS API Key.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        apiUrl:
+                          description: APIURL is the URL of SDKMS API. Defaults to `sdkms.fortanix.com`.
+                          type: string
+                      type: object
+                    gcpsm:
+                      description: GCPSM configures this store to sync secrets using Google Cloud Platform Secret Manager provider
+                      properties:
+                        auth:
+                          description: Auth defines the information necessary to authenticate against GCP
+                          properties:
+                            secretRef:
+                              properties:
+                                secretAccessKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            workloadIdentity:
+                              properties:
+                                clusterLocation:
+                                  type: string
+                                clusterName:
+                                  type: string
+                                clusterProjectID:
+                                  type: string
+                                serviceAccountRef:
+                                  description: A reference to a ServiceAccount resource.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              required:
+                                - clusterLocation
+                                - clusterName
+                                - serviceAccountRef
+                              type: object
+                          type: object
+                        location:
+                          description: Location optionally defines a location for a secret
+                          type: string
+                        projectID:
+                          description: ProjectID project where secret is located
+                          type: string
+                      type: object
+                    gitlab:
+                      description: GitLab configures this store to sync secrets using GitLab Variables provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with a GitLab instance.
+                          properties:
+                            SecretRef:
+                              properties:
+                                accessToken:
+                                  description: AccessToken is used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          required:
+                            - SecretRef
+                          type: object
+                        environment:
+                          description: Environment environment_scope of gitlab CI/CD variables (Please see https://docs.gitlab.com/ee/ci/environments/#create-a-static-environment on how to create environments)
+                          type: string
+                        groupIDs:
+                          description: GroupIDs specify, which gitlab groups to pull secrets from. Group secrets are read from left to right followed by the project variables.
+                          items:
+                            type: string
+                          type: array
+                        inheritFromGroups:
+                          description: InheritFromGroups specifies whether parent groups should be discovered and checked for secrets.
+                          type: boolean
+                        projectID:
+                          description: ProjectID specifies a project where secrets are located.
+                          type: string
+                        url:
+                          description: URL configures the GitLab instance URL. Defaults to https://gitlab.com/.
+                          type: string
+                      required:
+                        - auth
+                      type: object
+                    ibm:
+                      description: IBM configures this store to sync secrets using IBM Cloud provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with the IBM secrets manager.
+                          maxProperties: 1
+                          minProperties: 1
+                          properties:
+                            containerAuth:
+                              description: IBM Container-based auth with IAM Trusted Profile.
+                              properties:
+                                iamEndpoint:
+                                  type: string
+                                profile:
+                                  description: the IBM Trusted Profile
+                                  type: string
+                                tokenLocation:
+                                  description: Location the token is mounted on the pod
+                                  type: string
+                              required:
+                                - profile
+                              type: object
+                            secretRef:
+                              properties:
+                                secretApiKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        serviceUrl:
+                          description: ServiceURL is the Endpoint URL that is specific to the Secrets Manager service instance
+                          type: string
+                      required:
+                        - auth
+                      type: object
+                    infisical:
+                      description: Infisical configures this store to sync secrets using the Infisical provider
+                      properties:
+                        auth:
+                          description: Auth configures how the Operator authenticates with the Infisical API
+                          properties:
+                            universalAuthCredentials:
+                              properties:
+                                clientId:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                clientSecret:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - clientId
+                                - clientSecret
+                              type: object
+                          type: object
+                        hostAPI:
+                          default: https://app.infisical.com/api
+                          type: string
+                        secretsScope:
+                          properties:
+                            environmentSlug:
+                              type: string
+                            projectSlug:
+                              type: string
+                            recursive:
+                              default: false
+                              type: boolean
+                            secretsPath:
+                              default: /
+                              type: string
+                          required:
+                            - environmentSlug
+                            - projectSlug
+                          type: object
+                      required:
+                        - auth
+                        - secretsScope
+                      type: object
+                    keepersecurity:
+                      description: KeeperSecurity configures this store to sync secrets using the KeeperSecurity provider
+                      properties:
+                        authRef:
+                          description: |-
+                            A reference to a specific 'key' within a Secret resource.
+                            In some instances, `key` is a required field.
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                        folderID:
+                          type: string
+                      required:
+                        - authRef
+                        - folderID
+                      type: object
+                    kubernetes:
+                      description: Kubernetes configures this store to sync secrets using a Kubernetes cluster provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with a Kubernetes instance.
+                          maxProperties: 1
+                          minProperties: 1
+                          properties:
+                            cert:
+                              description: has both clientCert and clientKey as secretKeySelector
+                              properties:
+                                clientCert:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                clientKey:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            serviceAccount:
+                              description: points to a service account that should be used for authentication
+                              properties:
+                                audiences:
+                                  description: |-
+                                    Audience specifies the `aud` claim for the service account token
+                                    If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                    then this audiences will be appended to the list
+                                  items:
+                                    type: string
+                                  type: array
+                                name:
+                                  description: The name of the ServiceAccount resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    Namespace of the resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              required:
+                                - name
+                              type: object
+                            token:
+                              description: use static token to authenticate with
+                              properties:
+                                bearerToken:
+                                  description: |-
+                                    A reference to a specific 'key' within a Secret resource.
+                                    In some instances, `key` is a required field.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        authRef:
+                          description: A reference to a secret that contains the auth information.
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                        remoteNamespace:
+                          default: default
+                          description: Remote namespace to fetch the secrets from
+                          maxLength: 63
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                          type: string
+                        server:
+                          description: configures the Kubernetes server Address.
+                          properties:
+                            caBundle:
+                              description: CABundle is a base64-encoded CA certificate
+                              format: byte
+                              type: string
+                            caProvider:
+                              description: 'see: https://external-secrets.io/v0.4.1/spec/#external-secrets.io/v1alpha1.CAProvider'
+                              properties:
+                                key:
+                                  description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the object located at the provider type.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace the Provider type is in.
+                                    Can only be defined when used in a ClusterSecretStore.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                                type:
+                                  description: The type of provider to use such as "Secret", or "ConfigMap".
+                                  enum:
+                                    - Secret
+                                    - ConfigMap
+                                  type: string
+                              required:
+                                - name
+                                - type
+                              type: object
+                            url:
+                              default: kubernetes.default
+                              description: configures the Kubernetes server Address.
+                              type: string
+                          type: object
+                      type: object
+                    onboardbase:
+                      description: Onboardbase configures this store to sync secrets using the Onboardbase provider
+                      properties:
+                        apiHost:
+                          default: https://public.onboardbase.com/api/v1/
+                          description: APIHost use this to configure the host url for the API for selfhosted installation, default is https://public.onboardbase.com/api/v1/
+                          type: string
+                        auth:
+                          description: Auth configures how the Operator authenticates with the Onboardbase API
+                          properties:
+                            apiKeyRef:
+                              description: |-
+                                OnboardbaseAPIKey is the APIKey generated by an admin account.
+                                It is used to recognize and authorize access to a project and environment within onboardbase
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            passcodeRef:
+                              description: OnboardbasePasscode is the passcode attached to the API Key
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          required:
+                            - apiKeyRef
+                            - passcodeRef
+                          type: object
+                        environment:
+                          default: development
+                          description: Environment is the name of an environmnent within a project to pull the secrets from
+                          type: string
+                        project:
+                          default: development
+                          description: Project is an onboardbase project that the secrets should be pulled from
+                          type: string
+                      required:
+                        - apiHost
+                        - auth
+                        - environment
+                        - project
+                      type: object
+                    onepassword:
+                      description: OnePassword configures this store to sync secrets using the 1Password Cloud provider
+                      properties:
+                        auth:
+                          description: Auth defines the information necessary to authenticate against OnePassword Connect Server
+                          properties:
+                            secretRef:
+                              description: OnePasswordAuthSecretRef holds secret references for 1Password credentials.
+                              properties:
+                                connectTokenSecretRef:
+                                  description: The ConnectToken is used for authentication to a 1Password Connect Server.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - connectTokenSecretRef
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        connectHost:
+                          description: ConnectHost defines the OnePassword Connect Server to connect to
+                          type: string
+                        vaults:
+                          additionalProperties:
+                            type: integer
+                          description: Vaults defines which OnePassword vaults to search in which order
+                          type: object
+                      required:
+                        - auth
+                        - connectHost
+                        - vaults
+                      type: object
+                    oracle:
+                      description: Oracle configures this store to sync secrets using Oracle Vault provider
+                      properties:
+                        auth:
+                          description: |-
+                            Auth configures how secret-manager authenticates with the Oracle Vault.
+                            If empty, use the instance principal, otherwise the user credentials specified in Auth.
+                          properties:
+                            secretRef:
+                              description: SecretRef to pass through sensitive information.
+                              properties:
+                                fingerprint:
+                                  description: Fingerprint is the fingerprint of the API private key.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                privatekey:
+                                  description: PrivateKey is the user's API Signing Key in PEM format, used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - fingerprint
+                                - privatekey
+                              type: object
+                            tenancy:
+                              description: Tenancy is the tenancy OCID where user is located.
+                              type: string
+                            user:
+                              description: User is an access OCID specific to the account.
+                              type: string
+                          required:
+                            - secretRef
+                            - tenancy
+                            - user
+                          type: object
+                        compartment:
+                          description: |-
+                            Compartment is the vault compartment OCID.
+                            Required for PushSecret
+                          type: string
+                        encryptionKey:
+                          description: |-
+                            EncryptionKey is the OCID of the encryption key within the vault.
+                            Required for PushSecret
+                          type: string
+                        principalType:
+                          description: |-
+                            The type of principal to use for authentication. If left blank, the Auth struct will
+                            determine the principal type. This optional field must be specified if using
+                            workload identity.
+                          enum:
+                            - ""
+                            - UserPrincipal
+                            - InstancePrincipal
+                            - Workload
+                          type: string
+                        region:
+                          description: Region is the region where vault is located.
+                          type: string
+                        serviceAccountRef:
+                          description: |-
+                            ServiceAccountRef specified the service account
+                            that should be used when authenticating with WorkloadIdentity.
+                          properties:
+                            audiences:
+                              description: |-
+                                Audience specifies the `aud` claim for the service account token
+                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                then this audiences will be appended to the list
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: The name of the ServiceAccount resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                Namespace of the resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          required:
+                            - name
+                          type: object
+                        vault:
+                          description: Vault is the vault's OCID of the specific vault where secret is located.
+                          type: string
+                      required:
+                        - region
+                        - vault
+                      type: object
+                    passbolt:
+                      properties:
+                        auth:
+                          description: Auth defines the information necessary to authenticate against Passbolt Server
+                          properties:
+                            passwordSecretRef:
+                              description: |-
+                                A reference to a specific 'key' within a Secret resource.
+                                In some instances, `key` is a required field.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            privateKeySecretRef:
+                              description: |-
+                                A reference to a specific 'key' within a Secret resource.
+                                In some instances, `key` is a required field.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          required:
+                            - passwordSecretRef
+                            - privateKeySecretRef
+                          type: object
+                        host:
+                          description: Host defines the Passbolt Server to connect to
+                          type: string
+                      required:
+                        - auth
+                        - host
+                      type: object
+                    passworddepot:
+                      description: Configures a store to sync secrets with a Password Depot instance.
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with a Password Depot instance.
+                          properties:
+                            secretRef:
+                              properties:
+                                credentials:
+                                  description: Username / Password is used for authentication.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                          required:
+                            - secretRef
+                          type: object
+                        database:
+                          description: Database to use as source
+                          type: string
+                        host:
+                          description: URL configures the Password Depot instance URL.
+                          type: string
+                      required:
+                        - auth
+                        - database
+                        - host
+                      type: object
+                    previder:
+                      description: Previder configures this store to sync secrets using the Previder provider
+                      properties:
+                        auth:
+                          description: PreviderAuth contains a secretRef for credentials.
+                          properties:
+                            secretRef:
+                              description: PreviderAuthSecretRef holds secret references for Previder Vault credentials.
+                              properties:
+                                accessToken:
+                                  description: The AccessToken is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - accessToken
+                              type: object
+                          type: object
+                        baseUri:
+                          type: string
+                      required:
+                        - auth
+                      type: object
+                    pulumi:
+                      description: Pulumi configures this store to sync secrets using the Pulumi provider
+                      properties:
+                        accessToken:
+                          description: AccessToken is the access tokens to sign in to the Pulumi Cloud Console.
+                          properties:
+                            secretRef:
+                              description: SecretRef is a reference to a secret containing the Pulumi API token.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        apiUrl:
+                          default: https://api.pulumi.com/api/esc
+                          description: APIURL is the URL of the Pulumi API.
+                          type: string
+                        environment:
+                          description: |-
+                            Environment are YAML documents composed of static key-value pairs, programmatic expressions,
+                            dynamically retrieved values from supported providers including all major clouds,
+                            and other Pulumi ESC environments.
+                            To create a new environment, visit https://www.pulumi.com/docs/esc/environments/ for more information.
+                          type: string
+                        organization:
+                          description: |-
+                            Organization are a space to collaborate on shared projects and stacks.
+                            To create a new organization, visit https://app.pulumi.com/ and click "New Organization".
+                          type: string
+                        project:
+                          description: Project is the name of the Pulumi ESC project the environment belongs to.
+                          type: string
+                      required:
+                        - accessToken
+                        - environment
+                        - organization
+                        - project
+                      type: object
+                    scaleway:
+                      description: Scaleway
+                      properties:
+                        accessKey:
+                          description: AccessKey is the non-secret part of the api key.
+                          properties:
+                            secretRef:
+                              description: SecretRef references a key in a secret that will be used as value.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            value:
+                              description: Value can be specified directly to set a value without using a secret.
+                              type: string
+                          type: object
+                        apiUrl:
+                          description: APIURL is the url of the api to use. Defaults to https://api.scaleway.com
+                          type: string
+                        projectId:
+                          description: 'ProjectID is the id of your project, which you can find in the console: https://console.scaleway.com/project/settings'
+                          type: string
+                        region:
+                          description: 'Region where your secrets are located: https://developers.scaleway.com/en/quickstart/#region-and-zone'
+                          type: string
+                        secretKey:
+                          description: SecretKey is the non-secret part of the api key.
+                          properties:
+                            secretRef:
+                              description: SecretRef references a key in a secret that will be used as value.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            value:
+                              description: Value can be specified directly to set a value without using a secret.
+                              type: string
+                          type: object
+                      required:
+                        - accessKey
+                        - projectId
+                        - region
+                        - secretKey
+                      type: object
+                    secretserver:
+                      description: |-
+                        SecretServer configures this store to sync secrets using SecretServer provider
+                        https://docs.delinea.com/online-help/secret-server/start.htm
+                      properties:
+                        password:
+                          description: Password is the secret server account password.
+                          properties:
+                            secretRef:
+                              description: SecretRef references a key in a secret that will be used as value.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            value:
+                              description: Value can be specified directly to set a value without using a secret.
+                              type: string
+                          type: object
+                        serverURL:
+                          description: |-
+                            ServerURL
+                            URL to your secret server installation
+                          type: string
+                        username:
+                          description: Username is the secret server account username.
+                          properties:
+                            secretRef:
+                              description: SecretRef references a key in a secret that will be used as value.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            value:
+                              description: Value can be specified directly to set a value without using a secret.
+                              type: string
+                          type: object
+                      required:
+                        - password
+                        - serverURL
+                        - username
+                      type: object
+                    senhasegura:
+                      description: Senhasegura configures this store to sync secrets using senhasegura provider
+                      properties:
+                        auth:
+                          description: Auth defines parameters to authenticate in senhasegura
+                          properties:
+                            clientId:
+                              type: string
+                            clientSecretSecretRef:
+                              description: |-
+                                A reference to a specific 'key' within a Secret resource.
+                                In some instances, `key` is a required field.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          required:
+                            - clientId
+                            - clientSecretSecretRef
+                          type: object
+                        ignoreSslCertificate:
+                          default: false
+                          description: IgnoreSslCertificate defines if SSL certificate must be ignored
+                          type: boolean
+                        module:
+                          description: Module defines which senhasegura module should be used to get secrets
+                          type: string
+                        url:
+                          description: URL of senhasegura
+                          type: string
+                      required:
+                        - auth
+                        - module
+                        - url
+                      type: object
+                    vault:
+                      description: Vault configures this store to sync secrets using Hashi provider
+                      properties:
+                        auth:
+                          description: Auth configures how secret-manager authenticates with the Vault server.
+                          properties:
+                            appRole:
+                              description: |-
+                                AppRole authenticates with Vault using the App Role auth mechanism,
+                                with the role and secret stored in a Kubernetes Secret resource.
+                              properties:
+                                path:
+                                  default: approle
+                                  description: |-
+                                    Path where the App Role authentication backend is mounted
+                                    in Vault, e.g: "approle"
+                                  type: string
+                                roleId:
+                                  description: |-
+                                    RoleID configured in the App Role authentication backend when setting
+                                    up the authentication backend in Vault.
+                                  type: string
+                                roleRef:
+                                  description: |-
+                                    Reference to a key in a Secret that contains the App Role ID used
+                                    to authenticate with Vault.
+                                    The `key` field must be specified and denotes which entry within the Secret
+                                    resource is used as the app role id.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                secretRef:
+                                  description: |-
+                                    Reference to a key in a Secret that contains the App Role secret used
+                                    to authenticate with Vault.
+                                    The `key` field must be specified and denotes which entry within the Secret
+                                    resource is used as the app role secret.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - path
+                                - secretRef
+                              type: object
+                            cert:
+                              description: |-
+                                Cert authenticates with TLS Certificates by passing client certificate, private key and ca certificate
+                                Cert authentication method
+                              properties:
+                                clientCert:
+                                  description: |-
+                                    ClientCert is a certificate to authenticate using the Cert Vault
+                                    authentication method
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                secretRef:
+                                  description: |-
+                                    SecretRef to a key in a Secret resource containing client private key to
+                                    authenticate with Vault using the Cert authentication method
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            iam:
+                              description: |-
+                                Iam authenticates with vault by passing a special AWS request signed with AWS IAM credentials
+                                AWS IAM authentication method
+                              properties:
+                                externalID:
+                                  description: AWS External ID set on assumed IAM roles
+                                  type: string
+                                jwt:
+                                  description: Specify a service account with IRSA enabled
+                                  properties:
+                                    serviceAccountRef:
+                                      description: A reference to a ServiceAccount resource.
+                                      properties:
+                                        audiences:
+                                          description: |-
+                                            Audience specifies the `aud` claim for the service account token
+                                            If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                            then this audiences will be appended to the list
+                                          items:
+                                            type: string
+                                          type: array
+                                        name:
+                                          description: The name of the ServiceAccount resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            Namespace of the resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      required:
+                                        - name
+                                      type: object
+                                  type: object
+                                path:
+                                  description: 'Path where the AWS auth method is enabled in Vault, e.g: "aws"'
+                                  type: string
+                                region:
+                                  description: AWS region
+                                  type: string
+                                role:
+                                  description: This is the AWS role to be assumed before talking to vault
+                                  type: string
+                                secretRef:
+                                  description: Specify credentials in a Secret object
+                                  properties:
+                                    accessKeyIDSecretRef:
+                                      description: The AccessKeyID is used for authentication
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                    secretAccessKeySecretRef:
+                                      description: The SecretAccessKey is used for authentication
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                    sessionTokenSecretRef:
+                                      description: |-
+                                        The SessionToken used for authentication
+                                        This must be defined if AccessKeyID and SecretAccessKey are temporary credentials
+                                        see: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html
+                                      properties:
+                                        key:
+                                          description: |-
+                                            A key in the referenced Secret.
+                                            Some instances of this field may be defaulted, in others it may be required.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[-._a-zA-Z0-9]+$
+                                          type: string
+                                        name:
+                                          description: The name of the Secret resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            The namespace of the Secret resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      type: object
+                                  type: object
+                                vaultAwsIamServerID:
+                                  description: 'X-Vault-AWS-IAM-Server-ID is an additional header used by Vault IAM auth method to mitigate against different types of replay attacks. More details here: https://developer.hashicorp.com/vault/docs/auth/aws'
+                                  type: string
+                                vaultRole:
+                                  description: Vault Role. In vault, a role describes an identity with a set of permissions, groups, or policies you want to attach a user of the secrets engine
+                                  type: string
+                              required:
+                                - vaultRole
+                              type: object
+                            jwt:
+                              description: |-
+                                Jwt authenticates with Vault by passing role and JWT token using the
+                                JWT/OIDC authentication method
+                              properties:
+                                kubernetesServiceAccountToken:
+                                  description: |-
+                                    Optional ServiceAccountToken specifies the Kubernetes service account for which to request
+                                    a token for with the `TokenRequest` API.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Optional audiences field that will be used to request a temporary Kubernetes service
+                                        account token for the service account referenced by `serviceAccountRef`.
+                                        Defaults to a single audience `vault` it not specified.
+                                        Deprecated: use serviceAccountRef.Audiences instead
+                                      items:
+                                        type: string
+                                      type: array
+                                    expirationSeconds:
+                                      description: |-
+                                        Optional expiration time in seconds that will be used to request a temporary
+                                        Kubernetes service account token for the service account referenced by
+                                        `serviceAccountRef`.
+                                        Deprecated: this will be removed in the future.
+                                        Defaults to 10 minutes.
+                                      format: int64
+                                      type: integer
+                                    serviceAccountRef:
+                                      description: Service account field containing the name of a kubernetes ServiceAccount.
+                                      properties:
+                                        audiences:
+                                          description: |-
+                                            Audience specifies the `aud` claim for the service account token
+                                            If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                            then this audiences will be appended to the list
+                                          items:
+                                            type: string
+                                          type: array
+                                        name:
+                                          description: The name of the ServiceAccount resource being referred to.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        namespace:
+                                          description: |-
+                                            Namespace of the resource being referred to.
+                                            Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                          type: string
+                                      required:
+                                        - name
+                                      type: object
+                                  required:
+                                    - serviceAccountRef
+                                  type: object
+                                path:
+                                  default: jwt
+                                  description: |-
+                                    Path where the JWT authentication backend is mounted
+                                    in Vault, e.g: "jwt"
+                                  type: string
+                                role:
+                                  description: |-
+                                    Role is a JWT role to authenticate using the JWT/OIDC Vault
+                                    authentication method
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Optional SecretRef that refers to a key in a Secret resource containing JWT token to
+                                    authenticate with Vault using the JWT/OIDC authentication method.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              required:
+                                - path
+                              type: object
+                            kubernetes:
+                              description: |-
+                                Kubernetes authenticates with Vault by passing the ServiceAccount
+                                token stored in the named Secret resource to the Vault server.
+                              properties:
+                                mountPath:
+                                  default: kubernetes
+                                  description: |-
+                                    Path where the Kubernetes authentication backend is mounted in Vault, e.g:
+                                    "kubernetes"
+                                  type: string
+                                role:
+                                  description: |-
+                                    A required field containing the Vault Role to assume. A Role binds a
+                                    Kubernetes ServiceAccount with a set of Vault policies.
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    Optional secret field containing a Kubernetes ServiceAccount JWT used
+                                    for authenticating with Vault. If a name is specified without a key,
+                                    `token` is the default. If one is not specified, the one bound to
+                                    the controller will be used.
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                serviceAccountRef:
+                                  description: |-
+                                    Optional service account field containing the name of a kubernetes ServiceAccount.
+                                    If the service account is specified, the service account secret token JWT will be used
+                                    for authenticating with Vault. If the service account selector is not supplied,
+                                    the secretRef will be used instead.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              required:
+                                - mountPath
+                                - role
+                              type: object
+                            ldap:
+                              description: |-
+                                Ldap authenticates with Vault by passing username/password pair using
+                                the LDAP authentication method
+                              properties:
+                                path:
+                                  default: ldap
+                                  description: |-
+                                    Path where the LDAP authentication backend is mounted
+                                    in Vault, e.g: "ldap"
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    SecretRef to a key in a Secret resource containing password for the LDAP
+                                    user used to authenticate with Vault using the LDAP authentication
+                                    method
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                username:
+                                  description: |-
+                                    Username is a LDAP user name used to authenticate using the LDAP Vault
+                                    authentication method
+                                  type: string
+                              required:
+                                - path
+                                - username
+                              type: object
+                            namespace:
+                              description: |-
+                                Name of the vault namespace to authenticate to. This can be different than the namespace your secret is in.
+                                Namespaces is a set of features within Vault Enterprise that allows
+                                Vault environments to support Secure Multi-tenancy. e.g: "ns1".
+                                More about namespaces can be found here https://www.vaultproject.io/docs/enterprise/namespaces
+                                This will default to Vault.Namespace field if set, or empty otherwise
+                              type: string
+                            tokenSecretRef:
+                              description: TokenSecretRef authenticates with Vault by presenting a token.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            userPass:
+                              description: UserPass authenticates with Vault by passing username/password pair
+                              properties:
+                                path:
+                                  default: user
+                                  description: |-
+                                    Path where the UserPassword authentication backend is mounted
+                                    in Vault, e.g: "user"
+                                  type: string
+                                secretRef:
+                                  description: |-
+                                    SecretRef to a key in a Secret resource containing password for the
+                                    user used to authenticate with Vault using the UserPass authentication
+                                    method
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                username:
+                                  description: |-
+                                    Username is a user name used to authenticate using the UserPass Vault
+                                    authentication method
+                                  type: string
+                              required:
+                                - path
+                                - username
+                              type: object
+                          type: object
+                        caBundle:
+                          description: |-
+                            PEM encoded CA bundle used to validate Vault server certificate. Only used
+                            if the Server URL is using HTTPS protocol. This parameter is ignored for
+                            plain HTTP protocol connection. If not set the system root certificates
+                            are used to validate the TLS connection.
+                          format: byte
+                          type: string
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate Vault server certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace the Provider type is in.
+                                Can only be defined when used in a ClusterSecretStore.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                        forwardInconsistent:
+                          description: |-
+                            ForwardInconsistent tells Vault to forward read-after-write requests to the Vault
+                            leader instead of simply retrying within a loop. This can increase performance if
+                            the option is enabled serverside.
+                            https://www.vaultproject.io/docs/configuration/replication#allow_forwarding_via_header
+                          type: boolean
+                        headers:
+                          additionalProperties:
+                            type: string
+                          description: Headers to be added in Vault request
+                          type: object
+                        namespace:
+                          description: |-
+                            Name of the vault namespace. Namespaces is a set of features within Vault Enterprise that allows
+                            Vault environments to support Secure Multi-tenancy. e.g: "ns1".
+                            More about namespaces can be found here https://www.vaultproject.io/docs/enterprise/namespaces
+                          type: string
+                        path:
+                          description: |-
+                            Path is the mount path of the Vault KV backend endpoint, e.g:
+                            "secret". The v2 KV secret engine version specific "/data" path suffix
+                            for fetching secrets from Vault is optional and will be appended
+                            if not present in specified path.
+                          type: string
+                        readYourWrites:
+                          description: |-
+                            ReadYourWrites ensures isolated read-after-write semantics by
+                            providing discovered cluster replication states in each request.
+                            More information about eventual consistency in Vault can be found here
+                            https://www.vaultproject.io/docs/enterprise/consistency
+                          type: boolean
+                        server:
+                          description: 'Server is the connection address for the Vault server, e.g: "https://vault.example.com:8200".'
+                          type: string
+                        tls:
+                          description: |-
+                            The configuration used for client side related TLS communication, when the Vault server
+                            requires mutual authentication. Only used if the Server URL is using HTTPS protocol.
+                            This parameter is ignored for plain HTTP protocol connection.
+                            It's worth noting this configuration is different from the "TLS certificates auth method",
+                            which is available under the `auth.cert` section.
+                          properties:
+                            certSecretRef:
+                              description: |-
+                                CertSecretRef is a certificate added to the transport layer
+                                when communicating with the Vault server.
+                                If no key for the Secret is specified, external-secret will default to 'tls.crt'.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            keySecretRef:
+                              description: |-
+                                KeySecretRef to a key in a Secret resource containing client private key
+                                added to the transport layer when communicating with the Vault server.
+                                If no key for the Secret is specified, external-secret will default to 'tls.key'.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        version:
+                          default: v2
+                          description: |-
+                            Version is the Vault KV secret engine version. This can be either "v1" or
+                            "v2". Version defaults to "v2".
+                          enum:
+                            - v1
+                            - v2
+                          type: string
+                      required:
+                        - auth
+                        - server
+                      type: object
+                    webhook:
+                      description: Webhook configures this store to sync secrets using a generic templated webhook
+                      properties:
+                        body:
+                          description: Body
+                          type: string
+                        caBundle:
+                          description: |-
+                            PEM encoded CA bundle used to validate webhook server certificate. Only used
+                            if the Server URL is using HTTPS protocol. This parameter is ignored for
+                            plain HTTP protocol connection. If not set the system root certificates
+                            are used to validate the TLS connection.
+                          format: byte
+                          type: string
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate webhook server certificate.
+                          properties:
+                            key:
+                              description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the object located at the provider type.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: The namespace the Provider type is in.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                            type:
+                              description: The type of provider to use such as "Secret", or "ConfigMap".
+                              enum:
+                                - Secret
+                                - ConfigMap
+                              type: string
+                          required:
+                            - name
+                            - type
+                          type: object
+                        headers:
+                          additionalProperties:
+                            type: string
+                          description: Headers
+                          type: object
+                        method:
+                          description: Webhook Method
+                          type: string
+                        result:
+                          description: Result formatting
+                          properties:
+                            jsonPath:
+                              description: Json path of return value
+                              type: string
+                          type: object
+                        secrets:
+                          description: |-
+                            Secrets to fill in templates
+                            These secrets will be passed to the templating function as key value pairs under the given name
+                          items:
+                            properties:
+                              name:
+                                description: Name of this secret in templates
+                                type: string
+                              secretRef:
+                                description: Secret ref to fill in credentials
+                                properties:
+                                  key:
+                                    description: |-
+                                      A key in the referenced Secret.
+                                      Some instances of this field may be defaulted, in others it may be required.
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[-._a-zA-Z0-9]+$
+                                    type: string
+                                  name:
+                                    description: The name of the Secret resource being referred to.
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                    type: string
+                                  namespace:
+                                    description: |-
+                                      The namespace of the Secret resource being referred to.
+                                      Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                    maxLength: 63
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                    type: string
+                                type: object
+                            required:
+                              - name
+                              - secretRef
+                            type: object
+                          type: array
+                        timeout:
+                          description: Timeout
+                          type: string
+                        url:
+                          description: Webhook url to call
+                          type: string
+                      required:
+                        - result
+                        - url
+                      type: object
+                    yandexcertificatemanager:
+                      description: YandexCertificateManager configures this store to sync secrets using Yandex Certificate Manager provider
+                      properties:
+                        apiEndpoint:
+                          description: Yandex.Cloud API endpoint (e.g. 'api.cloud.yandex.net:443')
+                          type: string
+                        auth:
+                          description: Auth defines the information necessary to authenticate against Yandex Certificate Manager
+                          properties:
+                            authorizedKeySecretRef:
+                              description: The authorized key used for authentication
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate Yandex.Cloud server certificate.
+                          properties:
+                            certSecretRef:
+                              description: |-
+                                A reference to a specific 'key' within a Secret resource.
+                                In some instances, `key` is a required field.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                      required:
+                        - auth
+                      type: object
+                    yandexlockbox:
+                      description: YandexLockbox configures this store to sync secrets using Yandex Lockbox provider
+                      properties:
+                        apiEndpoint:
+                          description: Yandex.Cloud API endpoint (e.g. 'api.cloud.yandex.net:443')
+                          type: string
+                        auth:
+                          description: Auth defines the information necessary to authenticate against Yandex Lockbox
+                          properties:
+                            authorizedKeySecretRef:
+                              description: The authorized key used for authentication
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        caProvider:
+                          description: The provider for the CA bundle to use to validate Yandex.Cloud server certificate.
+                          properties:
+                            certSecretRef:
+                              description: |-
+                                A reference to a specific 'key' within a Secret resource.
+                                In some instances, `key` is a required field.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                      required:
+                        - auth
+                      type: object
+                  type: object
+                refreshInterval:
+                  description: Used to configure store refresh interval in seconds. Empty or 0 will default to the controller config.
+                  type: integer
+                retrySettings:
+                  description: Used to configure http retries if failed
+                  properties:
+                    maxRetries:
+                      format: int32
+                      type: integer
+                    retryInterval:
+                      type: string
+                  type: object
+              required:
+                - provider
+              type: object
+            status:
+              description: SecretStoreStatus defines the observed state of the SecretStore.
+              properties:
+                capabilities:
+                  description: SecretStoreCapabilities defines the possible operations a SecretStore can do.
+                  type: string
+                conditions:
+                  items:
+                    properties:
+                      lastTransitionTime:
+                        format: date-time
+                        type: string
+                      message:
+                        type: string
+                      reason:
+                        type: string
+                      status:
+                        type: string
+                      type:
+                        type: string
+                    required:
+                      - status
+                      - type
+                    type: object
+                  type: array
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/stssessiontoken.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/stssessiontoken.yaml
new file mode 100644
index 000000000..bbd7b4719
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/stssessiontoken.yaml
@@ -0,0 +1,228 @@
+{{- if .Values.installCRDs }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: stssessiontokens.generators.external-secrets.io
+spec:
+  group: generators.external-secrets.io
+  names:
+    categories:
+      - external-secrets
+      - external-secrets-generators
+    kind: STSSessionToken
+    listKind: STSSessionTokenList
+    plural: stssessiontokens
+    singular: stssessiontoken
+  scope: Namespaced
+  versions:
+    - name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: |-
+            STSSessionToken uses the GetSessionToken API to retrieve an authorization token.
+            The authorization token is valid for 12 hours.
+            The authorizationToken returned is a base64 encoded string that can be decoded.
+            For more information, see GetSessionToken (https://docs.aws.amazon.com/STS/latest/APIReference/API_GetSessionToken.html).
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              properties:
+                auth:
+                  description: Auth defines how to authenticate with AWS
+                  properties:
+                    jwt:
+                      description: Authenticate against AWS using service account tokens.
+                      properties:
+                        serviceAccountRef:
+                          description: A reference to a ServiceAccount resource.
+                          properties:
+                            audiences:
+                              description: |-
+                                Audience specifies the `aud` claim for the service account token
+                                If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                then this audiences will be appended to the list
+                              items:
+                                type: string
+                              type: array
+                            name:
+                              description: The name of the ServiceAccount resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                Namespace of the resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          required:
+                            - name
+                          type: object
+                      type: object
+                    secretRef:
+                      description: |-
+                        AWSAuthSecretRef holds secret references for AWS credentials
+                        both AccessKeyID and SecretAccessKey must be defined in order to properly authenticate.
+                      properties:
+                        accessKeyIDSecretRef:
+                          description: The AccessKeyID is used for authentication
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                        secretAccessKeySecretRef:
+                          description: The SecretAccessKey is used for authentication
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                        sessionTokenSecretRef:
+                          description: |-
+                            The SessionToken used for authentication
+                            This must be defined if AccessKeyID and SecretAccessKey are temporary credentials
+                            see: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                      type: object
+                  type: object
+                region:
+                  description: Region specifies the region to operate in.
+                  type: string
+                requestParameters:
+                  description: RequestParameters contains parameters that can be passed to the STS service.
+                  properties:
+                    serialNumber:
+                      description: |-
+                        SerialNumber is the identification number of the MFA device that is associated with the IAM user who is making
+                        the GetSessionToken call.
+                        Possible values: hardware device (such as GAHT12345678) or an Amazon Resource Name (ARN) for a virtual device
+                        (such as arn:aws:iam::123456789012:mfa/user)
+                      type: string
+                    sessionDuration:
+                      description: |-
+                        SessionDuration The duration, in seconds, that the credentials should remain valid. Acceptable durations for
+                        IAM user sessions range from 900 seconds (15 minutes) to 129,600 seconds (36 hours), with 43,200 seconds
+                        (12 hours) as the default.
+                      format: int64
+                      type: integer
+                    tokenCode:
+                      description: TokenCode is the value provided by the MFA device, if MFA is required.
+                      type: string
+                  type: object
+                role:
+                  description: |-
+                    You can assume a role before making calls to the
+                    desired AWS service.
+                  type: string
+              required:
+                - region
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/uuid.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/uuid.yaml
new file mode 100644
index 000000000..460d88fe3
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/uuid.yaml
@@ -0,0 +1,70 @@
+{{- if .Values.installCRDs }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: uuids.generators.external-secrets.io
+spec:
+  group: generators.external-secrets.io
+  names:
+    categories:
+      - external-secrets
+      - external-secrets-generators
+    kind: UUID
+    listKind: UUIDList
+    plural: uuids
+    singular: uuid
+  scope: Namespaced
+  versions:
+    - name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: UUID generates a version 1 UUID (e56657e3-764f-11ef-a397-65231a88c216).
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: UUIDSpec controls the behavior of the uuid generator.
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/vaultdynamicsecret.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/vaultdynamicsecret.yaml
new file mode 100644
index 000000000..30e417e7f
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/vaultdynamicsecret.yaml
@@ -0,0 +1,872 @@
+{{- if .Values.installCRDs }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: vaultdynamicsecrets.generators.external-secrets.io
+spec:
+  group: generators.external-secrets.io
+  names:
+    categories:
+      - external-secrets
+      - external-secrets-generators
+    kind: VaultDynamicSecret
+    listKind: VaultDynamicSecretList
+    plural: vaultdynamicsecrets
+    singular: vaultdynamicsecret
+  scope: Namespaced
+  versions:
+    - name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              properties:
+                allowEmptyResponse:
+                  default: false
+                  description: Do not fail if no secrets are found. Useful for requests where no data is expected.
+                  type: boolean
+                controller:
+                  description: |-
+                    Used to select the correct ESO controller (think: ingress.ingressClassName)
+                    The ESO controller is instantiated with a specific controller name and filters VDS based on this property
+                  type: string
+                method:
+                  description: Vault API method to use (GET/POST/other)
+                  type: string
+                parameters:
+                  description: Parameters to pass to Vault write (for non-GET methods)
+                  x-kubernetes-preserve-unknown-fields: true
+                path:
+                  description: Vault path to obtain the dynamic secret from
+                  type: string
+                provider:
+                  description: Vault provider common spec
+                  properties:
+                    auth:
+                      description: Auth configures how secret-manager authenticates with the Vault server.
+                      properties:
+                        appRole:
+                          description: |-
+                            AppRole authenticates with Vault using the App Role auth mechanism,
+                            with the role and secret stored in a Kubernetes Secret resource.
+                          properties:
+                            path:
+                              default: approle
+                              description: |-
+                                Path where the App Role authentication backend is mounted
+                                in Vault, e.g: "approle"
+                              type: string
+                            roleId:
+                              description: |-
+                                RoleID configured in the App Role authentication backend when setting
+                                up the authentication backend in Vault.
+                              type: string
+                            roleRef:
+                              description: |-
+                                Reference to a key in a Secret that contains the App Role ID used
+                                to authenticate with Vault.
+                                The `key` field must be specified and denotes which entry within the Secret
+                                resource is used as the app role id.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            secretRef:
+                              description: |-
+                                Reference to a key in a Secret that contains the App Role secret used
+                                to authenticate with Vault.
+                                The `key` field must be specified and denotes which entry within the Secret
+                                resource is used as the app role secret.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          required:
+                            - path
+                            - secretRef
+                          type: object
+                        cert:
+                          description: |-
+                            Cert authenticates with TLS Certificates by passing client certificate, private key and ca certificate
+                            Cert authentication method
+                          properties:
+                            clientCert:
+                              description: |-
+                                ClientCert is a certificate to authenticate using the Cert Vault
+                                authentication method
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            secretRef:
+                              description: |-
+                                SecretRef to a key in a Secret resource containing client private key to
+                                authenticate with Vault using the Cert authentication method
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          type: object
+                        iam:
+                          description: |-
+                            Iam authenticates with vault by passing a special AWS request signed with AWS IAM credentials
+                            AWS IAM authentication method
+                          properties:
+                            externalID:
+                              description: AWS External ID set on assumed IAM roles
+                              type: string
+                            jwt:
+                              description: Specify a service account with IRSA enabled
+                              properties:
+                                serviceAccountRef:
+                                  description: A reference to a ServiceAccount resource.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              type: object
+                            path:
+                              description: 'Path where the AWS auth method is enabled in Vault, e.g: "aws"'
+                              type: string
+                            region:
+                              description: AWS region
+                              type: string
+                            role:
+                              description: This is the AWS role to be assumed before talking to vault
+                              type: string
+                            secretRef:
+                              description: Specify credentials in a Secret object
+                              properties:
+                                accessKeyIDSecretRef:
+                                  description: The AccessKeyID is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                secretAccessKeySecretRef:
+                                  description: The SecretAccessKey is used for authentication
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                                sessionTokenSecretRef:
+                                  description: |-
+                                    The SessionToken used for authentication
+                                    This must be defined if AccessKeyID and SecretAccessKey are temporary credentials
+                                    see: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html
+                                  properties:
+                                    key:
+                                      description: |-
+                                        A key in the referenced Secret.
+                                        Some instances of this field may be defaulted, in others it may be required.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[-._a-zA-Z0-9]+$
+                                      type: string
+                                    name:
+                                      description: The name of the Secret resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        The namespace of the Secret resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  type: object
+                              type: object
+                            vaultAwsIamServerID:
+                              description: 'X-Vault-AWS-IAM-Server-ID is an additional header used by Vault IAM auth method to mitigate against different types of replay attacks. More details here: https://developer.hashicorp.com/vault/docs/auth/aws'
+                              type: string
+                            vaultRole:
+                              description: Vault Role. In vault, a role describes an identity with a set of permissions, groups, or policies you want to attach a user of the secrets engine
+                              type: string
+                          required:
+                            - vaultRole
+                          type: object
+                        jwt:
+                          description: |-
+                            Jwt authenticates with Vault by passing role and JWT token using the
+                            JWT/OIDC authentication method
+                          properties:
+                            kubernetesServiceAccountToken:
+                              description: |-
+                                Optional ServiceAccountToken specifies the Kubernetes service account for which to request
+                                a token for with the `TokenRequest` API.
+                              properties:
+                                audiences:
+                                  description: |-
+                                    Optional audiences field that will be used to request a temporary Kubernetes service
+                                    account token for the service account referenced by `serviceAccountRef`.
+                                    Defaults to a single audience `vault` it not specified.
+                                    Deprecated: use serviceAccountRef.Audiences instead
+                                  items:
+                                    type: string
+                                  type: array
+                                expirationSeconds:
+                                  description: |-
+                                    Optional expiration time in seconds that will be used to request a temporary
+                                    Kubernetes service account token for the service account referenced by
+                                    `serviceAccountRef`.
+                                    Deprecated: this will be removed in the future.
+                                    Defaults to 10 minutes.
+                                  format: int64
+                                  type: integer
+                                serviceAccountRef:
+                                  description: Service account field containing the name of a kubernetes ServiceAccount.
+                                  properties:
+                                    audiences:
+                                      description: |-
+                                        Audience specifies the `aud` claim for the service account token
+                                        If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                        then this audiences will be appended to the list
+                                      items:
+                                        type: string
+                                      type: array
+                                    name:
+                                      description: The name of the ServiceAccount resource being referred to.
+                                      maxLength: 253
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace of the resource being referred to.
+                                        Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                      maxLength: 63
+                                      minLength: 1
+                                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                              required:
+                                - serviceAccountRef
+                              type: object
+                            path:
+                              default: jwt
+                              description: |-
+                                Path where the JWT authentication backend is mounted
+                                in Vault, e.g: "jwt"
+                              type: string
+                            role:
+                              description: |-
+                                Role is a JWT role to authenticate using the JWT/OIDC Vault
+                                authentication method
+                              type: string
+                            secretRef:
+                              description: |-
+                                Optional SecretRef that refers to a key in a Secret resource containing JWT token to
+                                authenticate with Vault using the JWT/OIDC authentication method.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                          required:
+                            - path
+                          type: object
+                        kubernetes:
+                          description: |-
+                            Kubernetes authenticates with Vault by passing the ServiceAccount
+                            token stored in the named Secret resource to the Vault server.
+                          properties:
+                            mountPath:
+                              default: kubernetes
+                              description: |-
+                                Path where the Kubernetes authentication backend is mounted in Vault, e.g:
+                                "kubernetes"
+                              type: string
+                            role:
+                              description: |-
+                                A required field containing the Vault Role to assume. A Role binds a
+                                Kubernetes ServiceAccount with a set of Vault policies.
+                              type: string
+                            secretRef:
+                              description: |-
+                                Optional secret field containing a Kubernetes ServiceAccount JWT used
+                                for authenticating with Vault. If a name is specified without a key,
+                                `token` is the default. If one is not specified, the one bound to
+                                the controller will be used.
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            serviceAccountRef:
+                              description: |-
+                                Optional service account field containing the name of a kubernetes ServiceAccount.
+                                If the service account is specified, the service account secret token JWT will be used
+                                for authenticating with Vault. If the service account selector is not supplied,
+                                the secretRef will be used instead.
+                              properties:
+                                audiences:
+                                  description: |-
+                                    Audience specifies the `aud` claim for the service account token
+                                    If the service account uses a well-known annotation for e.g. IRSA or GCP Workload Identity
+                                    then this audiences will be appended to the list
+                                  items:
+                                    type: string
+                                  type: array
+                                name:
+                                  description: The name of the ServiceAccount resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    Namespace of the resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              required:
+                                - name
+                              type: object
+                          required:
+                            - mountPath
+                            - role
+                          type: object
+                        ldap:
+                          description: |-
+                            Ldap authenticates with Vault by passing username/password pair using
+                            the LDAP authentication method
+                          properties:
+                            path:
+                              default: ldap
+                              description: |-
+                                Path where the LDAP authentication backend is mounted
+                                in Vault, e.g: "ldap"
+                              type: string
+                            secretRef:
+                              description: |-
+                                SecretRef to a key in a Secret resource containing password for the LDAP
+                                user used to authenticate with Vault using the LDAP authentication
+                                method
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            username:
+                              description: |-
+                                Username is a LDAP user name used to authenticate using the LDAP Vault
+                                authentication method
+                              type: string
+                          required:
+                            - path
+                            - username
+                          type: object
+                        namespace:
+                          description: |-
+                            Name of the vault namespace to authenticate to. This can be different than the namespace your secret is in.
+                            Namespaces is a set of features within Vault Enterprise that allows
+                            Vault environments to support Secure Multi-tenancy. e.g: "ns1".
+                            More about namespaces can be found here https://www.vaultproject.io/docs/enterprise/namespaces
+                            This will default to Vault.Namespace field if set, or empty otherwise
+                          type: string
+                        tokenSecretRef:
+                          description: TokenSecretRef authenticates with Vault by presenting a token.
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                        userPass:
+                          description: UserPass authenticates with Vault by passing username/password pair
+                          properties:
+                            path:
+                              default: user
+                              description: |-
+                                Path where the UserPassword authentication backend is mounted
+                                in Vault, e.g: "user"
+                              type: string
+                            secretRef:
+                              description: |-
+                                SecretRef to a key in a Secret resource containing password for the
+                                user used to authenticate with Vault using the UserPass authentication
+                                method
+                              properties:
+                                key:
+                                  description: |-
+                                    A key in the referenced Secret.
+                                    Some instances of this field may be defaulted, in others it may be required.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[-._a-zA-Z0-9]+$
+                                  type: string
+                                name:
+                                  description: The name of the Secret resource being referred to.
+                                  maxLength: 253
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  type: string
+                                namespace:
+                                  description: |-
+                                    The namespace of the Secret resource being referred to.
+                                    Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                                  maxLength: 63
+                                  minLength: 1
+                                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  type: string
+                              type: object
+                            username:
+                              description: |-
+                                Username is a user name used to authenticate using the UserPass Vault
+                                authentication method
+                              type: string
+                          required:
+                            - path
+                            - username
+                          type: object
+                      type: object
+                    caBundle:
+                      description: |-
+                        PEM encoded CA bundle used to validate Vault server certificate. Only used
+                        if the Server URL is using HTTPS protocol. This parameter is ignored for
+                        plain HTTP protocol connection. If not set the system root certificates
+                        are used to validate the TLS connection.
+                      format: byte
+                      type: string
+                    caProvider:
+                      description: The provider for the CA bundle to use to validate Vault server certificate.
+                      properties:
+                        key:
+                          description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                          maxLength: 253
+                          minLength: 1
+                          pattern: ^[-._a-zA-Z0-9]+$
+                          type: string
+                        name:
+                          description: The name of the object located at the provider type.
+                          maxLength: 253
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                          type: string
+                        namespace:
+                          description: |-
+                            The namespace the Provider type is in.
+                            Can only be defined when used in a ClusterSecretStore.
+                          maxLength: 63
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                          type: string
+                        type:
+                          description: The type of provider to use such as "Secret", or "ConfigMap".
+                          enum:
+                            - Secret
+                            - ConfigMap
+                          type: string
+                      required:
+                        - name
+                        - type
+                      type: object
+                    forwardInconsistent:
+                      description: |-
+                        ForwardInconsistent tells Vault to forward read-after-write requests to the Vault
+                        leader instead of simply retrying within a loop. This can increase performance if
+                        the option is enabled serverside.
+                        https://www.vaultproject.io/docs/configuration/replication#allow_forwarding_via_header
+                      type: boolean
+                    headers:
+                      additionalProperties:
+                        type: string
+                      description: Headers to be added in Vault request
+                      type: object
+                    namespace:
+                      description: |-
+                        Name of the vault namespace. Namespaces is a set of features within Vault Enterprise that allows
+                        Vault environments to support Secure Multi-tenancy. e.g: "ns1".
+                        More about namespaces can be found here https://www.vaultproject.io/docs/enterprise/namespaces
+                      type: string
+                    path:
+                      description: |-
+                        Path is the mount path of the Vault KV backend endpoint, e.g:
+                        "secret". The v2 KV secret engine version specific "/data" path suffix
+                        for fetching secrets from Vault is optional and will be appended
+                        if not present in specified path.
+                      type: string
+                    readYourWrites:
+                      description: |-
+                        ReadYourWrites ensures isolated read-after-write semantics by
+                        providing discovered cluster replication states in each request.
+                        More information about eventual consistency in Vault can be found here
+                        https://www.vaultproject.io/docs/enterprise/consistency
+                      type: boolean
+                    server:
+                      description: 'Server is the connection address for the Vault server, e.g: "https://vault.example.com:8200".'
+                      type: string
+                    tls:
+                      description: |-
+                        The configuration used for client side related TLS communication, when the Vault server
+                        requires mutual authentication. Only used if the Server URL is using HTTPS protocol.
+                        This parameter is ignored for plain HTTP protocol connection.
+                        It's worth noting this configuration is different from the "TLS certificates auth method",
+                        which is available under the `auth.cert` section.
+                      properties:
+                        certSecretRef:
+                          description: |-
+                            CertSecretRef is a certificate added to the transport layer
+                            when communicating with the Vault server.
+                            If no key for the Secret is specified, external-secret will default to 'tls.crt'.
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                        keySecretRef:
+                          description: |-
+                            KeySecretRef to a key in a Secret resource containing client private key
+                            added to the transport layer when communicating with the Vault server.
+                            If no key for the Secret is specified, external-secret will default to 'tls.key'.
+                          properties:
+                            key:
+                              description: |-
+                                A key in the referenced Secret.
+                                Some instances of this field may be defaulted, in others it may be required.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[-._a-zA-Z0-9]+$
+                              type: string
+                            name:
+                              description: The name of the Secret resource being referred to.
+                              maxLength: 253
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                              type: string
+                            namespace:
+                              description: |-
+                                The namespace of the Secret resource being referred to.
+                                Ignored if referent is not cluster-scoped, otherwise defaults to the namespace of the referent.
+                              maxLength: 63
+                              minLength: 1
+                              pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                              type: string
+                          type: object
+                      type: object
+                    version:
+                      default: v2
+                      description: |-
+                        Version is the Vault KV secret engine version. This can be either "v1" or
+                        "v2". Version defaults to "v2".
+                      enum:
+                        - v1
+                        - v2
+                      type: string
+                  required:
+                    - auth
+                    - server
+                  type: object
+                resultType:
+                  default: Data
+                  description: |-
+                    Result type defines which data is returned from the generator.
+                    By default it is the "data" section of the Vault API response.
+                    When using e.g. /auth/token/create the "data" section is empty but
+                    the "auth" section contains the generated token.
+                    Please refer to the vault docs regarding the result data structure.
+                  enum:
+                    - Data
+                    - Auth
+                  type: string
+                retrySettings:
+                  description: Used to configure http retries if failed
+                  properties:
+                    maxRetries:
+                      format: int32
+                      type: integer
+                    retryInterval:
+                      type: string
+                  type: object
+              required:
+                - path
+                - provider
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/crds/webhook.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/crds/webhook.yaml
new file mode 100644
index 000000000..b48526cde
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/crds/webhook.yaml
@@ -0,0 +1,171 @@
+{{- if .Values.installCRDs }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    {{- with .Values.crds.annotations }}
+    {{- toYaml . | nindent 4}}
+    {{- end }}
+    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook
+    {{- end }}
+    controller-gen.kubebuilder.io/version: v0.17.1
+  labels:
+    external-secrets.io/component: controller
+  name: webhooks.generators.external-secrets.io
+spec:
+  group: generators.external-secrets.io
+  names:
+    categories:
+      - external-secrets
+      - external-secrets-generators
+    kind: Webhook
+    listKind: WebhookList
+    plural: webhooks
+    singular: webhook
+  scope: Namespaced
+  versions:
+    - name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: |-
+            Webhook connects to a third party API server to handle the secrets generation
+            configuration parameters in spec.
+            You can specify the server, the token, and additional body parameters.
+            See documentation for the full API specification for requests and responses.
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: WebhookSpec controls the behavior of the external generator. Any body parameters should be passed to the server through the parameters field.
+              properties:
+                body:
+                  description: Body
+                  type: string
+                caBundle:
+                  description: |-
+                    PEM encoded CA bundle used to validate webhook server certificate. Only used
+                    if the Server URL is using HTTPS protocol. This parameter is ignored for
+                    plain HTTP protocol connection. If not set the system root certificates
+                    are used to validate the TLS connection.
+                  format: byte
+                  type: string
+                caProvider:
+                  description: The provider for the CA bundle to use to validate webhook server certificate.
+                  properties:
+                    key:
+                      description: The key where the CA certificate can be found in the Secret or ConfigMap.
+                      maxLength: 253
+                      minLength: 1
+                      pattern: ^[-._a-zA-Z0-9]+$
+                      type: string
+                    name:
+                      description: The name of the object located at the provider type.
+                      maxLength: 253
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                      type: string
+                    namespace:
+                      description: The namespace the Provider type is in.
+                      maxLength: 63
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                      type: string
+                    type:
+                      description: The type of provider to use such as "Secret", or "ConfigMap".
+                      enum:
+                        - Secret
+                        - ConfigMap
+                      type: string
+                  required:
+                    - name
+                    - type
+                  type: object
+                headers:
+                  additionalProperties:
+                    type: string
+                  description: Headers
+                  type: object
+                method:
+                  description: Webhook Method
+                  type: string
+                result:
+                  description: Result formatting
+                  properties:
+                    jsonPath:
+                      description: Json path of return value
+                      type: string
+                  type: object
+                secrets:
+                  description: |-
+                    Secrets to fill in templates
+                    These secrets will be passed to the templating function as key value pairs under the given name
+                  items:
+                    properties:
+                      name:
+                        description: Name of this secret in templates
+                        type: string
+                      secretRef:
+                        description: Secret ref to fill in credentials
+                        properties:
+                          key:
+                            description: The key where the token is found.
+                            maxLength: 253
+                            minLength: 1
+                            pattern: ^[-._a-zA-Z0-9]+$
+                            type: string
+                          name:
+                            description: The name of the Secret resource being referred to.
+                            maxLength: 253
+                            minLength: 1
+                            pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                            type: string
+                        type: object
+                    required:
+                      - name
+                      - secretRef
+                    type: object
+                  type: array
+                timeout:
+                  description: Timeout
+                  type: string
+                url:
+                  description: Webhook url to call
+                  type: string
+              required:
+                - result
+                - url
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+{{- if .Values.crds.conversion.enabled }}
+  conversion:
+    strategy: Webhook
+    webhook:
+      conversionReviewVersions:
+        - v1
+      clientConfig:
+        service:
+          name: {{ include "external-secrets.fullname" . }}-webhook
+          namespace: {{ .Release.Namespace | quote }}
+          path: /convert
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/deployment.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/deployment.yaml
new file mode 100644
index 000000000..42c0d967a
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/deployment.yaml
@@ -0,0 +1,146 @@
+{{- if .Values.createOperator }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "external-secrets.fullname" . }}
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets.labels" . | nindent 4 }}
+  {{- with .Values.deploymentAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
+  selector:
+    matchLabels:
+      {{- include "external-secrets.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "external-secrets.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "external-secrets.serviceAccountName" . }}
+      automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
+      {{- with .Values.podSecurityContext }}
+      {{- if and (.enabled) (gt (keys . | len) 1) }}
+      securityContext:
+        {{- include "external-secrets.renderSecurityContext" (dict "securityContext" . "context" $) | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      hostNetwork: {{ .Values.hostNetwork }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{- with .Values.securityContext }}
+           {{- if and (.enabled) (gt (keys . | len) 1) }}
+          securityContext:
+            {{- include "external-secrets.renderSecurityContext" (dict "securityContext" . "context" $) | nindent 12 }}
+          {{- end }}
+          {{- end }}
+          image: {{ include "external-secrets.image" (dict "chartAppVersion" .Chart.AppVersion "image" .Values.image) | trim }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- if or (.Values.leaderElect) (.Values.scopedNamespace) (.Values.processClusterStore) (.Values.processClusterExternalSecret) (.Values.concurrent) (.Values.extraArgs) }}
+          args:
+          {{- if .Values.leaderElect }}
+          - --enable-leader-election=true
+          {{- end }}
+          {{- if .Values.scopedNamespace }}
+          - --namespace={{ .Values.scopedNamespace }}
+          {{- end }}
+          {{- if and .Values.scopedNamespace .Values.scopedRBAC }}
+          - --enable-cluster-store-reconciler=false
+          - --enable-cluster-external-secret-reconciler=false
+          {{- else }}
+            {{- if not .Values.processClusterStore }}
+          - --enable-cluster-store-reconciler=false
+            {{- end }}
+            {{- if not .Values.processClusterExternalSecret }}
+          - --enable-cluster-external-secret-reconciler=false
+            {{- end }}
+          {{- end }}
+          {{- if not .Values.processPushSecret }}
+          - --enable-push-secret-reconciler=false
+          {{- end }}
+          {{- if .Values.controllerClass }}
+          - --controller-class={{ .Values.controllerClass }}
+          {{- end }}
+          {{- if .Values.extendedMetricLabels }}
+          - --enable-extended-metric-labels={{ .Values.extendedMetricLabels }}
+          {{- end }}
+          {{- if .Values.concurrent }}
+          - --concurrent={{ .Values.concurrent }}
+          {{- end }}
+          {{- range $key, $value := .Values.extraArgs }}
+            {{- if $value }}
+          - --{{ $key }}={{ $value }}
+            {{- else }}
+          - --{{ $key }}
+            {{- end }}
+          {{- end }}
+          {{- end }}
+          - --metrics-addr=:{{ .Values.metrics.listen.port }}
+          - --loglevel={{ .Values.log.level }}
+          - --zap-time-encoding={{ .Values.log.timeEncoding }}
+          ports:
+            - containerPort: {{ .Values.metrics.listen.port }}
+              protocol: TCP
+              name: metrics
+          {{- with .Values.extraEnv }}
+          env:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- if .Values.extraVolumeMounts }}
+          volumeMounts:
+          {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
+          {{- end }}
+        {{- if .Values.extraContainers }}
+          {{ toYaml .Values.extraContainers | nindent 8 }}
+        {{- end }}
+      dnsPolicy: {{ .Values.dnsPolicy }}
+      {{- if .Values.dnsConfig }}
+      dnsConfig:
+          {{- toYaml .Values.dnsConfig | nindent 8 }}
+      {{- end }}
+      {{- if .Values.extraVolumes }}
+      volumes:
+      {{- toYaml .Values.extraVolumes | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector | default .Values.global.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity | default .Values.global.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations | default .Values.global.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.topologySpreadConstraints | default .Values.global.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.priorityClassName }}
+      priorityClassName: {{ .Values.priorityClassName }}
+      {{- end }}
+      {{- if .Values.podSpecExtra }}
+      {{- toYaml .Values.podSpecExtra | nindent 6 }}
+      {{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/extra-manifests.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/extra-manifests.yaml
new file mode 100644
index 000000000..1dfe8f48f
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/extra-manifests.yaml
@@ -0,0 +1,4 @@
+{{- range .Values.extraObjects }}
+---
+{{ include "external-secrets.render" (dict "value" . "context" $) }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/poddisruptionbudget.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/poddisruptionbudget.yaml
new file mode 100644
index 000000000..7b75ca3f4
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/poddisruptionbudget.yaml
@@ -0,0 +1,19 @@
+{{- if .Values.podDisruptionBudget.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-pdb
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets.labels" . | nindent 4 }}
+spec:
+  {{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{- if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "external-secrets.selectorLabels" . | nindent 6 }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/rbac.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/rbac.yaml
new file mode 100644
index 000000000..69bde32c2
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/rbac.yaml
@@ -0,0 +1,309 @@
+{{- if .Values.rbac.create -}}
+apiVersion: rbac.authorization.k8s.io/v1
+{{- if and .Values.scopedNamespace .Values.scopedRBAC }}
+kind: Role
+{{- else }}
+kind: ClusterRole
+{{- end }}
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-controller
+  {{- if and .Values.scopedNamespace .Values.scopedRBAC }}
+  namespace: {{ .Values.scopedNamespace | quote }}
+  {{- end }}
+  labels:
+    {{- include "external-secrets.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+    - "external-secrets.io"
+    resources:
+    - "secretstores"
+    - "clustersecretstores"
+    - "externalsecrets"
+    - "clusterexternalsecrets"
+    - "pushsecrets"
+    verbs:
+    - "get"
+    - "list"
+    - "watch"
+  - apiGroups:
+    - "external-secrets.io"
+    resources:
+    - "externalsecrets"
+    - "externalsecrets/status"
+    - "externalsecrets/finalizers"
+    - "secretstores"
+    - "secretstores/status"
+    - "secretstores/finalizers"
+    - "clustersecretstores"
+    - "clustersecretstores/status"
+    - "clustersecretstores/finalizers"
+    - "clusterexternalsecrets"
+    - "clusterexternalsecrets/status"
+    - "clusterexternalsecrets/finalizers"
+    - "pushsecrets"
+    - "pushsecrets/status"
+    - "pushsecrets/finalizers"
+    verbs:
+    - "get"
+    - "update"
+    - "patch"
+  - apiGroups:
+    - "generators.external-secrets.io"
+    resources:
+    - "acraccesstokens"
+    - "clustergenerators"
+    - "ecrauthorizationtokens"
+    - "fakes"
+    - "gcraccesstokens"
+    - "githubaccesstokens"
+    - "quayaccesstokens"
+    - "passwords"
+    - "stssessiontokens"
+    - "uuids"
+    - "vaultdynamicsecrets"
+    - "webhooks"
+    verbs:
+    - "get"
+    - "list"
+    - "watch"
+  - apiGroups:
+    - ""
+    resources:
+    - "serviceaccounts"
+    - "namespaces"
+    verbs:
+    - "get"
+    - "list"
+    - "watch"
+  - apiGroups:
+    - ""
+    resources:
+    - "configmaps"
+    verbs:
+    - "get"
+    - "list"
+    - "watch"
+  - apiGroups:
+    - ""
+    resources:
+    - "secrets"
+    verbs:
+    - "get"
+    - "list"
+    - "watch"
+    - "create"
+    - "update"
+    - "delete"
+    - "patch"
+  - apiGroups:
+    - ""
+    resources:
+    - "serviceaccounts/token"
+    verbs:
+    - "create"
+  - apiGroups:
+    - ""
+    resources:
+    - "events"
+    verbs:
+    - "create"
+    - "patch"
+  - apiGroups:
+    - "external-secrets.io"
+    resources:
+    - "externalsecrets"
+    verbs:
+    - "create"
+    - "update"
+    - "delete"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+{{- if and .Values.scopedNamespace .Values.scopedRBAC }}
+kind: Role
+{{- else }}
+kind: ClusterRole
+{{- end }}
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-view
+  {{- if and .Values.scopedNamespace .Values.scopedRBAC }}
+  namespace: {{ .Values.scopedNamespace | quote }}
+  {{- end }}
+  labels:
+    {{- include "external-secrets.labels" . | nindent 4 }}
+    rbac.authorization.k8s.io/aggregate-to-view: "true"
+    rbac.authorization.k8s.io/aggregate-to-edit: "true"
+    rbac.authorization.k8s.io/aggregate-to-admin: "true"
+rules:
+  - apiGroups:
+      - "external-secrets.io"
+    resources:
+      - "externalsecrets"
+      - "secretstores"
+      - "clustersecretstores"
+      - "pushsecrets"
+    verbs:
+      - "get"
+      - "watch"
+      - "list"
+  - apiGroups:
+    - "generators.external-secrets.io"
+    resources:
+    - "acraccesstokens"
+    - "clustergenerators"
+    - "ecrauthorizationtokens"
+    - "fakes"
+    - "gcraccesstokens"
+    - "githubaccesstokens"
+    - "quayaccesstokens"
+    - "passwords"
+    - "vaultdynamicsecrets"
+    - "webhooks"
+    verbs:
+      - "get"
+      - "watch"
+      - "list"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+{{- if and .Values.scopedNamespace .Values.scopedRBAC }}
+kind: Role
+{{- else }}
+kind: ClusterRole
+{{- end }}
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-edit
+  {{- if and .Values.scopedNamespace .Values.scopedRBAC }}
+  namespace: {{ .Values.scopedNamespace | quote }}
+  {{- end }}
+  labels:
+    {{- include "external-secrets.labels" . | nindent 4 }}
+    rbac.authorization.k8s.io/aggregate-to-edit: "true"
+    rbac.authorization.k8s.io/aggregate-to-admin: "true"
+rules:
+  - apiGroups:
+      - "external-secrets.io"
+    resources:
+      - "externalsecrets"
+      - "secretstores"
+      - "clustersecretstores"
+      - "pushsecrets"
+    verbs:
+      - "create"
+      - "delete"
+      - "deletecollection"
+      - "patch"
+      - "update"
+  - apiGroups:
+    - "generators.external-secrets.io"
+    resources:
+    - "acraccesstokens"
+    - "clustergenerators"
+    - "ecrauthorizationtokens"
+    - "fakes"
+    - "gcraccesstokens"
+    - "githubaccesstokens"
+    - "quayaccesstokens"
+    - "passwords"
+    - "vaultdynamicsecrets"
+    - "webhooks"
+    verbs:
+      - "create"
+      - "delete"
+      - "deletecollection"
+      - "patch"
+      - "update"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+{{- if and .Values.scopedNamespace .Values.scopedRBAC }}
+kind: RoleBinding
+{{- else }}
+kind: ClusterRoleBinding
+{{- end }}
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-controller
+  {{- if and .Values.scopedNamespace .Values.scopedRBAC }}
+  namespace: {{ .Values.scopedNamespace | quote }}
+  {{- end }}
+  labels:
+    {{- include "external-secrets.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  {{- if and .Values.scopedNamespace .Values.scopedRBAC }}
+  kind: Role
+  {{- else }}
+  kind: ClusterRole
+  {{- end }}
+  name: {{ include "external-secrets.fullname" . }}-controller
+subjects:
+  - name: {{ include "external-secrets.serviceAccountName" . }}
+    namespace: {{ template "external-secrets.namespace" . }}
+    kind: ServiceAccount
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-leaderelection
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+    - ""
+    resources:
+    - "configmaps"
+    resourceNames:
+    - "external-secrets-controller"
+    verbs:
+    - "get"
+    - "update"
+    - "patch"
+  - apiGroups:
+    - ""
+    resources:
+    - "configmaps"
+    verbs:
+    - "create"
+  - apiGroups:
+    - "coordination.k8s.io"
+    resources:
+    - "leases"
+    verbs:
+    - "get"
+    - "create"
+    - "update"
+    - "patch"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-leaderelection
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "external-secrets.fullname" . }}-leaderelection
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "external-secrets.serviceAccountName" . }}
+    namespace: {{ template "external-secrets.namespace" . }}
+{{- if .Values.rbac.servicebindings.create }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-servicebindings
+  labels:
+    servicebinding.io/controller: "true"
+    {{- include "external-secrets.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+    - "external-secrets.io"
+    resources:
+    - "externalsecrets"
+    verbs:
+    - "get"
+    - "list"
+    - "watch"
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/service.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/service.yaml
new file mode 100644
index 000000000..94859a34e
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/service.yaml
@@ -0,0 +1,28 @@
+{{- if .Values.metrics.service.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-metrics
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets.labels" . | nindent 4 }}
+  {{- with .Values.metrics.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  type: ClusterIP
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
+  ports:
+    - port: {{ .Values.metrics.service.port }}
+      protocol: TCP
+      targetPort: metrics
+      name: metrics
+  selector:
+    {{- include "external-secrets.selectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/serviceaccount.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/serviceaccount.yaml
new file mode 100644
index 000000000..ceaa98e1c
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/serviceaccount.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "external-secrets.serviceAccountName" . }}
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets.labels" . | nindent 4 }}
+    {{- with .Values.serviceAccount.extraLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/servicemonitor.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/servicemonitor.yaml
new file mode 100644
index 000000000..31451791a
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/servicemonitor.yaml
@@ -0,0 +1,164 @@
+{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) .Values.serviceMonitor.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-metrics
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets.labels" . | nindent 4 }}
+spec:
+  type: ClusterIP
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
+  ports:
+    - port: {{ .Values.metrics.service.port }}
+      protocol: TCP
+      name: metrics
+  selector:
+    {{- include "external-secrets.selectorLabels" . | nindent 4 }}
+---
+apiVersion: "monitoring.coreos.com/v1"
+kind: ServiceMonitor
+metadata:
+  labels:
+    {{- include "external-secrets.labels" . | nindent 4 }}
+{{- if .Values.serviceMonitor.additionalLabels }}
+{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
+{{- end }}
+  name: {{ include "external-secrets.fullname" . }}-metrics
+  namespace: {{ .Values.serviceMonitor.namespace | default (include "external-secrets.namespace" .) | quote }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "external-secrets.selectorLabels" . | nindent 6 }}
+  namespaceSelector:
+    matchNames:
+    - {{ template "external-secrets.namespace" . }}
+  endpoints:
+  - port: metrics
+    interval: {{ .Values.serviceMonitor.interval }}
+    scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
+    honorLabels: {{ .Values.serviceMonitor.honorLabels }}
+    {{- with .Values.serviceMonitor.metricRelabelings }}
+    metricRelabelings:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.serviceMonitor.relabelings }}
+    relabelings:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+---
+{{- if .Values.webhook.create }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-webhook-metrics
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets-webhook-metrics.labels" . | nindent 4 }}
+spec:
+  type: ClusterIP
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
+  ports:
+    - port: {{ .Values.webhook.metrics.service.port }}
+      protocol: TCP
+      name: metrics
+  selector:
+    {{- include "external-secrets-webhook.selectorLabels" . | nindent 4 }}
+---
+apiVersion: "monitoring.coreos.com/v1"
+kind: ServiceMonitor
+metadata:
+  labels:
+    {{- include "external-secrets-webhook.labels" . | nindent 4 }}
+{{- if .Values.serviceMonitor.additionalLabels }}
+{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
+{{- end }}
+  name: {{ include "external-secrets.fullname" . }}-webhook-metrics
+  namespace: {{ .Values.serviceMonitor.namespace | default (include "external-secrets.namespace" .) | quote }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "external-secrets-webhook-metrics.labels" . | nindent 6 }}
+  namespaceSelector:
+    matchNames:
+    - {{ template "external-secrets.namespace" . }}
+  endpoints:
+  - port: metrics
+    interval: {{ .Values.serviceMonitor.interval }}
+    scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
+    honorLabels: {{ .Values.serviceMonitor.honorLabels }}
+    {{- with .Values.serviceMonitor.metricRelabelings }}
+    metricRelabelings:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.serviceMonitor.relabelings }}
+    relabelings:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+{{- end }}
+---
+{{- if .Values.certController.create }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-cert-controller-metrics
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets-cert-controller-metrics.labels" . | nindent 4 }}
+spec:
+  type: ClusterIP
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
+  ports:
+    - port: {{ .Values.certController.metrics.listen.port }}
+      protocol: TCP
+      name: metrics
+  selector:
+    {{- include "external-secrets-cert-controller.selectorLabels" . | nindent 4 }}
+---
+apiVersion: "monitoring.coreos.com/v1"
+kind: ServiceMonitor
+metadata:
+  labels:
+    {{- include "external-secrets-cert-controller.labels" . | nindent 4 }}
+{{- if .Values.serviceMonitor.additionalLabels }}
+{{ toYaml .Values.serviceMonitor.additionalLabels | indent 4 }}
+{{- end }}
+  name: {{ include "external-secrets.fullname" . }}-cert-controller-metrics
+  namespace: {{ .Values.serviceMonitor.namespace | default (include "external-secrets.namespace" .) | quote }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "external-secrets-cert-controller-metrics.labels" . | nindent 6 }}
+  namespaceSelector:
+    matchNames:
+    - {{ template "external-secrets.namespace" . }}
+  endpoints:
+  - port: metrics
+    interval: {{ .Values.serviceMonitor.interval }}
+    scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
+    honorLabels: {{ .Values.serviceMonitor.honorLabels }}
+    {{- with .Values.serviceMonitor.metricRelabelings }}
+    metricRelabelings:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.serviceMonitor.relabelings }}
+    relabelings:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/validatingwebhook.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/validatingwebhook.yaml
new file mode 100644
index 000000000..0c3183ee1
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/validatingwebhook.yaml
@@ -0,0 +1,74 @@
+{{- if .Values.webhook.create }}
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  name: secretstore-validate
+  labels:
+    {{- include "external-secrets-webhook.labels" . | nindent 4 }}
+    external-secrets.io/component: webhook
+  {{- if and .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+  annotations:
+    cert-manager.io/inject-ca-from: {{ template "external-secrets.namespace" . }}/{{ include "external-secrets.fullname" . }}-webhook
+  {{- end }}
+webhooks:
+- name: "validate.secretstore.external-secrets.io"
+  rules:
+  - apiGroups:   ["external-secrets.io"]
+    apiVersions: ["v1beta1"]
+    operations:  ["CREATE", "UPDATE", "DELETE"]
+    resources:   ["secretstores"]
+    scope:       "Namespaced"
+  clientConfig:
+    service:
+      namespace: {{ template "external-secrets.namespace" . }}
+      name: {{ include "external-secrets.fullname" . }}-webhook
+      path: /validate-external-secrets-io-v1beta1-secretstore
+  admissionReviewVersions: ["v1", "v1beta1"]
+  sideEffects: None
+  timeoutSeconds: 5
+
+- name: "validate.clustersecretstore.external-secrets.io"
+  rules:
+  - apiGroups:   ["external-secrets.io"]
+    apiVersions: ["v1beta1"]
+    operations:  ["CREATE", "UPDATE", "DELETE"]
+    resources:   ["clustersecretstores"]
+    scope:       "Cluster"
+  clientConfig:
+    service:
+      namespace: {{ template "external-secrets.namespace" . }}
+      name: {{ include "external-secrets.fullname" . }}-webhook
+      path: /validate-external-secrets-io-v1beta1-clustersecretstore
+  admissionReviewVersions: ["v1", "v1beta1"]
+  sideEffects: None
+  timeoutSeconds: 5
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  name: externalsecret-validate
+  labels:
+    {{- include "external-secrets-webhook.labels" . | nindent 4 }}
+    external-secrets.io/component: webhook
+  {{- if and .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}
+  annotations:
+    cert-manager.io/inject-ca-from: {{ template "external-secrets.namespace" . }}/{{ include "external-secrets.fullname" . }}-webhook
+  {{- end }}
+webhooks:
+- name: "validate.externalsecret.external-secrets.io"
+  rules:
+  - apiGroups:   ["external-secrets.io"]
+    apiVersions: ["v1beta1"]
+    operations:  ["CREATE", "UPDATE", "DELETE"]
+    resources:   ["externalsecrets"]
+    scope:       "Namespaced"
+  clientConfig:
+    service:
+      namespace: {{ template "external-secrets.namespace" . }}
+      name: {{ include "external-secrets.fullname" . }}-webhook
+      path: /validate-external-secrets-io-v1beta1-externalsecret
+  admissionReviewVersions: ["v1", "v1beta1"]
+  sideEffects: None
+  timeoutSeconds: 5
+  failurePolicy: {{ .Values.webhook.failurePolicy}}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/webhook-certificate.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/webhook-certificate.yaml
new file mode 100644
index 000000000..adb19fd95
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/webhook-certificate.yaml
@@ -0,0 +1,30 @@
+{{- if and .Values.webhook.create .Values.webhook.certManager.enabled .Values.webhook.certManager.cert.create }}
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-webhook
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets-webhook.labels" . | nindent 4 }}
+    external-secrets.io/component: webhook
+  {{- with .Values.webhook.certManager.cert.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  commonName: {{ include "external-secrets.fullname" . }}-webhook
+  dnsNames:
+    - {{ include "external-secrets.fullname" . }}-webhook
+    - {{ include "external-secrets.fullname" . }}-webhook.{{ template "external-secrets.namespace" . }}
+    - {{ include "external-secrets.fullname" . }}-webhook.{{ template "external-secrets.namespace" . }}.svc
+  issuerRef:
+    {{- toYaml .Values.webhook.certManager.cert.issuerRef | nindent 4 }}
+  {{- with .Values.webhook.certManager.cert.duration }}
+  duration: {{ . | quote }}
+  {{- end }}
+  {{- with .Values.webhook.certManager.cert.renewBefore }}
+  renewBefore: {{ . | quote }}
+  {{- end }}
+  secretName: {{ include "external-secrets.fullname" . }}-webhook
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/webhook-deployment.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/webhook-deployment.yaml
new file mode 100644
index 000000000..7419a426b
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/webhook-deployment.yaml
@@ -0,0 +1,128 @@
+{{- if .Values.webhook.create }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-webhook
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets-webhook.labels" . | nindent 4 }}
+  {{- with .Values.webhook.deploymentAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  replicas: {{ .Values.webhook.replicaCount }}
+  revisionHistoryLimit: {{ .Values.webhook.revisionHistoryLimit }}
+  selector:
+    matchLabels:
+      {{- include "external-secrets-webhook.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.webhook.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "external-secrets-webhook.labels" . | nindent 8 }}
+        {{- with .Values.webhook.podLabels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.webhook.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      hostNetwork: {{ .Values.webhook.hostNetwork}}
+      serviceAccountName: {{ include "external-secrets-webhook.serviceAccountName" . }}
+      automountServiceAccountToken: {{ .Values.webhook.serviceAccount.automount }}
+      {{- with .Values.webhook.podSecurityContext }}
+      {{- if and (.enabled) (gt (keys . | len) 1) }}
+      securityContext:
+        {{- include "external-secrets.renderSecurityContext" (dict "securityContext" . "context" $) | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      containers:
+        - name: webhook
+          {{- with .Values.webhook.securityContext }}
+          {{- if and (.enabled) (gt (keys . | len) 1) }}
+          securityContext:
+            {{- include "external-secrets.renderSecurityContext" (dict "securityContext" . "context" $) | nindent 12 }}
+          {{- end }}
+          {{- end }}
+          image: {{ include "external-secrets.image" (dict "chartAppVersion" .Chart.AppVersion "image" .Values.webhook.image) | trim }}
+          imagePullPolicy: {{ .Values.webhook.image.pullPolicy }}
+          args:
+          - webhook
+          - --port={{ .Values.webhook.port }}
+          - --dns-name={{ include "external-secrets.fullname" . }}-webhook.{{ template "external-secrets.namespace" . }}.svc
+          - --cert-dir={{ .Values.webhook.certDir }}
+          - --check-interval={{ .Values.webhook.certCheckInterval }}
+          - --metrics-addr=:{{ .Values.webhook.metrics.listen.port }}
+          - --healthz-addr={{ .Values.webhook.readinessProbe.address }}:{{ .Values.webhook.readinessProbe.port }}
+          - --loglevel={{ .Values.webhook.log.level }}
+          - --zap-time-encoding={{ .Values.webhook.log.timeEncoding }}
+          {{- if .Values.webhook.lookaheadInterval }}
+          - --lookahead-interval={{ .Values.webhook.lookaheadInterval }}
+          {{- end }}
+          {{- range $key, $value := .Values.webhook.extraArgs }}
+            {{- if $value }}
+          - --{{ $key }}={{ $value }}
+            {{- else }}
+          - --{{ $key }}
+            {{- end }}
+          {{- end }}
+          ports:
+            - containerPort: {{ .Values.webhook.metrics.listen.port }}
+              protocol: TCP
+              name: metrics
+            - containerPort: {{ .Values.webhook.port }}
+              protocol: TCP
+              name: webhook
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.webhook.readinessProbe.port }}
+              path: /readyz
+            initialDelaySeconds: 20
+            periodSeconds: 5
+          {{- with .Values.webhook.extraEnv }}
+          env:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.webhook.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - name: certs
+              mountPath: {{ .Values.webhook.certDir }}
+              readOnly: true
+          {{- if .Values.webhook.extraVolumeMounts }}
+          {{- toYaml .Values.webhook.extraVolumeMounts | nindent 12 }}
+          {{- end }}
+      volumes:
+        - name: certs
+          secret:
+            secretName: {{ include "external-secrets.fullname" . }}-webhook
+      {{- if .Values.webhook.extraVolumes }}
+      {{- toYaml .Values.webhook.extraVolumes | nindent 8 }}
+      {{- end }}
+      {{- with .Values.webhook.nodeSelector | default .Values.global.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.webhook.affinity | default .Values.global.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.webhook.tolerations | default .Values.global.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.webhook.topologySpreadConstraints | default .Values.global.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.webhook.priorityClassName }}
+      priorityClassName: {{ .Values.webhook.priorityClassName }}
+      {{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/webhook-poddisruptionbudget.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/webhook-poddisruptionbudget.yaml
new file mode 100644
index 000000000..58345ba68
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/webhook-poddisruptionbudget.yaml
@@ -0,0 +1,20 @@
+{{- if and .Values.webhook.create .Values.webhook.podDisruptionBudget.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-webhook-pdb
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets-webhook.labels" . | nindent 4 }}
+    external-secrets.io/component: webhook
+spec:
+  {{- if .Values.webhook.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.webhook.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{- if .Values.webhook.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.webhook.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "external-secrets-webhook.selectorLabels" . | nindent 6 }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/webhook-secret.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/webhook-secret.yaml
new file mode 100644
index 000000000..fa7760ed6
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/webhook-secret.yaml
@@ -0,0 +1,14 @@
+{{- if and .Values.webhook.create (not .Values.webhook.certManager.enabled) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-webhook
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets-webhook.labels" . | nindent 4 }}
+    external-secrets.io/component: webhook
+  {{- with .Values.webhook.secretAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/webhook-service.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/webhook-service.yaml
new file mode 100644
index 000000000..59dbddc95
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/webhook-service.yaml
@@ -0,0 +1,37 @@
+{{- if .Values.webhook.create }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "external-secrets.fullname" . }}-webhook
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets-webhook.labels" . | nindent 4 }}
+    external-secrets.io/component: webhook
+  {{- if .Values.webhook.metrics.service.enabled }}
+  {{- with .Values.webhook.metrics.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- end }}
+spec:
+  type: ClusterIP
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
+  ports:
+  - port: 443
+    targetPort: {{ .Values.webhook.port }}
+    protocol: TCP
+    name: webhook
+  {{- if .Values.webhook.metrics.service.enabled }}
+  - port: {{ .Values.webhook.metrics.service.port }}
+    protocol: TCP
+    targetPort: metrics
+    name: metrics
+  {{- end }}
+  selector:
+    {{- include "external-secrets-webhook.selectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/templates/webhook-serviceaccount.yaml b/charts/external-secrets/external-secrets/0.13.0/templates/webhook-serviceaccount.yaml
new file mode 100644
index 000000000..193621842
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/templates/webhook-serviceaccount.yaml
@@ -0,0 +1,16 @@
+{{- if and .Values.webhook.create .Values.webhook.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "external-secrets-webhook.serviceAccountName" . }}
+  namespace: {{ template "external-secrets.namespace" . }}
+  labels:
+    {{- include "external-secrets-webhook.labels" . | nindent 4 }}
+    {{- with .Values.webhook.serviceAccount.extraLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.webhook.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/external-secrets/external-secrets/0.13.0/values.schema.json b/charts/external-secrets/external-secrets/0.13.0/values.schema.json
new file mode 100644
index 000000000..f1edecd83
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/values.schema.json
@@ -0,0 +1,908 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "properties": {
+        "affinity": {
+            "properties": {},
+            "type": "object"
+        },
+        "bitwarden-sdk-server": {
+            "properties": {
+                "enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "certController": {
+            "properties": {
+                "affinity": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "create": {
+                    "type": "boolean"
+                },
+                "deploymentAnnotations": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "extraArgs": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "extraEnv": {
+                    "type": "array"
+                },
+                "extraVolumeMounts": {
+                    "type": "array"
+                },
+                "extraVolumes": {
+                    "type": "array"
+                },
+                "fullnameOverride": {
+                    "type": "string"
+                },
+                "hostNetwork": {
+                    "type": "boolean"
+                },
+                "image": {
+                    "properties": {
+                        "flavour": {
+                            "type": "string"
+                        },
+                        "pullPolicy": {
+                            "type": "string"
+                        },
+                        "repository": {
+                            "type": "string"
+                        },
+                        "tag": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "imagePullSecrets": {
+                    "type": "array"
+                },
+                "log": {
+                    "properties": {
+                        "level": {
+                            "type": "string"
+                        },
+                        "timeEncoding": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "metrics": {
+                    "properties": {
+                        "listen": {
+                            "properties": {
+                                "port": {
+                                    "type": "integer"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "service": {
+                            "properties": {
+                                "annotations": {
+                                    "properties": {},
+                                    "type": "object"
+                                },
+                                "enabled": {
+                                    "type": "boolean"
+                                },
+                                "port": {
+                                    "type": "integer"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "nameOverride": {
+                    "type": "string"
+                },
+                "nodeSelector": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "podAnnotations": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "podDisruptionBudget": {
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        },
+                        "minAvailable": {
+                            "type": "integer"
+                        }
+                    },
+                    "type": "object"
+                },
+                "podLabels": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "podSecurityContext": {
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "priorityClassName": {
+                    "type": "string"
+                },
+                "rbac": {
+                    "properties": {
+                        "create": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "readinessProbe": {
+                    "properties": {
+                        "address": {
+                            "type": "string"
+                        },
+                        "port": {
+                            "type": "integer"
+                        }
+                    },
+                    "type": "object"
+                },
+                "replicaCount": {
+                    "type": "integer"
+                },
+                "requeueInterval": {
+                    "type": "string"
+                },
+                "resources": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "revisionHistoryLimit": {
+                    "type": "integer"
+                },
+                "securityContext": {
+                    "properties": {
+                        "allowPrivilegeEscalation": {
+                            "type": "boolean"
+                        },
+                        "capabilities": {
+                            "properties": {
+                                "drop": {
+                                    "items": {
+                                        "type": "string"
+                                    },
+                                    "type": "array"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "enabled": {
+                            "type": "boolean"
+                        },
+                        "readOnlyRootFilesystem": {
+                            "type": "boolean"
+                        },
+                        "runAsNonRoot": {
+                            "type": "boolean"
+                        },
+                        "runAsUser": {
+                            "type": "integer"
+                        },
+                        "seccompProfile": {
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "serviceAccount": {
+                    "properties": {
+                        "annotations": {
+                            "properties": {},
+                            "type": "object"
+                        },
+                        "automount": {
+                            "type": "boolean"
+                        },
+                        "create": {
+                            "type": "boolean"
+                        },
+                        "extraLabels": {
+                            "properties": {},
+                            "type": "object"
+                        },
+                        "name": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "tolerations": {
+                    "type": "array"
+                },
+                "topologySpreadConstraints": {
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "commonLabels": {
+            "properties": {},
+            "type": "object"
+        },
+        "concurrent": {
+            "type": "integer"
+        },
+        "controllerClass": {
+            "type": "string"
+        },
+        "crds": {
+            "properties": {
+                "annotations": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "conversion": {
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "createClusterExternalSecret": {
+                    "type": "boolean"
+                },
+                "createClusterGenerator": {
+                    "type": "boolean"
+                },
+                "createClusterSecretStore": {
+                    "type": "boolean"
+                },
+                "createPushSecret": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "createOperator": {
+            "type": "boolean"
+        },
+        "deploymentAnnotations": {
+            "properties": {},
+            "type": "object"
+        },
+        "dnsConfig": {
+            "properties": {},
+            "type": "object"
+        },
+        "dnsPolicy": {
+            "type": "string"
+        },
+        "extendedMetricLabels": {
+            "type": "boolean"
+        },
+        "extraArgs": {
+            "properties": {},
+            "type": "object"
+        },
+        "extraContainers": {
+            "type": "array"
+        },
+        "extraEnv": {
+            "type": "array"
+        },
+        "extraObjects": {
+            "type": "array"
+        },
+        "extraVolumeMounts": {
+            "type": "array"
+        },
+        "extraVolumes": {
+            "type": "array"
+        },
+        "fullnameOverride": {
+            "type": "string"
+        },
+        "global": {
+            "properties": {
+                "affinity": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "compatibility": {
+                    "properties": {
+                        "openshift": {
+                            "properties": {
+                                "adaptSecurityContext": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "nodeSelector": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "tolerations": {
+                    "type": "array"
+                },
+                "topologySpreadConstraints": {
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "hostNetwork": {
+            "type": "boolean"
+        },
+        "image": {
+            "properties": {
+                "flavour": {
+                    "type": "string"
+                },
+                "pullPolicy": {
+                    "type": "string"
+                },
+                "repository": {
+                    "type": "string"
+                },
+                "tag": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "imagePullSecrets": {
+            "type": "array"
+        },
+        "installCRDs": {
+            "type": "boolean"
+        },
+        "leaderElect": {
+            "type": "boolean"
+        },
+        "log": {
+            "properties": {
+                "level": {
+                    "type": "string"
+                },
+                "timeEncoding": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "metrics": {
+            "properties": {
+                "listen": {
+                    "properties": {
+                        "port": {
+                            "type": "integer"
+                        }
+                    },
+                    "type": "object"
+                },
+                "service": {
+                    "properties": {
+                        "annotations": {
+                            "properties": {},
+                            "type": "object"
+                        },
+                        "enabled": {
+                            "type": "boolean"
+                        },
+                        "port": {
+                            "type": "integer"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "nameOverride": {
+            "type": "string"
+        },
+        "namespaceOverride": {
+            "type": "string"
+        },
+        "nodeSelector": {
+            "properties": {},
+            "type": "object"
+        },
+        "podAnnotations": {
+            "properties": {},
+            "type": "object"
+        },
+        "podDisruptionBudget": {
+            "properties": {
+                "enabled": {
+                    "type": "boolean"
+                },
+                "minAvailable": {
+                    "type": "integer"
+                }
+            },
+            "type": "object"
+        },
+        "podLabels": {
+            "properties": {},
+            "type": "object"
+        },
+        "podSecurityContext": {
+            "properties": {
+                "enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "podSpecExtra": {
+            "properties": {},
+            "type": "object"
+        },
+        "priorityClassName": {
+            "type": "string"
+        },
+        "processClusterExternalSecret": {
+            "type": "boolean"
+        },
+        "processClusterStore": {
+            "type": "boolean"
+        },
+        "processPushSecret": {
+            "type": "boolean"
+        },
+        "rbac": {
+            "properties": {
+                "create": {
+                    "type": "boolean"
+                },
+                "servicebindings": {
+                    "properties": {
+                        "create": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "replicaCount": {
+            "type": "integer"
+        },
+        "resources": {
+            "properties": {},
+            "type": "object"
+        },
+        "revisionHistoryLimit": {
+            "type": "integer"
+        },
+        "scopedNamespace": {
+            "type": "string"
+        },
+        "scopedRBAC": {
+            "type": "boolean"
+        },
+        "securityContext": {
+            "properties": {
+                "allowPrivilegeEscalation": {
+                    "type": "boolean"
+                },
+                "capabilities": {
+                    "properties": {
+                        "drop": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "enabled": {
+                    "type": "boolean"
+                },
+                "readOnlyRootFilesystem": {
+                    "type": "boolean"
+                },
+                "runAsNonRoot": {
+                    "type": "boolean"
+                },
+                "runAsUser": {
+                    "type": "integer"
+                },
+                "seccompProfile": {
+                    "properties": {
+                        "type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "service": {
+            "properties": {
+                "ipFamilies": {
+                    "type": "array"
+                },
+                "ipFamilyPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "serviceAccount": {
+            "properties": {
+                "annotations": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "automount": {
+                    "type": "boolean"
+                },
+                "create": {
+                    "type": "boolean"
+                },
+                "extraLabels": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "serviceMonitor": {
+            "properties": {
+                "additionalLabels": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "enabled": {
+                    "type": "boolean"
+                },
+                "honorLabels": {
+                    "type": "boolean"
+                },
+                "interval": {
+                    "type": "string"
+                },
+                "metricRelabelings": {
+                    "type": "array"
+                },
+                "namespace": {
+                    "type": "string"
+                },
+                "relabelings": {
+                    "type": "array"
+                },
+                "scrapeTimeout": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "tolerations": {
+            "type": "array"
+        },
+        "topologySpreadConstraints": {
+            "type": "array"
+        },
+        "webhook": {
+            "properties": {
+                "affinity": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "certCheckInterval": {
+                    "type": "string"
+                },
+                "certDir": {
+                    "type": "string"
+                },
+                "certManager": {
+                    "properties": {
+                        "addInjectorAnnotations": {
+                            "type": "boolean"
+                        },
+                        "cert": {
+                            "properties": {
+                                "annotations": {
+                                    "properties": {},
+                                    "type": "object"
+                                },
+                                "create": {
+                                    "type": "boolean"
+                                },
+                                "duration": {
+                                    "type": "string"
+                                },
+                                "issuerRef": {
+                                    "properties": {
+                                        "group": {
+                                            "type": "string"
+                                        },
+                                        "kind": {
+                                            "type": "string"
+                                        },
+                                        "name": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "type": "object"
+                                },
+                                "renewBefore": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "create": {
+                    "type": "boolean"
+                },
+                "deploymentAnnotations": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "extraArgs": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "extraEnv": {
+                    "type": "array"
+                },
+                "extraVolumeMounts": {
+                    "type": "array"
+                },
+                "extraVolumes": {
+                    "type": "array"
+                },
+                "failurePolicy": {
+                    "type": "string"
+                },
+                "fullnameOverride": {
+                    "type": "string"
+                },
+                "hostNetwork": {
+                    "type": "boolean"
+                },
+                "image": {
+                    "properties": {
+                        "flavour": {
+                            "type": "string"
+                        },
+                        "pullPolicy": {
+                            "type": "string"
+                        },
+                        "repository": {
+                            "type": "string"
+                        },
+                        "tag": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "imagePullSecrets": {
+                    "type": "array"
+                },
+                "log": {
+                    "properties": {
+                        "level": {
+                            "type": "string"
+                        },
+                        "timeEncoding": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "lookaheadInterval": {
+                    "type": "string"
+                },
+                "metrics": {
+                    "properties": {
+                        "listen": {
+                            "properties": {
+                                "port": {
+                                    "type": "integer"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "service": {
+                            "properties": {
+                                "annotations": {
+                                    "properties": {},
+                                    "type": "object"
+                                },
+                                "enabled": {
+                                    "type": "boolean"
+                                },
+                                "port": {
+                                    "type": "integer"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "nameOverride": {
+                    "type": "string"
+                },
+                "nodeSelector": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "podAnnotations": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "podDisruptionBudget": {
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        },
+                        "minAvailable": {
+                            "type": "integer"
+                        }
+                    },
+                    "type": "object"
+                },
+                "podLabels": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "podSecurityContext": {
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "port": {
+                    "type": "integer"
+                },
+                "priorityClassName": {
+                    "type": "string"
+                },
+                "rbac": {
+                    "properties": {
+                        "create": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "readinessProbe": {
+                    "properties": {
+                        "address": {
+                            "type": "string"
+                        },
+                        "port": {
+                            "type": "integer"
+                        }
+                    },
+                    "type": "object"
+                },
+                "replicaCount": {
+                    "type": "integer"
+                },
+                "resources": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "revisionHistoryLimit": {
+                    "type": "integer"
+                },
+                "secretAnnotations": {
+                    "properties": {},
+                    "type": "object"
+                },
+                "securityContext": {
+                    "properties": {
+                        "allowPrivilegeEscalation": {
+                            "type": "boolean"
+                        },
+                        "capabilities": {
+                            "properties": {
+                                "drop": {
+                                    "items": {
+                                        "type": "string"
+                                    },
+                                    "type": "array"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "enabled": {
+                            "type": "boolean"
+                        },
+                        "readOnlyRootFilesystem": {
+                            "type": "boolean"
+                        },
+                        "runAsNonRoot": {
+                            "type": "boolean"
+                        },
+                        "runAsUser": {
+                            "type": "integer"
+                        },
+                        "seccompProfile": {
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "serviceAccount": {
+                    "properties": {
+                        "annotations": {
+                            "properties": {},
+                            "type": "object"
+                        },
+                        "automount": {
+                            "type": "boolean"
+                        },
+                        "create": {
+                            "type": "boolean"
+                        },
+                        "extraLabels": {
+                            "properties": {},
+                            "type": "object"
+                        },
+                        "name": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "tolerations": {
+                    "type": "array"
+                },
+                "topologySpreadConstraints": {
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        }
+    },
+    "type": "object"
+}
diff --git a/charts/external-secrets/external-secrets/0.13.0/values.yaml b/charts/external-secrets/external-secrets/0.13.0/values.yaml
new file mode 100644
index 000000000..071e73737
--- /dev/null
+++ b/charts/external-secrets/external-secrets/0.13.0/values.yaml
@@ -0,0 +1,535 @@
+global:
+  nodeSelector: {}
+  tolerations: []
+  topologySpreadConstraints: []
+  affinity: {}
+  compatibility:
+    openshift:
+      # -- Manages the securityContext properties to make them compatible with OpenShift.
+      # Possible values:
+      # auto - Apply configurations if it is detected that OpenShift is the target platform.
+      # force - Always apply configurations.
+      # disabled - No modification applied.
+      adaptSecurityContext: auto
+
+replicaCount: 1
+
+bitwarden-sdk-server:
+  enabled: false
+
+# -- Specifies the amount of historic ReplicaSets k8s should keep (see https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#clean-up-policy)
+revisionHistoryLimit: 10
+
+image:
+  repository: oci.external-secrets.io/external-secrets/external-secrets
+  pullPolicy: IfNotPresent
+  # -- The image tag to use. The default is the chart appVersion.
+  tag: ""
+  # -- The flavour of tag you want to use
+  # There are different image flavours available, like distroless and ubi.
+  # Please see GitHub release notes for image tags for these flavors.
+  # By default, the distroless image is used.
+  flavour: ""
+
+# -- If set, install and upgrade CRDs through helm chart.
+installCRDs: true
+
+crds:
+  # -- If true, create CRDs for Cluster External Secret.
+  createClusterExternalSecret: true
+  # -- If true, create CRDs for Cluster Secret Store.
+  createClusterSecretStore: true
+  # -- If true, create CRDs for Cluster Generator.
+  createClusterGenerator: true
+  # -- If true, create CRDs for Push Secret.
+  createPushSecret: true
+  annotations: {}
+  conversion:
+    # -- If webhook is set to false this also needs to be set to false otherwise the kubeapi will be hammered because the conversion is looking for a webhook endpoint.
+    enabled: true
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+namespaceOverride: ""
+
+# -- Additional labels added to all helm chart resources.
+commonLabels: {}
+
+# -- If true, external-secrets will perform leader election between instances to ensure no more
+# than one instance of external-secrets operates at a time.
+leaderElect: false
+
+# -- If set external secrets will filter matching
+# Secret Stores with the appropriate controller values.
+controllerClass: ""
+
+# -- If true external secrets will use recommended kubernetes
+# annotations as prometheus metric labels.
+extendedMetricLabels: false
+
+# -- If set external secrets are only reconciled in the
+# provided namespace
+scopedNamespace: ""
+
+# -- Must be used with scopedNamespace. If true, create scoped RBAC roles under the scoped namespace
+# and implicitly disable cluster stores and cluster external secrets
+scopedRBAC: false
+
+# -- if true, the operator will process cluster external secret. Else, it will ignore them.
+processClusterExternalSecret: true
+
+# -- if true, the operator will process cluster store. Else, it will ignore them.
+processClusterStore: true
+
+# -- if true, the operator will process push secret. Else, it will ignore them.
+processPushSecret: true
+
+# -- Specifies whether an external secret operator deployment be created.
+createOperator: true
+
+# -- Specifies the number of concurrent ExternalSecret Reconciles external-secret executes at
+# a time.
+concurrent: 1
+# -- Specifices Log Params to the Webhook
+log:
+  level: info
+  timeEncoding: epoch
+service:
+  # -- Set the ip family policy to configure dual-stack see [Configure dual-stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services)
+  ipFamilyPolicy: ""
+  # -- Sets the families that should be supported and the order in which they should be applied to ClusterIP as well. Can be IPv4 and/or IPv6.
+  ipFamilies: []
+
+serviceAccount:
+  # -- Specifies whether a service account should be created.
+  create: true
+  # -- Automounts the service account token in all containers of the pod
+  automount: true
+  # -- Annotations to add to the service account.
+  annotations: {}
+  # -- Extra Labels to add to the service account.
+  extraLabels: {}
+  # -- The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template.
+  name: ""
+
+rbac:
+  # -- Specifies whether role and rolebinding resources should be created.
+  create: true
+
+  servicebindings:
+    # -- Specifies whether a clusterrole to give servicebindings read access should be created.
+    create: true
+
+## -- Extra environment variables to add to container.
+extraEnv: []
+
+## -- Map of extra arguments to pass to container.
+extraArgs: {}
+
+## -- Extra volumes to pass to pod.
+extraVolumes: []
+
+## -- Extra Kubernetes objects to deploy with the helm chart
+extraObjects: []
+
+## -- Extra volumes to mount to the container.
+extraVolumeMounts: []
+
+## -- Extra containers to add to the pod.
+extraContainers: []
+
+# -- Annotations to add to Deployment
+deploymentAnnotations: {}
+
+# -- Annotations to add to Pod
+podAnnotations: {}
+
+podLabels: {}
+
+podSecurityContext:
+  enabled: true
+  # fsGroup: 2000
+
+securityContext:
+  allowPrivilegeEscalation: false
+  capabilities:
+    drop:
+      - ALL
+  enabled: true
+  readOnlyRootFilesystem: true
+  runAsNonRoot: true
+  runAsUser: 1000
+  seccompProfile:
+    type: RuntimeDefault
+
+resources: {}
+  # requests:
+  #   cpu: 10m
+  #   memory: 32Mi
+
+serviceMonitor:
+  # -- Specifies whether to create a ServiceMonitor resource for collecting Prometheus metrics
+  enabled: false
+
+  # -- namespace where you want to install ServiceMonitors
+  namespace: ""
+
+  # -- Additional labels
+  additionalLabels: {}
+
+  # --  Interval to scrape metrics
+  interval: 30s
+
+  # -- Timeout if metrics can't be retrieved in given time interval
+  scrapeTimeout: 25s
+
+  # -- Let prometheus add an exported_ prefix to conflicting labels
+  honorLabels: false
+
+  # -- Metric relabel configs to apply to samples before ingestion. [Metric Relabeling](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs)
+  metricRelabelings: []
+  # - action: replace
+  #   regex: (.*)
+  #   replacement: $1
+  #   sourceLabels:
+  #   - exported_namespace
+  #   targetLabel: namespace
+
+  # -- Relabel configs to apply to samples before ingestion. [Relabeling](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config)
+  relabelings: []
+  # - sourceLabels: [__meta_kubernetes_pod_node_name]
+  #   separator: ;
+  #   regex: ^(.*)$
+  #   targetLabel: nodename
+  #   replacement: $1
+  #   action: replace
+
+metrics:
+
+  listen:
+    port: 8080
+
+  service:
+    # -- Enable if you use another monitoring tool than Prometheus to scrape the metrics
+    enabled: false
+
+    # -- Metrics service port to scrape
+    port: 8080
+
+    # -- Additional service annotations
+    annotations: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+topologySpreadConstraints: []
+
+affinity: {}
+
+# -- Pod priority class name.
+priorityClassName: ""
+
+# -- Pod disruption budget - for more details see https://kubernetes.io/docs/concepts/workloads/pods/disruptions/
+podDisruptionBudget:
+  enabled: false
+  minAvailable: 1
+  # maxUnavailable: 1
+
+# -- Run the controller on the host network
+hostNetwork: false
+
+webhook:
+  # -- Specifies whether a webhook deployment be created.
+  create: true
+  # -- Specifices the time to check if the cert is valid
+  certCheckInterval: "5m"
+  # -- Specifices the lookaheadInterval for certificate validity
+  lookaheadInterval: ""
+  replicaCount: 1
+  # -- Specifices Log Params to the Webhook
+  log:
+    level: info
+    timeEncoding: epoch
+  # -- Specifies the amount of historic ReplicaSets k8s should keep (see https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#clean-up-policy)
+  revisionHistoryLimit: 10
+
+  certDir: /tmp/certs
+  # -- Specifies whether validating webhooks should be created with failurePolicy: Fail or Ignore
+  failurePolicy: Fail
+  # -- Specifies if webhook pod should use hostNetwork or not.
+  hostNetwork: false
+  image:
+    repository: oci.external-secrets.io/external-secrets/external-secrets
+    pullPolicy: IfNotPresent
+    # -- The image tag to use. The default is the chart appVersion.
+    tag: ""
+    # -- The flavour of tag you want to use
+    flavour: ""
+  imagePullSecrets: []
+  nameOverride: ""
+  fullnameOverride: ""
+  # -- The port the webhook will listen to
+  port: 10250
+  rbac:
+  # -- Specifies whether role and rolebinding resources should be created.
+    create: true
+  serviceAccount:
+    # -- Specifies whether a service account should be created.
+    create: true
+    # -- Automounts the service account token in all containers of the pod
+    automount: true
+    # -- Annotations to add to the service account.
+    annotations: {}
+    # -- Extra Labels to add to the service account.
+    extraLabels: {}
+    # -- The name of the service account to use.
+    # If not set and create is true, a name is generated using the fullname template.
+    name: ""
+  nodeSelector: {}
+
+  certManager:
+    # -- Enabling cert-manager support will disable the built in secret and
+    # switch to using cert-manager (installed separately) to automatically issue
+    # and renew the webhook certificate. This chart does not install
+    # cert-manager for you, See https://cert-manager.io/docs/
+    enabled: false
+    # -- Automatically add the cert-manager.io/inject-ca-from annotation to the
+    # webhooks and CRDs. As long as you have the cert-manager CA Injector
+    # enabled, this will automatically setup your webhook's CA to the one used
+    # by cert-manager. See https://cert-manager.io/docs/concepts/ca-injector
+    addInjectorAnnotations: true
+    cert:
+      # -- Create a certificate resource within this chart. See
+      # https://cert-manager.io/docs/usage/certificate/
+      create: true
+      # -- For the Certificate created by this chart, setup the issuer. See
+      # https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.IssuerSpec
+      issuerRef:
+        group: cert-manager.io
+        kind: "Issuer"
+        name: "my-issuer"
+      # -- Set the requested duration (i.e. lifetime) of the Certificate. See
+      # https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.CertificateSpec
+      # One year by default.
+      duration: "8760h"
+      # -- How long before the currently issued certificate’s expiry
+      # cert-manager should renew the certificate. See
+      # https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.CertificateSpec
+      # Note that renewBefore should be greater than .webhook.lookaheadInterval
+      # since the webhook will check this far in advance that the certificate is
+      # valid.
+      renewBefore: ""
+      # -- Add extra annotations to the Certificate resource.
+      annotations: {}
+
+  tolerations: []
+
+  topologySpreadConstraints: []
+
+  affinity: {}
+
+    # -- Pod priority class name.
+  priorityClassName: ""
+
+  # -- Pod disruption budget - for more details see https://kubernetes.io/docs/concepts/workloads/pods/disruptions/
+  podDisruptionBudget:
+    enabled: false
+    minAvailable: 1
+    # maxUnavailable: 1
+
+  metrics:
+
+    listen:
+      port: 8080
+
+    service:
+      # -- Enable if you use another monitoring tool than Prometheus to scrape the metrics
+      enabled: false
+
+      # -- Metrics service port to scrape
+      port: 8080
+
+      # -- Additional service annotations
+      annotations: {}
+
+
+  readinessProbe:
+    # -- Address for readiness probe
+    address: ""
+    # -- ReadinessProbe port for kubelet
+    port: 8081
+
+
+    ## -- Extra environment variables to add to container.
+  extraEnv: []
+
+    ## -- Map of extra arguments to pass to container.
+  extraArgs: {}
+
+    ## -- Extra volumes to pass to pod.
+  extraVolumes: []
+
+    ## -- Extra volumes to mount to the container.
+  extraVolumeMounts: []
+
+    # -- Annotations to add to Secret
+  secretAnnotations: {}
+
+    # -- Annotations to add to Deployment
+  deploymentAnnotations: {}
+
+    # -- Annotations to add to Pod
+  podAnnotations: {}
+
+  podLabels: {}
+
+  podSecurityContext:
+    enabled: true
+      # fsGroup: 2000
+
+  securityContext:
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop:
+        - ALL
+    enabled: true
+    readOnlyRootFilesystem: true
+    runAsNonRoot: true
+    runAsUser: 1000
+    seccompProfile:
+      type: RuntimeDefault
+
+  resources: {}
+      # requests:
+      #   cpu: 10m
+      #   memory: 32Mi
+
+certController:
+  # -- Specifies whether a certificate controller deployment be created.
+  create: true
+  requeueInterval: "5m"
+  replicaCount: 1
+  # -- Specifices Log Params to the Webhook
+  log:
+    level: info
+    timeEncoding: epoch
+  # -- Specifies the amount of historic ReplicaSets k8s should keep (see https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#clean-up-policy)
+  revisionHistoryLimit: 10
+
+  image:
+    repository: oci.external-secrets.io/external-secrets/external-secrets
+    pullPolicy: IfNotPresent
+    tag: ""
+    flavour: ""
+  imagePullSecrets: []
+  nameOverride: ""
+  fullnameOverride: ""
+  rbac:
+  # -- Specifies whether role and rolebinding resources should be created.
+    create: true
+  serviceAccount:
+    # -- Specifies whether a service account should be created.
+    create: true
+    # -- Automounts the service account token in all containers of the pod
+    automount: true
+    # -- Annotations to add to the service account.
+    annotations: {}
+    # -- Extra Labels to add to the service account.
+    extraLabels: {}
+    # -- The name of the service account to use.
+    # If not set and create is true, a name is generated using the fullname template.
+    name: ""
+  nodeSelector: {}
+
+  tolerations: []
+
+  topologySpreadConstraints: []
+
+  affinity: {}
+
+  # -- Run the certController on the host network
+  hostNetwork: false
+
+    # -- Pod priority class name.
+  priorityClassName: ""
+
+  # -- Pod disruption budget - for more details see https://kubernetes.io/docs/concepts/workloads/pods/disruptions/
+  podDisruptionBudget:
+    enabled: false
+    minAvailable: 1
+    # maxUnavailable: 1
+
+  metrics:
+
+    listen:
+      port: 8080
+
+    service:
+      # -- Enable if you use another monitoring tool than Prometheus to scrape the metrics
+      enabled: false
+
+      # -- Metrics service port to scrape
+      port: 8080
+
+      # -- Additional service annotations
+      annotations: {}
+
+  readinessProbe:
+    # -- Address for readiness probe
+    address: ""
+    # -- ReadinessProbe port for kubelet
+    port: 8081
+
+    ## -- Extra environment variables to add to container.
+  extraEnv: []
+
+    ## -- Map of extra arguments to pass to container.
+  extraArgs: {}
+
+
+    ## -- Extra volumes to pass to pod.
+  extraVolumes: []
+
+    ## -- Extra volumes to mount to the container.
+  extraVolumeMounts: []
+
+    # -- Annotations to add to Deployment
+  deploymentAnnotations: {}
+
+    # -- Annotations to add to Pod
+  podAnnotations: {}
+
+  podLabels: {}
+
+  podSecurityContext:
+    enabled: true
+      # fsGroup: 2000
+
+  securityContext:
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop:
+        - ALL
+    enabled: true
+    readOnlyRootFilesystem: true
+    runAsNonRoot: true
+    runAsUser: 1000
+    seccompProfile:
+      type: RuntimeDefault
+
+  resources: {}
+      # requests:
+      #   cpu: 10m
+      #   memory: 32Mi
+
+# -- Specifies `dnsPolicy` to deployment
+dnsPolicy: ClusterFirst
+
+# -- Specifies `dnsOptions` to deployment
+dnsConfig: {}
+
+# -- Any extra pod spec on the deployment
+podSpecExtra: {}
diff --git a/charts/jfrog/artifactory-ha/107.98.13/Chart.yaml b/charts/jfrog/artifactory-ha/107.98.13/Chart.yaml
index 43e66f19b..e5031d941 100644
--- a/charts/jfrog/artifactory-ha/107.98.13/Chart.yaml
+++ b/charts/jfrog/artifactory-ha/107.98.13/Chart.yaml
@@ -2,7 +2,6 @@ annotations:
   artifactoryServiceVersion: 7.98.13
   catalog.cattle.io/certified: partner
   catalog.cattle.io/display-name: JFrog Artifactory HA
-  catalog.cattle.io/featured: "2"
   catalog.cattle.io/kube-version: '>= 1.19.0-0'
   catalog.cattle.io/release-name: artifactory-ha
   metadataVersion: 7.90.7
diff --git a/charts/jfrog/artifactory-ha/107.98.14/.helmignore b/charts/jfrog/artifactory-ha/107.98.14/.helmignore
new file mode 100644
index 000000000..b6e97f07f
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/.helmignore
@@ -0,0 +1,24 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+OWNERS
+
+tests/
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/CHANGELOG.md b/charts/jfrog/artifactory-ha/107.98.14/CHANGELOG.md
new file mode 100644
index 000000000..3ee44b68c
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/CHANGELOG.md
@@ -0,0 +1,1495 @@
+# JFrog Artifactory-ha Chart Changelog
+All changes to this chart will be documented in this file
+
+## [107.98.14] - Nov 06, 2024
+* Add support for `extraEnvironmentVariables` on filebeat Sidecar [GH-1377](https://github.com/jfrog/charts/pull/1377)
+* Support for SSL offload HTTPS proto override in Nginx service (ClusterIP, LoadBalancer) layer. Introduced `nginx.service.ssloffloadForceHttps` field with boolean type. [GH-1906](https://github.com/jfrog/charts/pull/1906)
+* Enable Access workers integration when artifactory.worker.enabled is true
+* Added `signedUrlExpirySeconds` option to artifactory.persistence.type of `google-storage`, `google-storage-v2`, and `google-storage-v2-direct` [GH-1858](https://github.com/jfrog/charts/pull/1858)
+* Added support to bootstrap jfconnect custom certs to jfconnect trusted directory
+* Added fix for database credentials secret in non-unified secret installations
+* Fixed the type of `.Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds` in binarystore.xml from boolean to integer
+
+## [107.96.0] - Sep 18, 2024
+* Merged Artifactory sizing templates to a single file per size
+* Added metadata and observability standalone image support
+
+## [107.95.0] - Aug 26, 2024
+* Adding missing annotations to primary Artifactory Service [GH-1862](https://github.com/jfrog/charts/pull/1862)
+
+## [107.94.0] - Aug 14, 2024
+* Fixed #Expose rtfs port only when it is enabled
+
+## [107.93.0] - Aug 9, 2024
+* Added support for worker via `artifactory.worker.enabled` flag
+* Fixed creation of duplicate objects in statefulSet
+
+## [107.92.0] - July 31, 2024
+* Updating the example link for downloading the DB driver
+* Adding dedicated ingress and service path for GRPC protocol
+
+## [107.91.0] - July 18, 2024
+* Remove X-JFrog-Override-Base-Url port when using default `443/80` ports
+
+## [107.90.0] - July 18, 2024
+* Fixed #adding colon in image registry which breaks deployment [GH-1892](https://github.com/jfrog/charts/pull/1892)
+* Added new `nginx.hosts` to use Nginx server_name directive instead of `ingress.hosts`
+* Added a deprecation notice of ingress.hosts when `ngnix.enabled` is true
+* Added new evidence service
+* Corrected database connection values based on sizing 
+* **IMPORTANT**
+* Separate access from artifactory tomcat to run on its own dedicated tomcat
+  * With this change access will be running in its own dedicated container
+  * This will give the ability to control resources and java options specific to access
+    Can be done by passing the following,
+    `access.javaOpts.other`
+    `access.resources`
+    `access.extraEnvironmentVariables`
+* Added Binary Provider recommendations
+
+## [107.89.0] - May 30, 2024
+* Fix the indentation of the commented-out sections in the values.yaml file
+
+## [107.88.0] - May 29, 2024
+* **IMPORTANT**
+* Refactored `nginx.artifactoryConf` and `nginx.mainConf` configuration (moved to files/nginx-artifactory-conf.yaml  and files/nginx-main-conf.yaml instead of keys in values.yaml)
+
+## [107.87.0] - May 29, 2024
+* Renamed `.Values.artifactory.openMetrics` to `.Values.artifactory.metrics`
+* Align all liveness and readiness probes (Removed hard-coded values)
+
+## [107.85.0] - May 29, 2024
+* Changed `migration.enabled` to false by default. For 6.x to 7.x migration, this flag needs to be set to `true`
+
+## [107.84.0] - May 29, 2024
+* Added image section for `initContainers` instead of `initContainerImage`
+* Renamed `router.image.imagePullPolicy` to `router.image.pullPolicy`
+* Removed loggers.image section
+* Added support for `global.verisons.initContainers` to override `initContainers.image.tag`
+* Fixed an issue with extraSystemYaml merge
+* **IMPORTANT**
+* Renamed `artifactory.setSecurityContext` to `artifactory.podSecurityContext` 
+* Renamed `artifactory.uid` to `artifactory.podSecurityContext.runAsUser`
+* Renamed `artifactory.gid` to `artifactory.podSecurityContext.runAsGroup` and `artifactory.podSecurityContext.fsGroup`
+* Renamed `artifactory.fsGroupChangePolicy` to `artifactory.podSecurityContext.fsGroupChangePolicy`
+* Renamed `artifactory.seLinuxOptions` to `artifactory.podSecurityContext.seLinuxOptions`
+* Added flag `allowNonPostgresql` defaults to false
+* Update postgresql tag version to `15.6.0-debian-12-r5`
+* Added a check if `initContainerImage` exists
+* Fixed a wrong imagePullPolicy configuration
+* Fixed an issue to generate unified secret to support artifactory fullname [GH-1882](https://github.com/jfrog/charts/issues/1882)
+* Fixed an issue template render on loggers [GH-1883](https://github.com/jfrog/charts/issues/1883)
+* Override metadata and observability image tag with `global.verisons.artifactory` value
+* Fixed resource constraints for "setup" initContainer of nginx deployment [GH-962] (https://github.com/jfrog/charts/issues/962)
+* Added .Values.artifactory.unifiedSecretsPrependReleaseName` for unified secret to prepend release name
+* Fixed maxCacheSize and cacheProviderDir mix up under azure-blob-storage-v2-direct template in binarystore.xml
+
+## [107.83.0] - Mar 12, 2024
+* Added image section for `metadata` and `observability`
+
+## [107.82.0] - Mar 04, 2024
+* Added `disableRouterBypass` flag as experimental feature, to disable the artifactoryPath /artifactory/ and route all traffic through the Router.
+* Removed Replicator Service
+
+## [107.81.0] - Feb 20, 2024
+* **IMPORTANT**
+* Refactored systemYaml configuration (moved to files/system.yaml instead of key in values.yaml)
+* Added ability to provide `extraSystemYaml` configuration in values.yaml which will merge with the existing system yaml when `systemYamlOverride` is not given [GH-1848](https://github.com/jfrog/charts/pull/1848)
+* Added option to modify the new cache configs, maxFileSizeLimit and skipDuringUpload
+* Added IPV4/IPV6 Dualstack flag support for Artifactory and nginx service
+* Added `singleStackIPv6Cluster` flag, which manages the Nginx configuration to enable listening on IPv6 and proxying
+* Fixing broken link for creating additional kubernetes resources. Refer [here](https://github.com/jfrog/log-analytics-prometheus/blob/master/helm/artifactory-ha-values.yaml)
+* Refactored installerInfo configuration (moved to files/installer-info.json instead of key in values.yaml)
+
+## [107.80.0] - Feb 20, 2024
+* Updated README.md to create a namespace using `--create-namespace` as part of helm install
+
+## [107.79.0] - Feb 20, 2024
+* **IMPORTANT**
+* Added `unifiedSecretInstallation` flag which enables single unified secret holding all internal (chart) secrets to `true` by default
+* Added support for azure-blob-storage-v2-direct config
+* Added option to set Nginx to write access_log to container STDOUT
+* **Important change:**
+* Update postgresql tag version to `15.2.0-debian-11-r23`
+* If this is a new deployment or you already use an external database (`postgresql.enabled=false`), these changes **do not affect you**!
+* If this is an upgrade and you are using the default bundles PostgreSQL (`postgresql.enabled=true`), you need to pass previous 9.x/10.x/12.x/13.x's postgresql.image.tag, previous postgresql.persistence.size and databaseUpgradeReady=true
+
+## [107.77.0] - April 22, 2024
+* Removed integration service
+* Added recommended postgresql sizing configurations under sizing directory
+* Updated artifactory-federation (probes, port, embedded mode)
+* **IMPORTANT**
+* setSecurityContext has been renamed to podSecurityContext. 
+* Moved podSecurityContext to values.yaml
+* Fixing broken nginx port [GH-1860](https://github.com/jfrog/charts/issues/1860)
+* Added nginx.customCommand to use custom commands for the nginx container
+
+## [107.76.0] - Dec 13, 2023
+* Added connectionTimeout and socketTimeout paramaters under AWSS3 binarystore section
+* Reduced nginx startupProbe initialDelaySeconds
+
+## [107.74.0] - Nov 30, 2023
+* Added recommended sizing configurations under sizing directory, please refer [here](README.md/#apply-sizing-configurations-to-the-chart)
+* **IMPORTANT**
+* Added min kubeVersion ">= 1.19.0-0" in chart.yaml
+
+## [107.70.0] - Nov 30, 2023
+* Fixed - StatefulSet pod annotations changed from range to toYaml [GH-1828](https://github.com/jfrog/charts/issues/1828)
+* Fixed - Invalid format for awsS3V3 `multiPartLimit,multipartElementSize` in binarystore.xml
+* Fixed - Artifactory primary service condition
+* Fixed - SecurityContext with runAsGroup in artifactory-ha [GH-1838](https://github.com/jfrog/charts/issues/1838)
+* Added support for custom labels in the Nginx pods [GH-1836](https://github.com/jfrog/charts/pull/1836)
+* Added podSecurityContext and containerSecurityContext for nginx
+* Added support for nginx on openshift, set `podSecurityContext` and `containerSecurityContext` to false
+* Renamed nginx internalPort 80,443 to 8080,8443 to support openshift
+
+## [107.69.0] - Sep 18, 2023
+* Adjust rtfs context
+* Fixed - Metadata service does not respect customVolumeMounts for DB CAs [GH-1815](https://github.com/jfrog/charts/issues/1815)
+
+## [107.68.8] - Sep 18, 2023
+* Reverted - Enabled `unifiedSecretInstallation` by default [GH-1819](https://github.com/jfrog/charts/issues/1819)
+* Removed unused `artifactory.javaOpts` from values.yaml
+* Removed openshift condition check from NOTES.txt
+* Fixed an issue with artifactory node replicaCount [GH-1808](https://github.com/jfrog/charts/issues/1808)
+
+## [107.68.7] - Aug 28, 2023
+* Enabled `unifiedSecretInstallation` by default
+* Removed unused `artifactory.javaOpts` from values.yaml
+
+## [107.67.0] - Aug 28, 2023
+* Add 'extraJavaOpts' and 'port' values to federation service
+
+## [107.66.0] - Aug 28, 2023
+* Added federation service container in artifactory
+* Add rtfs service to ingress in artifactory
+
+## [107.64.0] - Aug 28,2023
+* Added support to configure event.webhooks within generated system.yaml
+* Fixed an issue to generate ssl certificate should support artifactory-ha fullname
+* Added 'multiPartLimit' and 'multipartElementSize' parameters to awsS3V3 binary providers.
+* Increased default Artifactory Tomcat acceptCount config to 400
+* Fixed Illegal Strict-Transport-Security header in nginx config
+
+## [107.63.0] - Aug 28, 2023
+* Added support for Openshift by adding the securityContext in container level.
+* **IMPORTANT**
+* Disable securityContext in container and pod level to deploy postgres on openshift.
+* Fixed support for fsGroup in non openshift environment and runAsGroup in openshift environment.
+* Fixed - Helm Template Error when using artifactory.loggers [GH-1791](https://github.com/jfrog/charts/issues/1791)
+* Removed the nginx disable condition for openshift
+* Fixed jfconnect disabling as micro-service on splitcontainers [GH-1806](https://github.com/jfrog/charts/issues/1806)
+
+## [107.62.0] - Jun 5, 2023
+* Added support for 'port' and 'useHttp' parameters for s3-storage-v3 binary provider [GH-1767](https://github.com/jfrog/charts/issues/1767)
+
+## [107.61.0] - May 31, 2023
+* Added new binary provider `google-storage-v2-direct`
+
+## [107.60.0] - May 31, 2023
+* Enabled `splitServicesToContainers` to true by default
+* Updated the recommended values for small, medium and large installations to support the 'splitServicesToContainers'
+
+## [107.59.0] - May 31, 2023
+* Fixed reference of `terminationGracePeriodSeconds`
+* **Breaking change**
+* Updated the defaults of replicaCount (Values.artifactory.primary.replicaCount and Values.artifactory.node.replicaCount) to support Cloud-Native High Availability. Refer [Cloud-Native High Availability](https://jfrog.com/help/r/jfrog-installation-setup-documentation/cloud-native-high-availability)
+* Updated the values of the recommended resources  - values-small, values-medium and values-large according to the Cloud-Native HA support. 
+* **IMPORTANT**
+* In the absence of custom parameters for primary.replicaCount and node.replicaCount on your deployment, it is recommended to specify the current values explicitly to prevent any undesired changes to the deployment structure.
+* Please be advised that the configuration for resources allocation (requests, limits, javaOpts, affinity rules, etc) will now be applied solely under Values.artifactory.primary when using the new defaults.
+* **Upgrade**
+* Upgrade from primary-members to primary-only is recommended, and can be done by deploy the chart with the new values.
+* During the upgrade, members pods should be deleted and new primary pods should be created. This might trigger the creation of new PVCs.
+* Added Support for Cold Artifact Storage as part of the systemYaml configuration (disabled by default)
+* Added new binary provider `s3-storage-v3-archive`
+* Fixed jfconnect disabling as micro-service on non-splitcontainers
+* Fixed an issue whereby, Artifactory failed to start when using persistence storage type `nfs` due to missing binarystore.xml
+
+
+## [107.58.0] - Mar 23, 2023
+* Updated postgresql multi-arch tag version to `13.10.0-debian-11-r14`
+* Removed obselete remove-lost-found initContainer`
+* Added env JF_SHARED_NODE_HAENABLED under frontend when running in the container split mode 
+
+## [107.57.0] - Mar 02, 2023
+* Updated initContainerImage and logger image to `ubi9/ubi-minimal:9.1.0.1793`
+
+## [107.55.0] - Feb 21, 2023
+* Updated initContainerImage and logger image to `ubi9/ubi-minimal:9.1.0.1760`
+* Adding a custom preStop to Artifactory router for allowing graceful termination to complete
+* Fixed an invalid reference of node selector on artifactory-ha chart
+
+## [107.53.0] - Jan 20, 2023
+* Updated initContainerImage and logger image to `ubi8/ubi-minimal:8.7.1049`
+
+## [107.50.0] - Jan 20, 2023
+* Updated postgresql tag version to `13.9.0-debian-11-r11`
+* Fixed make lint issue on artifactory-ha chart [GH-1714](https://github.com/jfrog/charts/issues/1714)
+* Fixed an issue for capabilities check of ingress
+* Updated jfrogUrl text path in migrate.sh file
+* Added a note that from 107.46.x chart versions, `copyOnEveryStartup` is not needed for binarystore.xml, it is always copied via initContainers. For more Info, Refer [GH-1723](https://github.com/jfrog/charts/issues/1723)
+
+## [107.49.0] - Jan 16, 2023
+* Changed logic in wait-for-primary container to use /dev/tcp instead of curl
+* Added support for setting `seLinuxOptions` in `securityContext` [GH-1700](https://github.com/jfrog/charts/pull/1700)
+* Added option to enable/disable proxy_request_buffering and proxy_buffering_off [GH-1686](https://github.com/jfrog/charts/pull/1686)
+* Updated initContainerImage and logger image to `ubi8/ubi-minimal:8.7.1049`
+
+## [107.48.0] - Oct 27, 2022
+* Updated router version to `7.51.0`
+
+## [107.47.0] - Sep 29, 2022
+* Updated initContainerImage to `ubi8/ubi-minimal:8.6-941`
+* Added support for annotations for artifactory statefulset and nginx deployment [GH-1665](https://github.com/jfrog/charts/pull/1665)
+* Updated router version to `7.49.0`
+
+## [107.46.0] - Sep 14, 2022
+* **IMPORTANT**
+* Added support for lifecycle hooks for all containers, changed `artifactory.postStartCommand` to `.Values.artifactory.lifecycle.postStart.exec.command`
+* Updated initContainerImage and logger image to `ubi8/ubi-minimal:8.6-902`
+* Update nginx configuration to allow websocket requests when using pipelines
+* Fixed an issue to allow artifactory to make direct API calls to store  instead via jfconnect service when `splitServicesToContainers=true`
+* Refactor binarystore.xml configuration (moved to `files/binarystore.xml` instead of key in values.yaml)
+* Added new binary providers `s3-storage-v3-direct`, `azure-blob-storage-direct`, `google-storage-v2`
+* Deprecated (removed) `aws-s3` binary provider [JetS3t library](https://www.jfrog.com/confluence/display/JFROG/Configuring+the+Filestore#ConfiguringtheFilestore-BinaryProvider)
+* Deprecated (removed) `google-storage` binary provider and force persistence storage type `google-storage` to work with `google-storage-v2` only
+* Copy binarystore.xml in init Container to fix existing persistence on file system in clear text
+* Removed obselete `.Values.artifactory.binarystore.enabled` key
+* Removed `newProbes.enabled`, default to new probes
+* Added nginx.customCommand using inotifyd to reload nginx's config upon ssl secret or configmap changes [GH-1640](https://github.com/jfrog/charts/pull/1640)
+
+## [107.43.0] - Aug 25, 2022
+* Added flag `artifactory.replicator.ingress.enabled` to enable/disable ingress for replicator
+* Updated initContainerImage and logger image to `ubi8/ubi-minimal:8.6-854`
+* Updated router version to `7.45.0`
+* Added flag `artifactory.schedulerName` to set for the pods the value of schedulerName field [GH-1606](https://github.com/jfrog/charts/issues/1606)
+* Enabled TLS based on access or router in values.yaml
+
+## [107.42.0] - Aug 25, 2022
+* Enabled database creds secret to use from unified secret
+* Updated router version to `7.42.0`
+* Added support to truncate (> 63 chars) for unifiedCustomSecretVolumeName
+
+## [107.41.0] - June 27, 2022
+* Added support for nginx.terminationGracePeriodSeconds [GH-1645](https://github.com/jfrog/charts/issues/1645)
+* Fix nginx lifecycle values [GH-1646](https://github.com/jfrog/charts/pull/1646)
+* Use an alternate command for `find` to copy custom certificates
+* Added support for circle of trust using `circleOfTrustCertificatesSecret` secret name [GH-1623](https://github.com/jfrog/charts/pull/1623)
+
+## [107.40.0] - Jun 16, 2022
+* Deprecated k8s PodDisruptionBudget api policy/v1beta1 [GH-1618](https://github.com/jfrog/charts/issues/1618)
+* Disabled node PodDisruptionBudget, statefulset and artifactory-primary service from artifactory-ha chart when member nodes are 0
+* From artifactory 7.38.x, joinKey can be retrived from Admin > User Management > Settings in UI
+* Fixed template name for artifactory-ha database creds [GH-1602](https://github.com/jfrog/charts/pull/1602)
+* Allow templating for pod annotations [GH-1634](https://github.com/jfrog/charts/pull/1634)
+* Added flags to control enable/disable infra services in splitServicesToContainers
+
+## [107.39.0] - May 16, 2022
+* Fix default `artifactory.async.corePoolSize`  [GH-1612](https://github.com/jfrog/charts/issues/1612)
+* Added support of nginx annotations
+* Reduce startupProbe `initialDelaySeconds`
+* Align all liveness and readiness probes failureThreshold to `5` seconds
+* Added new flag `unifiedSecretInstallation` to enables single unified secret holding all the artifactory-ha secrets
+* Updated router version to `7.38.0`
+
+## [107.38.0] - May 04, 2022
+* Added support for `global.nodeSelector` to artifactory and nginx pods
+* Updated router version to `7.36.1`
+* Added support for custom global probes timeout
+* Updated frontend container command
+* Added topologySpreadConstraints to artifactory and nginx, and add lifecycle hooks to nginx [GH-1596](https://github.com/jfrog/charts/pull/1596)
+* Added support of extraEnvironmentVariables for all infra services containers
+* Enabled the consumption (jfconnect) flag by default
+* Fix jfconnect disabling on non-splitcontainers
+
+## [107.37.0] - Mar 08, 2022
+* Added support for customPorts in nginx deployment
+* Bugfix - Wrong proxy_pass configurations for /artifactory/ in the default artifactory.conf
+* Added signedUrlExpirySeconds option to artifactory.persistence.type aws-S3-V3
+* Updated router version to `7.35.0`
+* Added useInstanceCredentials,enableSignedUrlRedirect option to google-storage-v2
+* Changed dependency charts repo to `charts.jfrog.io`
+
+## [107.36.0] - Mar 03, 2022
+* Remove pdn tracker which starts replicator service
+* Added silent option for curl probes
+* Added readiness health check for the artifactory container for k8s version < 1.20
+* Fix property file migration issue to system.yaml 6.x to 7.x
+
+## [107.35.0] - Feb 08, 2022
+* Updated router version to `7.32.1`
+
+## [107.33.0] - Jan 11, 2022
+* Make default value of anti-affinity to soft
+* Readme fixes
+* Added support for setting `fsGroupChangePolicy`
+* Added nginx customInitContainers, customVolumes, customSidecarContainers [GH-1565](https://github.com/jfrog/charts/pull/1565)
+* Updated router version to `7.30.0`
+
+## [107.32.0] - Dec 23, 2021
+* Updated logger image to `jfrog/ubi-minimal:8.5-204`
+* Added default `8091` as `artifactory.tomcat.maintenanceConnector.port` for probes check
+* Refactored probes to replace httpGet probes with basic exec + curl
+* Refactored `database-creds` secret to create only when database values are passed
+* Added new endpoints for probes `/artifactory/api/v1/system/liveness` and `/artifactory/api/v1/system/readiness`
+* Enabled `newProbes:true` by default to use these endpoints
+* Fix filebeat sidecar spool file permissions
+* Updated filebeat sidecar container to `7.16.2`
+
+## [107.31.0] - Dec 17, 2021
+* Remove integration service feature flag to make it mandatory service
+* Update postgresql tag version to `13.4.0-debian-10-r39`
+* Refactored `router.requiredServiceTypes` to support platform chart
+
+## [107.30.0] - Nov 30, 2021
+* Fixed incorrect permission for filebeat.yaml
+* Updated healthcheck (liveness/readiness) api for integration service
+* Disable readiness health check for the artifactory container when running in the container split mode
+* Ability to start replicator on enabling pdn tracker
+
+## [107.29.0] - Nov 30, 2021
+* Added integration service container in artifactory
+* Add support for Ingress Class Name in Ingress Spec [GH-1516](https://github.com/jfrog/charts/pull/1516)
+* Fixed chart values to use curl instead of wget [GH-1529](https://github.com/jfrog/charts/issues/1529)
+* Updated nginx config to allow websockets when pipelines is enabled
+* Moved router.topology.local.requireqservicetypes from system.yaml to router as environment variable
+* Added jfconnect in system.yaml
+* Updated artifactory container’s health probes to use artifactory api on rt-split
+* Updated initContainerImage to `jfrog/ubi-minimal:8.5-204`
+* Updated router version to `7.28.2`
+* Set Jfconnect enabled to `false` in the artifactory container when running in the container split mode
+
+## [107.28.0] - Nov 11, 2021
+* Added default values cpu and memeory in initContainers
+* Updated router version to `7.26.0`
+* Bug fix - jmx port not exposed in artifactory service
+* Updated (`rbac.create` and `serviceAccount.create` to false by default) for least privileges
+* Fixed incorrect data type for `Values.router.serviceRegistry.insecure` in default values.yaml [GH-1514](https://github.com/jfrog/charts/pull/1514/files)
+* **IMPORTANT**
+* Changed init-container images from `alpine` to `ubi8/ubi-minimal`
+* Added support for AWS License Manager using `.Values.aws.licenseConfigSecretName`
+
+## [107.27.0] - Oct 6, 2021
+* **Breaking change**
+* Aligned probe structure (moved probes variables under config block)
+* Added support for new probes(set to false by default)
+* Bugfix - Invalid format for `multiPartLimit,multipartElementSize,maxCacheSize` in binarystore.xml [GH-1466](https://github.com/jfrog/charts/issues/1466)
+* Added missioncontrol container in artifactory
+* Dropped NET_RAW capability for the containers
+* Added resources to migration-artifactory init container
+* Added resources to all rt split containers
+* Updated router version to `7.25.1`
+* Added support for Ingress networking.k8s.io/v1/Ingress for k8s >=1.22 [GH-1487](https://github.com/jfrog/charts/pull/1487)
+* Added min kubeVersion ">= 1.14.0-0" in chart.yaml
+* Update alpine tag version to `3.14.2`
+* Update busybox tag version to `1.33.1`
+* Update postgresql tag version to `13.4.0-debian-10-r39`
+
+## [107.26.0] - Aug 20, 2021
+* Added Observability container (only when `splitServicesToContainers` is enabled)
+* Added min kubeVersion ">= 1.12.0-0" in chart.yaml
+
+## [107.25.0] - Aug 13, 2021
+* Updated readme of chart to point to wiki. Refer [Installing Artifactory](https://www.jfrog.com/confluence/display/JFROG/Installing+Artifactory)
+* Added startupProbe and livenessProbe for RT-split containers
+* Updated router version to 7.24.1
+* Added security hardening fixes
+* Enabled startup probes for k8s >= 1.20.x
+* Changed network policy to allow all ingress and egress traffic
+* Added Observability changes
+* Added support for global.versions.router (only when `splitServicesToContainers` is enabled)
+
+## [107.24.0] - July 27, 2021
+* Support global and product specific tags at the same time
+* Added support for artifactory containers split
+
+## [107.23.0] - July 8, 2021
+* Bug fix - logger sideCar picks up Wrong File in helm
+* Allow filebeat metrics configuration in values.yaml
+
+## [107.22.0] - July 6, 2021
+* Update alpine tag version to `3.14.0`
+* Added `nodePort` support to artifactory-service and nginx-service templates
+* Removed redundant `terminationGracePeriodSeconds` in statefulset
+* Increased `startupProbe.failureThreshold` time
+
+## [107.21.3] - July 2, 2021
+* Added ability to change sendreasonphrase value in server.xml via system yaml
+
+## [107.19.3] - May 20, 2021
+* Fix broken support for startupProbe for k8s < 1.18.x
+* Removed an extraneous resources block from the prepare-custom-persistent-volume container in the primary statefulset
+* Added support for `nameOverride` and `fullnameOverride` in values.yaml
+
+## [107.18.6] - May 4, 2021
+* Removed `JF_SHARED_NODE_PRIMARY` env to support for Cloud Native HA
+* Bumping chart version to align with app version
+* Add `securityContext` option on nginx container
+
+## [5.0.0] - April 22, 2021
+* **Breaking change:** 
+* Increased default postgresql persistence  size to `200Gi` 
+* Update postgresql tag version to `13.2.0-debian-10-r55`
+* Update postgresql chart version to `10.3.18` in chart.yaml - [10.x Upgrade Notes](https://github.com/bitnami/charts/tree/master/bitnami/postgresql#to-1000)
+* If this is a new deployment or you already use an external database (`postgresql.enabled=false`), these changes **do not affect you**!
+* If this is an upgrade and you are using the default PostgreSQL (`postgresql.enabled=true`), you need to pass previous 9.x/10.x/12.x's postgresql.image.tag, previous postgresql.persistence.size and databaseUpgradeReady=true
+* **IMPORTANT**
+* This chart is only helm v3 compatible
+* Fix support for Cloud Native HA
+* Fixed filebeat-configmap naming
+* Explicitly set ServiceAccount `automountServiceAccountToken` to 'true'
+* Update alpine tag version to `3.13.5`
+
+## [4.13.2] - April 15, 2021
+* Updated Artifactory version to 7.17.9 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.17.9)
+
+## [4.13.1] - April 6, 2021
+* Updated Artifactory version to 7.17.6 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.17.6)
+* Update alpine tag version to `3.13.4`
+
+## [4.13.0] - April 5, 2021
+* **IMPORTANT**
+* Added `charts.jfrog.io` as default JFrog Helm repository
+* Updated Artifactory version to 7.17.5 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.17.5)
+
+## [4.12.2] - Mar 31, 2021
+* Updated Artifactory version to 7.17.4 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.17.4)
+
+## [4.12.1] - Mar 30, 2021
+* Updated Artifactory version to 7.17.3
+* Add `timeoutSeconds` to all exec probes - Please refer [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes)
+
+## [4.12.0] - Mar 24, 2021
+* Updated Artifactory version to 7.17.2
+* Optimized startupProbe time
+
+## [4.11.0] - Mar 18, 2021
+* Add support to startupProbe
+
+## [4.10.0] - Mar 15, 2021
+* Updated Artifactory version to 7.16.3
+
+## [4.9.5] - Mar 09, 2021
+* Added HSTS header to nginx conf
+
+## [4.9.4] - Mar 9, 2021
+* Removed bintray URL references in the chart
+
+## [4.9.3] - Mar 04, 2021
+* Updated Artifactory version to 7.15.4 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.15.4)
+
+## [4.9.2] - Mar 04, 2021
+* Fixed creation of nginx-certificate-secret when Nginx is disabled
+
+## [4.9.1] - Feb 19, 2021
+* Update busybox tag version to `1.32.1`
+
+## [4.9.0] - Feb 18, 2021
+* Updated Artifactory version to 7.15.3 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.15.3)
+* Add option to specify update strategy for Artifactory statefulset
+
+## [4.8.1] - Feb 11, 2021
+* Exposed "multiPartLimit" and "multipartElementSize" for the Azure Blob Storage Binary Provider
+
+## [4.8.0] - Feb 08, 2021
+* Updated Artifactory version to 7.12.8 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.12.8)
+* Support for custom certificates using secrets
+* **Important:** Switched docker images download from `docker.bintray.io` to `releases-docker.jfrog.io`
+* Update alpine tag version to `3.13.1`
+
+## [4.7.9] - Feb 3, 2021
+* Fix copyOnEveryStartup for HA cluster license
+
+## [4.7.8] - Jan 25, 2021
+* Add support for hostAliases
+
+## [4.7.7] - Jan 11, 2021
+* Fix failures when using creds file for configurating google storage
+
+## [4.7.6] - Jan 11, 2021
+* Updated Artifactory version to 7.12.6 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.12.6)
+
+## [4.7.5] - Jan 07, 2021
+* Added support for optional tracker dedicated ingress `.Values.artifactory.replicator.trackerIngress.enabled` (defaults to false)
+
+## [4.7.4] - Jan 04, 2021
+* Fixed gid support for statefulset
+
+## [4.7.3] - Dec 31, 2020
+* Added gid support for statefulset
+* Add setSecurityContext flag to allow securityContext block to be removed from artifactory statefulset
+
+## [4.7.2] - Dec 29, 2020
+* **Important:** Removed `.Values.metrics` and `.Values.fluentd` (Fluentd and Prometheus integrations)
+* Add support for creating additional kubernetes resources - [refer here](https://github.com/jfrog/log-analytics-prometheus/blob/master/artifactory-ha-values.yaml)
+* Updated Artifactory version to 7.12.5
+
+## [4.7.1] - Dec 21, 2020
+* Updated Artifactory version to 7.12.3
+
+## [4.7.0] - Dec 18, 2020
+* Updated Artifactory version to 7.12.2
+* Added `.Values.artifactory.openMetrics.enabled`
+
+## [4.6.1] - Dec 11, 2020
+* Added configurable `.Values.global.versions.artifactory` in values.yaml
+
+## [4.6.0] - Dec 10, 2020
+* Update postgresql tag version to `12.5.0-debian-10-r25`
+* Fixed `artifactory.persistence.googleStorage.endpoint` from `storage.googleapis.com` to `commondatastorage.googleapis.com`
+* Updated chart maintainers email
+
+## [4.5.5] - Dec 4, 2020
+* **Important:** Renamed `.Values.systemYaml` to `.Values.systemYamlOverride`
+
+## [4.5.4] - Dec 1, 2020
+* Improve error message returned when attempting helm upgrade command
+
+## [4.5.3] - Nov 30, 2020
+* Updated Artifactory version to 7.11.5 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.11)
+
+# [4.5.2] - Nov 23, 2020
+* Updated Artifactory version to 7.11.2 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.11)
+* Updated port namings on services and pods to allow for istio protocol discovery
+* Change semverCompare checks to support hosted Kubernetes
+* Add flag to disable creation of ServiceMonitor when enabling prometheus metrics
+* Prevent the PostHook command to be executed if the user did not specify a command in the values file
+* Fix issue with tls file generation when nginx.https.enabled is false
+
+## [4.5.1] - Nov 19, 2020
+* Updated Artifactory version to 7.11.2
+* Bugfix - access.config.import.xml override Access Federation configurations
+
+## [4.5.0] - Nov 17, 2020
+* Updated Artifactory version to 7.11.1
+* Update alpine tag version to `3.12.1`
+
+## [4.4.6] - Nov 10, 2020
+* Pass system.yaml via external secret for advanced usecases
+* Added support for custom ingress
+* Bugfix - stateful set not picking up changes to database secrets
+
+## [4.4.5] - Nov 9, 2020
+* Updated Artifactory version to 7.10.6 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.10.6)
+
+## [4.4.4] - Nov 2, 2020
+* Add enablePathStyleAccess property for aws-s3-v3 binary provider template
+
+## [4.4.3] - Nov 2, 2020
+* Updated Artifactory version to 7.10.5 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.10.5)
+
+## [4.4.2] - Oct 22, 2020
+* Chown bug fix where Linux capability cannot chown all files causing log line warnings
+* Fix Frontend timeout linting issue
+
+## [4.4.1] - Oct 20, 2020
+* Add flag to disable prepare-custom-persistent-volume init container
+
+## [4.4.0] - Oct 19, 2020
+* Updated Artifactory version to 7.10.2 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.10.2)
+
+## [4.3.4] - Oct 19, 2020
+* Add support to specify priorityClassName for nginx deployment
+
+## [4.3.3] - Oct 15, 2020
+* Fixed issue with node PodDisruptionBudget which also getting applied on the primary
+* Fix mandatory masterKey check issue when upgrading from 6.x to 7.x
+
+## [4.3.2] - Oct 14, 2020
+* Add support to allow more than 1 Primary in Artifactory-ha STS
+
+## [4.3.1] - Oct 9, 2020
+* Add global support for customInitContainersBegin
+
+## [4.3.0] - Oct 07, 2020
+* Updated Artifactory version to 7.9.1
+* **Breaking change:** Fix `storageClass` to correct `storageClassName` in values.yaml
+
+## [4.2.0] - Oct 5, 2020
+* Expose Prometheus metrics via a ServiceMonitor
+* Parse log files for metric data with Fluentd
+
+## [4.1.0] - Sep 30, 2020
+* Updated Artifactory version to 7.9.0 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.9)
+
+## [4.0.12] - Sep 25, 2020
+* Update to use linux capability CAP_CHOWN instead of root base init container to avoid any use of root containers to pass Redhat security requirements
+
+## [4.0.11] - Sep 28, 2020
+* Setting chart coordinates in migitation yaml
+
+## [4.0.10] - Sep 25, 2020
+* Update filebeat version to `7.9.2`
+
+## [4.0.9] - Sep 24, 2020
+* Fixed broken issue - when setting `waitForDatabase:false` container startup still waits for DB
+
+## [4.0.8] - Sep 22, 2020
+* Updated readme
+
+## [4.0.7] - Sep 22, 2020
+* Fix lint issue in migitation yaml
+
+## [4.0.6] - Sep 22, 2020
+* Fix broken migitation yaml
+
+## [4.0.5] - Sep 21, 2020
+* Added mitigation yaml for Artifactory - [More info](https://github.com/jfrog/chartcenter/blob/master/docs/securitymitigationspec.md)
+
+## [4.0.4] - Sep 17, 2020
+* Added configurable session(UI) timeout in frontend microservice
+
+## [4.0.3] - Sep 17, 2020
+* Fix small typo in README and added proper required text to be shown while postgres upgrades
+
+## [4.0.2] - Sep 14, 2020
+* Updated Artifactory version to 7.7.8 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.7.8)
+
+## [4.0.1] - Sep 8, 2020
+* Added support for artifactory pro license (single node) installation.
+
+## [4.0.0] - Sep 2, 2020
+* **Breaking change:** Changed `imagePullSecrets` value from string to list
+* **Breaking change:** Added `image.registry` and changed `image.version` to `image.tag` for docker images
+* Added support for global values
+* Updated maintainers in chart.yaml
+* Update postgresql tag version to `12.3.0-debian-10-r71`
+* Update postgresqlsub chart version to `9.3.4` - [9.x Upgrade Notes](https://github.com/bitnami/charts/tree/master/bitnami/postgresql#900)
+* **IMPORTANT**
+* If this is a new deployment or you already use an external database (`postgresql.enabled=false`), these changes **do not affect you**!
+* If this is an upgrade and you are using the default PostgreSQL (`postgresql.enabled=true`), you need to pass previous 9.x/10.x's postgresql.image.tag and databaseUpgradeReady=true.
+
+## [3.1.0] - Aug 13, 2020
+* Updated Artifactory version to 7.7.3 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.7)
+
+## [3.0.15] - Aug 10, 2020
+* Added enableSignedUrlRedirect for persistent storage type aws-s3-v3.
+
+## [3.0.14] - Jul 31, 2020
+* Update the README section on Nginx SSL termination to reflect the actual YAML structure.
+
+## [3.0.13] - Jul 30, 2020
+* Added condition to disable the migration scripts.
+
+## [3.0.12] - Jul 29, 2020
+* Document Artifactory node affinity.
+
+## [3.0.11] - Jul 28, 2020
+* Added maxConnections for persistent storage type aws-s3-v3.
+
+## [3.0.10] - Jul 28, 2020
+Bugfix / support for userPluginSecrets with Artifactory 7
+
+## [3.0.9] - Jul 27, 2020
+* Add tpl to external database secrets.
+* Modified `scheme`  to `artifactory-ha.scheme`
+
+## [3.0.8] - Jul 23, 2020
+* Added condition to disable the migration init container.
+
+## [3.0.7] - Jul 21, 2020
+* Updated Artifactory-ha Chart to add node and primary labels to pods and service objects.
+
+## [3.0.6] - Jul 20, 2020
+* Support custom CA and certificates
+
+## [3.0.5] - Jul 13, 2020
+* Updated Artifactory version to 7.6.3 - https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.6.3
+* Fixed Mysql database jar path in `preStartCommand` in README
+
+## [3.0.4] - Jul 8, 2020
+* Move some postgresql values to where they should be according to the subchart
+
+## [3.0.3] - Jul 8, 2020
+* Set Artifactory access client connections to the same value as the access threads.
+
+## [3.0.2] - Jul 6, 2020
+* Updated Artifactory version to 7.6.2
+* **IMPORTANT**
+* Added ChartCenter Helm repository in README
+
+## [3.0.1] - Jul 01, 2020
+* Add dedicated ingress object for Replicator service when enabled
+
+## [3.0.0] - Jun 30, 2020
+* Update postgresql tag version to `10.13.0-debian-10-r38`
+* Update alpine tag version to `3.12`
+* Update busybox tag version to `1.31.1`
+* **IMPORTANT**
+* If this is a new deployment or you already use an external database (`postgresql.enabled=false`), these changes **do not affect you**!
+* If this is an upgrade and you are using the default PostgreSQL (`postgresql.enabled=true`), you need to pass postgresql.image.tag=9.6.18-debian-10-r7 and databaseUpgradeReady=true
+
+## [2.6.0] - Jun 29, 2020
+* Updated Artifactory version to 7.6.1 - https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.6.1
+* Add tpl for external database secrets
+
+## [2.5.8] - Jun 25, 2020
+* Stop loading the Nginx stream module because it is now a core module
+
+## [2.5.7] - Jun 18, 2020
+* Fixes bootstrap configMap issue on member node
+
+## [2.5.6] - Jun 11, 2020
+* Support list of custom secrets
+
+## [2.5.5] - Jun 11, 2020
+* NOTES.txt fixed incorrect information
+
+## [2.5.4] - Jun 12, 2020
+* Updated Artifactory version to 7.5.7 - https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.5.7
+
+## [2.5.3] - Jun 8, 2020
+* Statically setting primary service type to ClusterIP.
+* Prevents primary service from being exposed publicly when using LoadBalancer type on cloud providers.
+
+## [2.5.2] - Jun 8, 2020
+* Readme update - configuring Artifactory with oracledb
+
+## [2.5.1] - Jun 5, 2020
+* Fixes broken PDB issue upgrading from 6.x to 7.x
+
+## [2.5.0] - Jun 1, 2020
+* Updated Artifactory version to 7.5.5 - https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.5
+* Fixes bootstrap configMap permission issue
+* Update postgresql tag version to `9.6.18-debian-10-r7`
+
+## [2.4.10] - May 27, 2020
+* Added Tomcat maxThreads & acceptCount
+
+## [2.4.9] - May 25, 2020
+* Fixed postgresql README `image` Parameters
+
+## [2.4.8] - May 24, 2020
+* Fixed typo in README regarding migration timeout
+
+## [2.4.7] - May 19, 2020
+* Added metadata maxOpenConnections
+
+## [2.4.6] - May 07, 2020
+* Fix `installerInfo` string format
+
+## [2.4.5] - Apr 27, 2020
+* Updated Artifactory version to 7.4.3
+
+## [2.4.4] - Apr 27, 2020
+* Change customInitContainers order to run before the "migration-ha-artifactory" initContainer
+
+## [2.4.3] - Apr 24, 2020
+* Fix `artifactory.persistence.awsS3V3.useInstanceCredentials` incorrect conditional logic
+* Bump postgresql tag version to `9.6.17-debian-10-r72` in values.yaml
+
+## [2.4.2] - Apr 16, 2020
+* Custom volume mounts in migration init container.
+
+## [2.4.1] - Apr 16, 2020
+* Fix broken support for gcpServiceAccount for googleStorage
+
+## [2.4.0] - Apr 14, 2020
+* Updated Artifactory version to 7.4.1
+
+## [2.3.1] - April 13, 2020
+* Update README with helm v3 commands
+
+## [2.3.0] - April 10, 2020
+* Use dependency charts from `https://charts.bitnami.com/bitnami`
+* Bump postgresql chart version to `8.7.3` in requirements.yaml
+* Bump postgresql tag version to `9.6.17-debian-10-r21` in values.yaml
+
+## [2.2.11] - Apr 8, 2020
+* Added recommended ingress annotation to avoid 413 errors
+
+## [2.2.10] - Apr 8, 2020
+* Moved migration scripts under `files` directory
+* Support preStartCommand in migration Init container as `artifactory.migration.preStartCommand`
+
+## [2.2.9] - Apr 01, 2020
+* Support masterKey and joinKey as secrets
+
+## [2.2.8] - Apr 01, 2020
+* Ensure that the join key is also copied when provided by an external secret
+* Migration container in primary and node statefulset now respects custom versions and the specified node/primary resources
+
+## [2.2.7] - Apr 01, 2020
+* Added cache-layer in chain definition of Google Cloud Storage template
+* Fix readme use to `-hex 32` instead of `-hex 16`
+
+## [2.2.6] - Mar 31, 2020
+* Change the way the artifactory `command:` is set so it will properly pass a SIGTERM to java
+
+## [2.2.5] - Mar 31, 2020
+* Removed duplicate `artifactory-license` volume from primary node
+
+## [2.2.4] - Mar 31, 2020
+* Restore `artifactory-license` volume for the primary node
+
+## [2.2.3] - Mar 29, 2020
+* Add Nginx log options: stderr as logfile and log level
+
+## [2.2.2] - Mar 30, 2020
+* Apply initContainers.resources to `copy-system-yaml`, `prepare-custom-persistent-volume`, and `migration-artifactory-ha` containers
+* Use the same defaulting mechanism used for the artifactory version used elsewhere in the chart
+* Removed duplicate `artifactory-license` volume that prevented using an external secret
+
+## [2.2.1] - Mar 29, 2020
+* Fix loggers sidecars configurations to support new file system layout and new log names
+
+## [2.2.0] - Mar 29, 2020
+* Fix broken admin user bootstrap configuration
+* **Breaking change:** renamed `artifactory.accessAdmin` to `artifactory.admin`
+
+## [2.1.3] - Mar 24, 2020
+* Use `postgresqlExtendedConf` for setting custom PostgreSQL configuration (instead of `postgresqlConfiguration`)
+
+## [2.1.2] - Mar 21, 2020
+* Support for SSL offload in Nginx service(LoadBalancer) layer. Introduced `nginx.service.ssloffload` field with boolean type.
+
+## [2.1.1] - Mar 23, 2020
+* Moved installer info to values.yaml so it is fully customizable
+
+## [2.1.0] - Mar 23, 2020
+* Updated Artifactory version to 7.3.2
+
+## [2.0.36] - Mar 20, 2020
+* Add support GCP credentials.json authentication
+
+## [2.0.35] - Mar 20, 2020
+* Add support for masterKey trim during 6.x to 7.x migration if 6.x masterKey is 32 hex (64 characters)
+
+## [2.0.34] - Mar 19, 2020
+* Add support for NFS directories `haBackupDir` and `haDataDir`
+
+## [2.0.33] - Mar 18, 2020
+* Increased Nginx proxy_buffers size
+
+## [2.0.32] - Mar 17, 2020
+* Changed all single quotes to double quotes in values files
+* useInstanceCredentials variable was declared in S3 settings but not used in chart. Now it is being used.
+
+## [2.0.31] - Mar 17, 2020
+* Fix rendering of Service Account annotations
+
+## [2.0.30] - Mar 16, 2020
+* Add Unsupported message from 6.18 to 7.2.x (migration)
+
+## [2.0.29] - Mar 11, 2020
+* Upgrade Docs update
+
+## [2.0.28] - Mar 11, 2020
+* Unified charts public release
+
+## [2.0.27] - Mar 8, 2020
+* Add an optional wait for primary node to be ready with a proper test for http status
+
+## [2.0.23] - Mar 6, 2020
+* Fix path to `/artifactory_bootstrap`
+* Add support for controlling the name of the ingress and allow to set more than one cname
+
+## [2.0.22] - Mar 4, 2020
+* Add support for disabling `consoleLog` in `system.yaml` file
+
+## [2.0.21] - Feb 28, 2020
+* Add support to process `valueFrom` for extraEnvironmentVariables
+
+## [2.0.20] - Feb 26, 2020
+* Store join key to secret
+
+## [2.0.19] - Feb 26, 2020
+* Updated Artifactory version to 7.2.1
+
+## [2.0.12] - Feb 07, 2020
+* Remove protection flag `databaseUpgradeReady` which was added to check internal postgres upgrade
+
+## [2.0.0] - Feb 07, 2020
+* Updated Artifactory version to 7.0.0
+
+## [1.4.10] - Feb 13, 2020
+* Add support for SSH authentication to Artifactory
+
+## [1.4.9] - Feb 10, 2020
+* Fix custom DB password indention
+
+## [1.4.8] - Feb 9, 2020
+* Add support for `tpl` in the `postStartCommand`
+
+## [1.4.7] - Feb 4, 2020
+* Support customisable Nginx kind
+
+## [1.4.6] - Feb 2, 2020
+* Add a comment stating that it is recommended to use an external PostgreSQL with a static password for production installations
+
+## [1.4.5] - Feb 2, 2020
+* Add support for primary or member node specific preStartCommand
+
+## [1.4.4] - Jan 30, 2020
+* Add the option to configure resources for the logger containers
+
+## [1.4.3] - Jan 26, 2020
+* Improve `database.user` and `database.password` logic in order to support more use cases and make the configuration less repetitive
+
+## [1.4.2] - Jan 22, 2020
+* Refined pod disruption budgets to separate nginx and Artifactory pods
+
+## [1.4.1] - Jan 19, 2020
+* Fix replicator port config in nginx replicator configmap
+
+## [1.4.0] - Jan 19, 2020
+* Updated Artifactory version to 6.17.0
+
+## [1.3.8] - Jan 16, 2020
+* Added example for external nginx-ingress
+
+## [1.3.7] - Jan 07, 2020
+* Add support for customizable `mountOptions` of NFS PVs
+
+## [1.3.6] - Dec 30, 2019
+* Fix for nginx probes failing when launched with http disabled
+
+## [1.3.5] - Dec 24, 2019
+* Better support for custom `artifactory.internalPort`
+
+## [1.3.4] - Dec 23, 2019
+* Mark empty map values with `{}`
+
+## [1.3.3] - Dec 16, 2019
+* Another fix for toggling nginx service ports
+
+## [1.3.2] - Dec 12, 2019
+* Fix for toggling nginx service ports
+
+## [1.3.1] - Dec 10, 2019
+* Add support for toggling nginx service ports
+
+## [1.3.0] - Dec 1, 2019
+* Updated Artifactory version to 6.16.0
+
+## [1.2.4] - Nov 28, 2019
+* Add support for using existing PriorityClass
+
+## [1.2.3] - Nov 27, 2019
+* Add support for PriorityClass
+
+## [1.2.2] - Nov 20, 2019
+* Update Artifactory logo
+
+## [1.2.1] - Nov 18, 2019
+* Add the option to provide service account annotations (in order to support stuff like https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.html)
+
+## [1.2.0] - Nov 18, 2019
+* Updated Artifactory version to 6.15.0
+
+## [1.1.12] - Nov 17, 2019
+* Fix `README.md` format (broken table)
+
+## [1.1.11] - Nov 17, 2019
+* Update comment on Artifactory master key
+
+## [1.1.10] - Nov 17, 2019
+* Fix creation of double slash in nginx artifactory configuration
+
+## [1.1.9] - Nov 14, 2019
+* Set explicit `postgresql.postgresqlPassword=""` to avoid helm v3 error
+
+## [1.1.8] - Nov 12, 2019
+* Updated Artifactory version to 6.14.1
+
+## [1.1.7] - Nov 11, 2019
+* Additional documentation for masterKey
+
+## [1.1.6] - Nov 10, 2019
+* Update PostgreSQL chart version to 7.0.1
+* Use formal PostgreSQL configuration format
+
+## [1.1.5] - Nov 8, 2019
+* Add support `artifactory.service.loadBalancerSourceRanges` for whitelisting when setting `artifactory.service.type=LoadBalancer`
+
+## [1.1.4] - Nov 6, 2019
+* Add support for any type of environment variable by using `extraEnvironmentVariables` as-is
+
+## [1.1.3] - Nov 6, 2019
+* Add nodeselector support for Postgresql
+
+## [1.1.2] - Nov 5, 2019
+* Add support for the aws-s3-v3 filestore, which adds support for pod IAM roles
+
+## [1.1.1] - Nov 4, 2019
+* When using `copyOnEveryStartup`, make sure that the target base directories are created before copying the files
+
+## [1.1.0] - Nov 3, 2019
+* Updated Artifactory version to 6.14.0
+
+## [1.0.1] - Nov 3, 2019
+* Make sure the artifactory pod exits when one of the pre-start stages fail
+
+## [1.0.0] - Oct 27, 2019
+**IMPORTANT - BREAKING CHANGES!**<br>
+**DOWNTIME MIGHT BE REQUIRED FOR AN UPGRADE!**
+* If this is a new deployment or you already use an external database (`postgresql.enabled=false`), these changes **do not affect you**!
+* If this is an upgrade and you are using the default PostgreSQL (`postgresql.enabled=true`), must use the upgrade instructions in [UPGRADE_NOTES.md](UPGRADE_NOTES.md)!
+* PostgreSQL sub chart was upgraded to version `6.5.x`. This version is **not backward compatible** with the old version (`0.9.5`)!
+* Note the following **PostgreSQL** Helm chart changes
+  * The chart configuration has changed! See [values.yaml](values.yaml) for the new keys used
+  * **PostgreSQL** is deployed as a StatefulSet
+  * See [PostgreSQL helm chart](https://hub.helm.sh/charts/stable/postgresql) for all available configurations
+
+## [0.17.3] - Oct 24, 2019
+* Change the preStartCommand to support templating
+
+## [0.17.2] - Oct 21, 2019
+* Add support for setting `artifactory.primary.labels`
+* Add support for setting `artifactory.node.labels`
+* Add support for setting `nginx.labels`
+
+## [0.17.1] - Oct 10, 2019
+* Updated Artifactory version to 6.13.1
+
+## [0.17.0] - Oct 7, 2019
+* Updated Artifactory version to 6.13.0
+
+## [0.16.7] - Sep 24, 2019
+* Option to skip wait-for-db init container with '--set waitForDatabase=false'
+
+## [0.16.6] - Sep 24, 2019
+* Add support for setting `nginx.service.labels`
+
+## [0.16.5] - Sep 23, 2019
+* Add support for setting `artifactory.customInitContainersBegin`
+
+## [0.16.4] - Sep 20, 2019
+* Add support for setting `initContainers.resources`
+
+## [0.16.3] - Sep 11, 2019
+* Updated Artifactory version to 6.12.2
+
+## [0.16.2] - Sep 9, 2019
+* Updated Artifactory version to 6.12.1
+
+## [0.16.1] - Aug 22, 2019
+* Fix the nginx server_name directive used with ingress.hosts
+
+## [0.16.0] - Aug 21, 2019
+* Updated Artifactory version to 6.12.0
+
+## [0.15.15] - Aug 18, 2019
+* Fix existingSharedClaim permissions issue and example
+
+## [0.15.14] - Aug 14, 2019
+* Updated Artifactory version to 6.11.6
+
+## [0.15.13] - Aug 11, 2019
+* Fix Ingress routing and add an example
+
+## [0.15.12] - Aug 6, 2019
+* Do not mount `access/etc/bootstrap.creds` unless user specifies a custom password or secret (Access already generates a random password if not provided one)
+* If custom `bootstrap.creds` is provided (using keys or custom secret), prepare it with an init container so the temp file does not persist
+
+## [0.15.11] - Aug 5, 2019
+* Improve binarystore config
+    1. Convert to a secret
+    2. Move config to values.yaml
+    3. Support an external secret
+
+## [0.15.10] - Aug 5, 2019
+* Don't create the nginx configmaps when nginx.enabled is false
+
+## [0.15.9] - Aug 1, 2019
+* Fix masterkey/masterKeySecretName not specified warning render logic in NOTES.txt
+
+## [0.15.8] - Jul 28, 2019
+* Simplify nginx setup and shorten initial wait for probes
+
+## [0.15.7] - Jul 25, 2019
+* Updated README about how to apply Artifactory licenses
+
+## [0.15.6] - Jul 22, 2019
+* Change Ingress API to be compatible with recent kubernetes versions
+
+## [0.15.5] - Jul 22, 2019
+* Updated Artifactory version to 6.11.3
+
+## [0.15.4] - Jul 11, 2019
+* Add `artifactory.customVolumeMounts` support to member node statefulset template
+
+## [0.15.3] - Jul 11, 2019
+* Add ingress.hosts to the Nginx server_name directive when ingress is enabled to help with Docker repository sub domain configuration
+
+## [0.15.2] - Jul 3, 2019
+* Add the option for changing nginx config using values.yaml and remove outdated reverse proxy documentation
+
+## [0.15.1] - Jul 1, 2019
+* Updated Artifactory version to 6.11.1
+
+## [0.15.0] - Jun 27, 2019
+* Updated Artifactory version to 6.11.0 and Restart Primary node when bootstrap.creds file has been modified in artifactory-ha
+
+## [0.14.4] - Jun 24, 2019
+* Add the option to provide an IP for the access-admin endpoints
+
+## [0.14.3] - Jun 24, 2019
+* Update chart maintainers
+
+## [0.14.2] - Jun 24, 2019
+* Change Nginx to point to the artifactory externalPort
+
+## [0.14.1] - Jun 23, 2019
+* Add values files for small, medium and large installations
+
+## [0.14.0] - Jun 20, 2019
+* Use ConfigMaps for nginx configuration and remove nginx postStart command
+
+## [0.13.10] - Jun 19, 2019
+* Updated Artifactory version to 6.10.4
+
+## [0.13.9] - Jun 18, 2019
+* Add the option to provide additional ingress rules
+
+## [0.13.8] - Jun 14, 2019
+* Updated readme with improved external database setup example
+
+## [0.13.7] - Jun 6, 2019
+* Updated Artifactory version to 6.10.3
+* Updated installer-info template
+
+## [0.13.6] - Jun 6, 2019
+* Updated Google Cloud Storage API URL and https settings
+
+## [0.13.5] - Jun 5, 2019
+* Delete the db.properties file on Artifactory startup
+
+## [0.13.4] - Jun 3, 2019
+* Updated Artifactory version to 6.10.2
+
+## [0.13.3] - May 21, 2019
+* Updated Artifactory version to 6.10.1
+
+## [0.13.2] - May 19, 2019
+* Fix missing logger image tag
+
+## [0.13.1] - May 15, 2019
+* Support `artifactory.persistence.cacheProviderDir` for on-premise cluster
+
+## [0.13.0] - May 7, 2019
+* Updated Artifactory version to 6.10.0
+
+## [0.12.23] - May 5, 2019
+* Add support for setting `artifactory.async.corePoolSize`
+
+## [0.12.22] - May 2, 2019
+* Remove unused property `artifactory.releasebundle.feature.enabled`
+
+## [0.12.21] - Apr 30, 2019
+* Add support for JMX monitoring
+
+## [0.12.20] - Apr29, 2019
+* Added support for headless services
+
+## [0.12.19] - Apr 28, 2019
+* Added support for `cacheProviderDir`
+
+## [0.12.18] - Apr 18, 2019
+* Changing API StatefulSet version to `v1` and permission fix for custom `artifactory.conf` for Nginx
+
+## [0.12.17] - Apr 16, 2019
+* Updated documentation for Reverse Proxy Configuration
+
+## [0.12.16] - Apr 12, 2019
+* Added support for `customVolumeMounts`
+
+## [0.12.15] - Aprl 12, 2019
+* Added support for `bucketExists` flag for googleStorage
+
+## [0.12.14] - Apr 11, 2019
+* Replace `curl` examples with `wget` due to the new base image
+
+## [0.12.13] - Aprl 07, 2019
+* Add support for providing the Artifactory license as a parameter
+
+## [0.12.12] - Apr 10, 2019
+* Updated Artifactory version to 6.9.1
+
+## [0.12.11] - Aprl 04, 2019
+* Add support for templated extraEnvironmentVariables
+
+## [0.12.10] - Aprl 07, 2019
+* Change network policy API group
+
+## [0.12.9] - Aprl 04, 2019
+* Apply the existing PVC for members (in addition to primary)
+
+## [0.12.8] - Aprl 03, 2019
+* Bugfix for userPluginSecrets
+
+## [0.12.7] - Apr 4, 2019
+* Add information about upgrading Artifactory with auto-generated postgres password
+
+## [0.12.6] - Aprl 03, 2019
+* Added installer info
+
+## [0.12.5] - Aprl 03, 2019
+* Allow secret names for user plugins to contain template language
+
+## [0.12.4] - Apr 02, 2019
+* Fix issue #253 (use existing PVC for data and backup storage)
+
+## [0.12.3] - Apr 02, 2019
+* Allow NetworkPolicy configurations (defaults to allow all)
+
+## [0.12.2] - Aprl 01, 2019
+* Add support for user plugin secret
+
+## [0.12.1] - Mar 26, 2019
+* Add the option to copy a list of files to ARTIFACTORY_HOME on startup
+
+## [0.12.0] - Mar 26, 2019
+* Updated Artifactory version to 6.9.0
+
+## [0.11.18] - Mar 25, 2019
+* Add CI tests for persistence, ingress support and nginx
+
+## [0.11.17] - Mar 22, 2019
+* Add the option to change the default access-admin password
+
+## [0.11.16] - Mar 22, 2019
+* Added support for `<artifactory|nginx>.<readiness|liveness>Probe.path` to customise the paths used for health probes
+
+## [0.11.15] - Mar 21, 2019
+* Added support for `artifactory.customSidecarContainers` to create custom sidecar containers
+* Added support for `artifactory.customVolumes` to create custom volumes
+
+## [0.11.14] - Mar 21, 2019
+* Make ingress path configurable
+
+## [0.11.13] - Mar 19, 2019
+* Move the copy of bootstrap config from postStart to preStart for Primary
+
+## [0.11.12] - Mar 19, 2019
+* Fix existingClaim example
+
+## [0.11.11] - Mar 18, 2019
+* Disable the option to use nginx PVC with more than one replica
+
+## [0.11.10] - Mar 15, 2019
+* Wait for nginx configuration file before using it
+
+## [0.11.9] - Mar 15, 2019
+* Revert securityContext changes since they were causing issues
+
+## [0.11.8] - Mar 15, 2019
+* Fix issue #247 (init container failing to run)
+
+## [0.11.7] - Mar 14, 2019
+* Updated Artifactory version to 6.8.7
+
+## [0.11.6] - Mar 13, 2019
+* Move securityContext to container level
+
+## [0.11.5] - Mar 11, 2019
+* Add the option to use existing volume claims for Artifactory storage
+
+## [0.11.4] - Mar 11, 2019
+* Updated Artifactory version to 6.8.6
+
+## [0.11.3] - Mar 5, 2019
+* Updated Artifactory version to 6.8.4
+
+## [0.11.2] - Mar 4, 2019
+* Add support for catalina logs sidecars
+
+## [0.11.1] - Feb 27, 2019
+* Updated Artifactory version to 6.8.3
+
+## [0.11.0] - Feb 25, 2019
+* Add nginx support for tail sidecars
+
+## [0.10.3] - Feb 21, 2019
+* Add s3AwsVersion option to awsS3 configuration for use with IAM roles
+
+## [0.10.2] - Feb 19, 2019
+* Updated Artifactory version to 6.8.2
+
+## [0.10.1] - Feb 17, 2019
+* Updated Artifactory version to 6.8.1
+* Add example of `SERVER_XML_EXTRA_CONNECTOR` usage
+
+## [0.10.0] - Feb 15, 2019
+* Updated Artifactory version to 6.8.0
+
+## [0.9.7] - Feb 13, 2019
+* Updated Artifactory version to 6.7.3
+
+## [0.9.6] - Feb 7, 2019
+* Add support for tail sidecars to view logs from k8s api
+
+## [0.9.5] - Feb 6, 2019
+* Fix support for customizing statefulset `terminationGracePeriodSeconds`
+
+## [0.9.4] - Feb 5, 2019
+* Add support for customizing statefulset `terminationGracePeriodSeconds`
+
+## [0.9.3] - Feb 5, 2019
+* Remove the inactive server remove plugin
+
+## [0.9.2] - Feb 3, 2019
+* Updated Artifactory version to 6.7.2
+
+## [0.9.1] - Jan 27, 2019
+* Fix support for Azure Blob Storage Binary provider
+
+## [0.9.0] - Jan 23, 2019
+* Updated Artifactory version to 6.7.0
+
+## [0.8.10] - Jan 22, 2019
+* Added support for `artifactory.customInitContainers` to create custom init containers
+
+## [0.8.9] - Jan 18, 2019
+* Added support of values ingress.labels
+
+## [0.8.8] - Jan 16, 2019
+* Mount replicator.yaml (config) directly to /replicator_extra_conf
+
+## [0.8.7] - Jan 15, 2018
+* Add support for Azure Blob Storage Binary provider
+
+## [0.8.6] - Jan 13, 2019
+* Fix documentation about nginx group id
+
+## [0.8.5] - Jan 13, 2019
+* Updated Artifactory version to 6.6.5
+
+## [0.8.4] - Jan 8, 2019
+* Make artifactory.replicator.publicUrl required when the replicator is enabled
+
+## [0.8.3] - Jan 1, 2019
+* Updated Artifactory version to 6.6.3
+* Add support for `artifactory.extraEnvironmentVariables` to pass more environment variables to Artifactory
+
+## [0.8.2] - Dec 28, 2018
+* Fix location `replicator.yaml` is copied to
+
+## [0.8.1] - Dec 27, 2018
+* Updated Artifactory version to 6.6.1
+
+## [0.8.0] - Dec 20, 2018
+* Updated Artifactory version to 6.6.0
+
+## [0.7.17] - Dec 17, 2018
+* Updated Artifactory version to 6.5.13
+
+## [0.7.16] - Dec 12, 2018
+* Fix documentation about Artifactory license setup using secret
+
+## [0.7.15] - Dec 9, 2018
+* AWS S3 add `roleName` for using IAM role
+
+## [0.7.14] - Dec 6, 2018
+* AWS S3 `identity` and `credential` are now added only if have a value to allow using IAM role
+
+## [0.7.13] - Dec 5, 2018
+* Remove Distribution certificates creation.
+
+## [0.7.12] - Dec 2, 2018
+* Remove Java option "-Dartifactory.locking.provider.type=db". This is already the default setting.
+
+## [0.7.11] - Nov 30, 2018
+* Updated Artifactory version to 6.5.9
+
+## [0.7.10] - Nov 29, 2018
+* Fixed the volumeMount for the replicator.yaml
+
+## [0.7.9] - Nov 29, 2018
+* Optionally include primary node into poddisruptionbudget
+
+## [0.7.8] - Nov 29, 2018
+* Updated postgresql version to 9.6.11
+
+## [0.7.7] - Nov 27, 2018
+* Updated Artifactory version to 6.5.8
+
+## [0.7.6] - Nov 18, 2018
+* Added support for configMap to use custom Reverse Proxy Configuration with Nginx
+
+## [0.7.5] - Nov 14, 2018
+* Updated Artifactory version to 6.5.3
+
+## [0.7.4] - Nov 13, 2018
+* Allow pod anti-affinity settings to include primary node
+
+## [0.7.3] - Nov 12, 2018
+* Support artifactory.preStartCommand for running command before entrypoint starts
+
+## [0.7.2] - Nov 7, 2018
+* Support database.url parameter (DB_URL)
+
+## [0.7.1] - Oct 29, 2018
+* Change probes port to 8040 (so they will not be blocked when all tomcat threads on 8081 are exhausted)
+
+## [0.7.0] - Oct 28, 2018
+* Update postgresql chart to version 0.9.5 to be able and use `postgresConfig` options
+
+## [0.6.9] - Oct 23, 2018
+* Fix providing external secret for database credentials
+
+## [0.6.8] - Oct 22, 2018
+* Allow user to configure externalTrafficPolicy for Loadbalancer
+
+## [0.6.7] - Oct 22, 2018
+* Updated ingress annotation support (with examples) to support docker registry v2
+
+## [0.6.6] - Oct 21, 2018
+* Updated Artifactory version to 6.5.2
+
+## [0.6.5] - Oct 19, 2018
+* Allow providing pre-existing secret containing master key
+* Allow arbitrary annotations on primary and member node pods
+* Enforce size limits when using local storage with `emptyDir`
+* Allow `soft` or `hard` specification of member node anti-affinity
+* Allow providing pre-existing secrets containing external database credentials
+* Fix `s3` binary store provider to properly use the `cache-fs` provider
+* Allow arbitrary properties when using the `s3` binary store provider
+
+## [0.6.4] - Oct 18, 2018
+* Updated Artifactory version to 6.5.1
+
+## [0.6.3] - Oct 17, 2018
+* Add Apache 2.0 license
+
+## [0.6.2] - Oct 14, 2018
+* Make S3 endpoint configurable (was hardcoded with `s3.amazonaws.com`)
+
+## [0.6.1] - Oct 11, 2018
+* Allows ingress default `backend` to be enabled or disabled (defaults to enabled)
+
+## [0.6.0] - Oct 11, 2018
+* Updated Artifactory version to 6.5.0
+
+## [0.5.3] - Oct 9, 2018
+* Quote ingress hosts to support wildcard names
+
+## [0.5.2] - Oct 2, 2018
+* Add `helm repo add jfrog https://charts.jfrog.io` to README
+
+## [0.5.1] - Oct 2, 2018
+* Set Artifactory to 6.4.1
+
+## [0.5.0] - Sep 27, 2018
+* Set Artifactory to 6.4.0
+
+## [0.4.7] - Sep 26, 2018
+* Add ci/test-values.yaml
+
+## [0.4.6] - Sep 25, 2018
+* Add PodDisruptionBudget for member nodes, defaulting to minAvailable of 1
+
+## [0.4.4] - Sep 2, 2018
+* Updated Artifactory version to 6.3.2
+
+## [0.4.0] - Aug 22, 2018
+* Added support to run as non root
+* Updated Artifactory version to 6.2.0
+
+## [0.3.0] - Aug 22, 2018
+* Enabled RBAC Support
+* Added support for PostStartCommand (To download Database JDBC connector)
+* Increased postgresql max_connections
+* Added support for `nginx.conf` ConfigMap
+* Updated Artifactory version to 6.1.0
diff --git a/charts/jfrog/artifactory-ha/107.98.14/Chart.lock b/charts/jfrog/artifactory-ha/107.98.14/Chart.lock
new file mode 100644
index 000000000..eb9409971
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: postgresql
+  repository: https://charts.jfrog.io/
+  version: 10.3.18
+digest: sha256:404ce007353baaf92a6c5f24b249d5b336c232e5fd2c29f8a0e4d0095a09fd53
+generated: "2022-03-08T08:54:51.805126+05:30"
diff --git a/charts/jfrog/artifactory-ha/107.98.14/Chart.yaml b/charts/jfrog/artifactory-ha/107.98.14/Chart.yaml
new file mode 100644
index 000000000..95a79e9d8
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/Chart.yaml
@@ -0,0 +1,33 @@
+annotations:
+  artifactoryServiceVersion: 7.98.13
+  catalog.cattle.io/certified: partner
+  catalog.cattle.io/display-name: JFrog Artifactory HA
+  catalog.cattle.io/featured: "2"
+  catalog.cattle.io/kube-version: '>= 1.19.0-0'
+  catalog.cattle.io/release-name: artifactory-ha
+  metadataVersion: 7.90.7
+  observabilityVersion: 1.31.11
+apiVersion: v2
+appVersion: 7.98.14
+dependencies:
+- condition: postgresql.enabled
+  name: postgresql
+  repository: https://charts.jfrog.io/
+  version: 10.3.18
+description: Universal Repository Manager supporting all major packaging formats,
+  build tools and CI servers.
+home: https://www.jfrog.com/artifactory/
+icon: file://assets/icons/artifactory-ha.png
+keywords:
+- artifactory
+- jfrog
+- devops
+kubeVersion: '>= 1.19.0-0'
+maintainers:
+- email: installers@jfrog.com
+  name: Chart Maintainers at JFrog
+name: artifactory-ha
+sources:
+- https://github.com/jfrog/charts
+type: application
+version: 107.98.14
diff --git a/charts/jfrog/artifactory-ha/107.98.14/LICENSE b/charts/jfrog/artifactory-ha/107.98.14/LICENSE
new file mode 100644
index 000000000..8dada3eda
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/charts/jfrog/artifactory-ha/107.98.14/README.md b/charts/jfrog/artifactory-ha/107.98.14/README.md
new file mode 100644
index 000000000..e0ef54016
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/README.md
@@ -0,0 +1,69 @@
+# JFrog Artifactory High Availability Helm Chart
+
+**IMPORTANT!** Our Helm Chart docs have moved to our main documentation site. Below you will find the basic instructions for installing, uninstalling, and deleting Artifactory. For all other information, refer to [Installing Artifactory - Helm HA Installation](https://www.jfrog.com/confluence/display/JFROG/Installing+Artifactory#InstallingArtifactory-HelmHAInstallation).
+
+**Note:** From Artifactory 7.17.4 and above, the Helm HA installation can be installed so that each node you install can run all tasks in the cluster.
+
+Below you will find the basic instructions for installing, uninstalling, and deleting Artifactory. For all other information, refer to the documentation site.
+
+## Prerequisites Details
+
+* Kubernetes 1.19+
+* Artifactory HA license
+
+## Chart Details
+This chart will do the following:
+
+* Deploy Artifactory highly available cluster. 3 primary nodes.
+* Deploy a PostgreSQL database  **NOTE:** For production grade installations it is recommended to use an external PostgreSQL
+* Deploy an Nginx server
+
+## Installing the Chart
+
+### Add JFrog Helm repository
+
+Before installing JFrog helm charts, you need to add the [JFrog helm repository](https://charts.jfrog.io) to your helm client
+
+```bash
+helm repo add jfrog https://charts.jfrog.io
+```
+2. Next, create a unique Master Key (Artifactory requires a unique master key) and pass it to the template during installation.
+3. Now, update the repository.
+
+```bash
+helm repo update
+```
+
+### Install Chart
+To install the chart with the release name `artifactory`:
+```bash
+helm upgrade --install artifactory-ha jfrog/artifactory-ha --namespace artifactory-ha --create-namespace
+```
+
+### Apply Sizing configurations to the Chart
+To apply the chart with recommended sizing configurations :
+For small configurations :
+```bash
+helm upgrade --install artifactory-ha jfrog/artifactory-ha -f sizing/artifactory-small.yaml --namespace artifactory-ha --create-namespace
+```
+
+## Uninstalling Artifactory
+
+Uninstall is supported only on Helm v3 and on.
+
+Uninstall Artifactory using the following command.
+
+```bash
+helm uninstall artifactory-ha && sleep 90 && kubectl delete pvc -l app=artifactory-ha
+```
+
+## Deleting Artifactory
+
+**IMPORTANT:** Deleting Artifactory will also delete your data volumes and you will lose all of your data. You must back up all this information before deletion. You do not need to uninstall Artifactory before deleting it.
+
+To delete Artifactory use the following command.
+
+```bash
+helm delete artifactory-ha --namespace artifactory-ha
+```
+
diff --git a/charts/jfrog/artifactory-ha/107.98.14/app-readme.md b/charts/jfrog/artifactory-ha/107.98.14/app-readme.md
new file mode 100644
index 000000000..a5aa5fd47
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/app-readme.md
@@ -0,0 +1,16 @@
+# JFrog Artifactory High Availability Helm Chart
+
+Universal Repository Manager supporting all major packaging formats, build tools and CI servers.
+
+## Chart Details
+This chart will do the following:
+
+* Deploy Artifactory highly available cluster. 1 primary node and 2 member nodes.
+* Deploy a PostgreSQL database
+* Deploy an Nginx server(optional)
+
+## Useful links
+Blog: [Herd Trust Into Your Rancher Labs Multi-Cloud Strategy with Artifactory](https://jfrog.com/blog/herd-trust-into-your-rancher-labs-multi-cloud-strategy-with-artifactory/)
+
+## Activate Your Artifactory Instance 
+Don't have a license? Please send an email to [rancher-jfrog-licenses@jfrog.com](mailto:rancher-jfrog-licenses@jfrog.com) to get it.
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/.helmignore b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/Chart.lock b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/Chart.lock
new file mode 100644
index 000000000..3687f52df
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: https://charts.bitnami.com/bitnami
+  version: 1.4.2
+digest: sha256:dce0349883107e3ff103f4f17d3af4ad1ea3c7993551b1c28865867d3e53d37c
+generated: "2021-03-30T09:13:28.360322819Z"
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/Chart.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/Chart.yaml
new file mode 100644
index 000000000..4b197b207
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/Chart.yaml
@@ -0,0 +1,29 @@
+annotations:
+  category: Database
+apiVersion: v2
+appVersion: 11.11.0
+dependencies:
+- name: common
+  repository: https://charts.bitnami.com/bitnami
+  version: 1.x.x
+description: Chart for PostgreSQL, an object-relational database management system
+  (ORDBMS) with an emphasis on extensibility and on standards-compliance.
+home: https://github.com/bitnami/charts/tree/master/bitnami/postgresql
+icon: https://bitnami.com/assets/stacks/postgresql/img/postgresql-stack-220x234.png
+keywords:
+- postgresql
+- postgres
+- database
+- sql
+- replication
+- cluster
+maintainers:
+- email: containers@bitnami.com
+  name: Bitnami
+- email: cedric@desaintmartin.fr
+  name: desaintmartin
+name: postgresql
+sources:
+- https://github.com/bitnami/bitnami-docker-postgresql
+- https://www.postgresql.org/
+version: 10.3.18
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/README.md b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/README.md
new file mode 100644
index 000000000..63d3605bb
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/README.md
@@ -0,0 +1,770 @@
+# PostgreSQL
+
+[PostgreSQL](https://www.postgresql.org/) is an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance.
+
+For HA, please see [this repo](https://github.com/bitnami/charts/tree/master/bitnami/postgresql-ha)
+
+## TL;DR
+
+```console
+$ helm repo add bitnami https://charts.bitnami.com/bitnami
+$ helm install my-release bitnami/postgresql
+```
+
+## Introduction
+
+This chart bootstraps a [PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+
+Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. This chart has been tested to work with NGINX Ingress, cert-manager, fluentd and Prometheus on top of the [BKPR](https://kubeprod.io/).
+
+## Prerequisites
+
+- Kubernetes 1.12+
+- Helm 3.1.0
+- PV provisioner support in the underlying infrastructure
+
+## Installing the Chart
+To install the chart with the release name `my-release`:
+
+```console
+$ helm install my-release bitnami/postgresql
+```
+
+The command deploys PostgreSQL on the Kubernetes cluster in the default configuration. The [Parameters](#parameters) section lists the parameters that can be configured during installation.
+
+> **Tip**: List all releases using `helm list`
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```console
+$ helm delete my-release
+```
+
+The command removes all the Kubernetes components but PVC's associated with the chart and deletes the release.
+
+To delete the PVC's associated with `my-release`:
+
+```console
+$ kubectl delete pvc -l release=my-release
+```
+
+> **Note**: Deleting the PVC's will delete postgresql data as well. Please be cautious before doing it.
+
+## Parameters
+
+The following tables lists the configurable parameters of the PostgreSQL chart and their default values.
+
+| Parameter                                     | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Default                                                       |
+|-----------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------|
+| `global.imageRegistry`                        | Global Docker Image registry                                                                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+| `global.postgresql.postgresqlDatabase`        | PostgreSQL database (overrides `postgresqlDatabase`)                                                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `global.postgresql.postgresqlUsername`        | PostgreSQL username (overrides `postgresqlUsername`)                                                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `global.postgresql.existingSecret`            | Name of existing secret to use for PostgreSQL passwords (overrides `existingSecret`)                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `global.postgresql.postgresqlPassword`        | PostgreSQL admin password (overrides `postgresqlPassword`)                                                                                                                                                                                                                                                                                                                                                                                                                 | `nil`                                                         |
+| `global.postgresql.servicePort`               | PostgreSQL port (overrides `service.port`)                                                                                                                                                                                                                                                                                                                                                                                                                                 | `nil`                                                         |
+| `global.postgresql.replicationPassword`       | Replication user password (overrides `replication.password`)                                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+| `global.imagePullSecrets`                     | Global Docker registry secret names as an array                                                                                                                                                                                                                                                                                                                                                                                                                            | `[]` (does not add image pull secrets to deployed pods)       |
+| `global.storageClass`                         | Global storage class for dynamic provisioning                                                                                                                                                                                                                                                                                                                                                                                                                              | `nil`                                                         |
+| `image.registry`                              | PostgreSQL Image registry                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `docker.io`                                                   |
+| `image.repository`                            | PostgreSQL Image name                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `bitnami/postgresql`                                          |
+| `image.tag`                                   | PostgreSQL Image tag                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `{TAG_NAME}`                                                  |
+| `image.pullPolicy`                            | PostgreSQL Image pull policy                                                                                                                                                                                                                                                                                                                                                                                                                                               | `IfNotPresent`                                                |
+| `image.pullSecrets`                           | Specify Image pull secrets                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `nil` (does not add image pull secrets to deployed pods)      |
+| `image.debug`                                 | Specify if debug values should be set                                                                                                                                                                                                                                                                                                                                                                                                                                      | `false`                                                       |
+| `nameOverride`                                | String to partially override common.names.fullname template with a string (will prepend the release name)                                                                                                                                                                                                                                                                                                                                                                    | `nil`                                                         |
+| `fullnameOverride`                            | String to fully override common.names.fullname template with a string                                                                                                                                                                                                                                                                                                                                                                                                        | `nil`                                                         |
+| `volumePermissions.enabled`                   | Enable init container that changes volume permissions in the data directory (for cases where the default k8s `runAsUser` and `fsUser` values do not work)                                                                                                                                                                                                                                                                                                                  | `false`                                                       |
+| `volumePermissions.image.registry`            | Init container volume-permissions image registry                                                                                                                                                                                                                                                                                                                                                                                                                           | `docker.io`                                                   |
+| `volumePermissions.image.repository`          | Init container volume-permissions image name                                                                                                                                                                                                                                                                                                                                                                                                                               | `bitnami/bitnami-shell`                                       |
+| `volumePermissions.image.tag`                 | Init container volume-permissions image tag                                                                                                                                                                                                                                                                                                                                                                                                                                | `"10"`                                                        |
+| `volumePermissions.image.pullPolicy`          | Init container volume-permissions image pull policy                                                                                                                                                                                                                                                                                                                                                                                                                        | `Always`                                                      |
+| `volumePermissions.securityContext.*`         | Other container security context to be included as-is in the container spec                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                                          |
+| `volumePermissions.securityContext.runAsUser` | User ID for the init container (when facing issues in OpenShift or uid unknown, try value "auto")                                                                                                                                                                                                                                                                                                                                                                          | `0`                                                           |
+| `usePasswordFile`                             | Have the secrets mounted as a file instead of env vars                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`                                                       |
+| `ldap.enabled`                                | Enable LDAP support                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `false`                                                       |
+| `ldap.existingSecret`                         | Name of existing secret to use for LDAP passwords                                                                                                                                                                                                                                                                                                                                                                                                                          | `nil`                                                         |
+| `ldap.url`                                    | LDAP URL beginning in the form `ldap[s]://host[:port]/basedn[?[attribute][?[scope][?[filter]]]]`                                                                                                                                                                                                                                                                                                                                                                           | `nil`                                                         |
+| `ldap.server`                                 | IP address or name of the LDAP server.                                                                                                                                                                                                                                                                                                                                                                                                                                     | `nil`                                                         |
+| `ldap.port`                                   | Port number on the LDAP server to connect to                                                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+| `ldap.scheme`                                 | Set to `ldaps` to use LDAPS.                                                                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+| `ldap.tls`                                    | Set to `1` to use TLS encryption                                                                                                                                                                                                                                                                                                                                                                                                                                           | `nil`                                                         |
+| `ldap.prefix`                                 | String to prepend to the user name when forming the DN to bind                                                                                                                                                                                                                                                                                                                                                                                                             | `nil`                                                         |
+| `ldap.suffix`                                 | String to append to the user name when forming the DN to bind                                                                                                                                                                                                                                                                                                                                                                                                              | `nil`                                                         |
+| `ldap.search_attr`                            | Attribute to match against the user name in the search                                                                                                                                                                                                                                                                                                                                                                                                                      | `nil`                                                         |
+| `ldap.search_filter`                          | The search filter to use when doing search+bind authentication                                                                                                                                                                                                                                                                                                                                                                                                             | `nil`                                                         |
+| `ldap.baseDN`                                 | Root DN to begin the search for the user in                                                                                                                                                                                                                                                                                                                                                                                                                                | `nil`                                                         |
+| `ldap.bindDN`                                 | DN of user to bind to LDAP                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `nil`                                                         |
+| `ldap.bind_password`                          | Password for the user to bind to LDAP                                                                                                                                                                                                                                                                                                                                                                                                                                      | `nil`                                                         |
+| `replication.enabled`                         | Enable replication                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                                                       |
+| `replication.user`                            | Replication user                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `repl_user`                                                   |
+| `replication.password`                        | Replication user password                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `repl_password`                                               |
+| `replication.readReplicas`                    | Number of read replicas replicas                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `1`                                                           |
+| `replication.synchronousCommit`               | Set synchronous commit mode. Allowed values: `on`, `remote_apply`, `remote_write`, `local` and `off`                                                                                                                                                                                                                                                                                                                                                                       | `off`                                                         |
+| `replication.numSynchronousReplicas`          | Number of replicas that will have synchronous replication. Note: Cannot be greater than `replication.readReplicas`.                                                                                                                                                                                                                                                                                                                                                       | `0`                                                           |
+| `replication.applicationName`                 | Cluster application name. Useful for advanced replication settings                                                                                                                                                                                                                                                                                                                                                                                                         | `my_application`                                              |
+| `existingSecret`                              | Name of existing secret to use for PostgreSQL passwords. The secret has to contain the keys `postgresql-password` which is the password for `postgresqlUsername` when it is different of `postgres`, `postgresql-postgres-password` which will override `postgresqlPassword`, `postgresql-replication-password` which will override `replication.password` and `postgresql-ldap-password` which will be used to authenticate on LDAP. The value is evaluated as a template. | `nil`                                                         |
+| `postgresqlPostgresPassword`                  | PostgreSQL admin password (used when `postgresqlUsername` is not `postgres`, in which case`postgres` is the admin username).                                                                                                                                                                                                                                                                                                                                               | _random 10 character alphanumeric string_                     |
+| `postgresqlUsername`                          | PostgreSQL user (creates a non-admin user when `postgresqlUsername` is not `postgres`)                                                                                                                                                                                                                                                                                                                                                                                     | `postgres`                                                    |
+| `postgresqlPassword`                          | PostgreSQL user password                                                                                                                                                                                                                                                                                                                                                                                                                                                   | _random 10 character alphanumeric string_                     |
+| `postgresqlDatabase`                          | PostgreSQL database                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `nil`                                                         |
+| `postgresqlDataDir`                           | PostgreSQL data dir folder                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `/bitnami/postgresql` (same value as persistence.mountPath)   |
+| `extraEnv`                                    | Any extra environment variables you would like to pass on to the pod. The value is evaluated as a template.                                                                                                                                                                                                                                                                                                                                                                | `[]`                                                          |
+| `extraEnvVarsCM`                              | Name of a Config Map containing extra environment variables you would like to pass on to the pod. The value is evaluated as a template.                                                                                                                                                                                                                                                                                                                                    | `nil`                                                         |
+| `postgresqlInitdbArgs`                        | PostgreSQL initdb extra arguments                                                                                                                                                                                                                                                                                                                                                                                                                                          | `nil`                                                         |
+| `postgresqlInitdbWalDir`                      | PostgreSQL location for transaction log                                                                                                                                                                                                                                                                                                                                                                                                                                    | `nil`                                                         |
+| `postgresqlConfiguration`                     | Runtime Config Parameters                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `nil`                                                         |
+| `postgresqlExtendedConf`                      | Extended Runtime Config Parameters (appended to main or default configuration)                                                                                                                                                                                                                                                                                                                                                                                             | `nil`                                                         |
+| `pgHbaConfiguration`                          | Content of pg_hba.conf                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `nil (do not create pg_hba.conf)`                             |
+| `postgresqlSharedPreloadLibraries`            | Shared preload libraries (comma-separated list)                                                                                                                                                                                                                                                                                                                                                                                                                            | `pgaudit`                                                     |
+| `postgresqlMaxConnections`                    | Maximum total connections                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `nil`                                                         |
+| `postgresqlPostgresConnectionLimit`           | Maximum total connections for the postgres user                                                                                                                                                                                                                                                                                                                                                                                                                            | `nil`                                                         |
+| `postgresqlDbUserConnectionLimit`             | Maximum total connections for the non-admin user                                                                                                                                                                                                                                                                                                                                                                                                                           | `nil`                                                         |
+| `postgresqlTcpKeepalivesInterval`             | TCP keepalives interval                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `nil`                                                         |
+| `postgresqlTcpKeepalivesIdle`                 | TCP keepalives idle                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `nil`                                                         |
+| `postgresqlTcpKeepalivesCount`                | TCP keepalives count                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `postgresqlStatementTimeout`                  | Statement timeout                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `nil`                                                         |
+| `postgresqlPghbaRemoveFilters`                | Comma-separated list of patterns to remove from the pg_hba.conf file                                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `customStartupProbe`                          | Override default startup probe                                                                                                                                                                                                                                                                                                                                                                                                                                             | `nil`                                                         |
+| `customLivenessProbe`                         | Override default liveness probe                                                                                                                                                                                                                                                                                                                                                                                                                                            | `nil`                                                         |
+| `customReadinessProbe`                        | Override default readiness probe                                                                                                                                                                                                                                                                                                                                                                                                                                           | `nil`                                                         |
+| `audit.logHostname`                           | Add client hostnames to the log file                                                                                                                                                                                                                                                                                                                                                                                                                                       | `false`                                                       |
+| `audit.logConnections`                        | Add client log-in operations to the log file                                                                                                                                                                                                                                                                                                                                                                                                                               | `false`                                                       |
+| `audit.logDisconnections`                     | Add client log-outs operations to the log file                                                                                                                                                                                                                                                                                                                                                                                                                             | `false`                                                       |
+| `audit.pgAuditLog`                            | Add operations to log using the pgAudit extension                                                                                                                                                                                                                                                                                                                                                                                                                          | `nil`                                                         |
+| `audit.clientMinMessages`                     | Message log level to share with the user                                                                                                                                                                                                                                                                                                                                                                                                                                   | `nil`                                                         |
+| `audit.logLinePrefix`                         | Template string for the log line prefix                                                                                                                                                                                                                                                                                                                                                                                                                                    | `nil`                                                         |
+| `audit.logTimezone`                           | Timezone for the log timestamps                                                                                                                                                                                                                                                                                                                                                                                                                                            | `nil`                                                         |
+| `configurationConfigMap`                      | ConfigMap with the PostgreSQL configuration files (Note: Overrides `postgresqlConfiguration` and `pgHbaConfiguration`). The value is evaluated as a template.                                                                                                                                                                                                                                                                                                              | `nil`                                                         |
+| `extendedConfConfigMap`                       | ConfigMap with the extended PostgreSQL configuration files. The value is evaluated as a template.                                                                                                                                                                                                                                                                                                                                                                          | `nil`                                                         |
+| `initdbScripts`                               | Dictionary of initdb scripts                                                                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+| `initdbUser`                                  | PostgreSQL user to execute the .sql and sql.gz scripts                                                                                                                                                                                                                                                                                                                                                                                                                     | `nil`                                                         |
+| `initdbPassword`                              | Password for the user specified in `initdbUser`                                                                                                                                                                                                                                                                                                                                                                                                                            | `nil`                                                         |
+| `initdbScriptsConfigMap`                      | ConfigMap with the initdb scripts (Note: Overrides `initdbScripts`). The value is evaluated as a template.                                                                                                                                                                                                                                                                                                                                                                 | `nil`                                                         |
+| `initdbScriptsSecret`                         | Secret with initdb scripts that contain sensitive information (Note: can be used with `initdbScriptsConfigMap` or `initdbScripts`). The value is evaluated as a template.                                                                                                                                                                                                                                                                                                  | `nil`                                                         |
+| `service.type`                                | Kubernetes Service type                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `ClusterIP`                                                   |
+| `service.port`                                | PostgreSQL port                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `5432`                                                        |
+| `service.nodePort`                            | Kubernetes Service nodePort                                                                                                                                                                                                                                                                                                                                                                                                                                                | `nil`                                                         |
+| `service.annotations`                         | Annotations for PostgreSQL service                                                                                                                                                                                                                                                                                                                                                                                                                                         | `{}` (evaluated as a template)                                |
+| `service.loadBalancerIP`                      | loadBalancerIP if service type is `LoadBalancer`                                                                                                                                                                                                                                                                                                                                                                                                                           | `nil`                                                         |
+| `service.loadBalancerSourceRanges`            | Address that are allowed when svc is LoadBalancer                                                                                                                                                                                                                                                                                                                                                                                                                          | `[]` (evaluated as a template)                                |
+| `schedulerName`                               | Name of the k8s scheduler (other than default)                                                                                                                                                                                                                                                                                                                                                                                                                             | `nil`                                                         |
+| `shmVolume.enabled`                           | Enable emptyDir volume for /dev/shm for primary and read replica(s) Pod(s)                                                                                                                                                                                                                                                                                                                                                                                                         | `true`                                                        |
+| `shmVolume.chmod.enabled`                     | Run at init chmod 777 of the /dev/shm (ignored if `volumePermissions.enabled` is `false`)                                                                                                                                                                                                                                                                                                                                                                                  | `true`                                                        |
+| `persistence.enabled`                         | Enable persistence using PVC                                                                                                                                                                                                                                                                                                                                                                                                                                               | `true`                                                        |
+| `persistence.existingClaim`                   | Provide an existing `PersistentVolumeClaim`, the value is evaluated as a template.                                                                                                                                                                                                                                                                                                                                                                                         | `nil`                                                         |
+| `persistence.mountPath`                       | Path to mount the volume at                                                                                                                                                                                                                                                                                                                                                                                                                                                | `/bitnami/postgresql`                                         |
+| `persistence.subPath`                         | Subdirectory of the volume to mount at                                                                                                                                                                                                                                                                                                                                                                                                                                     | `""`                                                          |
+| `persistence.storageClass`                    | PVC Storage Class for PostgreSQL volume                                                                                                                                                                                                                                                                                                                                                                                                                                    | `nil`                                                         |
+| `persistence.accessModes`                     | PVC Access Mode for PostgreSQL volume                                                                                                                                                                                                                                                                                                                                                                                                                                      | `[ReadWriteOnce]`                                             |
+| `persistence.size`                            | PVC Storage Request for PostgreSQL volume                                                                                                                                                                                                                                                                                                                                                                                                                                  | `8Gi`                                                         |
+| `persistence.annotations`                     | Annotations for the PVC                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `{}`                                                          |
+| `persistence.selector`                        | Selector to match an existing Persistent Volume (this value is evaluated as a template)                                                                                                                                                                                                                                                                                                                                                                                    | `{}`                                                          |
+| `commonAnnotations`                           | Annotations to be added to all deployed resources (rendered as a template)                                                                                                                                                                                                                                                                                                                                                                                                 | `{}`                                                          |
+| `primary.podAffinityPreset`                   | PostgreSQL primary pod affinity preset. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard`            | `""`                                                         |
+| `primary.podAntiAffinityPreset`               | PostgreSQL primary pod anti-affinity preset. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard`       | `soft`                                                       |
+| `primary.nodeAffinityPreset.type`             | PostgreSQL primary node affinity preset type. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard`      | `""`                                                         |
+| `primary.nodeAffinityPreset.key`              | PostgreSQL primary node label key to match Ignored if `primary.affinity` is set.                                          | `""`                                                         |
+| `primary.nodeAffinityPreset.values`           | PostgreSQL primary node label values to match. Ignored if `primary.affinity` is set.                                      | `[]`                                                         |
+| `primary.affinity`                            | Affinity for PostgreSQL primary pods assignment                                                                           | `{}` (evaluated as a template)                               |
+| `primary.nodeSelector`                        | Node labels for PostgreSQL primary pods assignment                                                                        | `{}` (evaluated as a template)                               |
+| `primary.tolerations`                         | Tolerations for PostgreSQL primary pods assignment                                                                        | `[]` (evaluated as a template)                               |
+| `primary.anotations`                          | Map of annotations to add to the statefulset (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                           | `{}`                                                          |
+| `primary.labels`                              | Map of labels to add to the statefulset (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                                          |
+| `primary.podAnnotations`                      | Map of annotations to add to the pods (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                                  | `{}`                                                          |
+| `primary.podLabels`                           | Map of labels to add to the pods (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                                       | `{}`                                                          |
+| `primary.priorityClassName`                   | Priority Class to use for each pod (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                                     | `nil`                                                         |
+| `primary.extraInitContainers`                 | Additional init containers to add to the pods (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                          | `[]`                                                          |
+| `primary.extraVolumeMounts`                   | Additional volume mounts to add to the pods (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                            | `[]`                                                          |
+| `primary.extraVolumes`                        | Additional volumes to add to the pods (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                                  | `[]`                                                          |
+| `primary.sidecars`                            | Add additional containers to the pod                                                                                                                                                                                                                                                                                                                                                                                                                                        | `[]`                                                          |
+| `primary.service.type`                        | Allows using a different service type for primary                                                                                                                                                                                                                                                                                                                                                                                                                           | `nil`                                                         |
+| `primary.service.nodePort`                    | Allows using a different nodePort for primary                                                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+| `primary.service.clusterIP`                   | Allows using a different clusterIP for primary                                                                                                                                                                                                                                                                                                                                                                                                                              | `nil`                                                         |
+| `primaryAsStandBy.enabled`                    | Whether to enable current cluster's primary as standby server of another cluster or not.                                                                                                                                                                                                                                                                                                                                                                                    | `false`                                                       |
+| `primaryAsStandBy.primaryHost`                | The Host of replication primary in the other cluster.                                                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `primaryAsStandBy.primaryPort `               | The Port of replication primary in the other cluster.                                                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `readReplicas.podAffinityPreset`              | PostgreSQL read only pod affinity preset. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard`            | `""`                                                         |
+| `readReplicas.podAntiAffinityPreset`          | PostgreSQL read only pod anti-affinity preset. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard`       | `soft`                                                       |
+| `readReplicas.nodeAffinityPreset.type`        | PostgreSQL read only node affinity preset type. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard`      | `""`                                                         |
+| `readReplicas.nodeAffinityPreset.key`         | PostgreSQL read only node label key to match Ignored if `primary.affinity` is set.                                          | `""`                                                         |
+| `readReplicas.nodeAffinityPreset.values`      | PostgreSQL read only node label values to match. Ignored if `primary.affinity` is set.                                      | `[]`                                                         |
+| `readReplicas.affinity`                       | Affinity for PostgreSQL read only pods assignment                                                                           | `{}` (evaluated as a template)                               |
+| `readReplicas.nodeSelector`                   | Node labels for PostgreSQL read only pods assignment                                                                        | `{}` (evaluated as a template)                               |
+| `readReplicas.anotations`                     | Map of annotations to add to the statefulsets (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                           | `{}`                                                          |
+| `readReplicas.resources`                      | CPU/Memory resource requests/limits override for readReplicass. Will fallback to `values.resources` if not defined.                                                                                                                                                                                                                                                                                                                                                               | `{}`                                                          |
+| `readReplicas.labels`                         | Map of labels to add to the statefulsets (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                                          |
+| `readReplicas.podAnnotations`                 | Map of annotations to add to the pods (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                                   | `{}`                                                          |
+| `readReplicas.podLabels`                      | Map of labels to add to the pods (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                                        | `{}`                                                          |
+| `readReplicas.priorityClassName`              | Priority Class to use for each pod (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                                      | `nil`                                                         |
+| `readReplicas.extraInitContainers`            | Additional init containers to add to the pods (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                           | `[]`                                                          |
+| `readReplicas.extraVolumeMounts`              | Additional volume mounts to add to the pods (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                             | `[]`                                                          |
+| `readReplicas.extraVolumes`                   | Additional volumes to add to the pods (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                                   | `[]`                                                          |
+| `readReplicas.sidecars`                       | Add additional containers to the pod                                                                                                                                                                                                                                                                                                                                                                                                                                              | `[]`                                                          |
+| `readReplicas.service.type`                   | Allows using a different service type for readReplicas                                                                                                                                                                                                                                                                                                                                                                                                                            | `nil`                                                         |
+| `readReplicas.service.nodePort`               | Allows using a different nodePort for readReplicas                                                                                                                                                                                                                                                                                                                                                                                                                                | `nil`                                                         |
+| `readReplicas.service.clusterIP`              | Allows using a different clusterIP for readReplicas                                                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+| `readReplicas.persistence.enabled`            | Whether to enable readReplicas replicas persistence                                                                                                                                                                                                                                                                                                                                                                                                                               | `true`                                                        |
+| `terminationGracePeriodSeconds`               | Seconds the pod needs to terminate gracefully                                                                                                                                                                                                                                                                                                                                                                                                                              | `nil`                                                         |
+| `resources`                                   | CPU/Memory resource requests/limits                                                                                                                                                                                                                                                                                                                                                                                                                                        | Memory: `256Mi`, CPU: `250m`                                  |
+| `securityContext.*`                           | Other pod security context to be included as-is in the pod spec                                                                                                                                                                                                                                                                                                                                                                                                            | `{}`                                                          |
+| `securityContext.enabled`                     | Enable security context                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `true`                                                        |
+| `securityContext.fsGroup`                     | Group ID for the pod                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `1001`                                                        |
+| `containerSecurityContext.*`                  | Other container security context to be included as-is in the container spec                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                                          |
+| `containerSecurityContext.enabled`            | Enable container security context                                                                                                                                                                                                                                                                                                                                                                                                                                          | `true`                                                        |
+| `containerSecurityContext.runAsUser`          | User ID for the container                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `1001`                                                        |
+| `serviceAccount.enabled`                      | Enable service account (Note: Service Account will only be automatically created if `serviceAccount.name` is not set)                                                                                                                                                                                                                                                                                                                                                      | `false`                                                       |
+| `serviceAccount.name`                         | Name of existing service account                                                                                                                                                                                                                                                                                                                                                                                                                                           | `nil`                                                         |
+| `networkPolicy.enabled`                       | Enable NetworkPolicy                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `false`                                                       |
+| `networkPolicy.allowExternal`                 | Don't require client label for connections                                                                                                                                                                                                                                                                                                                                                                                                                                 | `true`                                                        |
+| `networkPolicy.explicitNamespacesSelector`    | A Kubernetes LabelSelector to explicitly select namespaces from which ingress traffic could be allowed                                                                                                                                                                                                                                                                                                                                                                     | `{}`                                                          |
+| `startupProbe.enabled`                        | Enable startupProbe                                                                          | `false`                                                       |
+| `startupProbe.initialDelaySeconds`            | Delay before liveness probe is initiated                                                     | 30                                                            |
+| `startupProbe.periodSeconds`                  | How often to perform the probe                                                               | 15                                                            |
+| `startupProbe.timeoutSeconds`                 | When the probe times                                                                         | 5                                                             |
+| `startupProbe.failureThreshold`               | Minimum consecutive failures for the probe to be considered failed after having succeeded.   | 10                                                            |
+| `startupProbe.successThreshold`               | Minimum consecutive successes for the probe to be considered successful after having failed. | 1                                                             |
+| `livenessProbe.enabled`                       | Enable livenessProbe                                                                         | `true`                                                        |
+| `livenessProbe.initialDelaySeconds`           | Delay before liveness probe is initiated                                                                                                                                                                                                                                                                                                                                                                                                                                   | 30                                                            |
+| `livenessProbe.periodSeconds`                 | How often to perform the probe                                                                                                                                                                                                                                                                                                                                                                                                                                             | 10                                                            |
+| `livenessProbe.timeoutSeconds`                | When the probe times out                                                                                                                                                                                                                                                                                                                                                                                                                                                   | 5                                                             |
+| `livenessProbe.failureThreshold`              | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                                                                                                                                                                                                                                                                                                                 | 6                                                             |
+| `livenessProbe.successThreshold`              | Minimum consecutive successes for the probe to be considered successful after having failed                                                                                                                                                                                                                                                                                                                                                                                | 1                                                             |
+| `readinessProbe.enabled`                      | Enable readinessProbe                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `true`                                                        |
+| `readinessProbe.initialDelaySeconds`          | Delay before readiness probe is initiated                                                                                                                                                                                                                                                                                                                                                                                                                                  | 5                                                             |
+| `readinessProbe.periodSeconds`                | How often to perform the probe                                                                                                                                                                                                                                                                                                                                                                                                                                             | 10                                                            |
+| `readinessProbe.timeoutSeconds`               | When the probe times out                                                                                                                                                                                                                                                                                                                                                                                                                                                   | 5                                                             |
+| `readinessProbe.failureThreshold`             | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                                                                                                                                                                                                                                                                                                                 | 6                                                             |
+| `readinessProbe.successThreshold`             | Minimum consecutive successes for the probe to be considered successful after having failed                                                                                                                                                                                                                                                                                                                                                                                | 1                                                             |
+| `tls.enabled`                                 | Enable TLS traffic support                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `false`                                                       |
+| `tls.preferServerCiphers`                     | Whether to use the server's TLS cipher preferences rather than the client's                                                                                                                                                                                                                                                                                                                                                                                                | `true`                                                        |
+| `tls.certificatesSecret`                      | Name of an existing secret that contains the certificates                                                                                                                                                                                                                                                                                                                                                                                                                  | `nil`                                                         |
+| `tls.certFilename`                            | Certificate filename                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `""`                                                          |
+| `tls.certKeyFilename`                         | Certificate key filename                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `""`                                                          |
+| `tls.certCAFilename`                          | CA Certificate filename. If provided, PostgreSQL will authenticate TLS/SSL clients by requesting them a certificate.                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `tls.crlFilename`                             | File containing a Certificate Revocation List                                                                                                                                                                                                                                                                                                                                                                                                                              | `nil`                                                         |
+| `metrics.enabled`                             | Start a prometheus exporter                                                                                                                                                                                                                                                                                                                                                                                                                                                | `false`                                                       |
+| `metrics.service.type`                        | Kubernetes Service type                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `ClusterIP`                                                   |
+| `service.clusterIP`                           | Static clusterIP or None for headless services                                                                                                                                                                                                                                                                                                                                                                                                                             | `nil`                                                         |
+| `metrics.service.annotations`                 | Additional annotations for metrics exporter pod                                                                                                                                                                                                                                                                                                                                                                                                                            | `{ prometheus.io/scrape: "true", prometheus.io/port: "9187"}` |
+| `metrics.service.loadBalancerIP`              | loadBalancerIP if redis metrics service type is `LoadBalancer`                                                                                                                                                                                                                                                                                                                                                                                                             | `nil`                                                         |
+| `metrics.serviceMonitor.enabled`              | Set this to `true` to create ServiceMonitor for Prometheus operator                                                                                                                                                                                                                                                                                                                                                                                                        | `false`                                                       |
+| `metrics.serviceMonitor.additionalLabels`     | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus                                                                                                                                                                                                                                                                                                                                                                                      | `{}`                                                          |
+| `metrics.serviceMonitor.namespace`            | Optional namespace in which to create ServiceMonitor                                                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `metrics.serviceMonitor.interval`             | Scrape interval. If not set, the Prometheus default scrape interval is used                                                                                                                                                                                                                                                                                                                                                                                                | `nil`                                                         |
+| `metrics.serviceMonitor.scrapeTimeout`        | Scrape timeout. If not set, the Prometheus default scrape timeout is used                                                                                                                                                                                                                                                                                                                                                                                                  | `nil`                                                         |
+| `metrics.prometheusRule.enabled`              | Set this to true to create prometheusRules for Prometheus operator                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                                                       |
+| `metrics.prometheusRule.additionalLabels`     | Additional labels that can be used so prometheusRules will be discovered by Prometheus                                                                                                                                                                                                                                                                                                                                                                                     | `{}`                                                          |
+| `metrics.prometheusRule.namespace`            | namespace where prometheusRules resource should be created                                                                                                                                                                                                                                                                                                                                                                                                                 | the same namespace as postgresql                              |
+| `metrics.prometheusRule.rules`                | [rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) to be created, check values for an example.                                                                                                                                                                                                                                                                                                                                            | `[]`                                                          |
+| `metrics.image.registry`                      | PostgreSQL Exporter Image registry                                                                                                                                                                                                                                                                                                                                                                                                                                         | `docker.io`                                                   |
+| `metrics.image.repository`                    | PostgreSQL Exporter Image name                                                                                                                                                                                                                                                                                                                                                                                                                                             | `bitnami/postgres-exporter`                                   |
+| `metrics.image.tag`                           | PostgreSQL Exporter Image tag                                                                                                                                                                                                                                                                                                                                                                                                                                              | `{TAG_NAME}`                                                  |
+| `metrics.image.pullPolicy`                    | PostgreSQL Exporter Image pull policy                                                                                                                                                                                                                                                                                                                                                                                                                                      | `IfNotPresent`                                                |
+| `metrics.image.pullSecrets`                   | Specify Image pull secrets                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `nil` (does not add image pull secrets to deployed pods)      |
+| `metrics.customMetrics`                       | Additional custom metrics                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `nil`                                                         |
+| `metrics.extraEnvVars`                        | Extra environment variables to add to exporter                                                                                                                                                                                                                                                                                                                                                                                                                             | `{}` (evaluated as a template)                                |
+| `metrics.securityContext.*`                   | Other container security context to be included as-is in the container spec                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                                          |
+| `metrics.securityContext.enabled`             | Enable security context for metrics                                                                                                                                                                                                                                                                                                                                                                                                                                        | `false`                                                       |
+| `metrics.securityContext.runAsUser`           | User ID for the container for metrics                                                                                                                                                                                                                                                                                                                                                                                                                                      | `1001`                                                        |
+| `metrics.livenessProbe.initialDelaySeconds`   | Delay before liveness probe is initiated                                                                                                                                                                                                                                                                                                                                                                                                                                   | 30                                                            |
+| `metrics.livenessProbe.periodSeconds`         | How often to perform the probe                                                                                                                                                                                                                                                                                                                                                                                                                                             | 10                                                            |
+| `metrics.livenessProbe.timeoutSeconds`        | When the probe times out                                                                                                                                                                                                                                                                                                                                                                                                                                                   | 5                                                             |
+| `metrics.livenessProbe.failureThreshold`      | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                                                                                                                                                                                                                                                                                                                 | 6                                                             |
+| `metrics.livenessProbe.successThreshold`      | Minimum consecutive successes for the probe to be considered successful after having failed                                                                                                                                                                                                                                                                                                                                                                                | 1                                                             |
+| `metrics.readinessProbe.enabled`              | would you like a readinessProbe to be enabled                                                                                                                                                                                                                                                                                                                                                                                                                              | `true`                                                        |
+| `metrics.readinessProbe.initialDelaySeconds`  | Delay before liveness probe is initiated                                                                                                                                                                                                                                                                                                                                                                                                                                   | 5                                                             |
+| `metrics.readinessProbe.periodSeconds`        | How often to perform the probe                                                                                                                                                                                                                                                                                                                                                                                                                                             | 10                                                            |
+| `metrics.readinessProbe.timeoutSeconds`       | When the probe times out                                                                                                                                                                                                                                                                                                                                                                                                                                                   | 5                                                             |
+| `metrics.readinessProbe.failureThreshold`     | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                                                                                                                                                                                                                                                                                                                 | 6                                                             |
+| `metrics.readinessProbe.successThreshold`     | Minimum consecutive successes for the probe to be considered successful after having failed                                                                                                                                                                                                                                                                                                                                                                                | 1                                                             |
+| `updateStrategy`                              | Update strategy policy                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `{type: "RollingUpdate"}`                                     |
+| `psp.create`                                  | Create Pod Security Policy                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `false`                                                       |
+| `rbac.create`                                 | Create Role and RoleBinding (required for PSP to work)                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`                                                       |
+| `extraDeploy`                                 | Array of extra objects to deploy with the release (evaluated as a template).                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+
+```console
+$ helm install my-release \
+  --set postgresqlPassword=secretpassword,postgresqlDatabase=my-database \
+    bitnami/postgresql
+```
+
+The above command sets the PostgreSQL `postgres` account password to `secretpassword`. Additionally it creates a database named `my-database`.
+
+> NOTE: Once this chart is deployed, it is not possible to change the application's access credentials, such as usernames or passwords, using Helm. To change these application credentials after deployment, delete any persistent volumes (PVs) used by the chart and re-deploy it, or use the application's built-in administrative tools if available.
+
+Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example,
+
+```console
+$ helm install my-release -f values.yaml bitnami/postgresql
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml)
+
+## Configuration and installation details
+
+### [Rolling VS Immutable tags](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/)
+
+It is strongly recommended to use immutable tags in a production environment. This ensures your deployment does not change automatically if the same tag is updated with a different image.
+
+Bitnami will release a new chart updating its containers if a new version of the main container, significant changes, or critical vulnerabilities exist.
+
+### Customizing primary and read replica services in a replicated configuration
+
+At the top level, there is a service object which defines the services for both primary and readReplicas. For deeper customization, there are service objects for both the primary and read types individually. This allows you to override the values in the top level service object so that the primary and read can be of different service types and with different clusterIPs / nodePorts. Also in the case you want the primary and read to be of type nodePort, you will need to set the nodePorts to different values to prevent a collision. The values that are deeper in the primary.service or readReplicas.service objects will take precedence over the top level service object.
+
+### Change PostgreSQL version
+
+To modify the PostgreSQL version used in this chart you can specify a [valid image tag](https://hub.docker.com/r/bitnami/postgresql/tags/) using the `image.tag` parameter. For example, `image.tag=X.Y.Z`. This approach is also applicable to other images like exporters.
+
+### postgresql.conf / pg_hba.conf files as configMap
+
+This helm chart also supports to customize the whole configuration file.
+
+Add your custom file to "files/postgresql.conf" in your working directory. This file will be mounted as configMap to the containers and it will be used for configuring the PostgreSQL server.
+
+Alternatively, you can add additional PostgreSQL configuration parameters using the `postgresqlExtendedConf` parameter as a dict, using camelCase, e.g. {"sharedBuffers": "500MB"}. Alternatively, to replace the entire default configuration use `postgresqlConfiguration`.
+
+In addition to these options, you can also set an external ConfigMap with all the configuration files. This is done by setting the `configurationConfigMap` parameter. Note that this will override the two previous options.
+
+### Allow settings to be loaded from files other than the default `postgresql.conf`
+
+If you don't want to provide the whole PostgreSQL configuration file and only specify certain parameters, you can add your extended `.conf` files to "files/conf.d/" in your working directory.
+Those files will be mounted as configMap to the containers adding/overwriting the default configuration using the `include_dir` directive that allows settings to be loaded from files other than the default `postgresql.conf`.
+
+Alternatively, you can also set an external ConfigMap with all the extra configuration files. This is done by setting the `extendedConfConfigMap` parameter. Note that this will override the previous option.
+
+### Initialize a fresh instance
+
+The [Bitnami PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) image allows you to use your custom scripts to initialize a fresh instance. In order to execute the scripts, they must be located inside the chart folder `files/docker-entrypoint-initdb.d` so they can be consumed as a ConfigMap.
+
+Alternatively, you can specify custom scripts using the `initdbScripts` parameter as dict.
+
+In addition to these options, you can also set an external ConfigMap with all the initialization scripts. This is done by setting the `initdbScriptsConfigMap` parameter. Note that this will override the two previous options. If your initialization scripts contain sensitive information such as credentials or passwords, you can use the `initdbScriptsSecret` parameter.
+
+The allowed extensions are `.sh`, `.sql` and `.sql.gz`.
+
+### Securing traffic using TLS
+
+TLS support can be enabled in the chart by specifying the `tls.` parameters while creating a release. The following parameters should be configured to properly enable the TLS support in the chart:
+
+- `tls.enabled`: Enable TLS support. Defaults to `false`
+- `tls.certificatesSecret`: Name of an existing secret that contains the certificates. No defaults.
+- `tls.certFilename`: Certificate filename. No defaults.
+- `tls.certKeyFilename`: Certificate key filename. No defaults.
+
+For example:
+
+* First, create the secret with the cetificates files:
+
+    ```console
+    kubectl create secret generic certificates-tls-secret --from-file=./cert.crt --from-file=./cert.key --from-file=./ca.crt
+    ```
+
+* Then, use the following parameters:
+
+    ```console
+    volumePermissions.enabled=true
+    tls.enabled=true
+    tls.certificatesSecret="certificates-tls-secret"
+    tls.certFilename="cert.crt"
+    tls.certKeyFilename="cert.key"
+    ```
+
+    > Note TLS and VolumePermissions: PostgreSQL requires certain permissions on sensitive files (such as certificate keys) to start up. Due to an on-going [issue](https://github.com/kubernetes/kubernetes/issues/57923) regarding kubernetes permissions and the use of `containerSecurityContext.runAsUser`, you must enable `volumePermissions` to ensure everything works as expected.
+
+### Sidecars
+
+If you need  additional containers to run within the same pod as PostgreSQL (e.g. an additional metrics or logging exporter), you can do so via the `sidecars` config parameter. Simply define your container according to the Kubernetes container spec.
+
+```yaml
+# For the PostgreSQL primary
+primary:
+  sidecars:
+  - name: your-image-name
+    image: your-image
+    imagePullPolicy: Always
+    ports:
+    - name: portname
+     containerPort: 1234
+# For the PostgreSQL replicas
+readReplicas:
+  sidecars:
+  - name: your-image-name
+    image: your-image
+    imagePullPolicy: Always
+    ports:
+    - name: portname
+     containerPort: 1234
+```
+
+### Metrics
+
+The chart optionally can start a metrics exporter for [prometheus](https://prometheus.io). The metrics endpoint (port 9187) is not exposed and it is expected that the metrics are collected from inside the k8s cluster using something similar as the described in the [example Prometheus scrape configuration](https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml).
+
+The exporter allows to create custom metrics from additional SQL queries. See the Chart's `values.yaml` for an example and consult the [exporters documentation](https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file) for more details.
+
+### Use of global variables
+
+In more complex scenarios, we may have the following tree of dependencies
+
+```
+                     +--------------+
+                     |              |
+        +------------+   Chart 1    +-----------+
+        |            |              |           |
+        |            --------+------+           |
+        |                    |                  |
+        |                    |                  |
+        |                    |                  |
+        |                    |                  |
+        v                    v                  v
++-------+------+    +--------+------+  +--------+------+
+|              |    |               |  |               |
+|  PostgreSQL  |    |  Sub-chart 1  |  |  Sub-chart 2  |
+|              |    |               |  |               |
++--------------+    +---------------+  +---------------+
+```
+
+The three charts below depend on the parent chart Chart 1. However, subcharts 1 and 2 may need to connect to PostgreSQL as well. In order to do so, subcharts 1 and 2 need to know the PostgreSQL credentials, so one option for deploying could be deploy Chart 1 with the following parameters:
+
+```
+postgresql.postgresqlPassword=testtest
+subchart1.postgresql.postgresqlPassword=testtest
+subchart2.postgresql.postgresqlPassword=testtest
+postgresql.postgresqlDatabase=db1
+subchart1.postgresql.postgresqlDatabase=db1
+subchart2.postgresql.postgresqlDatabase=db1
+```
+
+If the number of dependent sub-charts increases, installing the chart with parameters can become increasingly difficult. An alternative would be to set the credentials using global variables as follows:
+
+```
+global.postgresql.postgresqlPassword=testtest
+global.postgresql.postgresqlDatabase=db1
+```
+
+This way, the credentials will be available in all of the subcharts.
+
+## Persistence
+
+The [Bitnami PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) image stores the PostgreSQL data and configurations at the `/bitnami/postgresql` path of the container.
+
+Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube.
+See the [Parameters](#parameters) section to configure the PVC or to disable persistence.
+
+If you already have data in it, you will fail to sync to standby nodes for all commits, details can refer to [code](https://github.com/bitnami/bitnami-docker-postgresql/blob/8725fe1d7d30ebe8d9a16e9175d05f7ad9260c93/9.6/debian-9/rootfs/libpostgresql.sh#L518-L556). If you need to use those data, please covert them to sql and import after `helm install` finished.
+
+## NetworkPolicy
+
+To enable network policy for PostgreSQL, install [a networking plugin that implements the Kubernetes NetworkPolicy spec](https://kubernetes.io/docs/tasks/administer-cluster/declare-network-policy#before-you-begin), and set `networkPolicy.enabled` to `true`.
+
+For Kubernetes v1.5 & v1.6, you must also turn on NetworkPolicy by setting the DefaultDeny namespace annotation. Note: this will enforce policy for _all_ pods in the namespace:
+
+```console
+$ kubectl annotate namespace default "net.beta.kubernetes.io/network-policy={\"ingress\":{\"isolation\":\"DefaultDeny\"}}"
+```
+
+With NetworkPolicy enabled, traffic will be limited to just port 5432.
+
+For more precise policy, set `networkPolicy.allowExternal=false`. This will only allow pods with the generated client label to connect to PostgreSQL.
+This label will be displayed in the output of a successful install.
+
+## Differences between Bitnami PostgreSQL image and [Docker Official](https://hub.docker.com/_/postgres) image
+
+- The Docker Official PostgreSQL image does not support replication. If you pass any replication environment variable, this would be ignored. The only environment variables supported by the Docker Official image are POSTGRES_USER, POSTGRES_DB, POSTGRES_PASSWORD, POSTGRES_INITDB_ARGS, POSTGRES_INITDB_WALDIR and PGDATA. All the remaining environment variables are specific to the Bitnami PostgreSQL image.
+- The Bitnami PostgreSQL image is non-root by default. This requires that you run the pod with `securityContext` and updates the permissions of the volume with an `initContainer`. A key benefit of this configuration is that the pod follows security best practices and is prepared to run on Kubernetes distributions with hard security constraints like OpenShift.
+- For OpenShift, one may either define the runAsUser and fsGroup accordingly, or try this more dynamic option: volumePermissions.securityContext.runAsUser="auto",securityContext.enabled=false,containerSecurityContext.enabled=false,shmVolume.chmod.enabled=false
+
+### Deploy chart using Docker Official PostgreSQL Image
+
+From chart version 4.0.0, it is possible to use this chart with the Docker Official PostgreSQL image.
+Besides specifying the new Docker repository and tag, it is important to modify the PostgreSQL data directory and volume mount point. Basically, the PostgreSQL data dir cannot be the mount point directly, it has to be a subdirectory.
+
+```
+image.repository=postgres
+image.tag=10.6
+postgresqlDataDir=/data/pgdata
+persistence.mountPath=/data/
+```
+
+### Setting Pod's affinity
+
+This chart allows you to set your custom affinity using the `XXX.affinity` paremeter(s). Find more infomation about Pod's affinity in the [kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity).
+
+As an alternative, you can use of the preset configurations for pod affinity, pod anti-affinity, and node affinity available at the [bitnami/common](https://github.com/bitnami/charts/tree/master/bitnami/common#affinities) chart. To do so, set the `XXX.podAffinityPreset`, `XXX.podAntiAffinityPreset`, or `XXX.nodeAffinityPreset` parameters.
+
+## Troubleshooting
+
+Find more information about how to deal with common errors related to Bitnami’s Helm charts in [this troubleshooting guide](https://docs.bitnami.com/general/how-to/troubleshoot-helm-chart-issues).
+
+## Upgrading
+
+It's necessary to specify the existing passwords while performing an upgrade to ensure the secrets are not updated with invalid randomly generated passwords. Remember to specify the existing values of the `postgresqlPassword` and `replication.password` parameters when upgrading the chart:
+
+```bash
+$ helm upgrade my-release bitnami/postgresql \
+    --set postgresqlPassword=[POSTGRESQL_PASSWORD] \
+    --set replication.password=[REPLICATION_PASSWORD]
+```
+
+> Note: you need to substitute the placeholders _[POSTGRESQL_PASSWORD]_, and _[REPLICATION_PASSWORD]_ with the values obtained from instructions in the installation notes.
+
+### To 10.0.0
+
+[On November 13, 2020, Helm v2 support was formally finished](https://github.com/helm/charts#status-of-the-project), this major version is the result of the required changes applied to the Helm Chart to be able to incorporate the different features added in Helm v3 and to be consistent with the Helm project itself regarding the Helm v2 EOL.
+
+**What changes were introduced in this major version?**
+
+- Previous versions of this Helm Chart use `apiVersion: v1` (installable by both Helm 2 and 3), this Helm Chart was updated to `apiVersion: v2` (installable by Helm 3 only). [Here](https://helm.sh/docs/topics/charts/#the-apiversion-field) you can find more information about the `apiVersion` field.
+- Move dependency information from the *requirements.yaml* to the *Chart.yaml*
+- After running `helm dependency update`, a *Chart.lock* file is generated containing the same structure used in the previous *requirements.lock*
+- The different fields present in the *Chart.yaml* file has been ordered alphabetically in a homogeneous way for all the Bitnami Helm Chart.
+
+**Considerations when upgrading to this version**
+
+- If you want to upgrade to this version using Helm v2, this scenario is not supported as this version doesn't support Helm v2 anymore
+- If you installed the previous version with Helm v2 and wants to upgrade to this version with Helm v3, please refer to the [official Helm documentation](https://helm.sh/docs/topics/v2_v3_migration/#migration-use-cases) about migrating from Helm v2 to v3
+
+**Useful links**
+
+- https://docs.bitnami.com/tutorials/resolve-helm2-helm3-post-migration-issues/
+- https://helm.sh/docs/topics/v2_v3_migration/
+- https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/
+
+#### Breaking changes
+
+- The term `master` has been replaced with `primary` and `slave` with `readReplicas` throughout the chart. Role names have changed from `master` and `slave` to `primary` and `read`.
+
+To upgrade to `10.0.0`, it should be done reusing the PVCs used to hold the PostgreSQL data on your previous release. To do so, follow the instructions below (the following example assumes that the release name is `postgresql`):
+
+> NOTE: Please, create a backup of your database before running any of those actions.
+
+Obtain the credentials and the names of the PVCs used to hold the PostgreSQL data on your current release:
+
+```console
+$ export POSTGRESQL_PASSWORD=$(kubectl get secret --namespace default postgresql -o jsonpath="{.data.postgresql-password}" | base64 --decode)
+$ export POSTGRESQL_PVC=$(kubectl get pvc -l app.kubernetes.io/instance=postgresql,role=master -o jsonpath="{.items[0].metadata.name}")
+```
+
+Delete the PostgreSQL statefulset. Notice the option `--cascade=false`:
+
+```console
+$ kubectl delete statefulsets.apps postgresql-postgresql --cascade=false
+```
+
+Now the upgrade works:
+
+```console
+$ helm upgrade postgresql bitnami/postgresql --set postgresqlPassword=$POSTGRESQL_PASSWORD --set persistence.existingClaim=$POSTGRESQL_PVC
+```
+
+You will have to delete the existing PostgreSQL pod and the new statefulset is going to create a new one
+
+```console
+$ kubectl delete pod postgresql-postgresql-0
+```
+
+Finally, you should see the lines below in PostgreSQL container logs:
+
+```console
+$ kubectl logs $(kubectl get pods -l app.kubernetes.io/instance=postgresql,app.kubernetes.io/name=postgresql,role=primary -o jsonpath="{.items[0].metadata.name}")
+...
+postgresql 08:05:12.59 INFO  ==> Deploying PostgreSQL with persisted data...
+...
+```
+
+### To 9.0.0
+
+In this version the chart was adapted to follow the Helm label best practices, see [PR 3021](https://github.com/bitnami/charts/pull/3021). That means the backward compatibility is not guarantee when upgrading the chart to this major version.
+
+As a workaround, you can delete the existing statefulset (using the `--cascade=false` flag pods are not deleted) before upgrade the chart. For example, this can be a valid workflow:
+
+- Deploy an old version (8.X.X)
+
+```console
+$ helm install postgresql bitnami/postgresql --version 8.10.14
+```
+
+- Old version is up and running
+
+```console
+$ helm ls
+NAME      	NAMESPACE	REVISION	UPDATED                                	STATUS  	CHART             	APP VERSION
+postgresql	default  	1       	2020-08-04 13:39:54.783480286 +0000 UTC	deployed	postgresql-8.10.14	11.8.0
+
+$ kubectl get pods
+NAME                      READY   STATUS    RESTARTS   AGE
+postgresql-postgresql-0   1/1     Running   0          76s
+```
+
+- The upgrade to the latest one (9.X.X) is going to fail
+
+```console
+$ helm upgrade postgresql bitnami/postgresql
+Error: UPGRADE FAILED: cannot patch "postgresql-postgresql" with kind StatefulSet: StatefulSet.apps "postgresql-postgresql" is invalid: spec: Forbidden: updates to statefulset spec for fields other than 'replicas', 'template', and 'updateStrategy' are forbidden
+```
+
+- Delete the statefulset
+
+```console
+$ kubectl delete statefulsets.apps --cascade=false postgresql-postgresql
+statefulset.apps "postgresql-postgresql" deleted
+```
+
+- Now the upgrade works
+
+```console
+$ helm upgrade postgresql bitnami/postgresql
+$ helm ls
+NAME      	NAMESPACE	REVISION	UPDATED                                	STATUS  	CHART           	APP VERSION
+postgresql	default  	3       	2020-08-04 13:42:08.020385884 +0000 UTC	deployed	postgresql-9.1.2	11.8.0
+```
+
+- We can kill the existing pod and the new statefulset is going to create a new one:
+
+```console
+$ kubectl delete pod postgresql-postgresql-0
+pod "postgresql-postgresql-0" deleted
+
+$ kubectl get pods
+NAME                      READY   STATUS    RESTARTS   AGE
+postgresql-postgresql-0   1/1     Running   0          19s
+```
+
+Please, note that without the `--cascade=false` both objects (statefulset and pod) are going to be removed and both objects will be deployed again with the `helm upgrade` command
+
+### To 8.0.0
+
+Prefixes the port names with their protocols to comply with Istio conventions.
+
+If you depend on the port names in your setup, make sure to update them to reflect this change.
+
+### To 7.1.0
+
+Adds support for LDAP configuration.
+
+### To 7.0.0
+
+Helm performs a lookup for the object based on its group (apps), version (v1), and kind (Deployment). Also known as its GroupVersionKind, or GVK. Changing the GVK is considered a compatibility breaker from Kubernetes' point of view, so you cannot "upgrade" those objects to the new GVK in-place. Earlier versions of Helm 3 did not perform the lookup correctly which has since been fixed to match the spec.
+
+In https://github.com/helm/charts/pull/17281 the `apiVersion` of the statefulset resources was updated to `apps/v1` in tune with the api's deprecated, resulting in compatibility breakage.
+
+This major version bump signifies this change.
+
+### To 6.5.7
+
+In this version, the chart will use PostgreSQL with the Postgis extension included. The version used with Postgresql version 10, 11 and 12 is Postgis 2.5. It has been compiled with the following dependencies:
+
+- protobuf
+- protobuf-c
+- json-c
+- geos
+- proj
+
+### To 5.0.0
+
+In this version, the **chart is using PostgreSQL 11 instead of PostgreSQL 10**. You can find the main difference and notable changes in the following links: [https://www.postgresql.org/about/news/1894/](https://www.postgresql.org/about/news/1894/) and [https://www.postgresql.org/about/featurematrix/](https://www.postgresql.org/about/featurematrix/).
+
+For major releases of PostgreSQL, the internal data storage format is subject to change, thus complicating upgrades, you can see some errors like the following one in the logs:
+
+```console
+Welcome to the Bitnami postgresql container
+Subscribe to project updates by watching https://github.com/bitnami/bitnami-docker-postgresql
+Submit issues and feature requests at https://github.com/bitnami/bitnami-docker-postgresql/issues
+Send us your feedback at containers@bitnami.com
+
+INFO  ==> ** Starting PostgreSQL setup **
+NFO  ==> Validating settings in POSTGRESQL_* env vars..
+INFO  ==> Initializing PostgreSQL database...
+INFO  ==> postgresql.conf file not detected. Generating it...
+INFO  ==> pg_hba.conf file not detected. Generating it...
+INFO  ==> Deploying PostgreSQL with persisted data...
+INFO  ==> Configuring replication parameters
+INFO  ==> Loading custom scripts...
+INFO  ==> Enabling remote connections
+INFO  ==> Stopping PostgreSQL...
+INFO  ==> ** PostgreSQL setup finished! **
+
+INFO  ==> ** Starting PostgreSQL **
+  [1] FATAL:  database files are incompatible with server
+  [1] DETAIL:  The data directory was initialized by PostgreSQL version 10, which is not compatible with this version 11.3.
+```
+
+In this case, you should migrate the data from the old chart to the new one following an approach similar to that described in [this section](https://www.postgresql.org/docs/current/upgrading.html#UPGRADING-VIA-PGDUMPALL) from the official documentation. Basically, create a database dump in the old chart, move and restore it in the new one.
+
+### To 4.0.0
+
+This chart will use by default the Bitnami PostgreSQL container starting from version `10.7.0-r68`. This version moves the initialization logic from node.js to bash. This new version of the chart requires setting the `POSTGRES_PASSWORD` in the slaves as well, in order to properly configure the `pg_hba.conf` file. Users from previous versions of the chart are advised to upgrade immediately.
+
+IMPORTANT: If you do not want to upgrade the chart version then make sure you use the `10.7.0-r68` version of the container. Otherwise, you will get this error
+
+```
+The POSTGRESQL_PASSWORD environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development
+```
+
+### To 3.0.0
+
+This releases make it possible to specify different nodeSelector, affinity and tolerations for master and slave pods.
+It also fixes an issue with `postgresql.master.fullname` helper template not obeying fullnameOverride.
+
+#### Breaking changes
+
+- `affinty` has been renamed to `master.affinity` and `slave.affinity`.
+- `tolerations` has been renamed to `master.tolerations` and `slave.tolerations`.
+- `nodeSelector` has been renamed to `master.nodeSelector` and `slave.nodeSelector`.
+
+### To 2.0.0
+
+In order to upgrade from the `0.X.X` branch to `1.X.X`, you should follow the below steps:
+
+- Obtain the service name (`SERVICE_NAME`) and password (`OLD_PASSWORD`) of the existing postgresql chart. You can find the instructions to obtain the password in the NOTES.txt, the service name can be obtained by running
+
+```console
+$ kubectl get svc
+```
+
+- Install (not upgrade) the new version
+
+```console
+$ helm repo update
+$ helm install my-release bitnami/postgresql
+```
+
+- Connect to the new pod (you can obtain the name by running `kubectl get pods`):
+
+```console
+$ kubectl exec -it NAME bash
+```
+
+- Once logged in, create a dump file from the previous database using `pg_dump`, for that we should connect to the previous postgresql chart:
+
+```console
+$ pg_dump -h SERVICE_NAME -U postgres DATABASE_NAME > /tmp/backup.sql
+```
+
+After run above command you should be prompted for a password, this password is the previous chart password (`OLD_PASSWORD`).
+This operation could take some time depending on the database size.
+
+- Once you have the backup file, you can restore it with a command like the one below:
+
+```console
+$ psql -U postgres DATABASE_NAME < /tmp/backup.sql
+```
+
+In this case, you are accessing to the local postgresql, so the password should be the new one (you can find it in NOTES.txt).
+
+If you want to restore the database and the database schema does not exist, it is necessary to first follow the steps described below.
+
+```console
+$ psql -U postgres
+postgres=# drop database DATABASE_NAME;
+postgres=# create database DATABASE_NAME;
+postgres=# create user USER_NAME;
+postgres=# alter role USER_NAME with password 'BITNAMI_USER_PASSWORD';
+postgres=# grant all privileges on database DATABASE_NAME to USER_NAME;
+postgres=# alter database DATABASE_NAME owner to USER_NAME;
+```
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/.helmignore b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/.helmignore
new file mode 100644
index 000000000..50af03172
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/Chart.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/Chart.yaml
new file mode 100644
index 000000000..bcc3808d0
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/Chart.yaml
@@ -0,0 +1,23 @@
+annotations:
+  category: Infrastructure
+apiVersion: v2
+appVersion: 1.4.2
+description: A Library Helm Chart for grouping common logic between bitnami charts.
+  This chart is not deployable by itself.
+home: https://github.com/bitnami/charts/tree/master/bitnami/common
+icon: https://bitnami.com/downloads/logos/bitnami-mark.png
+keywords:
+- common
+- helper
+- template
+- function
+- bitnami
+maintainers:
+- email: containers@bitnami.com
+  name: Bitnami
+name: common
+sources:
+- https://github.com/bitnami/charts
+- http://www.bitnami.com/
+type: library
+version: 1.4.2
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/README.md b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/README.md
new file mode 100644
index 000000000..7287cbb5f
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/README.md
@@ -0,0 +1,322 @@
+# Bitnami Common Library Chart
+
+A [Helm Library Chart](https://helm.sh/docs/topics/library_charts/#helm) for grouping common logic between bitnami charts.
+
+## TL;DR
+
+```yaml
+dependencies:
+  - name: common
+    version: 0.x.x
+    repository: https://charts.bitnami.com/bitnami
+```
+
+```bash
+$ helm dependency update
+```
+
+```yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.names.fullname" . }}
+data:
+  myvalue: "Hello World"
+```
+
+## Introduction
+
+This chart provides a common template helpers which can be used to develop new charts using [Helm](https://helm.sh) package manager.
+
+Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. This Helm chart has been tested on top of [Bitnami Kubernetes Production Runtime](https://kubeprod.io/) (BKPR). Deploy BKPR to get automated TLS certificates, logging and monitoring for your applications.
+
+## Prerequisites
+
+- Kubernetes 1.12+
+- Helm 3.1.0
+
+## Parameters
+
+The following table lists the helpers available in the library which are scoped in different sections.
+
+### Affinities
+
+| Helper identifier             | Description                                          | Expected Input                                 |
+|-------------------------------|------------------------------------------------------|------------------------------------------------|
+| `common.affinities.node.soft` | Return a soft nodeAffinity definition                | `dict "key" "FOO" "values" (list "BAR" "BAZ")` |
+| `common.affinities.node.hard` | Return a hard nodeAffinity definition                | `dict "key" "FOO" "values" (list "BAR" "BAZ")` |
+| `common.affinities.pod.soft`  | Return a soft podAffinity/podAntiAffinity definition | `dict "component" "FOO" "context" $`           |
+| `common.affinities.pod.hard`  | Return a hard podAffinity/podAntiAffinity definition | `dict "component" "FOO" "context" $`           |
+
+### Capabilities
+
+| Helper identifier                            | Description                                                                                    | Expected Input    |
+|----------------------------------------------|------------------------------------------------------------------------------------------------|-------------------|
+| `common.capabilities.kubeVersion`            | Return the target Kubernetes version (using client default if .Values.kubeVersion is not set). | `.` Chart context |
+| `common.capabilities.deployment.apiVersion`  | Return the appropriate apiVersion for deployment.                                              | `.` Chart context |
+| `common.capabilities.statefulset.apiVersion` | Return the appropriate apiVersion for statefulset.                                             | `.` Chart context |
+| `common.capabilities.ingress.apiVersion`     | Return the appropriate apiVersion for ingress.                                                 | `.` Chart context |
+| `common.capabilities.rbac.apiVersion`        | Return the appropriate apiVersion for RBAC resources.                                          | `.` Chart context |
+| `common.capabilities.crd.apiVersion`         | Return the appropriate apiVersion for CRDs.                                                    | `.` Chart context |
+| `common.capabilities.supportsHelmVersion`    | Returns true if the used Helm version is 3.3+                                                  | `.` Chart context |
+
+### Errors
+
+| Helper identifier                       | Description                                                                                                                                                            | Expected Input                                                                      |
+|-----------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------|
+| `common.errors.upgrade.passwords.empty` | It will ensure required passwords are given when we are upgrading a chart. If `validationErrors` is not empty it will throw an error and will stop the upgrade action. | `dict "validationErrors" (list $validationError00 $validationError01)  "context" $` |
+
+### Images
+
+| Helper identifier           | Description                                          | Expected Input                                                                                          |
+|-----------------------------|------------------------------------------------------|---------------------------------------------------------------------------------------------------------|
+| `common.images.image`       | Return the proper and full image name                | `dict "imageRoot" .Values.path.to.the.image "global" $`, see [ImageRoot](#imageroot) for the structure. |
+| `common.images.pullSecrets` | Return the proper Docker Image Registry Secret Names | `dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "global" .Values.global`   |
+
+### Ingress
+
+| Helper identifier        | Description                                                          | Expected Input                                                                                                                                                                   |
+|--------------------------|----------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `common.ingress.backend` | Generate a proper Ingress backend entry depending on the API version | `dict "serviceName" "foo" "servicePort" "bar"`, see the [Ingress deprecation notice](https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/) for the syntax differences |
+
+### Labels
+
+| Helper identifier           | Description                                          | Expected Input    |
+|-----------------------------|------------------------------------------------------|-------------------|
+| `common.labels.standard`    | Return Kubernetes standard labels                    | `.` Chart context |
+| `common.labels.matchLabels` | Return the proper Docker Image Registry Secret Names | `.` Chart context |
+
+### Names
+
+| Helper identifier       | Description                                                | Expected Inpput   |
+|-------------------------|------------------------------------------------------------|-------------------|
+| `common.names.name`     | Expand the name of the chart or use `.Values.nameOverride` | `.` Chart context |
+| `common.names.fullname` | Create a default fully qualified app name.                 | `.` Chart context |
+| `common.names.chart`    | Chart name plus version                                    | `.` Chart context |
+
+### Secrets
+
+| Helper identifier         | Description                                                  | Expected Input                                                                                                                                                                                                                  |
+|---------------------------|--------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `common.secrets.name`     | Generate the name of the secret.                             | `dict "existingSecret" .Values.path.to.the.existingSecret "defaultNameSuffix" "mySuffix" "context" $` see [ExistingSecret](#existingsecret) for the structure.                                                                  |
+| `common.secrets.key`      | Generate secret key.                                         | `dict "existingSecret" .Values.path.to.the.existingSecret "key" "keyName"` see [ExistingSecret](#existingsecret) for the structure.                                                                                             |
+| `common.passwords.manage` | Generate secret password or retrieve one if already created. | `dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "context" $`, length, strong and chartNAme fields are optional. |
+| `common.secrets.exists`   | Returns whether a previous generated secret already exists.  | `dict "secret" "secret-name" "context" $`                                                                                                                                                                                       |
+
+### Storage
+
+| Helper identifier             | Description                           | Expected Input                                                                                                      |
+|-------------------------------|---------------------------------------|---------------------------------------------------------------------------------------------------------------------|
+| `common.affinities.node.soft` | Return a soft nodeAffinity definition | `dict "persistence" .Values.path.to.the.persistence "global" $`, see [Persistence](#persistence) for the structure. |
+
+### TplValues
+
+| Helper identifier         | Description                            | Expected Input                                                                                                                                           |
+|---------------------------|----------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `common.tplvalues.render` | Renders a value that contains template | `dict "value" .Values.path.to.the.Value "context" $`, value is the value should rendered as template, context frequently is the chart context `$` or `.` |
+
+### Utils
+
+| Helper identifier              | Description                                                                              | Expected Input                                                         |
+|--------------------------------|------------------------------------------------------------------------------------------|------------------------------------------------------------------------|
+| `common.utils.fieldToEnvVar`   | Build environment variable name given a field.                                           | `dict "field" "my-password"`                                           |
+| `common.utils.secret.getvalue` | Print instructions to get a secret value.                                                | `dict "secret" "secret-name" "field" "secret-value-field" "context" $` |
+| `common.utils.getValueFromKey` | Gets a value from `.Values` object given its key path                                    | `dict "key" "path.to.key" "context" $`                                 |
+| `common.utils.getKeyFromList`  | Returns first `.Values` key with a defined value or first of the list if all non-defined | `dict "keys" (list "path.to.key1" "path.to.key2") "context" $`         |
+
+### Validations
+
+| Helper identifier                                | Description                                                                                                                   | Expected Input                                                                                                                                                                                                                                                           |
+|--------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `common.validations.values.single.empty`         | Validate a value must not be empty.                                                                                           | `dict "valueKey" "path.to.value" "secret" "secret.name" "field" "my-password" "subchart" "subchart" "context" $` secret, field and subchart are optional. In case they are given, the helper will generate a how to get instruction. See [ValidateValue](#validatevalue) |
+| `common.validations.values.multiple.empty`       | Validate a multiple values must not be empty. It returns a shared error for all the values.                                   | `dict "required" (list $validateValueConf00 $validateValueConf01) "context" $`. See [ValidateValue](#validatevalue)                                                                                                                                                      |
+| `common.validations.values.mariadb.passwords`    | This helper will ensure required password for MariaDB are not empty. It returns a shared error for all the values.            | `dict "secret" "mariadb-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use mariadb chart and the helper.                                                                                      |
+| `common.validations.values.postgresql.passwords` | This helper will ensure required password for PostgreSQL are not empty. It returns a shared error for all the values.         | `dict "secret" "postgresql-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use postgresql chart and the helper.                                                                                |
+| `common.validations.values.redis.passwords`      | This helper will ensure required password for Redis<sup>TM</sup> are not empty. It returns a shared error for all the values. | `dict "secret" "redis-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use redis chart and the helper.                                                                                          |
+| `common.validations.values.cassandra.passwords`  | This helper will ensure required password for Cassandra are not empty. It returns a shared error for all the values.          | `dict "secret" "cassandra-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use cassandra chart and the helper.                                                                                  |
+| `common.validations.values.mongodb.passwords`    | This helper will ensure required password for MongoDB&reg; are not empty. It returns a shared error for all the values.            | `dict "secret" "mongodb-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use mongodb chart and the helper.                                                                                      |
+
+### Warnings
+
+| Helper identifier            | Description                      | Expected Input                                             |
+|------------------------------|----------------------------------|------------------------------------------------------------|
+| `common.warnings.rollingTag` | Warning about using rolling tag. | `ImageRoot` see [ImageRoot](#imageroot) for the structure. |
+
+## Special input schemas
+
+### ImageRoot
+
+```yaml
+registry:
+  type: string
+  description: Docker registry where the image is located
+  example: docker.io
+
+repository:
+  type: string
+  description: Repository and image name
+  example: bitnami/nginx
+
+tag:
+  type: string
+  description: image tag
+  example: 1.16.1-debian-10-r63
+
+pullPolicy:
+  type: string
+  description: Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+
+pullSecrets:
+  type: array
+  items:
+    type: string
+  description: Optionally specify an array of imagePullSecrets.
+
+debug:
+  type: boolean
+  description: Set to true if you would like to see extra information on logs
+  example: false
+
+## An instance would be:
+# registry: docker.io
+# repository: bitnami/nginx
+# tag: 1.16.1-debian-10-r63
+# pullPolicy: IfNotPresent
+# debug: false
+```
+
+### Persistence
+
+```yaml
+enabled:
+  type: boolean
+  description: Whether enable persistence.
+  example: true
+
+storageClass:
+  type: string
+  description: Ghost data Persistent Volume Storage Class, If set to "-", storageClassName: "" which disables dynamic provisioning.
+  example: "-"
+
+accessMode:
+  type: string
+  description: Access mode for the Persistent Volume Storage.
+  example: ReadWriteOnce
+
+size:
+  type: string
+  description: Size the Persistent Volume Storage.
+  example: 8Gi
+
+path:
+  type: string
+  description: Path to be persisted.
+  example: /bitnami
+
+## An instance would be:
+# enabled: true
+# storageClass: "-"
+# accessMode: ReadWriteOnce
+# size: 8Gi
+# path: /bitnami
+```
+
+### ExistingSecret
+
+```yaml
+name:
+  type: string
+  description: Name of the existing secret.
+  example: mySecret
+keyMapping:
+  description: Mapping between the expected key name and the name of the key in the existing secret.
+  type: object
+
+## An instance would be:
+# name: mySecret
+# keyMapping:
+#   password: myPasswordKey
+```
+
+#### Example of use
+
+When we store sensitive data for a deployment in a secret, some times we want to give to users the possibility of using theirs existing secrets.
+
+```yaml
+# templates/secret.yaml
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    app: {{ include "common.names.fullname" . }}
+type: Opaque
+data:
+  password: {{ .Values.password | b64enc | quote }}
+
+# templates/dpl.yaml
+---
+...
+      env:
+        - name: PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "common.secrets.name" (dict "existingSecret" .Values.existingSecret "context" $) }}
+              key: {{ include "common.secrets.key" (dict "existingSecret" .Values.existingSecret "key" "password") }}
+...
+
+# values.yaml
+---
+name: mySecret
+keyMapping:
+  password: myPasswordKey
+```
+
+### ValidateValue
+
+#### NOTES.txt
+
+```console
+{{- $validateValueConf00 := (dict "valueKey" "path.to.value00" "secret" "secretName" "field" "password-00") -}}
+{{- $validateValueConf01 := (dict "valueKey" "path.to.value01" "secret" "secretName" "field" "password-01") -}}
+
+{{ include "common.validations.values.multiple.empty" (dict "required" (list $validateValueConf00 $validateValueConf01) "context" $) }}
+```
+
+If we force those values to be empty we will see some alerts
+
+```console
+$ helm install test mychart --set path.to.value00="",path.to.value01=""
+    'path.to.value00' must not be empty, please add '--set path.to.value00=$PASSWORD_00' to the command. To get the current value:
+
+        export PASSWORD_00=$(kubectl get secret --namespace default secretName -o jsonpath="{.data.password-00}" | base64 --decode)
+
+    'path.to.value01' must not be empty, please add '--set path.to.value01=$PASSWORD_01' to the command. To get the current value:
+
+        export PASSWORD_01=$(kubectl get secret --namespace default secretName -o jsonpath="{.data.password-01}" | base64 --decode)
+```
+
+## Upgrading
+
+### To 1.0.0
+
+[On November 13, 2020, Helm v2 support was formally finished](https://github.com/helm/charts#status-of-the-project), this major version is the result of the required changes applied to the Helm Chart to be able to incorporate the different features added in Helm v3 and to be consistent with the Helm project itself regarding the Helm v2 EOL.
+
+**What changes were introduced in this major version?**
+
+- Previous versions of this Helm Chart use `apiVersion: v1` (installable by both Helm 2 and 3), this Helm Chart was updated to `apiVersion: v2` (installable by Helm 3 only). [Here](https://helm.sh/docs/topics/charts/#the-apiversion-field) you can find more information about the `apiVersion` field.
+- Use `type: library`. [Here](https://v3.helm.sh/docs/faq/#library-chart-support) you can find more information.
+- The different fields present in the *Chart.yaml* file has been ordered alphabetically in a homogeneous way for all the Bitnami Helm Charts
+
+**Considerations when upgrading to this version**
+
+- If you want to upgrade to this version from a previous one installed with Helm v3, you shouldn't face any issues
+- If you want to upgrade to this version using Helm v2, this scenario is not supported as this version doesn't support Helm v2 anymore
+- If you installed the previous version with Helm v2 and wants to upgrade to this version with Helm v3, please refer to the [official Helm documentation](https://helm.sh/docs/topics/v2_v3_migration/#migration-use-cases) about migrating from Helm v2 to v3
+
+**Useful links**
+
+- https://docs.bitnami.com/tutorials/resolve-helm2-helm3-post-migration-issues/
+- https://helm.sh/docs/topics/v2_v3_migration/
+- https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_affinities.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_affinities.tpl
new file mode 100644
index 000000000..493a6dc7e
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_affinities.tpl
@@ -0,0 +1,94 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Return a soft nodeAffinity definition 
+{{ include "common.affinities.nodes.soft" (dict "key" "FOO" "values" (list "BAR" "BAZ")) -}}
+*/}}
+{{- define "common.affinities.nodes.soft" -}}
+preferredDuringSchedulingIgnoredDuringExecution:
+  - preference:
+      matchExpressions:
+        - key: {{ .key }}
+          operator: In
+          values:
+            {{- range .values }}
+            - {{ . }}
+            {{- end }}
+    weight: 1
+{{- end -}}
+
+{{/*
+Return a hard nodeAffinity definition
+{{ include "common.affinities.nodes.hard" (dict "key" "FOO" "values" (list "BAR" "BAZ")) -}}
+*/}}
+{{- define "common.affinities.nodes.hard" -}}
+requiredDuringSchedulingIgnoredDuringExecution:
+  nodeSelectorTerms:
+    - matchExpressions:
+        - key: {{ .key }}
+          operator: In
+          values:
+            {{- range .values }}
+            - {{ . }}
+            {{- end }}
+{{- end -}}
+
+{{/*
+Return a nodeAffinity definition
+{{ include "common.affinities.nodes" (dict "type" "soft" "key" "FOO" "values" (list "BAR" "BAZ")) -}}
+*/}}
+{{- define "common.affinities.nodes" -}}
+  {{- if eq .type "soft" }}
+    {{- include "common.affinities.nodes.soft" . -}}
+  {{- else if eq .type "hard" }}
+    {{- include "common.affinities.nodes.hard" . -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Return a soft podAffinity/podAntiAffinity definition
+{{ include "common.affinities.pods.soft" (dict "component" "FOO" "context" $) -}}
+*/}}
+{{- define "common.affinities.pods.soft" -}}
+{{- $component := default "" .component -}}
+preferredDuringSchedulingIgnoredDuringExecution:
+  - podAffinityTerm:
+      labelSelector:
+        matchLabels: {{- (include "common.labels.matchLabels" .context) | nindent 10 }}
+          {{- if not (empty $component) }}
+          {{ printf "app.kubernetes.io/component: %s" $component }}
+          {{- end }}
+      namespaces:
+        - {{ .context.Release.Namespace | quote }}
+      topologyKey: kubernetes.io/hostname
+    weight: 1
+{{- end -}}
+
+{{/*
+Return a hard podAffinity/podAntiAffinity definition
+{{ include "common.affinities.pods.hard" (dict "component" "FOO" "context" $) -}}
+*/}}
+{{- define "common.affinities.pods.hard" -}}
+{{- $component := default "" .component -}}
+requiredDuringSchedulingIgnoredDuringExecution:
+  - labelSelector:
+      matchLabels: {{- (include "common.labels.matchLabels" .context) | nindent 8 }}
+        {{- if not (empty $component) }}
+        {{ printf "app.kubernetes.io/component: %s" $component }}
+        {{- end }}
+    namespaces:
+      - {{ .context.Release.Namespace | quote }}
+    topologyKey: kubernetes.io/hostname
+{{- end -}}
+
+{{/*
+Return a podAffinity/podAntiAffinity definition
+{{ include "common.affinities.pods" (dict "type" "soft" "key" "FOO" "values" (list "BAR" "BAZ")) -}}
+*/}}
+{{- define "common.affinities.pods" -}}
+  {{- if eq .type "soft" }}
+    {{- include "common.affinities.pods.soft" . -}}
+  {{- else if eq .type "hard" }}
+    {{- include "common.affinities.pods.hard" . -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_capabilities.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_capabilities.tpl
new file mode 100644
index 000000000..4dde56a38
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_capabilities.tpl
@@ -0,0 +1,95 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Return the target Kubernetes version
+*/}}
+{{- define "common.capabilities.kubeVersion" -}}
+{{- if .Values.global }}
+    {{- if .Values.global.kubeVersion }}
+    {{- .Values.global.kubeVersion -}}
+    {{- else }}
+    {{- default .Capabilities.KubeVersion.Version .Values.kubeVersion -}}
+    {{- end -}}
+{{- else }}
+{{- default .Capabilities.KubeVersion.Version .Values.kubeVersion -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for deployment.
+*/}}
+{{- define "common.capabilities.deployment.apiVersion" -}}
+{{- if semverCompare "<1.14-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "extensions/v1beta1" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for statefulset.
+*/}}
+{{- define "common.capabilities.statefulset.apiVersion" -}}
+{{- if semverCompare "<1.14-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "apps/v1beta1" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for ingress.
+*/}}
+{{- define "common.capabilities.ingress.apiVersion" -}}
+{{- if .Values.ingress -}}
+{{- if .Values.ingress.apiVersion -}}
+{{- .Values.ingress.apiVersion -}}
+{{- else if semverCompare "<1.14-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "extensions/v1beta1" -}}
+{{- else if semverCompare "<1.19-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "networking.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "networking.k8s.io/v1" -}}
+{{- end }}
+{{- else if semverCompare "<1.14-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "extensions/v1beta1" -}}
+{{- else if semverCompare "<1.19-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "networking.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "networking.k8s.io/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for RBAC resources.
+*/}}
+{{- define "common.capabilities.rbac.apiVersion" -}}
+{{- if semverCompare "<1.17-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "rbac.authorization.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "rbac.authorization.k8s.io/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for CRDs.
+*/}}
+{{- define "common.capabilities.crd.apiVersion" -}}
+{{- if semverCompare "<1.19-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "apiextensions.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "apiextensions.k8s.io/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns true if the used Helm version is 3.3+.
+A way to check the used Helm version was not introduced until version 3.3.0 with .Capabilities.HelmVersion, which contains an additional "{}}"  structure.
+This check is introduced as a regexMatch instead of {{ if .Capabilities.HelmVersion }} because checking for the key HelmVersion in <3.3 results in a "interface not found" error.
+**To be removed when the catalog's minimun Helm version is 3.3**
+*/}}
+{{- define "common.capabilities.supportsHelmVersion" -}}
+{{- if regexMatch "{(v[0-9])*[^}]*}}$" (.Capabilities | toString ) }}
+  {{- true -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_errors.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_errors.tpl
new file mode 100644
index 000000000..a79cc2e32
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_errors.tpl
@@ -0,0 +1,23 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Through error when upgrading using empty passwords values that must not be empty.
+
+Usage:
+{{- $validationError00 := include "common.validations.values.single.empty" (dict "valueKey" "path.to.password00" "secret" "secretName" "field" "password-00") -}}
+{{- $validationError01 := include "common.validations.values.single.empty" (dict "valueKey" "path.to.password01" "secret" "secretName" "field" "password-01") -}}
+{{ include "common.errors.upgrade.passwords.empty" (dict "validationErrors" (list $validationError00 $validationError01) "context" $) }}
+
+Required password params:
+  - validationErrors - String - Required. List of validation strings to be return, if it is empty it won't throw error.
+  - context - Context - Required. Parent context.
+*/}}
+{{- define "common.errors.upgrade.passwords.empty" -}}
+  {{- $validationErrors := join "" .validationErrors -}}
+  {{- if and $validationErrors .context.Release.IsUpgrade -}}
+    {{- $errorString := "\nPASSWORDS ERROR: You must provide your current passwords when upgrading the release." -}}
+    {{- $errorString = print $errorString "\n                 Note that even after reinstallation, old credentials may be needed as they may be kept in persistent volume claims." -}}
+    {{- $errorString = print $errorString "\n                 Further information can be obtained at https://docs.bitnami.com/general/how-to/troubleshoot-helm-chart-issues/#credential-errors-while-upgrading-chart-releases" -}}
+    {{- $errorString = print $errorString "\n%s" -}}
+    {{- printf $errorString $validationErrors | fail -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_images.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_images.tpl
new file mode 100644
index 000000000..60f04fd6e
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_images.tpl
@@ -0,0 +1,47 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Return the proper image name
+{{ include "common.images.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
+*/}}
+{{- define "common.images.image" -}}
+{{- $registryName := .imageRoot.registry -}}
+{{- $repositoryName := .imageRoot.repository -}}
+{{- $tag := .imageRoot.tag | toString -}}
+{{- if .global }}
+    {{- if .global.imageRegistry }}
+     {{- $registryName = .global.imageRegistry -}}
+    {{- end -}}
+{{- end -}}
+{{- if $registryName }}
+{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- else -}}
+{{- printf "%s:%s" $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper Docker Image Registry Secret Names
+{{ include "common.images.pullSecrets" ( dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "global" .Values.global) }}
+*/}}
+{{- define "common.images.pullSecrets" -}}
+  {{- $pullSecrets := list }}
+
+  {{- if .global }}
+    {{- range .global.imagePullSecrets -}}
+      {{- $pullSecrets = append $pullSecrets . -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- range .images -}}
+    {{- range .pullSecrets -}}
+      {{- $pullSecrets = append $pullSecrets . -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if (not (empty $pullSecrets)) }}
+imagePullSecrets:
+    {{- range $pullSecrets }}
+  - name: {{ . }}
+    {{- end }}
+  {{- end }}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_ingress.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_ingress.tpl
new file mode 100644
index 000000000..622ef50e3
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_ingress.tpl
@@ -0,0 +1,42 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Generate backend entry that is compatible with all Kubernetes API versions.
+
+Usage:
+{{ include "common.ingress.backend" (dict "serviceName" "backendName" "servicePort" "backendPort" "context" $) }}
+
+Params:
+  - serviceName - String. Name of an existing service backend
+  - servicePort - String/Int. Port name (or number) of the service. It will be translated to different yaml depending if it is a string or an integer.
+  - context - Dict - Required. The context for the template evaluation.
+*/}}
+{{- define "common.ingress.backend" -}}
+{{- $apiVersion := (include "common.capabilities.ingress.apiVersion" .context) -}}
+{{- if or (eq $apiVersion "extensions/v1beta1") (eq $apiVersion "networking.k8s.io/v1beta1") -}}
+serviceName: {{ .serviceName }}
+servicePort: {{ .servicePort }}
+{{- else -}}
+service:
+  name: {{ .serviceName }}
+  port:
+    {{- if typeIs "string" .servicePort }}
+    name: {{ .servicePort }}
+    {{- else if typeIs "int" .servicePort }}
+    number: {{ .servicePort }}
+    {{- end }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Print "true" if the API pathType field is supported
+Usage:
+{{ include "common.ingress.supportsPathType" . }}
+*/}}
+{{- define "common.ingress.supportsPathType" -}}
+{{- if (semverCompare "<1.18-0" (include "common.capabilities.kubeVersion" .)) -}}
+{{- print "false" -}}
+{{- else -}}
+{{- print "true" -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_labels.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_labels.tpl
new file mode 100644
index 000000000..252066c7e
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_labels.tpl
@@ -0,0 +1,18 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Kubernetes standard labels
+*/}}
+{{- define "common.labels.standard" -}}
+app.kubernetes.io/name: {{ include "common.names.name" . }}
+helm.sh/chart: {{ include "common.names.chart" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Labels to use on deploy.spec.selector.matchLabels and svc.spec.selector
+*/}}
+{{- define "common.labels.matchLabels" -}}
+app.kubernetes.io/name: {{ include "common.names.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_names.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_names.tpl
new file mode 100644
index 000000000..adf2a74f4
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_names.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "common.names.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "common.names.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "common.names.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_secrets.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_secrets.tpl
new file mode 100644
index 000000000..60b84a701
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_secrets.tpl
@@ -0,0 +1,129 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Generate secret name.
+
+Usage:
+{{ include "common.secrets.name" (dict "existingSecret" .Values.path.to.the.existingSecret "defaultNameSuffix" "mySuffix" "context" $) }}
+
+Params:
+  - existingSecret - ExistingSecret/String - Optional. The path to the existing secrets in the values.yaml given by the user
+    to be used instead of the default one. Allows for it to be of type String (just the secret name) for backwards compatibility.
+    +info: https://github.com/bitnami/charts/tree/master/bitnami/common#existingsecret
+  - defaultNameSuffix - String - Optional. It is used only if we have several secrets in the same deployment.
+  - context - Dict - Required. The context for the template evaluation.
+*/}}
+{{- define "common.secrets.name" -}}
+{{- $name := (include "common.names.fullname" .context) -}}
+
+{{- if .defaultNameSuffix -}}
+{{- $name = printf "%s-%s" $name .defaultNameSuffix | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- with .existingSecret -}}
+{{- if not (typeIs "string" .) -}}
+{{- with .name -}}
+{{- $name = . -}}
+{{- end -}}
+{{- else -}}
+{{- $name = . -}}
+{{- end -}}
+{{- end -}}
+
+{{- printf "%s" $name -}}
+{{- end -}}
+
+{{/*
+Generate secret key.
+
+Usage:
+{{ include "common.secrets.key" (dict "existingSecret" .Values.path.to.the.existingSecret "key" "keyName") }}
+
+Params:
+  - existingSecret - ExistingSecret/String - Optional. The path to the existing secrets in the values.yaml given by the user
+    to be used instead of the default one. Allows for it to be of type String (just the secret name) for backwards compatibility.
+    +info: https://github.com/bitnami/charts/tree/master/bitnami/common#existingsecret
+  - key - String - Required. Name of the key in the secret.
+*/}}
+{{- define "common.secrets.key" -}}
+{{- $key := .key -}}
+
+{{- if .existingSecret -}}
+  {{- if not (typeIs "string" .existingSecret) -}}
+    {{- if .existingSecret.keyMapping -}}
+      {{- $key = index .existingSecret.keyMapping $.key -}}
+    {{- end -}}
+  {{- end }}
+{{- end -}}
+
+{{- printf "%s" $key -}}
+{{- end -}}
+
+{{/*
+Generate secret password or retrieve one if already created.
+
+Usage:
+{{ include "common.secrets.passwords.manage" (dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "context" $) }}
+
+Params:
+  - secret - String - Required - Name of the 'Secret' resource where the password is stored.
+  - key - String - Required - Name of the key in the secret.
+  - providedValues - List<String> - Required - The path to the validating value in the values.yaml, e.g: "mysql.password". Will pick first parameter with a defined value.
+  - length - int - Optional - Length of the generated random password.
+  - strong - Boolean - Optional - Whether to add symbols to the generated random password.
+  - chartName - String - Optional - Name of the chart used when said chart is deployed as a subchart.
+  - context - Context - Required - Parent context.
+*/}}
+{{- define "common.secrets.passwords.manage" -}}
+
+{{- $password := "" }}
+{{- $subchart := "" }}
+{{- $chartName := default "" .chartName }}
+{{- $passwordLength := default 10 .length }}
+{{- $providedPasswordKey := include "common.utils.getKeyFromList" (dict "keys" .providedValues "context" $.context) }}
+{{- $providedPasswordValue := include "common.utils.getValueFromKey" (dict "key" $providedPasswordKey "context" $.context) }}
+{{- $secret := (lookup "v1" "Secret" $.context.Release.Namespace .secret) }}
+{{- if $secret }}
+  {{- if index $secret.data .key }}
+  {{- $password = index $secret.data .key }}
+  {{- end -}}
+{{- else if $providedPasswordValue }}
+  {{- $password = $providedPasswordValue | toString | b64enc | quote }}
+{{- else }}
+
+  {{- if .context.Values.enabled }}
+    {{- $subchart = $chartName }}
+  {{- end -}}
+
+  {{- $requiredPassword := dict "valueKey" $providedPasswordKey "secret" .secret "field" .key "subchart" $subchart "context" $.context -}}
+  {{- $requiredPasswordError := include "common.validations.values.single.empty" $requiredPassword -}}
+  {{- $passwordValidationErrors := list $requiredPasswordError -}}
+  {{- include "common.errors.upgrade.passwords.empty" (dict "validationErrors" $passwordValidationErrors "context" $.context) -}}
+  
+  {{- if .strong }}
+    {{- $subStr := list (lower (randAlpha 1)) (randNumeric 1) (upper (randAlpha 1)) | join "_" }}
+    {{- $password = randAscii $passwordLength }}
+    {{- $password = regexReplaceAllLiteral "\\W" $password "@" | substr 5 $passwordLength }}
+    {{- $password = printf "%s%s" $subStr $password | toString | shuffle | b64enc | quote }}
+  {{- else }}
+    {{- $password = randAlphaNum $passwordLength | b64enc | quote }}
+  {{- end }}
+{{- end -}}
+{{- printf "%s" $password -}}
+{{- end -}}
+
+{{/*
+Returns whether a previous generated secret already exists
+
+Usage:
+{{ include "common.secrets.exists" (dict "secret" "secret-name" "context" $) }}
+
+Params:
+  - secret - String - Required - Name of the 'Secret' resource where the password is stored.
+  - context - Context - Required - Parent context.
+*/}}
+{{- define "common.secrets.exists" -}}
+{{- $secret := (lookup "v1" "Secret" $.context.Release.Namespace .secret) }}
+{{- if $secret }}
+  {{- true -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_storage.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_storage.tpl
new file mode 100644
index 000000000..60e2a844f
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_storage.tpl
@@ -0,0 +1,23 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Return  the proper Storage Class
+{{ include "common.storage.class" ( dict "persistence" .Values.path.to.the.persistence "global" $) }}
+*/}}
+{{- define "common.storage.class" -}}
+
+{{- $storageClass := .persistence.storageClass -}}
+{{- if .global -}}
+    {{- if .global.storageClass -}}
+        {{- $storageClass = .global.storageClass -}}
+    {{- end -}}
+{{- end -}}
+
+{{- if $storageClass -}}
+  {{- if (eq "-" $storageClass) -}}
+      {{- printf "storageClassName: \"\"" -}}
+  {{- else }}
+      {{- printf "storageClassName: %s" $storageClass -}}
+  {{- end -}}
+{{- end -}}
+
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_tplvalues.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_tplvalues.tpl
new file mode 100644
index 000000000..2db166851
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_tplvalues.tpl
@@ -0,0 +1,13 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Renders a value that contains template.
+Usage:
+{{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }}
+*/}}
+{{- define "common.tplvalues.render" -}}
+    {{- if typeIs "string" .value }}
+        {{- tpl .value .context }}
+    {{- else }}
+        {{- tpl (.value | toYaml) .context }}
+    {{- end }}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_utils.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_utils.tpl
new file mode 100644
index 000000000..ea083a249
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_utils.tpl
@@ -0,0 +1,62 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Print instructions to get a secret value.
+Usage:
+{{ include "common.utils.secret.getvalue" (dict "secret" "secret-name" "field" "secret-value-field" "context" $) }}
+*/}}
+{{- define "common.utils.secret.getvalue" -}}
+{{- $varname := include "common.utils.fieldToEnvVar" . -}}
+export {{ $varname }}=$(kubectl get secret --namespace {{ .context.Release.Namespace | quote }} {{ .secret }} -o jsonpath="{.data.{{ .field }}}" | base64 --decode)
+{{- end -}}
+
+{{/*
+Build env var name given a field
+Usage:
+{{ include "common.utils.fieldToEnvVar" dict "field" "my-password" }}
+*/}}
+{{- define "common.utils.fieldToEnvVar" -}}
+  {{- $fieldNameSplit := splitList "-" .field -}}
+  {{- $upperCaseFieldNameSplit := list -}}
+
+  {{- range $fieldNameSplit -}}
+    {{- $upperCaseFieldNameSplit = append $upperCaseFieldNameSplit ( upper . ) -}}
+  {{- end -}}
+
+  {{ join "_" $upperCaseFieldNameSplit }}
+{{- end -}}
+
+{{/*
+Gets a value from .Values given
+Usage:
+{{ include "common.utils.getValueFromKey" (dict "key" "path.to.key" "context" $) }}
+*/}}
+{{- define "common.utils.getValueFromKey" -}}
+{{- $splitKey := splitList "." .key -}}
+{{- $value := "" -}}
+{{- $latestObj := $.context.Values -}}
+{{- range $splitKey -}}
+  {{- if not $latestObj -}}
+    {{- printf "please review the entire path of '%s' exists in values" $.key | fail -}}
+  {{- end -}}
+  {{- $value = ( index $latestObj . ) -}}
+  {{- $latestObj = $value -}}
+{{- end -}}
+{{- printf "%v" (default "" $value) -}} 
+{{- end -}}
+
+{{/*
+Returns first .Values key with a defined value or first of the list if all non-defined
+Usage:
+{{ include "common.utils.getKeyFromList" (dict "keys" (list "path.to.key1" "path.to.key2") "context" $) }}
+*/}}
+{{- define "common.utils.getKeyFromList" -}}
+{{- $key := first .keys -}}
+{{- $reverseKeys := reverse .keys }}
+{{- range $reverseKeys }}
+  {{- $value := include "common.utils.getValueFromKey" (dict "key" . "context" $.context ) }}
+  {{- if $value -}}
+    {{- $key = . }}
+  {{- end -}}
+{{- end -}}
+{{- printf "%s" $key -}} 
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_warnings.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_warnings.tpl
new file mode 100644
index 000000000..ae10fa41e
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/_warnings.tpl
@@ -0,0 +1,14 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Warning about using rolling tag.
+Usage:
+{{ include "common.warnings.rollingTag" .Values.path.to.the.imageRoot }}
+*/}}
+{{- define "common.warnings.rollingTag" -}}
+
+{{- if and (contains "bitnami/" .repository) (not (.tag | toString | regexFind "-r\\d+$|sha256:")) }}
+WARNING: Rolling tag detected ({{ .repository }}:{{ .tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment.
++info https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/
+{{- end }}
+
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_cassandra.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_cassandra.tpl
new file mode 100644
index 000000000..8679ddffb
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_cassandra.tpl
@@ -0,0 +1,72 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Validate Cassandra required passwords are not empty.
+
+Usage:
+{{ include "common.validations.values.cassandra.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
+Params:
+  - secret - String - Required. Name of the secret where Cassandra values are stored, e.g: "cassandra-passwords-secret"
+  - subchart - Boolean - Optional. Whether Cassandra is used as subchart or not. Default: false
+*/}}
+{{- define "common.validations.values.cassandra.passwords" -}}
+  {{- $existingSecret := include "common.cassandra.values.existingSecret" . -}}
+  {{- $enabled := include "common.cassandra.values.enabled" . -}}
+  {{- $dbUserPrefix := include "common.cassandra.values.key.dbUser" . -}}
+  {{- $valueKeyPassword := printf "%s.password" $dbUserPrefix -}}
+
+  {{- if and (not $existingSecret) (eq $enabled "true") -}}
+    {{- $requiredPasswords := list -}}
+
+    {{- $requiredPassword := dict "valueKey" $valueKeyPassword "secret" .secret "field" "cassandra-password" -}}
+    {{- $requiredPasswords = append $requiredPasswords $requiredPassword -}}
+
+    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
+
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for existingSecret.
+
+Usage:
+{{ include "common.cassandra.values.existingSecret" (dict "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether Cassandra is used as subchart or not. Default: false
+*/}}
+{{- define "common.cassandra.values.existingSecret" -}}
+  {{- if .subchart -}}
+    {{- .context.Values.cassandra.dbUser.existingSecret | quote -}}
+  {{- else -}}
+    {{- .context.Values.dbUser.existingSecret | quote -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for enabled cassandra.
+
+Usage:
+{{ include "common.cassandra.values.enabled" (dict "context" $) }}
+*/}}
+{{- define "common.cassandra.values.enabled" -}}
+  {{- if .subchart -}}
+    {{- printf "%v" .context.Values.cassandra.enabled -}}
+  {{- else -}}
+    {{- printf "%v" (not .context.Values.enabled) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for the key dbUser
+
+Usage:
+{{ include "common.cassandra.values.key.dbUser" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether Cassandra is used as subchart or not. Default: false
+*/}}
+{{- define "common.cassandra.values.key.dbUser" -}}
+  {{- if .subchart -}}
+    cassandra.dbUser
+  {{- else -}}
+    dbUser
+  {{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_mariadb.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_mariadb.tpl
new file mode 100644
index 000000000..bb5ed7253
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_mariadb.tpl
@@ -0,0 +1,103 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Validate MariaDB required passwords are not empty.
+
+Usage:
+{{ include "common.validations.values.mariadb.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
+Params:
+  - secret - String - Required. Name of the secret where MariaDB values are stored, e.g: "mysql-passwords-secret"
+  - subchart - Boolean - Optional. Whether MariaDB is used as subchart or not. Default: false
+*/}}
+{{- define "common.validations.values.mariadb.passwords" -}}
+  {{- $existingSecret := include "common.mariadb.values.auth.existingSecret" . -}}
+  {{- $enabled := include "common.mariadb.values.enabled" . -}}
+  {{- $architecture := include "common.mariadb.values.architecture" . -}}
+  {{- $authPrefix := include "common.mariadb.values.key.auth" . -}}
+  {{- $valueKeyRootPassword := printf "%s.rootPassword" $authPrefix -}}
+  {{- $valueKeyUsername := printf "%s.username" $authPrefix -}}
+  {{- $valueKeyPassword := printf "%s.password" $authPrefix -}}
+  {{- $valueKeyReplicationPassword := printf "%s.replicationPassword" $authPrefix -}}
+
+  {{- if and (not $existingSecret) (eq $enabled "true") -}}
+    {{- $requiredPasswords := list -}}
+
+    {{- $requiredRootPassword := dict "valueKey" $valueKeyRootPassword "secret" .secret "field" "mariadb-root-password" -}}
+    {{- $requiredPasswords = append $requiredPasswords $requiredRootPassword -}}
+
+    {{- $valueUsername := include "common.utils.getValueFromKey" (dict "key" $valueKeyUsername "context" .context) }}
+    {{- if not (empty $valueUsername) -}}
+        {{- $requiredPassword := dict "valueKey" $valueKeyPassword "secret" .secret "field" "mariadb-password" -}}
+        {{- $requiredPasswords = append $requiredPasswords $requiredPassword -}}
+    {{- end -}}
+
+    {{- if (eq $architecture "replication") -}}
+        {{- $requiredReplicationPassword := dict "valueKey" $valueKeyReplicationPassword "secret" .secret "field" "mariadb-replication-password" -}}
+        {{- $requiredPasswords = append $requiredPasswords $requiredReplicationPassword -}}
+    {{- end -}}
+
+    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
+
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for existingSecret.
+
+Usage:
+{{ include "common.mariadb.values.auth.existingSecret" (dict "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether MariaDB is used as subchart or not. Default: false
+*/}}
+{{- define "common.mariadb.values.auth.existingSecret" -}}
+  {{- if .subchart -}}
+    {{- .context.Values.mariadb.auth.existingSecret | quote -}}
+  {{- else -}}
+    {{- .context.Values.auth.existingSecret | quote -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for enabled mariadb.
+
+Usage:
+{{ include "common.mariadb.values.enabled" (dict "context" $) }}
+*/}}
+{{- define "common.mariadb.values.enabled" -}}
+  {{- if .subchart -}}
+    {{- printf "%v" .context.Values.mariadb.enabled -}}
+  {{- else -}}
+    {{- printf "%v" (not .context.Values.enabled) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for architecture
+
+Usage:
+{{ include "common.mariadb.values.architecture" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether MariaDB is used as subchart or not. Default: false
+*/}}
+{{- define "common.mariadb.values.architecture" -}}
+  {{- if .subchart -}}
+    {{- .context.Values.mariadb.architecture -}}
+  {{- else -}}
+    {{- .context.Values.architecture -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for the key auth
+
+Usage:
+{{ include "common.mariadb.values.key.auth" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether MariaDB is used as subchart or not. Default: false
+*/}}
+{{- define "common.mariadb.values.key.auth" -}}
+  {{- if .subchart -}}
+    mariadb.auth
+  {{- else -}}
+    auth
+  {{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_mongodb.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_mongodb.tpl
new file mode 100644
index 000000000..7d5ecbccb
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_mongodb.tpl
@@ -0,0 +1,108 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Validate MongoDB(R) required passwords are not empty.
+
+Usage:
+{{ include "common.validations.values.mongodb.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
+Params:
+  - secret - String - Required. Name of the secret where MongoDB(R) values are stored, e.g: "mongodb-passwords-secret"
+  - subchart - Boolean - Optional. Whether MongoDB(R) is used as subchart or not. Default: false
+*/}}
+{{- define "common.validations.values.mongodb.passwords" -}}
+  {{- $existingSecret := include "common.mongodb.values.auth.existingSecret" . -}}
+  {{- $enabled := include "common.mongodb.values.enabled" . -}}
+  {{- $authPrefix := include "common.mongodb.values.key.auth" . -}}
+  {{- $architecture := include "common.mongodb.values.architecture" . -}}
+  {{- $valueKeyRootPassword := printf "%s.rootPassword" $authPrefix -}}
+  {{- $valueKeyUsername := printf "%s.username" $authPrefix -}}
+  {{- $valueKeyDatabase := printf "%s.database" $authPrefix -}}
+  {{- $valueKeyPassword := printf "%s.password" $authPrefix -}}
+  {{- $valueKeyReplicaSetKey := printf "%s.replicaSetKey" $authPrefix -}}
+  {{- $valueKeyAuthEnabled := printf "%s.enabled" $authPrefix -}}
+
+  {{- $authEnabled := include "common.utils.getValueFromKey" (dict "key" $valueKeyAuthEnabled "context" .context) -}}
+
+  {{- if and (not $existingSecret) (eq $enabled "true") (eq $authEnabled "true") -}}
+    {{- $requiredPasswords := list -}}
+
+    {{- $requiredRootPassword := dict "valueKey" $valueKeyRootPassword "secret" .secret "field" "mongodb-root-password" -}}
+    {{- $requiredPasswords = append $requiredPasswords $requiredRootPassword -}}
+
+    {{- $valueUsername := include "common.utils.getValueFromKey" (dict "key" $valueKeyUsername "context" .context) }}
+    {{- $valueDatabase := include "common.utils.getValueFromKey" (dict "key" $valueKeyDatabase "context" .context) }}
+    {{- if and $valueUsername $valueDatabase -}}
+        {{- $requiredPassword := dict "valueKey" $valueKeyPassword "secret" .secret "field" "mongodb-password" -}}
+        {{- $requiredPasswords = append $requiredPasswords $requiredPassword -}}
+    {{- end -}}
+
+    {{- if (eq $architecture "replicaset") -}}
+        {{- $requiredReplicaSetKey := dict "valueKey" $valueKeyReplicaSetKey "secret" .secret "field" "mongodb-replica-set-key" -}}
+        {{- $requiredPasswords = append $requiredPasswords $requiredReplicaSetKey -}}
+    {{- end -}}
+
+    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
+
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for existingSecret.
+
+Usage:
+{{ include "common.mongodb.values.auth.existingSecret" (dict "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether MongoDb is used as subchart or not. Default: false
+*/}}
+{{- define "common.mongodb.values.auth.existingSecret" -}}
+  {{- if .subchart -}}
+    {{- .context.Values.mongodb.auth.existingSecret | quote -}}
+  {{- else -}}
+    {{- .context.Values.auth.existingSecret | quote -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for enabled mongodb.
+
+Usage:
+{{ include "common.mongodb.values.enabled" (dict "context" $) }}
+*/}}
+{{- define "common.mongodb.values.enabled" -}}
+  {{- if .subchart -}}
+    {{- printf "%v" .context.Values.mongodb.enabled -}}
+  {{- else -}}
+    {{- printf "%v" (not .context.Values.enabled) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for the key auth
+
+Usage:
+{{ include "common.mongodb.values.key.auth" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether MongoDB(R) is used as subchart or not. Default: false
+*/}}
+{{- define "common.mongodb.values.key.auth" -}}
+  {{- if .subchart -}}
+    mongodb.auth
+  {{- else -}}
+    auth
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for architecture
+
+Usage:
+{{ include "common.mongodb.values.architecture" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether MariaDB is used as subchart or not. Default: false
+*/}}
+{{- define "common.mongodb.values.architecture" -}}
+  {{- if .subchart -}}
+    {{- .context.Values.mongodb.architecture -}}
+  {{- else -}}
+    {{- .context.Values.architecture -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_postgresql.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_postgresql.tpl
new file mode 100644
index 000000000..992bcd390
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_postgresql.tpl
@@ -0,0 +1,131 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Validate PostgreSQL required passwords are not empty.
+
+Usage:
+{{ include "common.validations.values.postgresql.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
+Params:
+  - secret - String - Required. Name of the secret where postgresql values are stored, e.g: "postgresql-passwords-secret"
+  - subchart - Boolean - Optional. Whether postgresql is used as subchart or not. Default: false
+*/}}
+{{- define "common.validations.values.postgresql.passwords" -}}
+  {{- $existingSecret := include "common.postgresql.values.existingSecret" . -}}
+  {{- $enabled := include "common.postgresql.values.enabled" . -}}
+  {{- $valueKeyPostgresqlPassword := include "common.postgresql.values.key.postgressPassword" . -}}
+  {{- $valueKeyPostgresqlReplicationEnabled := include "common.postgresql.values.key.replicationPassword" . -}}
+
+  {{- if and (not $existingSecret) (eq $enabled "true") -}}
+    {{- $requiredPasswords := list -}}
+
+    {{- $requiredPostgresqlPassword := dict "valueKey" $valueKeyPostgresqlPassword "secret" .secret "field" "postgresql-password" -}}
+    {{- $requiredPasswords = append $requiredPasswords $requiredPostgresqlPassword -}}
+
+    {{- $enabledReplication := include "common.postgresql.values.enabled.replication" . -}}
+    {{- if (eq $enabledReplication "true") -}}
+        {{- $requiredPostgresqlReplicationPassword := dict "valueKey" $valueKeyPostgresqlReplicationEnabled "secret" .secret "field" "postgresql-replication-password" -}}
+        {{- $requiredPasswords = append $requiredPasswords $requiredPostgresqlReplicationPassword -}}
+    {{- end -}}
+
+    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to decide whether evaluate global values.
+
+Usage:
+{{ include "common.postgresql.values.use.global" (dict "key" "key-of-global" "context" $) }}
+Params:
+  - key - String - Required. Field to be evaluated within global, e.g: "existingSecret"
+*/}}
+{{- define "common.postgresql.values.use.global" -}}
+  {{- if .context.Values.global -}}
+    {{- if .context.Values.global.postgresql -}}
+      {{- index .context.Values.global.postgresql .key | quote -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for existingSecret.
+
+Usage:
+{{ include "common.postgresql.values.existingSecret" (dict "context" $) }}
+*/}}
+{{- define "common.postgresql.values.existingSecret" -}}
+  {{- $globalValue := include "common.postgresql.values.use.global" (dict "key" "existingSecret" "context" .context) -}}
+
+  {{- if .subchart -}}
+    {{- default (.context.Values.postgresql.existingSecret | quote) $globalValue -}}
+  {{- else -}}
+    {{- default (.context.Values.existingSecret | quote) $globalValue -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for enabled postgresql.
+
+Usage:
+{{ include "common.postgresql.values.enabled" (dict "context" $) }}
+*/}}
+{{- define "common.postgresql.values.enabled" -}}
+  {{- if .subchart -}}
+    {{- printf "%v" .context.Values.postgresql.enabled -}}
+  {{- else -}}
+    {{- printf "%v" (not .context.Values.enabled) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for the key postgressPassword.
+
+Usage:
+{{ include "common.postgresql.values.key.postgressPassword" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether postgresql is used as subchart or not. Default: false
+*/}}
+{{- define "common.postgresql.values.key.postgressPassword" -}}
+  {{- $globalValue := include "common.postgresql.values.use.global" (dict "key" "postgresqlUsername" "context" .context) -}}
+
+  {{- if not $globalValue -}}
+    {{- if .subchart -}}
+      postgresql.postgresqlPassword
+    {{- else -}}
+      postgresqlPassword
+    {{- end -}}
+  {{- else -}}
+    global.postgresql.postgresqlPassword
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for enabled.replication.
+
+Usage:
+{{ include "common.postgresql.values.enabled.replication" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether postgresql is used as subchart or not. Default: false
+*/}}
+{{- define "common.postgresql.values.enabled.replication" -}}
+  {{- if .subchart -}}
+    {{- printf "%v" .context.Values.postgresql.replication.enabled -}}
+  {{- else -}}
+    {{- printf "%v" .context.Values.replication.enabled -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for the key replication.password.
+
+Usage:
+{{ include "common.postgresql.values.key.replicationPassword" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether postgresql is used as subchart or not. Default: false
+*/}}
+{{- define "common.postgresql.values.key.replicationPassword" -}}
+  {{- if .subchart -}}
+    postgresql.replication.password
+  {{- else -}}
+    replication.password
+  {{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_redis.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_redis.tpl
new file mode 100644
index 000000000..3e2a47c03
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_redis.tpl
@@ -0,0 +1,72 @@
+
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Validate Redis(TM) required passwords are not empty.
+
+Usage:
+{{ include "common.validations.values.redis.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
+Params:
+  - secret - String - Required. Name of the secret where redis values are stored, e.g: "redis-passwords-secret"
+  - subchart - Boolean - Optional. Whether redis is used as subchart or not. Default: false
+*/}}
+{{- define "common.validations.values.redis.passwords" -}}
+  {{- $existingSecret := include "common.redis.values.existingSecret" . -}}
+  {{- $enabled := include "common.redis.values.enabled" . -}}
+  {{- $valueKeyPrefix := include "common.redis.values.keys.prefix" . -}}
+  {{- $valueKeyRedisPassword := printf "%s%s" $valueKeyPrefix "password" -}}
+  {{- $valueKeyRedisUsePassword := printf "%s%s" $valueKeyPrefix "usePassword" -}}
+
+  {{- if and (not $existingSecret) (eq $enabled "true") -}}
+    {{- $requiredPasswords := list -}}
+
+    {{- $usePassword := include "common.utils.getValueFromKey" (dict "key" $valueKeyRedisUsePassword "context" .context) -}}
+    {{- if eq $usePassword "true" -}}
+      {{- $requiredRedisPassword := dict "valueKey" $valueKeyRedisPassword "secret" .secret "field" "redis-password" -}}
+      {{- $requiredPasswords = append $requiredPasswords $requiredRedisPassword -}}
+    {{- end -}}
+
+    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Redis Auxiliary function to get the right value for existingSecret.
+
+Usage:
+{{ include "common.redis.values.existingSecret" (dict "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether Redis(TM) is used as subchart or not. Default: false
+*/}}
+{{- define "common.redis.values.existingSecret" -}}
+  {{- if .subchart -}}
+    {{- .context.Values.redis.existingSecret | quote -}}
+  {{- else -}}
+    {{- .context.Values.existingSecret | quote -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for enabled redis.
+
+Usage:
+{{ include "common.redis.values.enabled" (dict "context" $) }}
+*/}}
+{{- define "common.redis.values.enabled" -}}
+  {{- if .subchart -}}
+    {{- printf "%v" .context.Values.redis.enabled -}}
+  {{- else -}}
+    {{- printf "%v" (not .context.Values.enabled) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right prefix path for the values
+
+Usage:
+{{ include "common.redis.values.key.prefix" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether redis is used as subchart or not. Default: false
+*/}}
+{{- define "common.redis.values.keys.prefix" -}}
+  {{- if .subchart -}}redis.{{- else -}}{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_validations.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_validations.tpl
new file mode 100644
index 000000000..9a814cf40
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/templates/validations/_validations.tpl
@@ -0,0 +1,46 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Validate values must not be empty.
+
+Usage:
+{{- $validateValueConf00 := (dict "valueKey" "path.to.value" "secret" "secretName" "field" "password-00") -}}
+{{- $validateValueConf01 := (dict "valueKey" "path.to.value" "secret" "secretName" "field" "password-01") -}}
+{{ include "common.validations.values.empty" (dict "required" (list $validateValueConf00 $validateValueConf01) "context" $) }}
+
+Validate value params:
+  - valueKey - String - Required. The path to the validating value in the values.yaml, e.g: "mysql.password"
+  - secret - String - Optional. Name of the secret where the validating value is generated/stored, e.g: "mysql-passwords-secret"
+  - field - String - Optional. Name of the field in the secret data, e.g: "mysql-password"
+*/}}
+{{- define "common.validations.values.multiple.empty" -}}
+  {{- range .required -}}
+    {{- include "common.validations.values.single.empty" (dict "valueKey" .valueKey "secret" .secret "field" .field "context" $.context) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Validate a value must not be empty.
+
+Usage:
+{{ include "common.validations.value.empty" (dict "valueKey" "mariadb.password" "secret" "secretName" "field" "my-password" "subchart" "subchart" "context" $) }}
+
+Validate value params:
+  - valueKey - String - Required. The path to the validating value in the values.yaml, e.g: "mysql.password"
+  - secret - String - Optional. Name of the secret where the validating value is generated/stored, e.g: "mysql-passwords-secret"
+  - field - String - Optional. Name of the field in the secret data, e.g: "mysql-password"
+  - subchart - String - Optional - Name of the subchart that the validated password is part of.
+*/}}
+{{- define "common.validations.values.single.empty" -}}
+  {{- $value := include "common.utils.getValueFromKey" (dict "key" .valueKey "context" .context) }}
+  {{- $subchart := ternary "" (printf "%s." .subchart) (empty .subchart) }}
+
+  {{- if not $value -}}
+    {{- $varname := "my-value" -}}
+    {{- $getCurrentValue := "" -}}
+    {{- if and .secret .field -}}
+      {{- $varname = include "common.utils.fieldToEnvVar" . -}}
+      {{- $getCurrentValue = printf " To get the current value:\n\n        %s\n" (include "common.utils.secret.getvalue" .) -}}
+    {{- end -}}
+    {{- printf "\n    '%s' must not be empty, please add '--set %s%s=$%s' to the command.%s" .valueKey $subchart .valueKey $varname $getCurrentValue -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/values.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/values.yaml
new file mode 100644
index 000000000..9ecdc93f5
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/charts/common/values.yaml
@@ -0,0 +1,3 @@
+## bitnami/common
+## It is required by CI/CD tools and processes.
+exampleValue: common-chart
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/ci/commonAnnotations.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/ci/commonAnnotations.yaml
new file mode 100644
index 000000000..97e18a4cc
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/ci/commonAnnotations.yaml
@@ -0,0 +1,3 @@
+commonAnnotations:
+  helm.sh/hook: "\"pre-install, pre-upgrade\""
+  helm.sh/hook-weight: "-1"
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/ci/default-values.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/ci/default-values.yaml
new file mode 100644
index 000000000..fc2ba605a
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/ci/default-values.yaml
@@ -0,0 +1 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/ci/shmvolume-disabled-values.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/ci/shmvolume-disabled-values.yaml
new file mode 100644
index 000000000..347d3b40a
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/ci/shmvolume-disabled-values.yaml
@@ -0,0 +1,2 @@
+shmVolume:
+  enabled: false
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/files/README.md b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/files/README.md
new file mode 100644
index 000000000..1813a2fea
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/files/README.md
@@ -0,0 +1 @@
+Copy here your postgresql.conf and/or pg_hba.conf files to use it as a config map.
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/files/conf.d/README.md b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/files/conf.d/README.md
new file mode 100644
index 000000000..184c1875d
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/files/conf.d/README.md
@@ -0,0 +1,4 @@
+If you don't want to provide the whole configuration file and only specify certain parameters, you can copy here your extended `.conf` files.
+These files will be injected as a config maps and add/overwrite the default configuration using the `include_dir` directive that allows settings to be loaded from files other than the default `postgresql.conf`.
+
+More info in the [bitnami-docker-postgresql README](https://github.com/bitnami/bitnami-docker-postgresql#configuration-file).
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/files/docker-entrypoint-initdb.d/README.md b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/files/docker-entrypoint-initdb.d/README.md
new file mode 100644
index 000000000..cba38091e
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/files/docker-entrypoint-initdb.d/README.md
@@ -0,0 +1,3 @@
+You can copy here your custom `.sh`, `.sql` or `.sql.gz` file so they are executed during the first boot of the image.
+
+More info in the [bitnami-docker-postgresql](https://github.com/bitnami/bitnami-docker-postgresql#initializing-a-new-instance) repository.
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/NOTES.txt b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/NOTES.txt
new file mode 100644
index 000000000..4e98958c1
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/NOTES.txt
@@ -0,0 +1,59 @@
+** Please be patient while the chart is being deployed **
+
+PostgreSQL can be accessed via port {{ template "postgresql.port" . }} on the following DNS name from within your cluster:
+
+    {{ template "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local - Read/Write connection
+{{- if .Values.replication.enabled }}
+    {{ template "common.names.fullname" . }}-read.{{ .Release.Namespace }}.svc.cluster.local - Read only connection
+{{- end }}
+
+{{- if not (eq (include "postgresql.username" .) "postgres")  }}
+
+To get the password for "postgres" run:
+
+    export POSTGRES_ADMIN_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "postgresql.secretName" . }} -o jsonpath="{.data.postgresql-postgres-password}" | base64 --decode)
+{{- end }}
+
+To get the password for "{{ template "postgresql.username" . }}" run:
+
+    export POSTGRES_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "postgresql.secretName" . }} -o jsonpath="{.data.postgresql-password}" | base64 --decode)
+
+To connect to your database run the following command:
+
+    kubectl run {{ template "common.names.fullname" . }}-client --rm --tty -i --restart='Never' --namespace {{ .Release.Namespace }} --image {{ template "postgresql.image" . }} --env="PGPASSWORD=$POSTGRES_PASSWORD" {{- if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}
+   --labels="{{ template "common.names.fullname" . }}-client=true" {{- end }} --command -- psql --host {{ template "common.names.fullname" . }} -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }} -p {{ template "postgresql.port" . }}
+
+{{ if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}
+Note: Since NetworkPolicy is enabled, only pods with label {{ template "common.names.fullname" . }}-client=true" will be able to connect to this PostgreSQL cluster.
+{{- end }}
+
+To connect to your database from outside the cluster execute the following commands:
+
+{{- if contains "NodePort" .Values.service.type }}
+
+    export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+    export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "common.names.fullname" . }})
+    {{ if (include "postgresql.password" . )  }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host $NODE_IP --port $NODE_PORT -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }}
+
+{{- else if contains "LoadBalancer" .Values.service.type }}
+
+  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.names.fullname" . }}'
+
+    export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.names.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+    {{ if (include "postgresql.password" . ) }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host $SERVICE_IP --port {{ template "postgresql.port" . }} -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }}
+
+{{- else if contains "ClusterIP" .Values.service.type }}
+
+    kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "common.names.fullname" . }} {{ template "postgresql.port" . }}:{{ template "postgresql.port" . }} &
+    {{ if (include "postgresql.password" . ) }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host 127.0.0.1 -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }} -p {{ template "postgresql.port" . }}
+
+{{- end }}
+
+{{- include "postgresql.validateValues" . -}}
+
+{{- include "common.warnings.rollingTag" .Values.image -}}
+
+{{- $passwordValidationErrors := include "common.validations.values.postgresql.passwords" (dict "secret" (include "common.names.fullname" .) "context" $) -}}
+
+{{- include "common.errors.upgrade.passwords.empty" (dict "validationErrors" (list $passwordValidationErrors) "context" $) -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/_helpers.tpl b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/_helpers.tpl
new file mode 100644
index 000000000..1f98efe78
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/_helpers.tpl
@@ -0,0 +1,337 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "postgresql.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "postgresql.primary.fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- $fullname := default (printf "%s-%s" .Release.Name $name) .Values.fullnameOverride -}}
+{{- if .Values.replication.enabled -}}
+{{- printf "%s-%s" $fullname "primary" | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s" $fullname | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper PostgreSQL image name
+*/}}
+{{- define "postgresql.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }}
+{{- end -}}
+
+{{/*
+Return the proper PostgreSQL metrics image name
+*/}}
+{{- define "postgresql.metrics.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.metrics.image "global" .Values.global) }}
+{{- end -}}
+
+{{/*
+Return the proper image name (for the init container volume-permissions image)
+*/}}
+{{- define "postgresql.volumePermissions.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.volumePermissions.image "global" .Values.global) }}
+{{- end -}}
+
+{{/*
+Return the proper Docker Image Registry Secret Names
+*/}}
+{{- define "postgresql.imagePullSecrets" -}}
+{{ include "common.images.pullSecrets" (dict "images" (list .Values.image .Values.metrics.image .Values.volumePermissions.image) "global" .Values.global) }}
+{{- end -}}
+
+{{/*
+Return PostgreSQL postgres user password
+*/}}
+{{- define "postgresql.postgres.password" -}}
+{{- if .Values.global.postgresql.postgresqlPostgresPassword }}
+    {{- .Values.global.postgresql.postgresqlPostgresPassword -}}
+{{- else if .Values.postgresqlPostgresPassword -}}
+    {{- .Values.postgresqlPostgresPassword -}}
+{{- else -}}
+    {{- randAlphaNum 10 -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL password
+*/}}
+{{- define "postgresql.password" -}}
+{{- if .Values.global.postgresql.postgresqlPassword }}
+    {{- .Values.global.postgresql.postgresqlPassword -}}
+{{- else if .Values.postgresqlPassword -}}
+    {{- .Values.postgresqlPassword -}}
+{{- else -}}
+    {{- randAlphaNum 10 -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL replication password
+*/}}
+{{- define "postgresql.replication.password" -}}
+{{- if .Values.global.postgresql.replicationPassword }}
+    {{- .Values.global.postgresql.replicationPassword -}}
+{{- else if .Values.replication.password -}}
+    {{- .Values.replication.password -}}
+{{- else -}}
+    {{- randAlphaNum 10 -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL username
+*/}}
+{{- define "postgresql.username" -}}
+{{- if .Values.global.postgresql.postgresqlUsername }}
+    {{- .Values.global.postgresql.postgresqlUsername -}}
+{{- else -}}
+    {{- .Values.postgresqlUsername -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL replication username
+*/}}
+{{- define "postgresql.replication.username" -}}
+{{- if .Values.global.postgresql.replicationUser }}
+    {{- .Values.global.postgresql.replicationUser -}}
+{{- else -}}
+    {{- .Values.replication.user -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL port
+*/}}
+{{- define "postgresql.port" -}}
+{{- if .Values.global.postgresql.servicePort }}
+    {{- .Values.global.postgresql.servicePort -}}
+{{- else -}}
+    {{- .Values.service.port -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL created database
+*/}}
+{{- define "postgresql.database" -}}
+{{- if .Values.global.postgresql.postgresqlDatabase }}
+    {{- .Values.global.postgresql.postgresqlDatabase -}}
+{{- else if .Values.postgresqlDatabase -}}
+    {{- .Values.postgresqlDatabase -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the password secret.
+*/}}
+{{- define "postgresql.secretName" -}}
+{{- if .Values.global.postgresql.existingSecret }}
+    {{- printf "%s" (tpl .Values.global.postgresql.existingSecret $) -}}
+{{- else if .Values.existingSecret -}}
+    {{- printf "%s" (tpl .Values.existingSecret $) -}}
+{{- else -}}
+    {{- printf "%s" (include "common.names.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return true if we should use an existingSecret.
+*/}}
+{{- define "postgresql.useExistingSecret" -}}
+{{- if or .Values.global.postgresql.existingSecret .Values.existingSecret -}}
+    {{- true -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return true if a secret object should be created
+*/}}
+{{- define "postgresql.createSecret" -}}
+{{- if not (include "postgresql.useExistingSecret" .) -}}
+    {{- true -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the configuration ConfigMap name.
+*/}}
+{{- define "postgresql.configurationCM" -}}
+{{- if .Values.configurationConfigMap -}}
+{{- printf "%s" (tpl .Values.configurationConfigMap $) -}}
+{{- else -}}
+{{- printf "%s-configuration" (include "common.names.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the extended configuration ConfigMap name.
+*/}}
+{{- define "postgresql.extendedConfigurationCM" -}}
+{{- if .Values.extendedConfConfigMap -}}
+{{- printf "%s" (tpl .Values.extendedConfConfigMap $) -}}
+{{- else -}}
+{{- printf "%s-extended-configuration" (include "common.names.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return true if a configmap should be mounted with PostgreSQL configuration
+*/}}
+{{- define "postgresql.mountConfigurationCM" -}}
+{{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }}
+    {{- true -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the initialization scripts ConfigMap name.
+*/}}
+{{- define "postgresql.initdbScriptsCM" -}}
+{{- if .Values.initdbScriptsConfigMap -}}
+{{- printf "%s" (tpl .Values.initdbScriptsConfigMap $) -}}
+{{- else -}}
+{{- printf "%s-init-scripts" (include "common.names.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the initialization scripts Secret name.
+*/}}
+{{- define "postgresql.initdbScriptsSecret" -}}
+{{- printf "%s" (tpl .Values.initdbScriptsSecret $) -}}
+{{- end -}}
+
+{{/*
+Get the metrics ConfigMap name.
+*/}}
+{{- define "postgresql.metricsCM" -}}
+{{- printf "%s-metrics" (include "common.names.fullname" .) -}}
+{{- end -}}
+
+{{/*
+Get the readiness probe command
+*/}}
+{{- define "postgresql.readinessProbeCommand" -}}
+- |
+{{- if (include "postgresql.database" .) }}
+  exec pg_isready -U {{ include "postgresql.username" . | quote }} -d "dbname={{ include "postgresql.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+{{- else }}
+  exec pg_isready -U {{ include "postgresql.username" . | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+{{- end }}
+{{- if contains "bitnami/" .Values.image.repository }}
+  [ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
+{{- end -}}
+{{- end -}}
+
+{{/*
+Compile all warnings into a single message, and call fail.
+*/}}
+{{- define "postgresql.validateValues" -}}
+{{- $messages := list -}}
+{{- $messages := append $messages (include "postgresql.validateValues.ldapConfigurationMethod" .) -}}
+{{- $messages := append $messages (include "postgresql.validateValues.psp" .) -}}
+{{- $messages := append $messages (include "postgresql.validateValues.tls" .) -}}
+{{- $messages := without $messages "" -}}
+{{- $message := join "\n" $messages -}}
+
+{{- if $message -}}
+{{- printf "\nVALUES VALIDATION:\n%s" $message | fail -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Validate values of Postgresql - If ldap.url is used then you don't need the other settings for ldap
+*/}}
+{{- define "postgresql.validateValues.ldapConfigurationMethod" -}}
+{{- if and .Values.ldap.enabled (and (not (empty .Values.ldap.url)) (not (empty .Values.ldap.server))) }}
+postgresql: ldap.url, ldap.server
+    You cannot set both `ldap.url` and `ldap.server` at the same time.
+    Please provide a unique way to configure LDAP.
+    More info at https://www.postgresql.org/docs/current/auth-ldap.html
+{{- end -}}
+{{- end -}}
+
+{{/*
+Validate values of Postgresql - If PSP is enabled RBAC should be enabled too
+*/}}
+{{- define "postgresql.validateValues.psp" -}}
+{{- if and .Values.psp.create (not .Values.rbac.create) }}
+postgresql: psp.create, rbac.create
+    RBAC should be enabled if PSP is enabled in order for PSP to work.
+    More info at https://kubernetes.io/docs/concepts/policy/pod-security-policy/#authorizing-policies
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for podsecuritypolicy.
+*/}}
+{{- define "podsecuritypolicy.apiVersion" -}}
+{{- if semverCompare "<1.10-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "extensions/v1beta1" -}}
+{{- else -}}
+{{- print "policy/v1beta1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for networkpolicy.
+*/}}
+{{- define "postgresql.networkPolicy.apiVersion" -}}
+{{- if semverCompare ">=1.4-0, <1.7-0" .Capabilities.KubeVersion.GitVersion -}}
+"extensions/v1beta1"
+{{- else if semverCompare "^1.7-0" .Capabilities.KubeVersion.GitVersion -}}
+"networking.k8s.io/v1"
+{{- end -}}
+{{- end -}}
+
+{{/*
+Validate values of Postgresql TLS - When TLS is enabled, so must be VolumePermissions
+*/}}
+{{- define "postgresql.validateValues.tls" -}}
+{{- if and .Values.tls.enabled (not .Values.volumePermissions.enabled) }}
+postgresql: tls.enabled, volumePermissions.enabled
+    When TLS is enabled you must enable volumePermissions as well to ensure certificates files have
+    the right permissions.
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the path to the cert file.
+*/}}
+{{- define "postgresql.tlsCert" -}}
+{{- required "Certificate filename is required when TLS in enabled" .Values.tls.certFilename | printf "/opt/bitnami/postgresql/certs/%s" -}}
+{{- end -}}
+
+{{/*
+Return the path to the cert key file.
+*/}}
+{{- define "postgresql.tlsCertKey" -}}
+{{- required "Certificate Key filename is required when TLS in enabled" .Values.tls.certKeyFilename | printf "/opt/bitnami/postgresql/certs/%s" -}}
+{{- end -}}
+
+{{/*
+Return the path to the CA cert file.
+*/}}
+{{- define "postgresql.tlsCACert" -}}
+{{- printf "/opt/bitnami/postgresql/certs/%s" .Values.tls.certCAFilename -}}
+{{- end -}}
+
+{{/*
+Return the path to the CRL file.
+*/}}
+{{- define "postgresql.tlsCRL" -}}
+{{- if .Values.tls.crlFilename -}}
+{{- printf "/opt/bitnami/postgresql/certs/%s" .Values.tls.crlFilename -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/configmap.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/configmap.yaml
new file mode 100644
index 000000000..3a5ea18ae
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/configmap.yaml
@@ -0,0 +1,31 @@
+{{ if and (or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration) (not .Values.configurationConfigMap) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "common.names.fullname" . }}-configuration
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+data:
+{{- if (.Files.Glob "files/postgresql.conf") }}
+{{ (.Files.Glob "files/postgresql.conf").AsConfig | indent 2 }}
+{{- else if .Values.postgresqlConfiguration }}
+  postgresql.conf: |
+{{- range $key, $value := default dict .Values.postgresqlConfiguration }}
+    {{- if kindIs "string" $value }}
+    {{ $key | snakecase }} = '{{ $value }}'
+    {{- else }}
+    {{ $key | snakecase }} = {{ $value }}
+    {{- end }}
+{{- end }}
+{{- end }}
+{{- if (.Files.Glob "files/pg_hba.conf") }}
+{{ (.Files.Glob "files/pg_hba.conf").AsConfig | indent 2 }}
+{{- else if .Values.pgHbaConfiguration }}
+  pg_hba.conf: |
+{{ .Values.pgHbaConfiguration | indent 4 }}
+{{- end }}
+{{ end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/extended-config-configmap.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/extended-config-configmap.yaml
new file mode 100644
index 000000000..b0dad253b
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/extended-config-configmap.yaml
@@ -0,0 +1,26 @@
+{{- if and (or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf) (not .Values.extendedConfConfigMap)}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "common.names.fullname" . }}-extended-configuration
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+data:
+{{- with .Files.Glob "files/conf.d/*.conf" }}
+{{ .AsConfig | indent 2 }}
+{{- end }}
+{{ with .Values.postgresqlExtendedConf }}
+  override.conf: |
+{{- range $key, $value := . }}
+    {{- if kindIs "string" $value }}
+    {{ $key | snakecase }} = '{{ $value }}'
+    {{- else }}
+    {{ $key | snakecase }} = {{ $value }}
+    {{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/extra-list.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/extra-list.yaml
new file mode 100644
index 000000000..9ac65f9e1
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/extra-list.yaml
@@ -0,0 +1,4 @@
+{{- range .Values.extraDeploy }}
+---
+{{ include "common.tplvalues.render" (dict "value" . "context" $) }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/initialization-configmap.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/initialization-configmap.yaml
new file mode 100644
index 000000000..7796c67a9
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/initialization-configmap.yaml
@@ -0,0 +1,25 @@
+{{- if and (or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScripts) (not .Values.initdbScriptsConfigMap) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "common.names.fullname" . }}-init-scripts
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+{{- with .Files.Glob "files/docker-entrypoint-initdb.d/*.sql.gz" }}
+binaryData:
+{{- range $path, $bytes := . }}
+  {{ base $path }}: {{ $.Files.Get $path | b64enc | quote }}
+{{- end }}
+{{- end }}
+data:
+{{- with .Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql}" }}
+{{ .AsConfig | indent 2 }}
+{{- end }}
+{{- with .Values.initdbScripts }}
+{{ toYaml . | indent 2 }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/metrics-configmap.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/metrics-configmap.yaml
new file mode 100644
index 000000000..fa539582b
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/metrics-configmap.yaml
@@ -0,0 +1,14 @@
+{{- if and .Values.metrics.enabled .Values.metrics.customMetrics }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "postgresql.metricsCM" . }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+data:
+  custom-metrics.yaml: {{ toYaml .Values.metrics.customMetrics | quote }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/metrics-svc.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/metrics-svc.yaml
new file mode 100644
index 000000000..af8b67e2f
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/metrics-svc.yaml
@@ -0,0 +1,26 @@
+{{- if .Values.metrics.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "common.names.fullname" . }}-metrics
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  annotations:
+  {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+    {{- toYaml .Values.metrics.service.annotations | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  type: {{ .Values.metrics.service.type }}
+  {{- if and (eq .Values.metrics.service.type "LoadBalancer") .Values.metrics.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.metrics.service.loadBalancerIP }}
+  {{- end }}
+  ports:
+    - name: http-metrics
+      port: 9187
+      targetPort: http-metrics
+  selector:
+  {{- include "common.labels.matchLabels" . | nindent 4 }}
+    role: primary
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/networkpolicy.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/networkpolicy.yaml
new file mode 100644
index 000000000..4f2740ea0
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/networkpolicy.yaml
@@ -0,0 +1,39 @@
+{{- if .Values.networkPolicy.enabled }}
+kind: NetworkPolicy
+apiVersion: {{ template "postgresql.networkPolicy.apiVersion" . }}
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  podSelector:
+    matchLabels:
+    {{- include "common.labels.matchLabels" . | nindent 6 }}
+  ingress:
+    # Allow inbound connections
+    - ports:
+        - port: {{ template "postgresql.port" . }}
+      {{- if not .Values.networkPolicy.allowExternal }}
+      from:
+        - podSelector:
+            matchLabels:
+              {{ template "common.names.fullname" . }}-client: "true"
+          {{- if .Values.networkPolicy.explicitNamespacesSelector }}
+          namespaceSelector:
+{{ toYaml .Values.networkPolicy.explicitNamespacesSelector | indent 12 }}
+          {{- end }}
+        - podSelector:
+            matchLabels:
+            {{- include "common.labels.matchLabels" . | nindent 14 }}
+              role: read
+      {{- end }}
+    {{- if .Values.metrics.enabled }}
+    # Allow prometheus scrapes
+    - ports:
+        - port: 9187
+    {{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/podsecuritypolicy.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/podsecuritypolicy.yaml
new file mode 100644
index 000000000..0c49694fa
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/podsecuritypolicy.yaml
@@ -0,0 +1,38 @@
+{{- if .Values.psp.create }}
+apiVersion: {{ include "podsecuritypolicy.apiVersion" . }}
+kind: PodSecurityPolicy
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  privileged: false
+  volumes:
+    - 'configMap'
+    - 'secret'
+    - 'persistentVolumeClaim'
+    - 'emptyDir'
+    - 'projected'
+  hostNetwork: false
+  hostIPC: false
+  hostPID: false
+  runAsUser:
+    rule: 'RunAsAny'
+  seLinux:
+    rule: 'RunAsAny'
+  supplementalGroups:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  fsGroup:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  readOnlyRootFilesystem: false
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/prometheusrule.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/prometheusrule.yaml
new file mode 100644
index 000000000..d0f408c78
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/prometheusrule.yaml
@@ -0,0 +1,23 @@
+{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ template "common.names.fullname" . }}
+{{- with .Values.metrics.prometheusRule.namespace }}
+  namespace: {{ . }}
+{{- end }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- with .Values.metrics.prometheusRule.additionalLabels }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+spec:
+{{- with .Values.metrics.prometheusRule.rules }}
+  groups:
+    - name: {{ template "postgresql.name" $ }}
+      rules: {{ tpl (toYaml .) $ | nindent 8 }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/role.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/role.yaml
new file mode 100644
index 000000000..017a5716b
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/role.yaml
@@ -0,0 +1,20 @@
+{{- if .Values.rbac.create }}
+kind: Role
+apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+rules:
+  {{- if .Values.psp.create }}
+  - apiGroups: ["extensions"]
+    resources: ["podsecuritypolicies"]
+    verbs: ["use"]
+    resourceNames:
+      - {{ template "common.names.fullname" . }}
+  {{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/rolebinding.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/rolebinding.yaml
new file mode 100644
index 000000000..189775a15
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/rolebinding.yaml
@@ -0,0 +1,20 @@
+{{- if .Values.rbac.create }}
+kind: RoleBinding
+apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: Role
+  name: {{ template "common.names.fullname" . }}
+  apiGroup: rbac.authorization.k8s.io
+subjects:
+  - kind: ServiceAccount
+    name: {{ default (include "common.names.fullname" . ) .Values.serviceAccount.name }}
+    namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/secrets.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/secrets.yaml
new file mode 100644
index 000000000..d492cd593
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/secrets.yaml
@@ -0,0 +1,24 @@
+{{- if (include "postgresql.createSecret" .) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+type: Opaque
+data:
+  {{- if not (eq (include "postgresql.username" .) "postgres")  }}
+  postgresql-postgres-password: {{ include "postgresql.postgres.password" . | b64enc | quote }}
+  {{- end }}
+  postgresql-password: {{ include "postgresql.password" . | b64enc | quote }}
+  {{- if .Values.replication.enabled }}
+  postgresql-replication-password: {{ include "postgresql.replication.password" . | b64enc | quote }}
+  {{- end }}
+  {{- if (and .Values.ldap.enabled .Values.ldap.bind_password)}}
+  postgresql-ldap-password: {{ .Values.ldap.bind_password | b64enc | quote }}
+  {{- end }}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/serviceaccount.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/serviceaccount.yaml
new file mode 100644
index 000000000..03f0f50e7
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/serviceaccount.yaml
@@ -0,0 +1,12 @@
+{{- if and (.Values.serviceAccount.enabled) (not .Values.serviceAccount.name) }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  name: {{ template "common.names.fullname" . }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/servicemonitor.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/servicemonitor.yaml
new file mode 100644
index 000000000..587ce85b8
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/servicemonitor.yaml
@@ -0,0 +1,33 @@
+{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  {{- if .Values.metrics.serviceMonitor.namespace }}
+  namespace: {{ .Values.metrics.serviceMonitor.namespace }}
+  {{- end }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.metrics.serviceMonitor.additionalLabels }}
+    {{- toYaml .Values.metrics.serviceMonitor.additionalLabels | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+
+spec:
+  endpoints:
+    - port: http-metrics
+      {{- if .Values.metrics.serviceMonitor.interval }}
+      interval: {{ .Values.metrics.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
+      {{- end }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+    {{- include "common.labels.matchLabels" . | nindent 6 }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/statefulset-readreplicas.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/statefulset-readreplicas.yaml
new file mode 100644
index 000000000..b038299bf
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/statefulset-readreplicas.yaml
@@ -0,0 +1,411 @@
+{{- if .Values.replication.enabled }}
+{{- $readReplicasResources := coalesce .Values.readReplicas.resources .Values.resources -}}
+apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }}
+kind: StatefulSet
+metadata:
+  name: "{{ template "common.names.fullname" . }}-read"
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: read
+{{- with .Values.readReplicas.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+  annotations:
+  {{- if .Values.commonAnnotations }}
+  {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  {{- with .Values.readReplicas.annotations }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  serviceName: {{ template "common.names.fullname" . }}-headless
+  replicas: {{ .Values.replication.readReplicas }}
+  selector:
+    matchLabels:
+    {{- include "common.labels.matchLabels" . | nindent 6 }}
+      role: read
+  template:
+    metadata:
+      name: {{ template "common.names.fullname" . }}
+      labels:
+      {{- include "common.labels.standard" . | nindent 8 }}
+        app.kubernetes.io/component: read
+        role: read
+{{- with .Values.readReplicas.podLabels }}
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- with .Values.readReplicas.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }}
+    spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: "{{ .Values.schedulerName }}"
+      {{- end }}
+{{- include "postgresql.imagePullSecrets" . | indent 6 }}
+      {{- if .Values.readReplicas.affinity }}
+      affinity: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.affinity "context" $) | nindent 8 }}
+      {{- else }}
+      affinity:
+        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.readReplicas.podAffinityPreset "component" "read" "context" $) | nindent 10 }}
+        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.readReplicas.podAntiAffinityPreset "component" "read" "context" $) | nindent 10 }}
+        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.readReplicas.nodeAffinityPreset.type "key" .Values.readReplicas.nodeAffinityPreset.key "values" .Values.readReplicas.nodeAffinityPreset.values) | nindent 10 }}
+      {{- end }}
+      {{- if .Values.readReplicas.nodeSelector }}
+      nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.nodeSelector "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.readReplicas.tolerations }}
+      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.tolerations "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      {{- end }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext: {{- omit .Values.securityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if .Values.serviceAccount.enabled }}
+      serviceAccountName: {{ default (include "common.names.fullname" . ) .Values.serviceAccount.name}}
+      {{- end }}
+      {{- if or .Values.readReplicas.extraInitContainers (and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled))) }}
+      initContainers:
+      {{- if and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled) .Values.tls.enabled) }}
+        - name: init-chmod-data
+          image: {{ template "postgresql.volumePermissions.image" . }}
+          imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          command:
+            - /bin/sh
+            - -cx
+            - |
+              {{- if .Values.persistence.enabled }}
+              {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+              chown `id -u`:`id -G | cut -d " " -f2` {{ .Values.persistence.mountPath }}
+              {{- else }}
+              chown {{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} {{ .Values.persistence.mountPath }}
+              {{- end }}
+              mkdir -p {{ .Values.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.persistence.mountPath }}/conf {{- end }}
+              chmod 700 {{ .Values.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.persistence.mountPath }}/conf {{- end }}
+              find {{ .Values.persistence.mountPath }} -mindepth 1 -maxdepth 1 {{- if not (include "postgresql.mountConfigurationCM" .) }} -not -name "conf" {{- end }} -not -name ".snapshot" -not -name "lost+found" | \
+              {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+                xargs chown -R `id -u`:`id -G | cut -d " " -f2`
+              {{- else }}
+                xargs chown -R {{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }}
+              {{- end }}
+              {{- end }}
+              {{- if and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled }}
+              chmod -R 777 /dev/shm
+              {{- end }}
+              {{- if .Values.tls.enabled }}
+              cp /tmp/certs/* /opt/bitnami/postgresql/certs/
+              {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+              chown -R `id -u`:`id -G | cut -d " " -f2` /opt/bitnami/postgresql/certs/
+              {{- else }}
+              chown -R {{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} /opt/bitnami/postgresql/certs/
+              {{- end }}
+              chmod 600 {{ template "postgresql.tlsCertKey" . }}
+              {{- end }}
+          {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+          securityContext: {{- omit .Values.volumePermissions.securityContext "runAsUser" | toYaml | nindent 12 }}
+          {{- else }}
+          securityContext: {{- .Values.volumePermissions.securityContext | toYaml | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            {{ if .Values.persistence.enabled }}
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{- end }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+            {{- if .Values.tls.enabled }}
+            - name: raw-certificates
+              mountPath: /tmp/certs
+            - name: postgresql-certificates
+              mountPath: /opt/bitnami/postgresql/certs
+            {{- end }}
+      {{- end }}
+      {{- if .Values.readReplicas.extraInitContainers }}
+      {{- include "common.tplvalues.render" ( dict "value" .Values.readReplicas.extraInitContainers "context" $ ) | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.readReplicas.priorityClassName }}
+      priorityClassName: {{ .Values.readReplicas.priorityClassName }}
+      {{- end }}
+      containers:
+        - name: {{ template "common.names.fullname" . }}
+          image: {{ template "postgresql.image" . }}
+          imagePullPolicy: "{{ .Values.image.pullPolicy }}"
+          {{- if $readReplicasResources }}
+          resources: {{- toYaml $readReplicasResources | nindent 12 }}
+          {{- end }}
+          {{- if .Values.containerSecurityContext.enabled }}
+          securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}
+          {{- end }}
+          env:
+            - name: BITNAMI_DEBUG
+              value: {{ ternary "true" "false" .Values.image.debug | quote }}
+            - name: POSTGRESQL_VOLUME_DIR
+              value: "{{ .Values.persistence.mountPath }}"
+            - name: POSTGRESQL_PORT_NUMBER
+              value: "{{ template "postgresql.port" . }}"
+            {{- if .Values.persistence.mountPath }}
+            - name: PGDATA
+              value: {{ .Values.postgresqlDataDir | quote }}
+            {{- end }}
+            - name: POSTGRES_REPLICATION_MODE
+              value: "slave"
+            - name: POSTGRES_REPLICATION_USER
+              value: {{ include "postgresql.replication.username" . | quote }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_REPLICATION_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-replication-password"
+            {{- else }}
+            - name: POSTGRES_REPLICATION_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-replication-password
+            {{- end }}
+            - name: POSTGRES_CLUSTER_APP_NAME
+              value: {{ .Values.replication.applicationName }}
+            - name: POSTGRES_MASTER_HOST
+              value: {{ template "common.names.fullname" . }}
+            - name: POSTGRES_MASTER_PORT_NUMBER
+              value: {{ include "postgresql.port" . | quote }}
+            {{- if not (eq (include "postgresql.username" .) "postgres")  }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-postgres-password"
+            {{- else }}
+            - name: POSTGRES_POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-postgres-password
+            {{- end }}
+            {{- end }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-password"
+            {{- else }}
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-password
+            {{- end }}
+            - name: POSTGRESQL_ENABLE_TLS
+              value: {{ ternary "yes" "no" .Values.tls.enabled | quote }}
+            {{- if .Values.tls.enabled }}
+            - name: POSTGRESQL_TLS_PREFER_SERVER_CIPHERS
+              value: {{ ternary "yes" "no" .Values.tls.preferServerCiphers | quote }}
+            - name: POSTGRESQL_TLS_CERT_FILE
+              value: {{ template "postgresql.tlsCert" . }}
+            - name: POSTGRESQL_TLS_KEY_FILE
+              value: {{ template "postgresql.tlsCertKey" . }}
+            {{- if .Values.tls.certCAFilename }}
+            - name: POSTGRESQL_TLS_CA_FILE
+              value: {{ template "postgresql.tlsCACert" . }}
+            {{- end }}
+            {{- if .Values.tls.crlFilename }}
+            - name: POSTGRESQL_TLS_CRL_FILE
+              value: {{ template "postgresql.tlsCRL" . }}
+            {{- end }}
+            {{- end }}
+            - name: POSTGRESQL_LOG_HOSTNAME
+              value: {{ .Values.audit.logHostname | quote }}
+            - name: POSTGRESQL_LOG_CONNECTIONS
+              value: {{ .Values.audit.logConnections | quote }}
+            - name: POSTGRESQL_LOG_DISCONNECTIONS
+              value: {{ .Values.audit.logDisconnections | quote }}
+            {{- if .Values.audit.logLinePrefix }}
+            - name: POSTGRESQL_LOG_LINE_PREFIX
+              value: {{ .Values.audit.logLinePrefix | quote }}
+            {{- end }}
+            {{- if .Values.audit.logTimezone }}
+            - name: POSTGRESQL_LOG_TIMEZONE
+              value: {{ .Values.audit.logTimezone | quote }}
+            {{- end }}
+            {{- if .Values.audit.pgAuditLog }}
+            - name: POSTGRESQL_PGAUDIT_LOG
+              value: {{ .Values.audit.pgAuditLog | quote }}
+            {{- end }}
+            - name: POSTGRESQL_PGAUDIT_LOG_CATALOG
+              value: {{ .Values.audit.pgAuditLogCatalog | quote }}
+            - name: POSTGRESQL_CLIENT_MIN_MESSAGES
+              value: {{ .Values.audit.clientMinMessages | quote }}
+            - name: POSTGRESQL_SHARED_PRELOAD_LIBRARIES
+              value: {{ .Values.postgresqlSharedPreloadLibraries | quote }}
+            {{- if .Values.postgresqlMaxConnections }}
+            - name: POSTGRESQL_MAX_CONNECTIONS
+              value: {{ .Values.postgresqlMaxConnections | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlPostgresConnectionLimit }}
+            - name: POSTGRESQL_POSTGRES_CONNECTION_LIMIT
+              value: {{ .Values.postgresqlPostgresConnectionLimit | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlDbUserConnectionLimit }}
+            - name: POSTGRESQL_USERNAME_CONNECTION_LIMIT
+              value: {{ .Values.postgresqlDbUserConnectionLimit | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlTcpKeepalivesInterval }}
+            - name: POSTGRESQL_TCP_KEEPALIVES_INTERVAL
+              value: {{ .Values.postgresqlTcpKeepalivesInterval | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlTcpKeepalivesIdle }}
+            - name: POSTGRESQL_TCP_KEEPALIVES_IDLE
+              value: {{ .Values.postgresqlTcpKeepalivesIdle | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlStatementTimeout }}
+            - name: POSTGRESQL_STATEMENT_TIMEOUT
+              value: {{ .Values.postgresqlStatementTimeout | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlTcpKeepalivesCount }}
+            - name: POSTGRESQL_TCP_KEEPALIVES_COUNT
+              value: {{ .Values.postgresqlTcpKeepalivesCount | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlPghbaRemoveFilters }}
+            - name: POSTGRESQL_PGHBA_REMOVE_FILTERS
+              value: {{ .Values.postgresqlPghbaRemoveFilters | quote }}
+            {{- end }}
+          ports:
+            - name: tcp-postgresql
+              containerPort: {{ template "postgresql.port" . }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                {{- if (include "postgresql.database" .) }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} -d "dbname={{ include "postgresql.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- else }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- end }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- else if .Values.customLivenessProbe }}
+          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - -e
+                {{- include "postgresql.readinessProbeCommand" . | nindent 16 }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          {{- else if .Values.customReadinessProbe }}
+          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            {{- if .Values.usePasswordFile }}
+            - name: postgresql-password
+              mountPath: /opt/bitnami/postgresql/secrets/
+            {{- end }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+            {{- if .Values.persistence.enabled }}
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{ end }}
+            {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+            - name: postgresql-extended-config
+              mountPath: /bitnami/postgresql/conf/conf.d/
+            {{- end }}
+            {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }}
+            - name: postgresql-config
+              mountPath: /bitnami/postgresql/conf
+            {{- end }}
+            {{- if .Values.tls.enabled }}
+            - name: postgresql-certificates
+              mountPath: /opt/bitnami/postgresql/certs
+              readOnly: true
+            {{- end }}
+            {{- if .Values.readReplicas.extraVolumeMounts }}
+            {{- toYaml .Values.readReplicas.extraVolumeMounts | nindent 12 }}
+            {{- end }}
+{{- if .Values.readReplicas.sidecars }}
+{{- include "common.tplvalues.render" ( dict "value" .Values.readReplicas.sidecars "context" $ ) | nindent 8 }}
+{{- end }}
+      volumes:
+        {{- if .Values.usePasswordFile }}
+        - name: postgresql-password
+          secret:
+            secretName: {{ template "postgresql.secretName" . }}
+        {{- end }}
+        {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap}}
+        - name: postgresql-config
+          configMap:
+            name: {{ template "postgresql.configurationCM" . }}
+        {{- end }}
+        {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+        - name: postgresql-extended-config
+          configMap:
+            name: {{ template "postgresql.extendedConfigurationCM" . }}
+        {{- end }}
+        {{- if  .Values.tls.enabled }}
+        - name: raw-certificates
+          secret:
+            secretName: {{ required "A secret containing TLS certificates is required when TLS is enabled" .Values.tls.certificatesSecret }}
+        - name: postgresql-certificates
+          emptyDir: {}
+        {{- end }}
+        {{- if .Values.shmVolume.enabled }}
+        - name: dshm
+          emptyDir:
+            medium: Memory
+            sizeLimit: 1Gi
+        {{- end }}
+        {{- if or (not .Values.persistence.enabled) (not .Values.readReplicas.persistence.enabled) }}
+        - name: data
+          emptyDir: {}
+        {{- end }}
+        {{- if .Values.readReplicas.extraVolumes }}
+        {{- toYaml .Values.readReplicas.extraVolumes | nindent 8 }}
+        {{- end }}
+  updateStrategy:
+    type: {{ .Values.updateStrategy.type }}
+    {{- if (eq "Recreate" .Values.updateStrategy.type) }}
+    rollingUpdate: null
+    {{- end }}
+{{- if and .Values.persistence.enabled .Values.readReplicas.persistence.enabled }}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+      {{- with .Values.persistence.annotations }}
+        annotations:
+        {{- range $key, $value := . }}
+          {{ $key }}: {{ $value }}
+        {{- end }}
+      {{- end }}
+      spec:
+        accessModes:
+        {{- range .Values.persistence.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.persistence.size | quote }}
+        {{ include "common.storage.class" (dict "persistence" .Values.persistence "global" .Values.global) }}
+
+        {{- if .Values.persistence.selector }}
+        selector: {{- include "common.tplvalues.render" (dict "value" .Values.persistence.selector "context" $) | nindent 10 }}
+        {{- end -}}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/statefulset.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/statefulset.yaml
new file mode 100644
index 000000000..f8163fd99
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/statefulset.yaml
@@ -0,0 +1,609 @@
+apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }}
+kind: StatefulSet
+metadata:
+  name: {{ template "postgresql.primary.fullname" . }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: primary
+  {{- with .Values.primary.labels }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  annotations:
+  {{- if .Values.commonAnnotations }}
+  {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  {{- with .Values.primary.annotations }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  serviceName: {{ template "common.names.fullname" . }}-headless
+  replicas: 1
+  updateStrategy:
+    type: {{ .Values.updateStrategy.type }}
+    {{- if (eq "Recreate" .Values.updateStrategy.type) }}
+    rollingUpdate: null
+    {{- end }}
+  selector:
+    matchLabels:
+    {{- include "common.labels.matchLabels" . | nindent 6 }}
+      role: primary
+  template:
+    metadata:
+      name: {{ template "common.names.fullname" . }}
+      labels:
+      {{- include "common.labels.standard" . | nindent 8 }}
+        role: primary
+        app.kubernetes.io/component: primary
+      {{- with .Values.primary.podLabels }}
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.primary.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: "{{ .Values.schedulerName }}"
+      {{- end }}
+{{- include "postgresql.imagePullSecrets" . | indent 6 }}
+      {{- if .Values.primary.affinity }}
+      affinity: {{- include "common.tplvalues.render" (dict "value" .Values.primary.affinity "context" $) | nindent 8 }}
+      {{- else }}
+      affinity:
+        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.primary.podAffinityPreset "component" "primary" "context" $) | nindent 10 }}
+        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.primary.podAntiAffinityPreset "component" "primary" "context" $) | nindent 10 }}
+        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.primary.nodeAffinityPreset.type "key" .Values.primary.nodeAffinityPreset.key "values" .Values.primary.nodeAffinityPreset.values) | nindent 10 }}
+      {{- end }}
+      {{- if .Values.primary.nodeSelector }}
+      nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.primary.nodeSelector "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.primary.tolerations }}
+      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.primary.tolerations "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      {{- end }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext: {{- omit .Values.securityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if .Values.serviceAccount.enabled }}
+      serviceAccountName: {{ default (include "common.names.fullname" . ) .Values.serviceAccount.name }}
+      {{- end }}
+      {{- if or .Values.primary.extraInitContainers (and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled))) }}
+      initContainers:
+      {{- if and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled) .Values.tls.enabled) }}
+        - name: init-chmod-data
+          image: {{ template "postgresql.volumePermissions.image" . }}
+          imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          command:
+            - /bin/sh
+            - -cx
+            - |
+              {{- if .Values.persistence.enabled }}
+              {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+              chown `id -u`:`id -G | cut -d " " -f2` {{ .Values.persistence.mountPath }}
+              {{- else }}
+              chown {{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} {{ .Values.persistence.mountPath }}
+              {{- end }}
+              mkdir -p {{ .Values.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.persistence.mountPath }}/conf {{- end }}
+              chmod 700 {{ .Values.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.persistence.mountPath }}/conf {{- end }}
+              find {{ .Values.persistence.mountPath }} -mindepth 1 -maxdepth 1 {{- if not (include "postgresql.mountConfigurationCM" .) }} -not -name "conf" {{- end }} -not -name ".snapshot" -not -name "lost+found" | \
+              {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+                xargs chown -R `id -u`:`id -G | cut -d " " -f2`
+              {{- else }}
+                xargs chown -R {{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }}
+              {{- end }}
+              {{- end }}
+              {{- if and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled }}
+              chmod -R 777 /dev/shm
+              {{- end }}
+              {{- if .Values.tls.enabled }}
+              cp /tmp/certs/* /opt/bitnami/postgresql/certs/
+              {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+              chown -R `id -u`:`id -G | cut -d " " -f2` /opt/bitnami/postgresql/certs/
+              {{- else }}
+              chown -R {{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} /opt/bitnami/postgresql/certs/
+              {{- end }}
+              chmod 600 {{ template "postgresql.tlsCertKey" . }}
+              {{- end }}
+          {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+          securityContext: {{- omit .Values.volumePermissions.securityContext "runAsUser" | toYaml | nindent 12 }}
+          {{- else }}
+          securityContext: {{- .Values.volumePermissions.securityContext | toYaml | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            {{- if .Values.persistence.enabled }}
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{- end }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+            {{- if .Values.tls.enabled }}
+            - name: raw-certificates
+              mountPath: /tmp/certs
+            - name: postgresql-certificates
+              mountPath: /opt/bitnami/postgresql/certs
+            {{- end }}
+      {{- end }}
+      {{- if .Values.primary.extraInitContainers }}
+      {{- include "common.tplvalues.render" ( dict "value" .Values.primary.extraInitContainers "context" $ ) | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.primary.priorityClassName }}
+      priorityClassName: {{ .Values.primary.priorityClassName }}
+      {{- end }}
+      containers:
+        - name: {{ template "common.names.fullname" . }}
+          image: {{ template "postgresql.image" . }}
+          imagePullPolicy: "{{ .Values.image.pullPolicy }}"
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          {{- if .Values.containerSecurityContext.enabled }}
+          securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}
+          {{- end }}
+          env:
+            - name: BITNAMI_DEBUG
+              value: {{ ternary "true" "false" .Values.image.debug | quote }}
+            - name: POSTGRESQL_PORT_NUMBER
+              value: "{{ template "postgresql.port" . }}"
+            - name: POSTGRESQL_VOLUME_DIR
+              value: "{{ .Values.persistence.mountPath }}"
+            {{- if .Values.postgresqlInitdbArgs }}
+            - name: POSTGRES_INITDB_ARGS
+              value: {{ .Values.postgresqlInitdbArgs | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlInitdbWalDir }}
+            - name: POSTGRES_INITDB_WALDIR
+              value: {{ .Values.postgresqlInitdbWalDir | quote }}
+            {{- end }}
+            {{- if .Values.initdbUser }}
+            - name: POSTGRESQL_INITSCRIPTS_USERNAME
+              value: {{ .Values.initdbUser }}
+            {{- end }}
+            {{- if .Values.initdbPassword }}
+            - name: POSTGRESQL_INITSCRIPTS_PASSWORD
+              value: {{ .Values.initdbPassword }}
+            {{- end }}
+            {{- if .Values.persistence.mountPath }}
+            - name: PGDATA
+              value: {{ .Values.postgresqlDataDir | quote }}
+            {{- end }}
+            {{- if .Values.primaryAsStandBy.enabled }}
+            - name: POSTGRES_MASTER_HOST
+              value: {{ .Values.primaryAsStandBy.primaryHost }}
+            - name: POSTGRES_MASTER_PORT_NUMBER
+              value: {{ .Values.primaryAsStandBy.primaryPort | quote }}
+            {{- end }}
+            {{- if or .Values.replication.enabled .Values.primaryAsStandBy.enabled }}
+            - name: POSTGRES_REPLICATION_MODE
+            {{- if .Values.primaryAsStandBy.enabled }}
+              value: "slave"
+            {{- else }}
+              value: "master"
+            {{- end }}
+            - name: POSTGRES_REPLICATION_USER
+              value: {{ include "postgresql.replication.username" . | quote }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_REPLICATION_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-replication-password"
+            {{- else }}
+            - name: POSTGRES_REPLICATION_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-replication-password
+            {{- end }}
+            {{- if not (eq .Values.replication.synchronousCommit "off")}}
+            - name: POSTGRES_SYNCHRONOUS_COMMIT_MODE
+              value: {{ .Values.replication.synchronousCommit | quote }}
+            - name: POSTGRES_NUM_SYNCHRONOUS_REPLICAS
+              value: {{ .Values.replication.numSynchronousReplicas | quote }}
+            {{- end }}
+            - name: POSTGRES_CLUSTER_APP_NAME
+              value: {{ .Values.replication.applicationName }}
+            {{- end }}
+            {{- if not (eq (include "postgresql.username" .) "postgres")  }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-postgres-password"
+            {{- else }}
+            - name: POSTGRES_POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-postgres-password
+            {{- end }}
+            {{- end }}
+            - name: POSTGRES_USER
+              value: {{ include "postgresql.username" . | quote }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-password"
+            {{- else }}
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-password
+            {{- end }}
+            {{- if (include "postgresql.database" .) }}
+            - name: POSTGRES_DB
+              value: {{ (include "postgresql.database" .) | quote }}
+            {{- end }}
+            {{- if .Values.extraEnv }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.extraEnv "context" $) | nindent 12 }}
+            {{- end }}
+            - name: POSTGRESQL_ENABLE_LDAP
+              value: {{ ternary "yes" "no" .Values.ldap.enabled | quote }}
+            {{- if .Values.ldap.enabled }}
+            - name: POSTGRESQL_LDAP_SERVER
+              value: {{ .Values.ldap.server }}
+            - name: POSTGRESQL_LDAP_PORT
+              value: {{ .Values.ldap.port | quote }}
+            - name: POSTGRESQL_LDAP_SCHEME
+              value: {{ .Values.ldap.scheme }}
+            {{- if .Values.ldap.tls }}
+            - name: POSTGRESQL_LDAP_TLS
+              value: "1"
+            {{- end }}
+            - name: POSTGRESQL_LDAP_PREFIX
+              value: {{ .Values.ldap.prefix | quote }}
+            - name: POSTGRESQL_LDAP_SUFFIX
+              value: {{ .Values.ldap.suffix | quote }}
+            - name: POSTGRESQL_LDAP_BASE_DN
+              value: {{ .Values.ldap.baseDN }}
+            - name: POSTGRESQL_LDAP_BIND_DN
+              value: {{ .Values.ldap.bindDN }}
+            {{- if (not (empty .Values.ldap.bind_password)) }}
+            - name: POSTGRESQL_LDAP_BIND_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-ldap-password
+            {{- end}}
+            - name: POSTGRESQL_LDAP_SEARCH_ATTR
+              value: {{ .Values.ldap.search_attr }}
+            - name: POSTGRESQL_LDAP_SEARCH_FILTER
+              value: {{ .Values.ldap.search_filter }}
+            - name: POSTGRESQL_LDAP_URL
+              value: {{ .Values.ldap.url }}
+            {{- end}}
+            - name: POSTGRESQL_ENABLE_TLS
+              value: {{ ternary "yes" "no" .Values.tls.enabled | quote }}
+            {{- if .Values.tls.enabled }}
+            - name: POSTGRESQL_TLS_PREFER_SERVER_CIPHERS
+              value: {{ ternary "yes" "no" .Values.tls.preferServerCiphers | quote }}
+            - name: POSTGRESQL_TLS_CERT_FILE
+              value: {{ template "postgresql.tlsCert" . }}
+            - name: POSTGRESQL_TLS_KEY_FILE
+              value: {{ template "postgresql.tlsCertKey" . }}
+            {{- if .Values.tls.certCAFilename }}
+            - name: POSTGRESQL_TLS_CA_FILE
+              value: {{ template "postgresql.tlsCACert" . }}
+            {{- end }}
+            {{- if .Values.tls.crlFilename }}
+            - name: POSTGRESQL_TLS_CRL_FILE
+              value: {{ template "postgresql.tlsCRL" . }}
+            {{- end }}
+            {{- end }}
+            - name: POSTGRESQL_LOG_HOSTNAME
+              value: {{ .Values.audit.logHostname | quote }}
+            - name: POSTGRESQL_LOG_CONNECTIONS
+              value: {{ .Values.audit.logConnections | quote }}
+            - name: POSTGRESQL_LOG_DISCONNECTIONS
+              value: {{ .Values.audit.logDisconnections | quote }}
+            {{- if .Values.audit.logLinePrefix }}
+            - name: POSTGRESQL_LOG_LINE_PREFIX
+              value: {{ .Values.audit.logLinePrefix | quote }}
+            {{- end }}
+            {{- if .Values.audit.logTimezone }}
+            - name: POSTGRESQL_LOG_TIMEZONE
+              value: {{ .Values.audit.logTimezone | quote }}
+            {{- end }}
+            {{- if .Values.audit.pgAuditLog }}
+            - name: POSTGRESQL_PGAUDIT_LOG
+              value: {{ .Values.audit.pgAuditLog | quote }}
+            {{- end }}
+            - name: POSTGRESQL_PGAUDIT_LOG_CATALOG
+              value: {{ .Values.audit.pgAuditLogCatalog | quote }}
+            - name: POSTGRESQL_CLIENT_MIN_MESSAGES
+              value: {{ .Values.audit.clientMinMessages | quote }}
+            - name: POSTGRESQL_SHARED_PRELOAD_LIBRARIES
+              value: {{ .Values.postgresqlSharedPreloadLibraries | quote }}
+            {{- if .Values.postgresqlMaxConnections }}
+            - name: POSTGRESQL_MAX_CONNECTIONS
+              value: {{ .Values.postgresqlMaxConnections | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlPostgresConnectionLimit }}
+            - name: POSTGRESQL_POSTGRES_CONNECTION_LIMIT
+              value: {{ .Values.postgresqlPostgresConnectionLimit | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlDbUserConnectionLimit }}
+            - name: POSTGRESQL_USERNAME_CONNECTION_LIMIT
+              value: {{ .Values.postgresqlDbUserConnectionLimit | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlTcpKeepalivesInterval }}
+            - name: POSTGRESQL_TCP_KEEPALIVES_INTERVAL
+              value: {{ .Values.postgresqlTcpKeepalivesInterval | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlTcpKeepalivesIdle }}
+            - name: POSTGRESQL_TCP_KEEPALIVES_IDLE
+              value: {{ .Values.postgresqlTcpKeepalivesIdle | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlStatementTimeout }}
+            - name: POSTGRESQL_STATEMENT_TIMEOUT
+              value: {{ .Values.postgresqlStatementTimeout | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlTcpKeepalivesCount }}
+            - name: POSTGRESQL_TCP_KEEPALIVES_COUNT
+              value: {{ .Values.postgresqlTcpKeepalivesCount | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlPghbaRemoveFilters }}
+            - name: POSTGRESQL_PGHBA_REMOVE_FILTERS
+              value: {{ .Values.postgresqlPghbaRemoveFilters | quote }}
+            {{- end }}
+          {{- if .Values.extraEnvVarsCM }}
+          envFrom:
+            - configMapRef:
+                name: {{ tpl .Values.extraEnvVarsCM . }}
+          {{- end }}
+          ports:
+            - name: tcp-postgresql
+              containerPort: {{ template "postgresql.port" . }}
+          {{- if .Values.startupProbe.enabled }}
+          startupProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                {{- if (include "postgresql.database" .) }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} -d "dbname={{ include "postgresql.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- else }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- end }}
+            initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.startupProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.startupProbe.successThreshold }}
+            failureThreshold: {{ .Values.startupProbe.failureThreshold }}
+          {{- else if .Values.customStartupProbe }}
+          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customStartupProbe "context" $) | nindent 12 }}
+          {{- end }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                {{- if (include "postgresql.database" .) }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} -d "dbname={{ include "postgresql.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- else }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- end }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- else if .Values.customLivenessProbe }}
+          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - -e
+                {{- include "postgresql.readinessProbeCommand" . | nindent 16 }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          {{- else if .Values.customReadinessProbe }}
+          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }}
+            - name: custom-init-scripts
+              mountPath: /docker-entrypoint-initdb.d/
+            {{- end }}
+            {{- if .Values.initdbScriptsSecret }}
+            - name: custom-init-scripts-secret
+              mountPath: /docker-entrypoint-initdb.d/secret
+            {{- end }}
+            {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+            - name: postgresql-extended-config
+              mountPath: /bitnami/postgresql/conf/conf.d/
+            {{- end }}
+            {{- if .Values.usePasswordFile }}
+            - name: postgresql-password
+              mountPath: /opt/bitnami/postgresql/secrets/
+            {{- end }}
+            {{- if .Values.tls.enabled }}
+            - name: postgresql-certificates
+              mountPath: /opt/bitnami/postgresql/certs
+              readOnly: true
+            {{- end }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+            {{- if .Values.persistence.enabled }}
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{- end }}
+            {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }}
+            - name: postgresql-config
+              mountPath: /bitnami/postgresql/conf
+            {{- end }}
+            {{- if .Values.primary.extraVolumeMounts }}
+            {{- toYaml .Values.primary.extraVolumeMounts | nindent 12 }}
+            {{- end }}
+{{- if .Values.primary.sidecars }}
+{{- include "common.tplvalues.render" ( dict "value" .Values.primary.sidecars "context" $ ) | nindent 8 }}
+{{- end }}
+{{- if .Values.metrics.enabled }}
+        - name: metrics
+          image: {{ template "postgresql.metrics.image" . }}
+          imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
+         {{- if .Values.metrics.securityContext.enabled }}
+          securityContext: {{- omit .Values.metrics.securityContext "enabled" | toYaml | nindent 12 }}
+        {{- end }}
+          env:
+            {{- $database := required "In order to enable metrics you need to specify a database (.Values.postgresqlDatabase or .Values.global.postgresql.postgresqlDatabase)" (include "postgresql.database" .) }}
+            {{- $sslmode := ternary "require" "disable" .Values.tls.enabled }}
+            {{- if and .Values.tls.enabled .Values.tls.certCAFilename }}
+            - name: DATA_SOURCE_NAME
+              value: {{ printf "host=127.0.0.1 port=%d user=%s sslmode=%s sslcert=%s sslkey=%s" (int (include "postgresql.port" .)) (include "postgresql.username" .) $sslmode (include "postgresql.tlsCert" .) (include "postgresql.tlsCertKey" .) }}
+            {{- else }}
+            - name: DATA_SOURCE_URI
+              value: {{ printf "127.0.0.1:%d/%s?sslmode=%s" (int (include "postgresql.port" .)) $database $sslmode }}
+            {{- end }}
+            {{- if .Values.usePasswordFile }}
+            - name: DATA_SOURCE_PASS_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-password"
+            {{- else }}
+            - name: DATA_SOURCE_PASS
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-password
+            {{- end }}
+            - name: DATA_SOURCE_USER
+              value: {{ template "postgresql.username" . }}
+            {{- if .Values.metrics.extraEnvVars }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http-metrics
+            initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metrics.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.metrics.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.metrics.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http-metrics
+            initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.metrics.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.metrics.readinessProbe.failureThreshold }}
+          {{- end }}
+          volumeMounts:
+            {{- if .Values.usePasswordFile }}
+            - name: postgresql-password
+              mountPath: /opt/bitnami/postgresql/secrets/
+            {{- end }}
+            {{- if .Values.tls.enabled }}
+            - name: postgresql-certificates
+              mountPath: /opt/bitnami/postgresql/certs
+              readOnly: true
+            {{- end }}
+            {{- if .Values.metrics.customMetrics }}
+            - name: custom-metrics
+              mountPath: /conf
+              readOnly: true
+          args: ["--extend.query-path", "/conf/custom-metrics.yaml"]
+            {{- end }}
+          ports:
+            - name: http-metrics
+              containerPort: 9187
+          {{- if .Values.metrics.resources }}
+          resources: {{- toYaml .Values.metrics.resources | nindent 12 }}
+          {{- end }}
+{{- end }}
+      volumes:
+        {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap}}
+        - name: postgresql-config
+          configMap:
+            name: {{ template "postgresql.configurationCM" . }}
+        {{- end }}
+        {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+        - name: postgresql-extended-config
+          configMap:
+            name: {{ template "postgresql.extendedConfigurationCM" . }}
+        {{- end }}
+        {{- if .Values.usePasswordFile }}
+        - name: postgresql-password
+          secret:
+            secretName: {{ template "postgresql.secretName" . }}
+        {{- end }}
+        {{- if  or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }}
+        - name: custom-init-scripts
+          configMap:
+            name: {{ template "postgresql.initdbScriptsCM" . }}
+        {{- end }}
+        {{- if .Values.initdbScriptsSecret }}
+        - name: custom-init-scripts-secret
+          secret:
+            secretName: {{ template "postgresql.initdbScriptsSecret" . }}
+        {{- end }}
+        {{- if  .Values.tls.enabled }}
+        - name: raw-certificates
+          secret:
+            secretName: {{ required "A secret containing TLS certificates is required when TLS is enabled" .Values.tls.certificatesSecret }}
+        - name: postgresql-certificates
+          emptyDir: {}
+        {{- end }}
+        {{- if .Values.primary.extraVolumes }}
+        {{- toYaml .Values.primary.extraVolumes | nindent 8 }}
+        {{- end }}
+        {{- if and .Values.metrics.enabled .Values.metrics.customMetrics }}
+        - name: custom-metrics
+          configMap:
+            name: {{ template "postgresql.metricsCM" . }}
+        {{- end }}
+        {{- if .Values.shmVolume.enabled }}
+        - name: dshm
+          emptyDir:
+            medium: Memory
+            sizeLimit: 1Gi
+        {{- end }}
+{{- if and .Values.persistence.enabled .Values.persistence.existingClaim }}
+        - name: data
+          persistentVolumeClaim:
+{{- with .Values.persistence.existingClaim }}
+            claimName: {{ tpl . $ }}
+{{- end }}
+{{- else if not .Values.persistence.enabled }}
+        - name: data
+          emptyDir: {}
+{{- else if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+      {{- with .Values.persistence.annotations }}
+        annotations:
+        {{- range $key, $value := . }}
+          {{ $key }}: {{ $value }}
+        {{- end }}
+      {{- end }}
+      spec:
+        accessModes:
+        {{- range .Values.persistence.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.persistence.size | quote }}
+        {{ include "common.storage.class" (dict "persistence" .Values.persistence "global" .Values.global) }}
+        {{- if .Values.persistence.selector }}
+        selector: {{- include "common.tplvalues.render" (dict "value" .Values.persistence.selector "context" $) | nindent 10 }}
+        {{- end -}}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/svc-headless.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/svc-headless.yaml
new file mode 100644
index 000000000..6f5f3b9ee
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/svc-headless.yaml
@@ -0,0 +1,28 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "common.names.fullname" . }}-headless
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+    # Use this annotation in addition to the actual publishNotReadyAddresses
+    # field below because the annotation will stop being respected soon but the
+    # field is broken in some versions of Kubernetes:
+    # https://github.com/kubernetes/kubernetes/issues/58662
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+  namespace: {{ .Release.Namespace }}
+spec:
+  type: ClusterIP
+  clusterIP: None
+  # We want all pods in the StatefulSet to have their addresses published for
+  # the sake of the other Postgresql pods even before they're ready, since they
+  # have to be able to talk to each other in order to become ready.
+  publishNotReadyAddresses: true
+  ports:
+    - name: tcp-postgresql
+      port: {{ template "postgresql.port" . }}
+      targetPort: tcp-postgresql
+  selector:
+  {{- include "common.labels.matchLabels" . | nindent 4 }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/svc-read.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/svc-read.yaml
new file mode 100644
index 000000000..56195ea1e
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/svc-read.yaml
@@ -0,0 +1,43 @@
+{{- if .Values.replication.enabled }}
+{{- $serviceAnnotations := coalesce .Values.readReplicas.service.annotations .Values.service.annotations -}}
+{{- $serviceType := coalesce .Values.readReplicas.service.type .Values.service.type -}}
+{{- $serviceLoadBalancerIP := coalesce .Values.readReplicas.service.loadBalancerIP .Values.service.loadBalancerIP -}}
+{{- $serviceLoadBalancerSourceRanges := coalesce .Values.readReplicas.service.loadBalancerSourceRanges .Values.service.loadBalancerSourceRanges -}}
+{{- $serviceClusterIP := coalesce .Values.readReplicas.service.clusterIP .Values.service.clusterIP -}}
+{{- $serviceNodePort := coalesce .Values.readReplicas.service.nodePort .Values.service.nodePort -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "common.names.fullname" . }}-read
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  annotations:
+  {{- if .Values.commonAnnotations }}
+  {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  {{- if $serviceAnnotations }}
+  {{- include "common.tplvalues.render" (dict "value" $serviceAnnotations "context" $) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  type: {{ $serviceType }}
+  {{- if and $serviceLoadBalancerIP (eq $serviceType "LoadBalancer") }}
+  loadBalancerIP: {{ $serviceLoadBalancerIP }}
+  {{- end }}
+  {{- if and (eq $serviceType "LoadBalancer") $serviceLoadBalancerSourceRanges }}
+  loadBalancerSourceRanges: {{- include "common.tplvalues.render" (dict "value" $serviceLoadBalancerSourceRanges "context" $) | nindent 4 }}
+  {{- end }}
+  {{- if and (eq $serviceType "ClusterIP") $serviceClusterIP }}
+  clusterIP: {{ $serviceClusterIP }}
+  {{- end }}
+  ports:
+    - name: tcp-postgresql
+      port:  {{ template "postgresql.port" . }}
+      targetPort: tcp-postgresql
+      {{- if $serviceNodePort }}
+      nodePort: {{ $serviceNodePort }}
+      {{- end }}
+  selector:
+  {{- include "common.labels.matchLabels" . | nindent 4 }}
+    role: read
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/svc.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/svc.yaml
new file mode 100644
index 000000000..a29431b6a
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/templates/svc.yaml
@@ -0,0 +1,41 @@
+{{- $serviceAnnotations := coalesce .Values.primary.service.annotations .Values.service.annotations -}}
+{{- $serviceType := coalesce .Values.primary.service.type .Values.service.type -}}
+{{- $serviceLoadBalancerIP := coalesce .Values.primary.service.loadBalancerIP .Values.service.loadBalancerIP -}}
+{{- $serviceLoadBalancerSourceRanges := coalesce .Values.primary.service.loadBalancerSourceRanges .Values.service.loadBalancerSourceRanges -}}
+{{- $serviceClusterIP := coalesce .Values.primary.service.clusterIP .Values.service.clusterIP -}}
+{{- $serviceNodePort := coalesce .Values.primary.service.nodePort .Values.service.nodePort -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  annotations:
+  {{- if .Values.commonAnnotations }}
+  {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  {{- if $serviceAnnotations }}
+  {{- include "common.tplvalues.render" (dict "value" $serviceAnnotations "context" $) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  type: {{ $serviceType }}
+  {{- if and $serviceLoadBalancerIP (eq $serviceType "LoadBalancer") }}
+  loadBalancerIP: {{ $serviceLoadBalancerIP }}
+  {{- end }}
+  {{- if and (eq $serviceType "LoadBalancer") $serviceLoadBalancerSourceRanges }}
+  loadBalancerSourceRanges: {{- include "common.tplvalues.render" (dict "value" $serviceLoadBalancerSourceRanges "context" $) | nindent 4 }}
+  {{- end }}
+  {{- if and (eq $serviceType "ClusterIP") $serviceClusterIP }}
+  clusterIP: {{ $serviceClusterIP }}
+  {{- end }}
+  ports:
+    - name: tcp-postgresql
+      port: {{ template "postgresql.port" . }}
+      targetPort: tcp-postgresql
+      {{- if $serviceNodePort }}
+      nodePort: {{ $serviceNodePort }}
+      {{- end }}
+  selector:
+  {{- include "common.labels.matchLabels" . | nindent 4 }}
+    role: primary
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/values.schema.json b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/values.schema.json
new file mode 100644
index 000000000..66a2a9dd0
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/values.schema.json
@@ -0,0 +1,103 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "type": "object",
+  "properties": {
+    "postgresqlUsername": {
+      "type": "string",
+      "title": "Admin user",
+      "form": true
+    },
+    "postgresqlPassword": {
+      "type": "string",
+      "title": "Password",
+      "form": true
+    },
+    "persistence": {
+      "type": "object",
+      "properties": {
+        "size": {
+          "type": "string",
+          "title": "Persistent Volume Size",
+          "form": true,
+          "render": "slider",
+          "sliderMin": 1,
+          "sliderMax": 100,
+          "sliderUnit": "Gi"
+        }
+      }
+    },
+    "resources": {
+      "type": "object",
+      "title": "Required Resources",
+      "description": "Configure resource requests",
+      "form": true,
+      "properties": {
+        "requests": {
+          "type": "object",
+          "properties": {
+            "memory": {
+              "type": "string",
+              "form": true,
+              "render": "slider",
+              "title": "Memory Request",
+              "sliderMin": 10,
+              "sliderMax": 2048,
+              "sliderUnit": "Mi"
+            },
+            "cpu": {
+              "type": "string",
+              "form": true,
+              "render": "slider",
+              "title": "CPU Request",
+              "sliderMin": 10,
+              "sliderMax": 2000,
+              "sliderUnit": "m"
+            }
+          }
+        }
+      }
+    },
+    "replication": {
+      "type": "object",
+      "form": true,
+      "title": "Replication Details",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "title": "Enable Replication",
+          "form": true
+        },
+        "readReplicas": {
+          "type": "integer",
+          "title": "read Replicas",
+          "form": true,
+          "hidden": {
+            "value": false,
+            "path": "replication/enabled"
+          }
+        }
+      }
+    },
+    "volumePermissions": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "form": true,
+          "title": "Enable Init Containers",
+          "description": "Change the owner of the persist volume mountpoint to RunAsUser:fsGroup"
+        }
+      }
+    },
+    "metrics": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "title": "Configure metrics exporter",
+          "form": true
+        }
+      }
+    }
+  }
+}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/values.yaml b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/values.yaml
new file mode 100644
index 000000000..82ce09234
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/charts/postgresql/values.yaml
@@ -0,0 +1,824 @@
+## Global Docker image parameters
+## Please, note that this will override the image parameters, including dependencies, configured to use the global value
+## Current available global Docker image parameters: imageRegistry and imagePullSecrets
+##
+global:
+  postgresql: {}
+#   imageRegistry: myRegistryName
+#   imagePullSecrets:
+#     - myRegistryKeySecretName
+#   storageClass: myStorageClass
+
+## Bitnami PostgreSQL image version
+## ref: https://hub.docker.com/r/bitnami/postgresql/tags/
+##
+image:
+  registry: docker.io
+  repository: bitnami/postgresql
+  tag: 11.11.0-debian-10-r71
+  ## Specify a imagePullPolicy
+  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+  ##
+  pullPolicy: IfNotPresent
+  ## Optionally specify an array of imagePullSecrets.
+  ## Secrets must be manually created in the namespace.
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+  ##
+  # pullSecrets:
+  #   - myRegistryKeySecretName
+
+  ## Set to true if you would like to see extra information on logs
+  ## It turns BASH and/or NAMI debugging in the image
+  ##
+  debug: false
+
+## String to partially override common.names.fullname template (will maintain the release name)
+##
+# nameOverride:
+
+## String to fully override common.names.fullname template
+##
+# fullnameOverride:
+
+##
+## Init containers parameters:
+## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup
+##
+volumePermissions:
+  enabled: false
+  image:
+    registry: docker.io
+    repository: bitnami/bitnami-shell
+    tag: "10"
+    ## Specify a imagePullPolicy
+    ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+    ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+    ##
+    pullPolicy: Always
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+  ## Init container Security Context
+  ## Note: the chown of the data folder is done to securityContext.runAsUser
+  ## and not the below volumePermissions.securityContext.runAsUser
+  ## When runAsUser is set to special value "auto", init container will try to chwon the
+  ## data folder to autodetermined user&group, using commands: `id -u`:`id -G | cut -d" " -f2`
+  ## "auto" is especially useful for OpenShift which has scc with dynamic userids (and 0 is not allowed).
+  ## You may want to use this volumePermissions.securityContext.runAsUser="auto" in combination with
+  ## pod securityContext.enabled=false and shmVolume.chmod.enabled=false
+  ##
+  securityContext:
+    runAsUser: 0
+
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+##
+# schedulerName:
+
+## Pod Security Context
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+##
+securityContext:
+  enabled: true
+  fsGroup: 1001
+
+## Container Security Context
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+##
+containerSecurityContext:
+  enabled: true
+  runAsUser: 1001
+
+## Pod Service Account
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
+##
+serviceAccount:
+  enabled: false
+  ## Name of an already existing service account. Setting this value disables the automatic service account creation.
+  # name:
+
+## Pod Security Policy
+## ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/
+##
+psp:
+  create: false
+
+## Creates role for ServiceAccount
+## Required for PSP
+##
+rbac:
+  create: false
+
+replication:
+  enabled: false
+  user: repl_user
+  password: repl_password
+  readReplicas: 1
+  ## Set synchronous commit mode: on, off, remote_apply, remote_write and local
+  ## ref: https://www.postgresql.org/docs/9.6/runtime-config-wal.html#GUC-WAL-LEVEL
+  synchronousCommit: 'off'
+  ## From the number of `readReplicas` defined above, set the number of those that will have synchronous replication
+  ## NOTE: It cannot be > readReplicas
+  numSynchronousReplicas: 0
+  ## Replication Cluster application name. Useful for defining multiple replication policies
+  ##
+  applicationName: my_application
+
+## PostgreSQL admin password (used when `postgresqlUsername` is not `postgres`)
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-user-on-first-run (see note!)
+# postgresqlPostgresPassword:
+
+## PostgreSQL user (has superuser privileges if username is `postgres`)
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run
+##
+postgresqlUsername: postgres
+
+## PostgreSQL password
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run
+##
+# postgresqlPassword:
+
+## PostgreSQL password using existing secret
+## existingSecret: secret
+##
+
+## Mount PostgreSQL secret as a file instead of passing environment variable
+# usePasswordFile: false
+
+## Create a database
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-on-first-run
+##
+# postgresqlDatabase:
+
+## PostgreSQL data dir
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+postgresqlDataDir: /bitnami/postgresql/data
+
+## An array to add extra environment variables
+## For example:
+## extraEnv:
+##   - name: FOO
+##     value: "bar"
+##
+# extraEnv:
+extraEnv: []
+
+## Name of a ConfigMap containing extra env vars
+##
+# extraEnvVarsCM:
+
+## Specify extra initdb args
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+# postgresqlInitdbArgs:
+
+## Specify a custom location for the PostgreSQL transaction log
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+# postgresqlInitdbWalDir:
+
+## PostgreSQL configuration
+## Specify runtime configuration parameters as a dict, using camelCase, e.g.
+## {"sharedBuffers": "500MB"}
+## Alternatively, you can put your postgresql.conf under the files/ directory
+## ref: https://www.postgresql.org/docs/current/static/runtime-config.html
+##
+# postgresqlConfiguration:
+
+## PostgreSQL extended configuration
+## As above, but _appended_ to the main configuration
+## Alternatively, you can put your *.conf under the files/conf.d/ directory
+## https://github.com/bitnami/bitnami-docker-postgresql#allow-settings-to-be-loaded-from-files-other-than-the-default-postgresqlconf
+##
+# postgresqlExtendedConf:
+
+## Configure current cluster's primary server to be the standby server in other cluster.
+## This will allow cross cluster replication and provide cross cluster high availability.
+## You will need to configure pgHbaConfiguration if you want to enable this feature with local cluster replication enabled.
+##
+primaryAsStandBy:
+  enabled: false
+  #  primaryHost:
+  #  primaryPort:
+
+## PostgreSQL client authentication configuration
+## Specify content for pg_hba.conf
+## Default: do not create pg_hba.conf
+## Alternatively, you can put your pg_hba.conf under the files/ directory
+# pgHbaConfiguration: |-
+#   local all all trust
+#   host all all localhost trust
+#   host mydatabase mysuser 192.168.0.0/24 md5
+
+## ConfigMap with PostgreSQL configuration
+## NOTE: This will override postgresqlConfiguration and pgHbaConfiguration
+# configurationConfigMap:
+
+## ConfigMap with PostgreSQL extended configuration
+# extendedConfConfigMap:
+
+## initdb scripts
+## Specify dictionary of scripts to be run at first boot
+## Alternatively, you can put your scripts under the files/docker-entrypoint-initdb.d directory
+##
+# initdbScripts:
+#   my_init_script.sh: |
+#      #!/bin/sh
+#      echo "Do something."
+
+## ConfigMap with scripts to be run at first boot
+## NOTE: This will override initdbScripts
+# initdbScriptsConfigMap:
+
+## Secret with scripts to be run at first boot (in case it contains sensitive information)
+## NOTE: This can work along initdbScripts or initdbScriptsConfigMap
+# initdbScriptsSecret:
+
+## Specify the PostgreSQL username and password to execute the initdb scripts
+# initdbUser:
+# initdbPassword:
+
+## Audit settings
+## https://github.com/bitnami/bitnami-docker-postgresql#auditing
+##
+audit:
+  ## Log client hostnames
+  ##
+  logHostname: false
+  ## Log connections to the server
+  ##
+  logConnections: false
+  ## Log disconnections
+  ##
+  logDisconnections: false
+  ## Operation to audit using pgAudit (default if not set)
+  ##
+  pgAuditLog: ""
+  ## Log catalog using pgAudit
+  ##
+  pgAuditLogCatalog: "off"
+  ## Log level for clients
+  ##
+  clientMinMessages: error
+  ## Template for log line prefix (default if not set)
+  ##
+  logLinePrefix: ""
+  ## Log timezone
+  ##
+  logTimezone: ""
+
+## Shared preload libraries
+##
+postgresqlSharedPreloadLibraries: "pgaudit"
+
+## Maximum total connections
+##
+postgresqlMaxConnections:
+
+## Maximum connections for the postgres user
+##
+postgresqlPostgresConnectionLimit:
+
+## Maximum connections for the created user
+##
+postgresqlDbUserConnectionLimit:
+
+## TCP keepalives interval
+##
+postgresqlTcpKeepalivesInterval:
+
+## TCP keepalives idle
+##
+postgresqlTcpKeepalivesIdle:
+
+## TCP keepalives count
+##
+postgresqlTcpKeepalivesCount:
+
+## Statement timeout
+##
+postgresqlStatementTimeout:
+
+## Remove pg_hba.conf lines with the following comma-separated patterns
+## (cannot be used with custom pg_hba.conf)
+##
+postgresqlPghbaRemoveFilters:
+
+## Optional duration in seconds the pod needs to terminate gracefully.
+## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods
+##
+# terminationGracePeriodSeconds: 30
+
+## LDAP configuration
+##
+ldap:
+  enabled: false
+  url: ''
+  server: ''
+  port: ''
+  prefix: ''
+  suffix: ''
+  baseDN: ''
+  bindDN: ''
+  bind_password:
+  search_attr: ''
+  search_filter: ''
+  scheme: ''
+  tls: {}
+
+## PostgreSQL service configuration
+##
+service:
+  ## PosgresSQL service type
+  ##
+  type: ClusterIP
+  # clusterIP: None
+  port: 5432
+
+  ## Specify the nodePort value for the LoadBalancer and NodePort service types.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
+  ##
+  # nodePort:
+
+  ## Provide any additional annotations which may be required. Evaluated as a template.
+  ##
+  annotations: {}
+  ## Set the LoadBalancer service type to internal only.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
+  ##
+  # loadBalancerIP:
+  ## Load Balancer sources. Evaluated as a template.
+  ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service
+  ##
+  # loadBalancerSourceRanges:
+  # - 10.10.10.0/24
+
+## Start primary and read(s) pod(s) without limitations on shm memory.
+## By default docker and containerd (and possibly other container runtimes)
+## limit `/dev/shm` to `64M` (see e.g. the
+## [docker issue](https://github.com/docker-library/postgres/issues/416) and the
+## [containerd issue](https://github.com/containerd/containerd/issues/3654),
+## which could be not enough if PostgreSQL uses parallel workers heavily.
+##
+shmVolume:
+  ## Set `shmVolume.enabled` to `true` to mount a new tmpfs volume to remove
+  ## this limitation.
+  ##
+  enabled: true
+  ## Set to `true` to `chmod 777 /dev/shm` on a initContainer.
+  ## This option is ignored if `volumePermissions.enabled` is `false`
+  ##
+  chmod:
+    enabled: true
+
+## PostgreSQL data Persistent Volume Storage Class
+## If defined, storageClassName: <storageClass>
+## If set to "-", storageClassName: "", which disables dynamic provisioning
+## If undefined (the default) or set to null, no storageClassName spec is
+##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+##   GKE, AWS & OpenStack)
+##
+persistence:
+  enabled: true
+  ## A manually managed Persistent Volume and Claim
+  ## If defined, PVC must be created manually before volume will be bound
+  ## The value is evaluated as a template, so, for example, the name can depend on .Release or .Chart
+  ##
+  # existingClaim:
+
+  ## The path the volume will be mounted at, useful when using different
+  ## PostgreSQL images.
+  ##
+  mountPath: /bitnami/postgresql
+
+  ## The subdirectory of the volume to mount to, useful in dev environments
+  ## and one PV for multiple services.
+  ##
+  subPath: ''
+
+  # storageClass: "-"
+  accessModes:
+    - ReadWriteOnce
+  size: 8Gi
+  annotations: {}
+  ## selector can be used to match an existing PersistentVolume
+  ## selector:
+  ##   matchLabels:
+  ##     app: my-app
+  selector: {}
+
+## updateStrategy for PostgreSQL StatefulSet and its reads StatefulSets
+## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
+##
+updateStrategy:
+  type: RollingUpdate
+
+##
+## PostgreSQL Primary parameters
+##
+primary:
+  ## PostgreSQL Primary pod affinity preset
+  ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
+  ## Allowed values: soft, hard
+  ##
+  podAffinityPreset: ""
+
+  ## PostgreSQL Primary pod anti-affinity preset
+  ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
+  ## Allowed values: soft, hard
+  ##
+  podAntiAffinityPreset: soft
+
+  ## PostgreSQL Primary node affinity preset
+  ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity
+  ## Allowed values: soft, hard
+  ##
+  nodeAffinityPreset:
+    ## Node affinity type
+    ## Allowed values: soft, hard
+    type: ""
+    ## Node label key to match
+    ## E.g.
+    ## key: "kubernetes.io/e2e-az-name"
+    ##
+    key: ""
+    ## Node label values to match
+    ## E.g.
+    ## values:
+    ##   - e2e-az1
+    ##   - e2e-az2
+    ##
+    values: []
+
+  ## Affinity for PostgreSQL primary pods assignment
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ## Note: primary.podAffinityPreset, primary.podAntiAffinityPreset, and primary.nodeAffinityPreset will be ignored when it's set
+  ##
+  affinity: {}
+
+  ## Node labels for PostgreSQL primary pods assignment
+  ## ref: https://kubernetes.io/docs/user-guide/node-selection/
+  ##
+  nodeSelector: {}
+
+  ## Tolerations for PostgreSQL primary pods assignment
+  ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  ##
+  tolerations: []
+
+  labels: {}
+  annotations: {}
+  podLabels: {}
+  podAnnotations: {}
+  priorityClassName: ''
+  ## Extra init containers
+  ## Example
+  ##
+  ## extraInitContainers:
+  ##   - name: do-something
+  ##     image: busybox
+  ##     command: ['do', 'something']
+  ##
+  extraInitContainers: []
+
+  ## Additional PostgreSQL primary Volume mounts
+  ##
+  extraVolumeMounts: []
+  ## Additional PostgreSQL primary Volumes
+  ##
+  extraVolumes: []
+  ## Add sidecars to the pod
+  ##
+  ## For example:
+  ## sidecars:
+  ##   - name: your-image-name
+  ##     image: your-image
+  ##     imagePullPolicy: Always
+  ##     ports:
+  ##       - name: portname
+  ##         containerPort: 1234
+  ##
+  sidecars: []
+
+  ## Override the service configuration for primary
+  ##
+  service: {}
+  # type:
+  # nodePort:
+  # clusterIP:
+
+##
+## PostgreSQL read only replica parameters
+##
+readReplicas:
+  ## PostgreSQL read only pod affinity preset
+  ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
+  ## Allowed values: soft, hard
+  ##
+  podAffinityPreset: ""
+
+  ## PostgreSQL read only pod anti-affinity preset
+  ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
+  ## Allowed values: soft, hard
+  ##
+  podAntiAffinityPreset: soft
+
+  ## PostgreSQL read only node affinity preset
+  ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity
+  ## Allowed values: soft, hard
+  ##
+  nodeAffinityPreset:
+    ## Node affinity type
+    ## Allowed values: soft, hard
+    type: ""
+    ## Node label key to match
+    ## E.g.
+    ## key: "kubernetes.io/e2e-az-name"
+    ##
+    key: ""
+    ## Node label values to match
+    ## E.g.
+    ## values:
+    ##   - e2e-az1
+    ##   - e2e-az2
+    ##
+    values: []
+
+  ## Affinity for PostgreSQL read only pods assignment
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ## Note: readReplicas.podAffinityPreset, readReplicas.podAntiAffinityPreset, and readReplicas.nodeAffinityPreset will be ignored when it's set
+  ##
+  affinity: {}
+
+  ## Node labels for PostgreSQL read only  pods assignment
+  ## ref: https://kubernetes.io/docs/user-guide/node-selection/
+  ##
+  nodeSelector: {}
+
+  ## Tolerations for PostgreSQL read only  pods assignment
+  ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  ##
+  tolerations: []
+  labels: {}
+  annotations: {}
+  podLabels: {}
+  podAnnotations: {}
+  priorityClassName: ''
+
+  ## Extra init containers
+  ## Example
+  ##
+  ## extraInitContainers:
+  ##   - name: do-something
+  ##     image: busybox
+  ##     command: ['do', 'something']
+  ##
+  extraInitContainers: []
+
+  ## Additional PostgreSQL read replicas Volume mounts
+  ##
+  extraVolumeMounts: []
+
+  ## Additional PostgreSQL read replicas Volumes
+  ##
+  extraVolumes: []
+
+  ## Add sidecars to the pod
+  ##
+  ## For example:
+  ## sidecars:
+  ##   - name: your-image-name
+  ##     image: your-image
+  ##     imagePullPolicy: Always
+  ##     ports:
+  ##       - name: portname
+  ##         containerPort: 1234
+  ##
+  sidecars: []
+
+  ## Override the service configuration for read
+  ##
+  service: {}
+  # type:
+  # nodePort:
+  # clusterIP:
+
+  ## Whether to enable PostgreSQL read replicas data Persistent
+  ##
+  persistence:
+    enabled: true
+
+  # Override the resource configuration for read replicas
+  resources: {}
+  # requests:
+  #   memory: 256Mi
+  #   cpu: 250m
+
+## Configure resource requests and limits
+## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+##
+resources:
+  requests:
+    memory: 256Mi
+    cpu: 250m
+
+## Add annotations to all the deployed resources
+##
+commonAnnotations: {}
+
+networkPolicy:
+  ## Enable creation of NetworkPolicy resources. Only Ingress traffic is filtered for now.
+  ##
+  enabled: false
+
+  ## The Policy model to apply. When set to false, only pods with the correct
+  ## client label will have network access to the port PostgreSQL is listening
+  ## on. When true, PostgreSQL will accept connections from any source
+  ## (with the correct destination port).
+  ##
+  allowExternal: true
+
+  ## if explicitNamespacesSelector is missing or set to {}, only client Pods that are in the networkPolicy's namespace
+  ## and that match other criteria, the ones that have the good label, can reach the DB.
+  ## But sometimes, we want the DB to be accessible to clients from other namespaces, in this case, we can use this
+  ## LabelSelector to select these namespaces, note that the networkPolicy's namespace should also be explicitly added.
+  ##
+  ## Example:
+  ## explicitNamespacesSelector:
+  ##   matchLabels:
+  ##     role: frontend
+  ##   matchExpressions:
+  ##    - {key: role, operator: In, values: [frontend]}
+  ##
+  explicitNamespacesSelector: {}
+
+## Configure extra options for startup, liveness and readiness probes
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
+##
+startupProbe:
+  enabled: false
+  initialDelaySeconds: 30
+  periodSeconds: 15
+  timeoutSeconds: 5
+  failureThreshold: 10
+  successThreshold: 1
+
+livenessProbe:
+  enabled: true
+  initialDelaySeconds: 30
+  periodSeconds: 10
+  timeoutSeconds: 5
+  failureThreshold: 6
+  successThreshold: 1
+
+readinessProbe:
+  enabled: true
+  initialDelaySeconds: 5
+  periodSeconds: 10
+  timeoutSeconds: 5
+  failureThreshold: 6
+  successThreshold: 1
+
+## Custom Startup probe
+##
+customStartupProbe: {}
+
+## Custom Liveness probe
+##
+customLivenessProbe: {}
+
+## Custom Rediness probe
+##
+customReadinessProbe: {}
+
+##
+## TLS configuration
+##
+tls:
+  # Enable TLS traffic
+  enabled: false
+  #
+  # Whether to use the server's TLS cipher preferences rather than the client's.
+  preferServerCiphers: true
+  #
+  # Name of the Secret that contains the certificates
+  certificatesSecret: ''
+  #
+  # Certificate filename
+  certFilename: ''
+  #
+  # Certificate Key filename
+  certKeyFilename: ''
+  #
+  # CA Certificate filename
+  # If provided, PostgreSQL will authenticate TLS/SSL clients by requesting them a certificate
+  # ref: https://www.postgresql.org/docs/9.6/auth-methods.html
+  certCAFilename:
+  #
+  # File containing a Certificate Revocation List
+  crlFilename:
+
+## Configure metrics exporter
+##
+metrics:
+  enabled: false
+  # resources: {}
+  service:
+    type: ClusterIP
+    annotations:
+      prometheus.io/scrape: 'true'
+      prometheus.io/port: '9187'
+    loadBalancerIP:
+  serviceMonitor:
+    enabled: false
+    additionalLabels: {}
+    # namespace: monitoring
+    # interval: 30s
+    # scrapeTimeout: 10s
+  ## Custom PrometheusRule to be defined
+  ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
+  ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions
+  ##
+  prometheusRule:
+    enabled: false
+    additionalLabels: {}
+    namespace: ''
+    ## These are just examples rules, please adapt them to your needs.
+    ## Make sure to constraint the rules to the current postgresql service.
+    ## rules:
+    ##   - alert: HugeReplicationLag
+    ##     expr: pg_replication_lag{service="{{ template "common.names.fullname" . }}-metrics"} / 3600 > 1
+    ##     for: 1m
+    ##     labels:
+    ##       severity: critical
+    ##     annotations:
+    ##       description: replication for {{ template "common.names.fullname" . }} PostgreSQL is lagging by {{ "{{ $value }}" }} hour(s).
+    ##       summary: PostgreSQL replication is lagging by {{ "{{ $value }}" }} hour(s).
+    ##
+    rules: []
+
+  image:
+    registry: docker.io
+    repository: bitnami/postgres-exporter
+    tag: 0.9.0-debian-10-r43
+    pullPolicy: IfNotPresent
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+  ## Define additional custom metrics
+  ## ref: https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file
+  # customMetrics:
+  #   pg_database:
+  #     query: "SELECT d.datname AS name, CASE WHEN pg_catalog.has_database_privilege(d.datname, 'CONNECT') THEN pg_catalog.pg_database_size(d.datname) ELSE 0 END AS size_bytes FROM pg_catalog.pg_database d where datname not in ('template0', 'template1', 'postgres')"
+  #     metrics:
+  #       - name:
+  #           usage: "LABEL"
+  #           description: "Name of the database"
+  #       - size_bytes:
+  #           usage: "GAUGE"
+  #           description: "Size of the database in bytes"
+  #
+  ## An array to add extra env vars to configure postgres-exporter
+  ## see: https://github.com/wrouesnel/postgres_exporter#environment-variables
+  ## For example:
+  #  extraEnvVars:
+  #  - name: PG_EXPORTER_DISABLE_DEFAULT_METRICS
+  #    value: "true"
+  extraEnvVars: {}
+
+  ## Pod Security Context
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+  ##
+  securityContext:
+    enabled: false
+    runAsUser: 1001
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
+  ## Configure extra options for liveness and readiness probes
+  ##
+  livenessProbe:
+    enabled: true
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 6
+    successThreshold: 1
+
+  readinessProbe:
+    enabled: true
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 6
+    successThreshold: 1
+
+## Array with extra yaml to deploy with the chart. Evaluated as a template
+##
+extraDeploy: []
diff --git a/charts/jfrog/artifactory-ha/107.98.14/ci/access-tls-values.yaml b/charts/jfrog/artifactory-ha/107.98.14/ci/access-tls-values.yaml
new file mode 100644
index 000000000..27e24d346
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/ci/access-tls-values.yaml
@@ -0,0 +1,34 @@
+databaseUpgradeReady: true
+artifactory:
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  persistence:
+    enabled: false
+  primary:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+  node:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "4g"
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+access:
+  accessConfig:
+    security:
+      tls: true
+  resetAccessCAKeys: true
diff --git a/charts/jfrog/artifactory-ha/107.98.14/ci/default-values.yaml b/charts/jfrog/artifactory-ha/107.98.14/ci/default-values.yaml
new file mode 100644
index 000000000..020f52335
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/ci/default-values.yaml
@@ -0,0 +1,32 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+databaseUpgradeReady: true
+## This is an exception here because HA needs masterKey to connect with other node members and it is commented in values to support 6.x to 7.x Migration
+## Please refer https://github.com/jfrog/charts/blob/master/stable/artifactory-ha/README.md#special-upgrade-notes-1
+artifactory:
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  persistence:
+    enabled: false
+  primary:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+    javaOpts:
+      xms: "4g"
+      xmx: "4g"
+  node:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
diff --git a/charts/jfrog/artifactory-ha/107.98.14/ci/global-values.yaml b/charts/jfrog/artifactory-ha/107.98.14/ci/global-values.yaml
new file mode 100644
index 000000000..0987e17ca
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/ci/global-values.yaml
@@ -0,0 +1,255 @@
+databaseUpgradeReady: true
+artifactory:
+  persistence:
+    enabled: false
+  primary:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+    javaOpts:
+      xms: "4g"
+      xmx: "4g"
+  node:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+  customInitContainersBegin: |
+   - name: "custom-init-begin-local"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     command:
+       - 'sh'
+       - '-c'
+       - echo "running in local"
+     volumeMounts:
+       - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+         name: volume
+  customInitContainers: |
+   - name: "custom-init-local"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     command:
+       - 'sh'
+       - '-c'
+       - echo "running in local"
+     volumeMounts:
+       - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+         name: volume
+  # Add custom volumes
+  customVolumes: |
+   - name: custom-script-local
+     emptyDir:
+       sizeLimit: 100Mi
+  # Add custom volumesMounts
+  customVolumeMounts: |
+   - name: custom-script-local
+     mountPath: "/scriptslocal"
+  # Add custom sidecar containers
+  customSidecarContainers: |
+   - name: "sidecar-list-local"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     securityContext:
+       allowPrivilegeEscalation: false
+       capabilities:
+         drop:
+           - NET_RAW
+     command: ["sh","-c","echo 'Sidecar is running in local' >> /scriptslocal/sidecarlocal.txt; cat /scriptslocal/sidecarlocal.txt; while true; do sleep 30; done"]
+     volumeMounts:
+       - mountPath: "/scriptslocal"
+         name: custom-script-local
+     resources:
+       requests:
+         memory: "32Mi"
+         cpu: "50m"
+       limits:
+         memory: "128Mi"
+         cpu: "100m"
+
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+global:
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+  customInitContainersBegin: |
+   - name: "custom-init-begin-global"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     command:
+       - 'sh'
+       - '-c'
+       - echo "running in global"
+     volumeMounts:
+       - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+         name: volume
+  customInitContainers: |
+   - name: "custom-init-global"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     command:
+       - 'sh'
+       - '-c'
+       - echo "running in global"
+     volumeMounts:
+       - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+         name: volume
+  # Add custom volumes
+  customVolumes: |
+   - name: custom-script-global
+     emptyDir:
+       sizeLimit: 100Mi
+  # Add custom volumesMounts
+  customVolumeMounts: |
+   - name: custom-script-global
+     mountPath: "/scripts"
+  # Add custom sidecar containers
+  customSidecarContainers: |
+   - name: "sidecar-list-global"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     securityContext:
+       allowPrivilegeEscalation: false
+       capabilities:
+         drop:
+           - NET_RAW
+     command: ["sh","-c","echo 'Sidecar is running in global' >> /scripts/sidecarglobal.txt; cat /scripts/sidecarglobal.txt; while true; do sleep 30; done"]
+     volumeMounts:
+       - mountPath: "/scripts"
+         name: custom-script-global
+     resources:
+       requests:
+         memory: "32Mi"
+         cpu: "50m"
+       limits:
+         memory: "128Mi"
+         cpu: "100m"
+
+nginx:
+  customInitContainers: |
+   - name: "custom-init-begin-nginx"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     command:
+       - 'sh'
+       - '-c'
+       - echo "running in nginx"
+     volumeMounts:
+       - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+         name: custom-script-local
+  customSidecarContainers: |
+   - name: "sidecar-list-nginx"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     securityContext:
+       allowPrivilegeEscalation: false
+       capabilities:
+         drop:
+           - NET_RAW
+     command: ["sh","-c","echo 'Sidecar is running in local' >> /scriptslocal/sidecarlocal.txt; cat /scriptslocal/sidecarlocal.txt; while true; do sleep 30; done"]
+     volumeMounts:
+       - mountPath: "/scriptslocal"
+         name: custom-script-local
+     resources:
+       requests:
+         memory: "32Mi"
+         cpu: "50m"
+       limits:
+         memory: "128Mi"
+         cpu: "100m"
+  # Add custom volumes
+  customVolumes: |
+   - name: custom-script-local
+     emptyDir:
+       sizeLimit: 100Mi
+
+  artifactoryConf: |
+    {{- if .Values.nginx.https.enabled }}
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+    ssl_certificate  {{ .Values.nginx.persistence.mountPath }}/ssl/tls.crt;
+    ssl_certificate_key  {{ .Values.nginx.persistence.mountPath }}/ssl/tls.key;
+    ssl_session_cache shared:SSL:1m;
+    ssl_prefer_server_ciphers   on;
+    {{- end }}
+    ## server configuration
+    server {
+      listen 8088;
+      {{- if .Values.nginx.internalPortHttps }}
+      listen {{ .Values.nginx.internalPortHttps }} ssl;
+      {{- else -}}
+      {{- if .Values.nginx.https.enabled }}
+      listen {{ .Values.nginx.https.internalPort }} ssl;
+      {{- end }}
+      {{- end }}
+      {{- if .Values.nginx.internalPortHttp }}
+      listen {{ .Values.nginx.internalPortHttp }};
+      {{- else -}}
+      {{- if .Values.nginx.http.enabled }}
+      listen {{ .Values.nginx.http.internalPort }};
+      {{- end }}
+      {{- end }}
+      server_name ~(?<repo>.+)\.{{ include "artifactory-ha.fullname" . }} {{ include "artifactory-ha.fullname" . }}
+      {{- range .Values.ingress.hosts -}}
+        {{- if contains "." . -}}
+          {{ "" | indent 0 }} ~(?<repo>.+)\.{{ . }}
+        {{- end -}}
+      {{- end -}};
+      if ($http_x_forwarded_proto = '') {
+        set $http_x_forwarded_proto  $scheme;
+      }
+      ## Application specific logs
+      ## access_log /var/log/nginx/artifactory-access.log timing;
+      ## error_log /var/log/nginx/artifactory-error.log;
+      rewrite ^/artifactory/?$ / redirect;
+      if ( $repo != "" ) {
+        rewrite ^/(v1|v2)/(.*) /artifactory/api/docker/$repo/$1/$2 break;
+      }
+      chunked_transfer_encoding on;
+      client_max_body_size 0;
+
+      location / {
+        proxy_read_timeout  900;
+        proxy_pass_header   Server;
+        proxy_cookie_path   ~*^/.* /;
+        proxy_pass          {{ include "artifactory-ha.scheme" . }}://{{ include "artifactory-ha.fullname" . }}:{{ .Values.artifactory.externalPort }}/;
+        {{- if .Values.nginx.service.ssloffload}}
+        proxy_set_header    X-JFrog-Override-Base-Url $http_x_forwarded_proto://$host;
+        {{- else }}
+        proxy_set_header    X-JFrog-Override-Base-Url $http_x_forwarded_proto://$host:$server_port;
+        proxy_set_header    X-Forwarded-Port  $server_port;
+        {{- end }}
+        proxy_set_header    X-Forwarded-Proto $http_x_forwarded_proto;
+        proxy_set_header    Host              $http_host;
+        proxy_set_header    X-Forwarded-For   $proxy_add_x_forwarded_for;
+        add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
+
+        location /artifactory/ {
+          if ( $request_uri ~ ^/artifactory/(.*)$ ) {
+            proxy_pass       {{ include "artifactory-ha.scheme" . }}://{{ include "artifactory-ha.fullname" . }}:{{ .Values.artifactory.externalArtifactoryPort }}/artifactory/$1;
+          }
+          proxy_pass          {{ include "artifactory-ha.scheme" . }}://{{ include "artifactory-ha.fullname" . }}:{{ .Values.artifactory.externalArtifactoryPort }}/artifactory/;
+        }
+      }
+    }
+
+  ## A list of custom ports to expose on the NGINX pod. Follows the conventional Kubernetes yaml syntax for container ports.
+  customPorts:
+  - containerPort: 8088
+    name: http2
+  service:
+    ## A list of custom ports to expose through the Ingress controller service. Follows the conventional Kubernetes yaml syntax for service ports.
+    customPorts:
+    - port: 8088
+      targetPort: 8088
+      protocol: TCP
+      name: http2
diff --git a/charts/jfrog/artifactory-ha/107.98.14/ci/large-values.yaml b/charts/jfrog/artifactory-ha/107.98.14/ci/large-values.yaml
new file mode 100644
index 000000000..153307aa2
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/ci/large-values.yaml
@@ -0,0 +1,85 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+databaseUpgradeReady: true
+
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  persistence:
+    enabled: false
+  database:
+    maxOpenConnections: 150
+  tomcat:
+    connector:
+      maxThreads: 300
+  primary:
+    replicaCount: 4
+    resources:
+      requests:
+        memory: "6Gi"
+        cpu: "2"
+      limits:
+        memory: "10Gi"
+        cpu: "8"
+    javaOpts:
+      xms: "8g"
+      xmx: "10g"
+access:
+  database:
+    maxOpenConnections: 150
+  tomcat:
+    connector:
+      maxThreads: 100
+router:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+frontend:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+metadata:
+  database:
+    maxOpenConnections: 150
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+event:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+jfconnect:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+observability:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
diff --git a/charts/jfrog/artifactory-ha/107.98.14/ci/loggers-values.yaml b/charts/jfrog/artifactory-ha/107.98.14/ci/loggers-values.yaml
new file mode 100644
index 000000000..03c94be95
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/ci/loggers-values.yaml
@@ -0,0 +1,43 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+databaseUpgradeReady: true
+
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  persistence:
+    enabled: false
+  resources:
+    requests:
+      memory: "4Gi"
+      cpu: "2"
+    limits:
+      memory: "6Gi"
+      cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "4g"
+
+  loggers:
+  - access-audit.log
+  - access-request.log
+  - access-security-audit.log
+  - access-service.log
+  - artifactory-access.log
+  - artifactory-event.log
+  - artifactory-import-export.log
+  - artifactory-request.log
+  - artifactory-service.log
+  - frontend-request.log
+  - frontend-service.log
+  - metadata-request.log
+  - metadata-service.log
+  - router-request.log
+  - router-service.log
+  - router-traefik.log
+
+  catalinaLoggers:
+  - tomcat-catalina.log
+  - tomcat-localhost.log
diff --git a/charts/jfrog/artifactory-ha/107.98.14/ci/medium-values.yaml b/charts/jfrog/artifactory-ha/107.98.14/ci/medium-values.yaml
new file mode 100644
index 000000000..115e7d460
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/ci/medium-values.yaml
@@ -0,0 +1,85 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+databaseUpgradeReady: true
+
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  persistence:
+    enabled: false
+  database:
+    maxOpenConnections: 100
+  tomcat:
+    connector:
+      maxThreads: 200
+  primary:
+    replicaCount: 3
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "8Gi"
+        cpu: "6"
+    javaOpts:
+      xms: "6g"
+      xmx: "8g"
+access:
+  database:
+    maxOpenConnections: 100
+  tomcat:
+    connector:
+      maxThreads: 50
+router:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+frontend:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+metadata:
+  database:
+    maxOpenConnections: 100
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+event:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+jfconnect:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+observability:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
diff --git a/charts/jfrog/artifactory-ha/107.98.14/ci/migration-disabled-values.yaml b/charts/jfrog/artifactory-ha/107.98.14/ci/migration-disabled-values.yaml
new file mode 100644
index 000000000..44895a373
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/ci/migration-disabled-values.yaml
@@ -0,0 +1,31 @@
+databaseUpgradeReady: true
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  migration:
+    enabled: false
+  persistence:
+    enabled: false
+  primary:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+    javaOpts:
+      xms: "4g"
+      xmx: "4g"
+  node:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
diff --git a/charts/jfrog/artifactory-ha/107.98.14/ci/nginx-autoreload-values.yaml b/charts/jfrog/artifactory-ha/107.98.14/ci/nginx-autoreload-values.yaml
new file mode 100644
index 000000000..a6f4e8001
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/ci/nginx-autoreload-values.yaml
@@ -0,0 +1,53 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+databaseUpgradeReady: true
+## This is an exception here because HA needs masterKey to connect with other node members and it is commented in values to support 6.x to 7.x Migration
+## Please refer https://github.com/jfrog/charts/blob/master/stable/artifactory-ha/README.md#special-upgrade-notes-1
+artifactory:
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  persistence:
+    enabled: false
+  primary:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+    javaOpts:
+      xms: "4g"
+      xmx: "4g"
+  node:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+
+nginx:
+  customVolumes: |
+    - name: scripts
+      configMap:
+        name: {{ template "artifactory-ha.fullname" . }}-nginx-scripts
+        defaultMode: 0550
+  customVolumeMounts: |
+    - name: scripts
+      mountPath: /var/opt/jfrog/nginx/scripts/
+  customCommand:
+    - /bin/sh
+    - -c
+    - |
+      # watch for configmap changes
+      /sbin/inotifyd /var/opt/jfrog/nginx/scripts/configreloader.sh {{ .Values.nginx.persistence.mountPath -}}/conf.d:n &
+      {{ if .Values.nginx.https.enabled -}}
+      # watch for tls secret changes
+      /sbin/inotifyd /var/opt/jfrog/nginx/scripts/configreloader.sh {{ .Values.nginx.persistence.mountPath -}}/ssl:n &
+      {{ end -}}
+      nginx -g 'daemon off;'
diff --git a/charts/jfrog/artifactory-ha/107.98.14/ci/rtsplit-access-tls-values.yaml b/charts/jfrog/artifactory-ha/107.98.14/ci/rtsplit-access-tls-values.yaml
new file mode 100644
index 000000000..6f3b13cb1
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/ci/rtsplit-access-tls-values.yaml
@@ -0,0 +1,106 @@
+databaseUpgradeReady: true
+artifactory:
+  replicaCount: 3
+  joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  persistence:
+    enabled: false
+  primary:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+  node:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "4g"
+
+access:
+  accessConfig:
+    security:
+      tls: true
+  resetAccessCAKeys: true
+
+postgresql:
+  postgresqlPassword: password
+  postgresqlExtendedConf:
+    maxConnections: 102
+  persistence:
+    enabled: false
+
+rbac:
+  create: true
+serviceAccount:
+  create: true
+  automountServiceAccountToken: true
+
+ingress:
+  enabled: true
+  className: "testclass"
+  hosts:
+    - demonow.xyz
+nginx:
+  enabled: false
+jfconnect:
+  enabled: true
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+mc:
+  enabled: true
+splitServicesToContainers: true
+
+router:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+frontend:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+metadata:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+event:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+observability:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
diff --git a/charts/jfrog/artifactory-ha/107.98.14/ci/rtsplit-values.yaml b/charts/jfrog/artifactory-ha/107.98.14/ci/rtsplit-values.yaml
new file mode 100644
index 000000000..87832a505
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/ci/rtsplit-values.yaml
@@ -0,0 +1,155 @@
+databaseUpgradeReady: true
+artifactory:
+  replicaCount: 3
+  joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  persistence:
+    enabled: false
+  primary:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+    javaOpts:
+      xms: "4g"
+      xmx: "4g"
+  node:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+
+  # Add lifecycle hooks for artifactory container
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the artifactory postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the artifactory postStart handler >> /tmp/message"]
+
+postgresql:
+  postgresqlPassword: password
+  postgresqlExtendedConf:
+    maxConnections: 102
+  persistence:
+    enabled: false
+
+rbac:
+  create: true
+serviceAccount:
+  create: true
+  automountServiceAccountToken: true
+
+ingress:
+  enabled: true
+  className: "testclass"
+  hosts:
+    - demonow.xyz
+nginx:
+  enabled: false
+jfconnect:
+  enabled: true
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+  # Add lifecycle hooks for jfconect container
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the jfconnect postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the jfconnect postStart handler >> /tmp/message"]
+
+mc:
+  enabled: true
+splitServicesToContainers: true
+
+router:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+  # Add lifecycle hooks for router container
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the router postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the router postStart handler >> /tmp/message"]
+frontend:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+  # Add lifecycle hooks for frontend container
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the frontend postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the frontend postStart handler >> /tmp/message"]
+metadata:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the metadata postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the metadata postStart handler >> /tmp/message"]
+event:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the event postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the event postStart handler >> /tmp/message"]
+observability:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the observability postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the observability postStart handler >> /tmp/message"]
diff --git a/charts/jfrog/artifactory-ha/107.98.14/ci/small-values.yaml b/charts/jfrog/artifactory-ha/107.98.14/ci/small-values.yaml
new file mode 100644
index 000000000..b4557289e
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/ci/small-values.yaml
@@ -0,0 +1,87 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+databaseUpgradeReady: true
+
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  persistence:
+    enabled: false
+  database:
+    maxOpenConnections: 80
+  tomcat:
+    connector:
+      maxThreads: 200
+  primary:
+    replicaCount: 1
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+    javaOpts:
+      xms: "4g"
+      xmx: "6g"
+  node:
+    replicaCount: 2
+access:
+  database:
+    maxOpenConnections: 80
+  tomcat:
+    connector:
+      maxThreads: 50
+router:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+frontend:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+metadata:
+  database:
+    maxOpenConnections: 80
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+event:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+jfconnect:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+observability:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
diff --git a/charts/jfrog/artifactory-ha/107.98.14/ci/test-values.yaml b/charts/jfrog/artifactory-ha/107.98.14/ci/test-values.yaml
new file mode 100644
index 000000000..8bbbb5b3e
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/ci/test-values.yaml
@@ -0,0 +1,85 @@
+databaseUpgradeReady: true
+artifactory:
+  metrics:
+    enabled: true
+  podSecurityContext:
+    fsGroupChangePolicy: "OnRootMismatch"
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  unifiedSecretInstallation: false
+  persistence:
+    enabled: false
+  primary:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+    javaOpts:
+      xms: "4g"
+      xmx: "4g"
+  node:
+    resources:
+      requests:
+        memory: "4Gi"
+        cpu: "2"
+      limits:
+        memory: "6Gi"
+        cpu: "4"
+  statefulset:
+    annotations:
+      artifactory: test
+
+postgresql:
+  postgresqlPassword: "password"
+  postgresqlExtendedConf:
+    maxConnections: "102"
+  persistence:
+    enabled: false
+rbac:
+  create: true
+serviceAccount:
+  create: true
+  automountServiceAccountToken: true
+ingress:
+  enabled: true
+  className: "testclass"
+  hosts:
+    - demonow.xyz
+nginx:
+  enabled: false
+
+jfconnect:
+  enabled: false
+
+## filebeat sidecar
+filebeat:
+  enabled: true
+  filebeatYml: |
+    logging.level: info
+    path.data: {{ .Values.artifactory.persistence.mountPath }}/log/filebeat
+    name: artifactory-filebeat
+    queue.spool:
+      file:
+        permissions: 0760
+    filebeat.inputs:
+    - type: log
+      enabled: true
+      close_eof: ${CLOSE:false}
+      paths:
+         - {{ .Values.artifactory.persistence.mountPath }}/log/*.log
+      fields:
+        service: "jfrt"
+        log_type: "artifactory"
+    output.file:
+      path: "/tmp/filebeat"
+      filename: filebeat
+  readinessProbe:
+    exec:
+      command:
+        - sh
+        - -c
+        - |
+          #!/usr/bin/env bash -e
+          curl --fail 127.0.0.1:5066
diff --git a/charts/jfrog/artifactory-ha/107.98.14/files/binarystore.xml b/charts/jfrog/artifactory-ha/107.98.14/files/binarystore.xml
new file mode 100644
index 000000000..d807bf2e4
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/files/binarystore.xml
@@ -0,0 +1,442 @@
+{{- if and (eq .Values.artifactory.persistence.type "nfs") (.Values.artifactory.haDataDir.enabled) }}
+<!--
+## Important!
+## Artifactory Node haDataDir (artifactory.node.haDataDir) is configured as part of the system.yaml.
+## The Artifactory Filestore is shared among all nodes and located according to the 'haDataDir' value.
+-->
+<config version="2">
+<chain> <!--template="file-system"-->
+    <provider id="file-system" type="file-system"/>
+</chain>
+</config>
+
+{{- end }}
+{{- if and (eq .Values.artifactory.persistence.type "nfs") (not .Values.artifactory.haDataDir.enabled) }}
+<config version="2">
+    {{- if  (.Values.artifactory.persistence.maxCacheSize) }}
+    <chain> <!--template="file-system"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="file-system" type="file-system"/>
+        </provider>
+    </chain>
+    {{- else }}
+    <chain> <!--template="file-system"-->
+            <provider id="file-system" type="file-system"/>
+    </chain>
+    {{- end }}
+
+    {{- if .Values.artifactory.persistence.maxCacheSize }}
+    <provider id="cache-fs" type="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+    {{- end }}
+
+    <provider id="file-system" type="file-system">
+        <fileStoreDir>{{ .Values.artifactory.persistence.nfs.dataDir }}/filestore</fileStoreDir>
+    </provider>
+</config>
+
+{{- end }}
+
+{{- if eq .Values.artifactory.persistence.type "file-system" }}
+<!-- File system replication -->
+{{- if .Values.artifactory.persistence.fileSystem.existingSharedClaim.enabled }}
+<!-- File Storage - Dynamic for Artifactory files, pre-created for DATA and BACKUP -->
+<config version="4">
+    <chain>
+        <provider id="cache-fs" type="cache-fs">                   <!-- This is a cached filestore -->
+            <provider id="sharding" type="sharding">                   <!-- This is a sharding provider -->
+                {{- range $sharedClaimNumber, $e := until (.Values.artifactory.persistence.fileSystem.existingSharedClaim.numberOfExistingClaims|int) -}}
+                <sub-provider id="shard{{ $sharedClaimNumber }}" type="state-aware"/>
+                {{- end }}
+            </provider>
+        </provider>
+    </chain>
+
+    <provider id="cache-fs" type="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+
+    // Specify the read and write strategy and redundancy for the sharding binary provider
+    <provider id="sharding" type="sharding">
+        <readBehavior>roundRobin</readBehavior>
+        <writeBehavior>percentageFreeSpace</writeBehavior>
+        <redundancy>2</redundancy>
+    </provider>
+
+    {{- range $sharedClaimNumber, $e := until (.Values.artifactory.persistence.fileSystem.existingSharedClaim.numberOfExistingClaims|int) -}}
+    //For each sub-provider (mount), specify the filestore location
+    <provider id="shard{{ $sharedClaimNumber }}" type="state-aware">
+        <fileStoreDir>filestore{{ $sharedClaimNumber }}</fileStoreDir>
+    </provider>
+    {{- end }}
+</config>
+{{- else }}
+<config version="2">
+    <chain>
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="sharding-cluster" type="sharding-cluster">
+                <readBehavior>crossNetworkStrategy</readBehavior>
+                <writeBehavior>crossNetworkStrategy</writeBehavior>
+                <redundancy>{{ .Values.artifactory.persistence.redundancy }}</redundancy>
+                <lenientLimit>2</lenientLimit>
+                <minSpareUploaderExecutor>2</minSpareUploaderExecutor>
+                <sub-provider id="state-aware" type="state-aware"/>
+                <dynamic-provider id="remote" type="remote"/>
+                <property name="zones" value="local,remote"/>
+            </provider>
+        </provider>
+    </chain>
+
+    <provider id="cache-fs" type="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+
+    <!-- Shards add local file-system provider configuration -->
+    <provider id="state-aware" type="state-aware">
+        <fileStoreDir>shard-fs-1</fileStoreDir>
+        <zone>local</zone>
+    </provider>
+
+    <!-- Shards dynamic remote provider configuration -->
+    <provider id="remote" type="remote">
+        <checkPeriod>30</checkPeriod>
+        <serviceId>tester-remote1</serviceId>
+        <timeout>10000</timeout>
+        <zone>remote</zone>
+        <property name="header.remote.block" value="true"/>
+    </provider>
+</config>
+{{- end }}
+{{- end }}
+{{- if or (eq .Values.artifactory.persistence.type "google-storage") (eq .Values.artifactory.persistence.type "google-storage-v2") (eq .Values.artifactory.persistence.type "google-storage-v2-direct") }}
+<!-- Google storage -->
+<config version="2">
+    {{- if or (eq .Values.artifactory.persistence.type "google-storage") (eq .Values.artifactory.persistence.type "google-storage-v2") }}
+    <chain>
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="sharding-cluster" type="sharding-cluster">
+                <readBehavior>crossNetworkStrategy</readBehavior>
+                <writeBehavior>crossNetworkStrategy</writeBehavior>
+                <redundancy>{{ .Values.artifactory.persistence.redundancy }}</redundancy>
+                <minSpareUploaderExecutor>2</minSpareUploaderExecutor>
+                <sub-provider id="eventual-cluster" type="eventual-cluster">
+                    <provider id="retry" type="retry">
+                        <provider id="google-storage-v2" type="google-storage-v2"/>
+                    </provider>
+                </sub-provider>
+                <dynamic-provider id="remote" type="remote"/>
+                <property name="zones" value="local,remote"/>
+            </provider>
+        </provider>
+    </chain>
+    {{- else if eq .Values.artifactory.persistence.type "google-storage-v2-direct" }}
+    <chain>  <!--template="google-storage-v2-direct"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="google-storage-v2" type="google-storage-v2"/>
+        </provider>
+    </chain>
+    {{- end }}
+
+    <!-- Set max cache-fs size -->
+    <provider id="cache-fs" type="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+
+    {{- if or (eq .Values.artifactory.persistence.type "google-storage") (eq .Values.artifactory.persistence.type "google-storage-v2") }}
+    <provider id="eventual-cluster" type="eventual-cluster">
+        <zone>local</zone>
+    </provider>
+
+
+    <provider id="remote" type="remote">
+        <checkPeriod>30</checkPeriod>
+        <timeout>10000</timeout>
+        <zone>remote</zone>
+    </provider>
+    {{- end }}
+
+
+    <provider id="google-storage-v2" type="google-storage-v2">
+        {{- if .Values.artifactory.persistence.googleStorage.useInstanceCredentials }}
+        <useInstanceCredentials>true</useInstanceCredentials>
+        {{- else }}
+        <useInstanceCredentials>false</useInstanceCredentials>
+        {{- end }}
+        <enableSignedUrlRedirect>{{ .Values.artifactory.persistence.googleStorage.enableSignedUrlRedirect }}</enableSignedUrlRedirect>
+        <providerId>google-cloud-storage</providerId>
+        <endpoint>{{ .Values.artifactory.persistence.googleStorage.endpoint }}</endpoint>
+        <httpsOnly>{{ .Values.artifactory.persistence.googleStorage.httpsOnly }}</httpsOnly>
+        <bucketName>{{ .Values.artifactory.persistence.googleStorage.bucketName }}</bucketName>
+        <path>{{ .Values.artifactory.persistence.googleStorage.path }}</path>
+        <bucketExists>{{ .Values.artifactory.persistence.googleStorage.bucketExists }}</bucketExists>
+        {{- if .Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds }}
+        <signedUrlExpirySeconds>{{ .Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds | int64 }}</signedUrlExpirySeconds>
+        {{- end }}
+    </provider>
+</config>
+{{- end }}
+{{- if or (eq .Values.artifactory.persistence.type "aws-s3-v3") (eq .Values.artifactory.persistence.type "s3-storage-v3-direct") (eq .Values.artifactory.persistence.type "s3-storage-v3-archive") }}
+<!-- AWS S3 V3 -->
+<config version="2">
+    {{- if eq .Values.artifactory.persistence.type "aws-s3-v3" }}
+    <chain> <!--template="cluster-s3-storage-v3"-->
+        <provider id="cache-fs-eventual-s3" type="cache-fs">
+            <provider id="sharding-cluster-eventual-s3" type="sharding-cluster">
+                <sub-provider id="eventual-cluster-s3" type="eventual-cluster">
+                    <provider id="retry-s3" type="retry">
+                        <provider id="s3-storage-v3" type="s3-storage-v3"/>
+                    </provider>
+                </sub-provider>
+                <dynamic-provider id="remote-s3" type="remote"/>
+            </provider>
+        </provider>
+    </chain>
+    {{- else if eq .Values.artifactory.persistence.type "s3-storage-v3-direct" }}
+    <chain> <!--template="s3-storage-v3-direct"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="s3-storage-v3" type="s3-storage-v3"/>
+        </provider>
+    </chain>
+    {{- else if eq .Values.artifactory.persistence.type "s3-storage-v3-archive" }}
+    <!-- s3-storage-v3 default chain based on AWS S3 client for archive purposes-->
+    <chain>   <!--template="s3-storage-v3-archive"-->
+        <provider id="s3-storage-v3-archive" type="s3-storage-v3-archive">
+            <provider id="s3-storage-v3" type="s3-storage-v3"/>
+        </provider>
+    </chain>
+    {{- end }}
+
+    {{- if eq .Values.artifactory.persistence.type "aws-s3-v3" }}
+    <provider id="sharding-cluster-eventual-s3" type="sharding-cluster">
+        <readBehavior>crossNetworkStrategy</readBehavior>
+        <writeBehavior>crossNetworkStrategy</writeBehavior>
+        <redundancy>{{ .Values.artifactory.persistence.redundancy }}</redundancy>
+        <property name="zones" value="local,remote"/>
+    </provider>
+
+    <provider id="remote-s3" type="remote">
+        <zone>remote</zone>
+    </provider>
+
+    <provider id="eventual-cluster-s3" type="eventual-cluster">
+        <zone>local</zone>
+    </provider>
+
+    <!-- Set max cache-fs size -->
+    <provider id="cache-fs-eventual-s3" type="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+    {{- end }}
+
+    {{- if eq .Values.artifactory.persistence.type "s3-storage-v3-direct" }}
+    <!-- Set max cache-fs size -->
+    <provider id="cache-fs" type="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+    {{- end }}
+
+    {{- with .Values.artifactory.persistence.awsS3V3 }}
+    <provider id="s3-storage-v3" type="s3-storage-v3">
+        <testConnection>{{ .testConnection }}</testConnection>
+        {{- if .identity }}
+        <identity>{{ .identity }}</identity>
+        {{- end }}
+        {{- if .credential }}
+        <credential>{{ .credential }}</credential>
+        {{- end }}
+        <region>{{ .region }}</region>
+        <bucketName>{{ .bucketName }}</bucketName>
+        <path>{{ .path }}</path>
+        <endpoint>{{ .endpoint }}</endpoint>
+        {{- with .port }}
+        <port>{{ . }}</port>
+        {{- end }}
+        {{- with .useHttp }}
+        <useHttp>{{ . }}</useHttp>
+        {{- end }}
+        {{- with .maxConnections }}
+        <maxConnections>{{ . }}</maxConnections>
+        {{- end }}
+        {{- with .connectionTimeout }}
+        <connectionTimeout>{{ . }}</connectionTimeout>
+        {{- end }}
+        {{- with .socketTimeout }}
+        <socketTimeout>{{ . }}</socketTimeout>
+        {{- end }}
+        {{- with .kmsServerSideEncryptionKeyId }}
+        <kmsServerSideEncryptionKeyId>{{ . }}</kmsServerSideEncryptionKeyId>
+        {{- end }}
+        {{- with .kmsKeyRegion }}
+        <kmsKeyRegion>{{ . }}</kmsKeyRegion>
+        {{- end }}
+        {{- with .kmsCryptoMode }}
+        <kmsCryptoMode>{{ . }}</kmsCryptoMode>
+        {{- end }}
+        {{- if .useInstanceCredentials }}
+        <useInstanceCredentials>true</useInstanceCredentials>
+        {{- else }}
+        <useInstanceCredentials>false</useInstanceCredentials>
+        {{- end }}
+        <usePresigning>{{ .usePresigning }}</usePresigning>
+        <signatureExpirySeconds>{{ .signatureExpirySeconds }}</signatureExpirySeconds>
+        <signedUrlExpirySeconds>{{ .signedUrlExpirySeconds }}</signedUrlExpirySeconds>
+        {{- with .cloudFrontDomainName }}
+        <cloudFrontDomainName>{{ . }}</cloudFrontDomainName>
+        {{- end }}
+        {{- with .cloudFrontKeyPairId }}
+        <cloudFrontKeyPairId>{{ . }}</cloudFrontKeyPairId>
+        {{- end }}
+        {{- with .cloudFrontPrivateKey }}
+        <cloudFrontPrivateKey>{{ . }}</cloudFrontPrivateKey>
+        {{- end }}
+        {{- with .enableSignedUrlRedirect }}
+        <enableSignedUrlRedirect>{{ . }}</enableSignedUrlRedirect>
+        {{- end }}
+        {{- with .enablePathStyleAccess }}
+        <enablePathStyleAccess>{{ . }}</enablePathStyleAccess>
+        {{- end }}
+        {{- with .multiPartLimit }}
+        <multiPartLimit>{{ . | int64 }}</multiPartLimit>
+        {{- end }}
+        {{- with .multipartElementSize }}
+        <multipartElementSize>{{ . | int64 }}</multipartElementSize>
+        {{- end }}
+    </provider>
+    {{- end }}
+</config>
+{{- end }}
+
+{{- if or (eq .Values.artifactory.persistence.type "azure-blob") (eq .Values.artifactory.persistence.type "azure-blob-storage-direct") }}
+<!-- Azure Blob Storage -->
+<config version="2">
+    {{- if eq .Values.artifactory.persistence.type "azure-blob" }}
+    <chain> <!--template="cluster-azure-blob-storage"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="sharding-cluster" type="sharding-cluster">
+                <sub-provider id="eventual-cluster" type="eventual-cluster">
+                    <provider id="retry-azure-blob-storage" type="retry">
+                        <provider id="azure-blob-storage" type="azure-blob-storage"/>
+                    </provider>
+                </sub-provider>
+                <dynamic-provider id="remote" type="remote"/>
+            </provider>
+        </provider>
+    </chain>
+    {{- else if eq .Values.artifactory.persistence.type "azure-blob-storage-direct" }}
+    <chain> <!--template="azure-blob-storage-direct"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="azure-blob-storage" type="azure-blob-storage"/>
+        </provider>
+    </chain>
+    {{- end }}
+
+    <!-- Set max cache-fs size -->
+    <provider id="cache-fs" type="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+
+    {{- if eq .Values.artifactory.persistence.type "azure-blob" }}
+    <!-- cluster eventual Azure Blob Storage Service default chain -->
+    <provider id="sharding-cluster" type="sharding-cluster">
+        <readBehavior>crossNetworkStrategy</readBehavior>
+        <writeBehavior>crossNetworkStrategy</writeBehavior>
+        <redundancy>2</redundancy>
+        <lenientLimit>1</lenientLimit>
+        <property name="zones" value="local,remote"/>
+    </provider>
+
+    <provider id="remote" type="remote">
+        <zone>remote</zone>
+    </provider>
+
+    <provider id="eventual-cluster" type="eventual-cluster">
+        <zone>local</zone>
+    </provider>
+    {{- end }}
+
+    <!--cluster eventual template-->
+    <provider id="azure-blob-storage" type="azure-blob-storage">
+        <accountName>{{ .Values.artifactory.persistence.azureBlob.accountName }}</accountName>
+        <accountKey>{{ .Values.artifactory.persistence.azureBlob.accountKey }}</accountKey>
+        <endpoint>{{ .Values.artifactory.persistence.azureBlob.endpoint }}</endpoint>
+        <containerName>{{ .Values.artifactory.persistence.azureBlob.containerName }}</containerName>
+        <multiPartLimit>{{ .Values.artifactory.persistence.azureBlob.multiPartLimit | int64 }}</multiPartLimit>
+        <multipartElementSize>{{ .Values.artifactory.persistence.azureBlob.multipartElementSize | int64 }}</multipartElementSize>
+        <testConnection>{{ .Values.artifactory.persistence.azureBlob.testConnection }}</testConnection>
+    </provider>
+</config>
+{{- end }}
+{{- if eq .Values.artifactory.persistence.type "azure-blob-storage-v2-direct" -}}
+<config version="3">
+    <chain template="azure-blob-storage-v2-direct"/>
+    <provider type="cache-fs" id="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+    <provider id="azure-blob-storage-v2" type="azure-blob-storage-v2">
+        <accountName>{{ .Values.artifactory.persistence.azureBlob.accountName }}</accountName>
+        <accountKey>{{ .Values.artifactory.persistence.azureBlob.accountKey }}</accountKey>
+        <endpoint>{{ .Values.artifactory.persistence.azureBlob.endpoint }}</endpoint>
+        <container>{{ .Values.artifactory.persistence.azureBlob.containerName }}</container> 
+        <multiPartLimit>{{ .Values.artifactory.persistence.azureBlob.multiPartLimit | int64 }}</multiPartLimit>
+        <multipartElementSize>{{ .Values.artifactory.persistence.azureBlob.multipartElementSize | int64 }}</multipartElementSize>
+        <testConnection>{{ .Values.artifactory.persistence.azureBlob.testConnection }}</testConnection>
+    </provider>   
+</config>
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/files/installer-info.json b/charts/jfrog/artifactory-ha/107.98.14/files/installer-info.json
new file mode 100644
index 000000000..cf6b020fb
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/files/installer-info.json
@@ -0,0 +1,32 @@
+{
+    "productId": "Helm_artifactory-ha/{{ .Chart.Version }}",
+    "features": [
+      {
+        "featureId": "Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"
+      },
+      {
+        "featureId": "Database/{{ .Values.database.type }}"
+      },
+      {
+        "featureId": "PostgreSQL_Enabled/{{ .Values.postgresql.enabled }}"
+      },
+      {
+        "featureId": "Nginx_Enabled/{{ .Values.nginx.enabled }}"
+      },
+      {
+        "featureId": "ArtifactoryPersistence_Type/{{ .Values.artifactory.persistence.type }}"
+      },
+      {
+        "featureId": "SplitServicesToContainers_Enabled/{{ .Values.splitServicesToContainers }}"
+      },
+      {
+        "featureId": "UnifiedSecretInstallation_Enabled/{{ .Values.artifactory.unifiedSecretInstallation }}"
+      },
+      {
+        "featureId": "Filebeat_Enabled/{{ .Values.filebeat.enabled }}"
+      },
+      {
+        "featureId": "ReplicaCount/{{ add .Values.artifactory.primary.replicaCount .Values.artifactory.node.replicaCount }}"
+      }
+    ]
+}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/files/migrate.sh b/charts/jfrog/artifactory-ha/107.98.14/files/migrate.sh
new file mode 100644
index 000000000..ba44160f4
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/files/migrate.sh
@@ -0,0 +1,4311 @@
+#!/bin/bash
+
+# Flags
+FLAG_Y="y"
+FLAG_N="n"
+FLAGS_Y_N="$FLAG_Y $FLAG_N"
+FLAG_NOT_APPLICABLE="_NA_"
+
+CURRENT_VERSION=$1
+
+WRAPPER_SCRIPT_TYPE_RPMDEB="RPMDEB"
+WRAPPER_SCRIPT_TYPE_DOCKER_COMPOSE="DOCKERCOMPOSE"
+
+SENSITIVE_KEY_VALUE="__sensitive_key_hidden___"
+
+# Shared system keys
+SYS_KEY_SHARED_JFROGURL="shared.jfrogUrl"
+SYS_KEY_SHARED_SECURITY_JOINKEY="shared.security.joinKey"
+SYS_KEY_SHARED_SECURITY_MASTERKEY="shared.security.masterKey"
+
+SYS_KEY_SHARED_NODE_ID="shared.node.id"
+SYS_KEY_SHARED_JAVAHOME="shared.javaHome"
+
+SYS_KEY_SHARED_DATABASE_TYPE="shared.database.type"
+SYS_KEY_SHARED_DATABASE_TYPE_VALUE_POSTGRES="postgresql"
+SYS_KEY_SHARED_DATABASE_DRIVER="shared.database.driver"
+SYS_KEY_SHARED_DATABASE_URL="shared.database.url"
+SYS_KEY_SHARED_DATABASE_USERNAME="shared.database.username"
+SYS_KEY_SHARED_DATABASE_PASSWORD="shared.database.password"
+
+SYS_KEY_SHARED_ELASTICSEARCH_URL="shared.elasticsearch.url"
+SYS_KEY_SHARED_ELASTICSEARCH_USERNAME="shared.elasticsearch.username"
+SYS_KEY_SHARED_ELASTICSEARCH_PASSWORD="shared.elasticsearch.password"
+SYS_KEY_SHARED_ELASTICSEARCH_CLUSTERSETUP="shared.elasticsearch.clusterSetup"
+SYS_KEY_SHARED_ELASTICSEARCH_UNICASTFILE="shared.elasticsearch.unicastFile"
+SYS_KEY_SHARED_ELASTICSEARCH_CLUSTERSETUP_VALUE="YES"
+
+# Define this in product specific script. Should contain the path to unitcast file
+# File used by insight server to write cluster active nodes info. This will be read by elasticsearch
+#SYS_KEY_SHARED_ELASTICSEARCH_UNICASTFILE_VALUE=""
+
+SYS_KEY_RABBITMQ_ACTIVE_NODE_NAME="shared.rabbitMq.active.node.name"
+SYS_KEY_RABBITMQ_ACTIVE_NODE_IP="shared.rabbitMq.active.node.ip"
+
+# Filenames
+FILE_NAME_SYSTEM_YAML="system.yaml"
+FILE_NAME_JOIN_KEY="join.key"
+FILE_NAME_MASTER_KEY="master.key"
+FILE_NAME_INSTALLER_YAML="installer.yaml"
+
+# Global constants used in business logic
+NODE_TYPE_STANDALONE="standalone"
+NODE_TYPE_CLUSTER_NODE="node"
+NODE_TYPE_DATABASE="database"
+
+# External(isable) databases 
+DATABASE_POSTGRES="POSTGRES"
+DATABASE_ELASTICSEARCH="ELASTICSEARCH"
+DATABASE_RABBITMQ="RABBITMQ"
+
+POSTGRES_LABEL="PostgreSQL"
+ELASTICSEARCH_LABEL="Elasticsearch"
+RABBITMQ_LABEL="Rabbitmq"
+
+ARTIFACTORY_LABEL="Artifactory"
+JFMC_LABEL="Mission Control"
+DISTRIBUTION_LABEL="Distribution"
+XRAY_LABEL="Xray"
+
+POSTGRES_CONTAINER="postgres"
+ELASTICSEARCH_CONTAINER="elasticsearch"
+RABBITMQ_CONTAINER="rabbitmq"
+REDIS_CONTAINER="redis"
+
+#Adding a small timeout before a read ensures it is positioned correctly in the screen
+read_timeout=0.5
+
+# Options related to data directory location
+PROMPT_DATA_DIR_LOCATION="Installation Directory"
+KEY_DATA_DIR_LOCATION="installer.data_dir"
+
+SYS_KEY_SHARED_NODE_HAENABLED="shared.node.haEnabled"
+PROMPT_ADD_TO_CLUSTER="Are you adding an additional node to an existing product cluster?"
+KEY_ADD_TO_CLUSTER="installer.ha"
+VALID_VALUES_ADD_TO_CLUSTER="$FLAGS_Y_N"
+
+MESSAGE_POSTGRES_INSTALL="The installer can install a $POSTGRES_LABEL database, or you can connect to an existing compatible $POSTGRES_LABEL database\n(compatible databases: https://www.jfrog.com/confluence/display/JFROG/System+Requirements#SystemRequirements-RequirementsMatrix)"
+PROMPT_POSTGRES_INSTALL="Do you want to install $POSTGRES_LABEL?"
+KEY_POSTGRES_INSTALL="installer.install_postgresql"
+VALID_VALUES_POSTGRES_INSTALL="$FLAGS_Y_N"
+
+# Postgres connection details
+RPM_DEB_POSTGRES_HOME_DEFAULT="/var/opt/jfrog/postgres"
+RPM_DEB_MESSAGE_STANDALONE_POSTGRES_DATA="$POSTGRES_LABEL home will have data and its configuration"
+RPM_DEB_PROMPT_STANDALONE_POSTGRES_DATA="Type desired $POSTGRES_LABEL home location"
+RPM_DEB_KEY_STANDALONE_POSTGRES_DATA="installer.postgresql.home"
+
+MESSAGE_DATABASE_URL="Provide the database connection details"
+PROMPT_DATABASE_URL(){
+    local databaseURlExample=
+    case "$PRODUCT_NAME" in
+            $ARTIFACTORY_LABEL)
+                databaseURlExample="jdbc:postgresql://<IP_ADDRESS>:<PORT>/artifactory"
+            ;;
+            $JFMC_LABEL)
+                databaseURlExample="postgresql://<IP_ADDRESS>:<PORT>/mission_control?sslmode=disable"
+            ;;
+            $DISTRIBUTION_LABEL)
+                databaseURlExample="jdbc:postgresql://<IP_ADDRESS>:<PORT>/distribution?sslmode=disable"
+            ;;
+            $XRAY_LABEL)
+                databaseURlExample="postgres://<IP_ADDRESS>:<PORT>/xraydb?sslmode=disable"
+            ;;
+        esac
+    if [ -z "$databaseURlExample" ]; then
+        echo -n "$POSTGRES_LABEL URL" # For consistency with username and password
+        return
+    fi
+    echo -n "$POSTGRES_LABEL url. Example: [$databaseURlExample]"
+}
+REGEX_DATABASE_URL(){
+    local databaseURlExample=
+    case "$PRODUCT_NAME" in
+            $ARTIFACTORY_LABEL)
+                databaseURlExample="jdbc:postgresql://.*/artifactory.*"
+            ;;
+            $JFMC_LABEL)
+                databaseURlExample="postgresql://.*/mission_control.*"
+            ;;
+            $DISTRIBUTION_LABEL)
+                databaseURlExample="jdbc:postgresql://.*/distribution.*"
+            ;;
+            $XRAY_LABEL)
+                databaseURlExample="postgres://.*/xraydb.*"
+            ;;
+        esac
+    echo -n "^$databaseURlExample\$"
+}
+ERROR_MESSAGE_DATABASE_URL="Invalid $POSTGRES_LABEL URL"
+KEY_DATABASE_URL="$SYS_KEY_SHARED_DATABASE_URL"
+#NOTE: It is important to display the label. Since the message may be hidden if URL is known
+PROMPT_DATABASE_USERNAME="$POSTGRES_LABEL username"
+KEY_DATABASE_USERNAME="$SYS_KEY_SHARED_DATABASE_USERNAME"
+#NOTE: It is important to display the label. Since the message may be hidden if URL is known
+PROMPT_DATABASE_PASSWORD="$POSTGRES_LABEL password"
+KEY_DATABASE_PASSWORD="$SYS_KEY_SHARED_DATABASE_PASSWORD"
+IS_SENSITIVE_DATABASE_PASSWORD="$FLAG_Y"
+
+MESSAGE_STANDALONE_ELASTICSEARCH_INSTALL="The installer can install a $ELASTICSEARCH_LABEL database or you can connect to an existing compatible $ELASTICSEARCH_LABEL database"
+PROMPT_STANDALONE_ELASTICSEARCH_INSTALL="Do you want to install $ELASTICSEARCH_LABEL?"
+KEY_STANDALONE_ELASTICSEARCH_INSTALL="installer.install_elasticsearch"
+VALID_VALUES_STANDALONE_ELASTICSEARCH_INSTALL="$FLAGS_Y_N"
+
+# Elasticsearch connection details
+MESSAGE_ELASTICSEARCH_DETAILS="Provide the $ELASTICSEARCH_LABEL connection details"
+PROMPT_ELASTICSEARCH_URL="$ELASTICSEARCH_LABEL URL"
+KEY_ELASTICSEARCH_URL="$SYS_KEY_SHARED_ELASTICSEARCH_URL"
+
+PROMPT_ELASTICSEARCH_USERNAME="$ELASTICSEARCH_LABEL username"
+KEY_ELASTICSEARCH_USERNAME="$SYS_KEY_SHARED_ELASTICSEARCH_USERNAME"
+
+PROMPT_ELASTICSEARCH_PASSWORD="$ELASTICSEARCH_LABEL password"
+KEY_ELASTICSEARCH_PASSWORD="$SYS_KEY_SHARED_ELASTICSEARCH_PASSWORD"
+IS_SENSITIVE_ELASTICSEARCH_PASSWORD="$FLAG_Y"
+
+# Cluster related questions
+MESSAGE_CLUSTER_MASTER_KEY="Provide the cluster's master key. It can be found in the data directory of the first node under /etc/security/master.key"
+PROMPT_CLUSTER_MASTER_KEY="Master Key"
+KEY_CLUSTER_MASTER_KEY="$SYS_KEY_SHARED_SECURITY_MASTERKEY"
+IS_SENSITIVE_CLUSTER_MASTER_KEY="$FLAG_Y"
+
+MESSAGE_JOIN_KEY="The Join key is the secret key used to establish trust between services in the JFrog Platform.\n(You can copy the Join Key from Admin > User Management > Settings)"
+PROMPT_JOIN_KEY="Join Key"
+KEY_JOIN_KEY="$SYS_KEY_SHARED_SECURITY_JOINKEY"
+IS_SENSITIVE_JOIN_KEY="$FLAG_Y"
+REGEX_JOIN_KEY="^[a-zA-Z0-9]{16,}\$"
+ERROR_MESSAGE_JOIN_KEY="Invalid Join Key"
+
+# Rabbitmq related cluster information
+MESSAGE_RABBITMQ_ACTIVE_NODE_NAME="Provide an active ${RABBITMQ_LABEL} node name. Run the command [ hostname -s ] on any of the existing nodes in the product cluster to get this"
+PROMPT_RABBITMQ_ACTIVE_NODE_NAME="${RABBITMQ_LABEL} active node name"
+KEY_RABBITMQ_ACTIVE_NODE_NAME="$SYS_KEY_RABBITMQ_ACTIVE_NODE_NAME"
+
+# Rabbitmq related cluster information (necessary only for docker-compose)
+PROMPT_RABBITMQ_ACTIVE_NODE_IP="${RABBITMQ_LABEL} active node ip"
+KEY_RABBITMQ_ACTIVE_NODE_IP="$SYS_KEY_RABBITMQ_ACTIVE_NODE_IP"
+
+MESSAGE_JFROGURL(){
+    echo -e "The JFrog URL allows ${PRODUCT_NAME} to connect to a JFrog Platform Instance.\n(You can copy the JFrog URL from Administration > User Management > Settings > Connection details)"
+}
+PROMPT_JFROGURL="JFrog URL"
+KEY_JFROGURL="$SYS_KEY_SHARED_JFROGURL"
+REGEX_JFROGURL="^https?://.*:{0,}[0-9]{0,4}\$"
+ERROR_MESSAGE_JFROGURL="Invalid JFrog URL"
+
+
+# Set this to FLAG_Y on upgrade
+IS_UPGRADE="${FLAG_N}"
+
+# This belongs in JFMC but is the ONLY one that needs it so keeping it here for now. Can be made into a method and overridden if necessary
+MESSAGE_MULTIPLE_PG_SCHEME="Please setup $POSTGRES_LABEL with schema as described in https://www.jfrog.com/confluence/display/JFROG/Installing+Mission+Control"
+
+_getMethodOutputOrVariableValue() {
+    unset EFFECTIVE_MESSAGE
+    local keyToSearch=$1
+    local effectiveMessage=
+    local result="0"
+    # logSilly "Searching for method: [$keyToSearch]"
+    LC_ALL=C type "$keyToSearch" > /dev/null 2>&1 || result="$?"
+    if [[ "$result" == "0" ]]; then
+        # logSilly "Found method for [$keyToSearch]"
+        EFFECTIVE_MESSAGE="$($keyToSearch)"
+        return
+    fi
+    eval EFFECTIVE_MESSAGE=\${$keyToSearch}
+    if [ ! -z "$EFFECTIVE_MESSAGE" ]; then
+        return
+    fi
+    # logSilly "Didn't find method or variable for [$keyToSearch]"
+}
+
+
+# REF https://misc.flogisoft.com/bash/tip_colors_and_formatting
+cClear="\e[0m"
+cBlue="\e[38;5;69m"
+cRedDull="\e[1;31m"
+cYellow="\e[1;33m"
+cRedBright="\e[38;5;197m"
+cBold="\e[1m"
+
+
+_loggerGetModeRaw() {
+    local MODE="$1"
+    case $MODE in
+    INFO)
+        printf ""
+    ;;
+    DEBUG)
+        printf "%s" "[${MODE}] "
+    ;;
+    WARN)
+        printf "${cRedDull}%s%s${cClear}" "[" "${MODE}" "] "
+    ;;
+    ERROR)
+        printf "${cRedBright}%s%s${cClear}" "[" "${MODE}" "] "
+    ;;
+    esac
+}
+
+
+_loggerGetMode() {
+    local MODE="$1"
+    case $MODE in
+    INFO)
+        printf "${cBlue}%s%-5s%s${cClear}" "[" "${MODE}" "]"
+    ;;
+    DEBUG)
+        printf "%-7s" "[${MODE}]"
+    ;;
+    WARN)
+        printf "${cRedDull}%s%-5s%s${cClear}" "[" "${MODE}" "]"
+    ;;
+    ERROR)
+        printf "${cRedBright}%s%-5s%s${cClear}" "[" "${MODE}" "]"
+    ;;
+    esac
+}
+
+# Capitalises the first letter of the message
+_loggerGetMessage() {
+    local originalMessage="$*"
+    local firstChar=$(echo "${originalMessage:0:1}" | awk '{ print toupper($0) }')
+    local resetOfMessage="${originalMessage:1}"
+    echo "$firstChar$resetOfMessage"
+}
+
+# The spec also says content should be left-trimmed but this is not necessary in our case. We don't reach the limit.
+_loggerGetStackTrace() {
+    printf "%s%-30s%s" "[" "$1:$2" "]"
+}
+
+_loggerGetThread() {
+    printf "%s" "[main]"
+}
+
+_loggerGetServiceType() {
+    printf "%s%-5s%s" "[" "shell" "]"
+}
+
+#Trace ID is not applicable to scripts
+_loggerGetTraceID() {
+    printf "%s" "[]"
+}
+
+logRaw() {
+    echo ""
+    printf "$1"
+    echo ""
+}
+
+logBold(){
+    echo ""
+    printf "${cBold}$1${cClear}"
+    echo ""
+}
+
+# The date binary works differently based on whether it is GNU/BSD
+is_date_supported=0
+date --version > /dev/null 2>&1 || is_date_supported=1
+IS_GNU=$(echo $is_date_supported)
+
+_loggerGetTimestamp() {
+    if [ "${IS_GNU}" == "0" ]; then
+        echo -n $(date -u +%FT%T.%3NZ)
+    else
+        echo -n $(date -u +%FT%T.000Z)
+    fi
+}
+
+# https://www.shellscript.sh/tips/spinner/
+_spin()
+{
+    spinner="/|\\-/|\\-"
+    while :
+    do
+    for i in `seq 0 7`
+    do
+        echo -n "${spinner:$i:1}"
+        echo -en "\010"
+        sleep 1
+    done
+    done
+}
+
+showSpinner() {
+    # Start the Spinner:
+    _spin &
+    # Make a note of its Process ID (PID):
+    SPIN_PID=$!
+    # Kill the spinner on any signal, including our own exit.
+    trap "kill -9 $SPIN_PID" `seq 0 15` &> /dev/null || return 0
+}
+
+stopSpinner() {
+    local occurrences=$(ps -ef | grep -wc "${SPIN_PID}")
+    let "occurrences+=0"
+    # validate that it is present (2 since this search itself will show up in the results)
+    if [ $occurrences -gt 1 ]; then
+        kill -9 $SPIN_PID &>/dev/null || return 0
+        wait $SPIN_ID &>/dev/null
+    fi
+}
+
+_getEffectiveMessage(){
+    local MESSAGE="$1"
+    local MODE=${2-"INFO"}
+
+    if [ -z "$CONTEXT" ]; then
+        CONTEXT=$(caller)
+    fi
+
+    _EFFECTIVE_MESSAGE=
+    if [ -z "$LOG_BEHAVIOR_ADD_META" ]; then
+        _EFFECTIVE_MESSAGE="$(_loggerGetModeRaw $MODE)$(_loggerGetMessage $MESSAGE)"
+    else
+        local SERVICE_TYPE="script"
+        local TRACE_ID=""
+        local THREAD="main"
+        
+        local CONTEXT_LINE=$(echo "$CONTEXT" | awk '{print $1}')
+        local CONTEXT_FILE=$(echo "$CONTEXT" | awk -F"/" '{print $NF}')
+        
+        _EFFECTIVE_MESSAGE="$(_loggerGetTimestamp) $(_loggerGetServiceType) $(_loggerGetMode $MODE) $(_loggerGetTraceID) $(_loggerGetStackTrace $CONTEXT_FILE $CONTEXT_LINE) $(_loggerGetThread) - $(_loggerGetMessage $MESSAGE)"
+    fi
+    CONTEXT=
+}
+
+# Important - don't call any log method from this method. Will become an infinite loop. Use echo to debug
+_logToFile() {
+    local MODE=${1-"INFO"}
+    local targetFile="$LOG_BEHAVIOR_ADD_REDIRECTION"
+    # IF the file isn't passed, abort
+    if [ -z "$targetFile" ]; then
+        return
+    fi
+    # IF this is not being run in verbose mode and mode is debug or lower, abort
+    if [ "${VERBOSE_MODE}" != "$FLAG_Y" ] && [ "${VERBOSE_MODE}" != "true" ] && [ "${VERBOSE_MODE}" != "debug" ]; then
+        if [ "$MODE" == "DEBUG" ] || [ "$MODE" == "SILLY" ]; then
+            return
+        fi
+    fi
+
+    # Create the file if it doesn't exist
+    if [ ! -f "${targetFile}" ]; then
+        return
+        # touch $targetFile > /dev/null 2>&1 || true
+    fi
+    # # Make it readable
+    # chmod 640 $targetFile > /dev/null 2>&1 || true
+
+    # Log contents
+    printf "%s\n" "$_EFFECTIVE_MESSAGE" >> "$targetFile" || true
+}
+
+logger() {
+    if [ "$LOG_BEHAVIOR_ADD_NEW_LINE" == "$FLAG_Y" ]; then
+        echo ""
+    fi
+    _getEffectiveMessage "$@"
+    local MODE=${2-"INFO"}
+    printf "%s\n" "$_EFFECTIVE_MESSAGE"
+    _logToFile "$MODE"
+}
+
+logDebug(){
+    VERBOSE_MODE=${VERBOSE_MODE-"false"}
+    CONTEXT=$(caller)
+    if [ "${VERBOSE_MODE}" == "$FLAG_Y" ] || [ "${VERBOSE_MODE}" == "true" ] || [ "${VERBOSE_MODE}" == "debug" ];then
+        logger "$1" "DEBUG"
+    else
+        logger "$1" "DEBUG" >&6
+    fi
+    CONTEXT=
+}
+
+logSilly(){
+    VERBOSE_MODE=${VERBOSE_MODE-"false"}
+    CONTEXT=$(caller)
+    if [ "${VERBOSE_MODE}" == "silly" ];then
+        logger "$1" "DEBUG"
+    else
+        logger "$1" "DEBUG" >&6
+    fi
+    CONTEXT=
+}
+
+logError() {
+    CONTEXT=$(caller)
+    logger "$1" "ERROR"
+    CONTEXT=
+}
+
+errorExit () {
+    CONTEXT=$(caller)
+    logger "$1" "ERROR"
+    CONTEXT=
+    exit 1
+}
+
+warn () {
+    CONTEXT=$(caller)
+    logger "$1" "WARN"
+    CONTEXT=
+}
+
+note () {
+    CONTEXT=$(caller)
+    logger "$1" "NOTE"
+    CONTEXT=
+}
+
+bannerStart() {
+    title=$1
+    echo
+    echo -e "\033[1m${title}\033[0m"
+    echo
+}
+
+bannerSection() {
+    title=$1
+    echo
+    echo -e "******************************** ${title} ********************************"
+    echo
+}
+
+bannerSubSection() {
+    title=$1
+    echo
+    echo -e "************** ${title} *******************"
+    echo
+}
+
+bannerMessge() {
+    title=$1
+    echo
+    echo -e "********************************"
+    echo -e "${title}"
+    echo -e "********************************"
+    echo
+}
+
+setRed () {
+    local input="$1"
+    echo -e \\033[31m${input}\\033[0m
+}
+setGreen () {
+    local input="$1"
+    echo -e \\033[32m${input}\\033[0m
+}
+setYellow () {
+    local input="$1"
+    echo -e \\033[33m${input}\\033[0m
+}
+
+logger_addLinebreak () {
+    echo -e "---\n"
+}
+
+bannerImportant() {
+    title=$1
+    local bold="\033[1m"
+    local noColour="\033[0m"
+    echo
+    echo -e "${bold}######################################## IMPORTANT ########################################${noColour}"
+    echo -e "${bold}${title}${noColour}"
+    echo -e "${bold}###########################################################################################${noColour}"
+    echo
+}
+
+bannerEnd() {
+    #TODO pass a title and calculate length dynamically so that start and end look alike
+    echo
+    echo "*****************************************************************************"
+    echo
+}
+
+banner() {
+    title=$1
+    content=$2
+    bannerStart "${title}"
+    echo -e "$content"
+}
+
+# The logic below helps us redirect content we'd normally hide to the log file. 
+    #
+    # We have several commands which clutter the console with output and so use 
+    # `cmd > /dev/null` - this redirects the command's output to null.
+    # 
+    # However, the information we just hid maybe useful for support. Using the code pattern
+    # `cmd >&6` (instead of `cmd> >/dev/null` ), the command's output is hidden from the console 
+    # but redirected to the installation log file
+    # 
+
+#Default value of 6 is just null
+exec 6>>/dev/null
+redirectLogsToFile() {
+    echo ""
+    # local file=$1
+
+    # [ ! -z "${file}" ] || return 0
+
+    # local logDir=$(dirname "$file")
+
+    # if [ ! -f "${file}" ]; then
+    #     [ -d "${logDir}" ] || mkdir -p ${logDir} || \
+    #     ( echo "WARNING : Could not create parent directory (${logDir}) to redirect console log : ${file}" ; return 0 )
+    # fi
+
+    # #6 now points to the log file
+    # exec 6>>${file}
+    # #reference https://unix.stackexchange.com/questions/145651/using-exec-and-tee-to-redirect-logs-to-stdout-and-a-log-file-in-the-same-time
+    # exec 2>&1 > >(tee -a "${file}")
+}
+
+# Check if a give key contains any sensitive string as part of it
+# Based on the result, the caller can decide its value can be displayed or not
+#   Sample usage : isKeySensitive "${key}" && displayValue="******" || displayValue=${value}
+isKeySensitive(){
+    local key=$1
+    local sensitiveKeys="password|secret|key|token"
+    
+    if [ -z "${key}" ]; then
+        return 1
+    else
+        local lowercaseKey=$(echo "${key}" | tr '[:upper:]' '[:lower:]' 2>/dev/null)
+        [[ "${lowercaseKey}" =~ ${sensitiveKeys} ]] && return 0 || return 1
+    fi
+}
+
+getPrintableValueOfKey(){
+    local displayValue=
+    local key="$1"
+    if [ -z "$key" ]; then
+        # This is actually an incorrect usage of this method but any logging will cause unexpected content in the caller
+        echo -n ""
+        return
+    fi
+
+    local value="$2"
+    isKeySensitive "${key}" && displayValue="$SENSITIVE_KEY_VALUE" || displayValue="${value}"
+    echo -n $displayValue
+}
+
+_createConsoleLog(){
+    if [ -z "${JF_PRODUCT_HOME}" ]; then
+        return
+    fi
+    local targetFile="${JF_PRODUCT_HOME}/var/log/console.log"
+    mkdir -p "${JF_PRODUCT_HOME}/var/log" || true
+    if [ ! -f ${targetFile} ]; then
+        touch $targetFile > /dev/null 2>&1 || true
+    fi
+    chmod 640 $targetFile > /dev/null 2>&1 || true
+}
+
+# Output from application's logs are piped to this method. It checks a configuration variable to determine if content should be logged to 
+# the common console.log file
+redirectServiceLogsToFile() {
+
+    local result="0"
+    # check if the function getSystemValue exists
+    LC_ALL=C type getSystemValue > /dev/null 2>&1 || result="$?"
+    if [[ "$result" != "0" ]]; then
+        warn "Couldn't find the systemYamlHelper. Skipping log redirection"
+        return 0
+    fi
+
+    getSystemValue "shared.consoleLog" "NOT_SET"
+    if [[ "${YAML_VALUE}" == "false" ]]; then
+        logger "Redirection is set to false. Skipping log redirection"
+        return 0;
+    fi
+
+    if [ -z "${JF_PRODUCT_HOME}" ] || [ "${JF_PRODUCT_HOME}" == "" ]; then
+        warn "JF_PRODUCT_HOME is unavailable. Skipping log redirection"
+        return 0
+    fi
+
+    local targetFile="${JF_PRODUCT_HOME}/var/log/console.log"
+    
+    _createConsoleLog
+
+    while read -r line; do
+        printf '%s\n' "${line}" >> $targetFile || return 0 # Don't want to log anything - might clutter the screen
+    done
+}
+
+## Display environment variables starting with JF_ along with its value
+## Value of sensitive keys will be displayed as "******"
+##
+## Sample Display :
+##
+## ========================
+## JF Environment variables
+## ========================
+##
+## JF_SHARED_NODE_ID                   : locahost
+## JF_SHARED_JOINKEY                   : ******
+##
+##
+displayEnv() {
+    local JFEnv=$(printenv | grep ^JF_ 2>/dev/null)
+    local key=
+    local value=
+
+    if [ -z "${JFEnv}" ]; then
+        return
+    fi
+
+    cat << ENV_START_MESSAGE
+
+========================
+JF Environment variables
+========================
+ENV_START_MESSAGE
+
+    for entry in ${JFEnv}; do
+        key=$(echo "${entry}" | awk -F'=' '{print $1}')
+        value=$(echo "${entry}" | awk -F'=' '{print $2}')
+
+        isKeySensitive "${key}" && value="******" || value=${value}
+        
+        printf "\n%-35s%s" "${key}" " : ${value}"
+    done
+    echo;
+}
+
+_addLogRotateConfiguration() {
+    logDebug "Method ${FUNCNAME[0]}"
+    # mandatory inputs
+    local confFile="$1"
+    local logFile="$2"
+
+    # Method available in _ioOperations.sh
+    LC_ALL=C type io_setYQPath > /dev/null 2>&1 || return 1
+
+    io_setYQPath
+
+    # Method available in _systemYamlHelper.sh
+    LC_ALL=C type getSystemValue > /dev/null 2>&1 || return 1
+
+    local frequency="daily"
+    local archiveFolder="archived"
+
+    local compressLogFiles=
+    getSystemValue "shared.logging.rotation.compress" "true"
+    if [[ "${YAML_VALUE}" == "true" ]]; then
+        compressLogFiles="compress"
+    fi
+
+    getSystemValue "shared.logging.rotation.maxFiles" "10"
+    local noOfBackupFiles="${YAML_VALUE}"
+
+    getSystemValue "shared.logging.rotation.maxSizeMb" "25"
+    local sizeOfFile="${YAML_VALUE}M"
+
+    logDebug "Adding logrotate configuration for [$logFile] to [$confFile]"
+
+    # Add configuration to file
+    local confContent=$(cat << LOGROTATECONF
+$logFile {
+    $frequency
+    missingok
+    rotate $noOfBackupFiles
+    $compressLogFiles
+    notifempty
+    olddir $archiveFolder
+    dateext
+    extension .log
+    dateformat -%Y-%m-%d
+    size ${sizeOfFile}
+}
+LOGROTATECONF
+) 
+    echo "${confContent}" > ${confFile} || return 1
+}
+
+_operationIsBySameUser() {
+    local targetUser="$1"
+    local currentUserID=$(id -u)
+    local currentUserName=$(id -un)
+
+    if [ $currentUserID == $targetUser ] || [ $currentUserName == $targetUser ]; then
+        echo -n "yes"
+    else   
+        echo -n "no"
+    fi
+}
+
+_addCronJobForLogrotate() {
+    logDebug "Method ${FUNCNAME[0]}"
+    
+    # Abort if logrotate is not available
+    [ "$(io_commandExists 'crontab')" != "yes" ] && warn "cron is not available" && return 1
+
+    # mandatory inputs
+    local productHome="$1"
+    local confFile="$2"
+    local cronJobOwner="$3"
+
+    # We want to use our binary if possible. It may be more recent than the one in the OS
+    local logrotateBinary="$productHome/app/third-party/logrotate/logrotate"
+
+    if [ ! -f "$logrotateBinary" ]; then
+        logrotateBinary="logrotate"
+        [ "$(io_commandExists 'logrotate')" != "yes" ] && warn "logrotate is not available" && return 1
+    fi
+    local cmd="$logrotateBinary ${confFile} --state $productHome/var/etc/logrotate/logrotate-state" #--verbose
+
+    id -u $cronJobOwner > /dev/null 2>&1 || { warn "User $cronJobOwner does not exist. Aborting logrotate configuration" && return 1; }
+    
+    # Remove the existing line
+    removeLogRotation "$productHome" "$cronJobOwner" || true
+
+    # Run logrotate daily at 23:55 hours
+    local cronInterval="55 23 * * * $cmd"
+
+    local standaloneMode=$(_operationIsBySameUser "$cronJobOwner")
+
+    # If this is standalone mode, we cannot use -u - the user running this process may not have the necessary privileges
+    if [ "$standaloneMode" == "no" ]; then
+        (crontab -l -u $cronJobOwner 2>/dev/null; echo "$cronInterval") | crontab -u $cronJobOwner -
+    else
+        (crontab -l 2>/dev/null; echo "$cronInterval") | crontab -
+    fi
+}
+
+## Configure logrotate for a product
+## Failure conditions:
+## If logrotation could not be setup for some reason
+## Parameters:
+## $1: The product name
+## $2: The product home
+## Depends on global: none
+## Updates global: none
+## Returns: NA
+
+configureLogRotation() {
+    logDebug "Method ${FUNCNAME[0]}"
+
+    # mandatory inputs
+    local productName="$1"
+    if [ -z $productName ]; then
+        warn "Incorrect usage. A product name is necessary for configuring log rotation" && return 1
+    fi
+    
+    local productHome="$2"
+    if [ -z $productHome ]; then
+        warn "Incorrect usage. A product home folder is necessary for configuring log rotation" && return 1
+    fi
+
+    local logFile="${productHome}/var/log/console.log"
+    if [[ $(uname) == "Darwin" ]]; then
+        logger "Log rotation for [$logFile] has not been configured. Please setup manually"
+        return 0
+    fi
+    
+    local userID="$3"
+    if [ -z $userID ]; then
+        warn "Incorrect usage. A userID is necessary for configuring log rotation" && return 1
+    fi
+
+    local groupID=${4:-$userID}
+    local logConfigOwner=${5:-$userID}
+
+    logDebug "Configuring log rotation as user [$userID], group [$groupID], effective cron User [$logConfigOwner]"
+    
+    local errorMessage="Could not configure logrotate. Please configure log rotation of the file: [$logFile] manually"
+
+    local confFile="${productHome}/var/etc/logrotate/logrotate.conf"
+
+    # TODO move to recursive method
+    createDir "${productHome}" "$userID" "$groupID" || { warn "${errorMessage}" && return 1; }
+    createDir "${productHome}/var" "$userID" "$groupID" || { warn "${errorMessage}" && return 1; }
+    createDir "${productHome}/var/log" "$userID" "$groupID" || { warn "${errorMessage}" && return 1; }
+    createDir "${productHome}/var/log/archived" "$userID" "$groupID" || { warn "${errorMessage}" && return 1; }
+    
+    # TODO move to recursive method
+    createDir "${productHome}/var/etc"  "$userID" "$groupID" || { warn "${errorMessage}" && return 1; }
+    createDir "${productHome}/var/etc/logrotate" "$logConfigOwner" || { warn "${errorMessage}" && return 1; }
+
+    # conf file should be owned by the user running the script
+    createFile "${confFile}" "${logConfigOwner}" || { warn "Could not create configuration file [$confFile]" return 1; }
+
+    _addLogRotateConfiguration "${confFile}" "${logFile}" "$userID" "$groupID" || { warn "${errorMessage}" && return 1; }
+    _addCronJobForLogrotate "${productHome}" "${confFile}" "${logConfigOwner}" || { warn "${errorMessage}" && return 1; }
+}
+
+_pauseExecution() {
+    if [ "${VERBOSE_MODE}" == "debug" ]; then
+        
+        local breakPoint="$1"
+        if [ ! -z "$breakPoint" ]; then
+            printf "${cBlue}Breakpoint${cClear} [$breakPoint] "
+            echo ""
+        fi
+        printf "${cBlue}Press enter once you are ready to continue${cClear}"
+        read -s choice
+        echo ""
+    fi
+}
+
+# removeLogRotation "$productHome" "$cronJobOwner" || true
+removeLogRotation() {
+    logDebug "Method ${FUNCNAME[0]}"
+    if [[ $(uname) == "Darwin" ]]; then
+        logDebug "Not implemented for Darwin."
+        return 0
+    fi
+    local productHome="$1"
+    local cronJobOwner="$2"
+    local standaloneMode=$(_operationIsBySameUser "$cronJobOwner")
+
+    local confFile="${productHome}/var/etc/logrotate/logrotate.conf"
+    
+    if [ "$standaloneMode" == "no" ]; then
+        crontab -l -u $cronJobOwner 2>/dev/null | grep -v "$confFile" | crontab -u $cronJobOwner -
+    else
+        crontab -l 2>/dev/null | grep -v "$confFile" | crontab -
+    fi
+}
+
+# NOTE: This method does not check the configuration to see if redirection is necessary.
+# This is intentional. If we don't redirect, tomcat logs might get redirected to a folder/file
+# that does not exist, causing the service itself to not start
+setupTomcatRedirection() {
+    logDebug "Method ${FUNCNAME[0]}"
+    local consoleLog="${JF_PRODUCT_HOME}/var/log/console.log"
+    _createConsoleLog
+    export CATALINA_OUT="${consoleLog}"
+}
+
+setupScriptLogsRedirection() {
+    logDebug "Method ${FUNCNAME[0]}"
+    if [ -z "${JF_PRODUCT_HOME}" ]; then
+        logDebug "No JF_PRODUCT_HOME. Returning"
+        return
+    fi
+    # Create the console.log file if it is not already present
+    # _createConsoleLog || true
+    # # Ensure any logs (logger/logError/warn) also get redirected to the console.log
+    # # Using installer.log as a temparory fix. Please change this to console.log once INST-291 is fixed
+    export LOG_BEHAVIOR_ADD_REDIRECTION="${JF_PRODUCT_HOME}/var/log/console.log"
+    export LOG_BEHAVIOR_ADD_META="$FLAG_Y"
+}
+
+# Returns Y if this method is run inside a container
+isRunningInsideAContainer() {
+    local check1=$(grep -sq 'docker\|kubepods' /proc/1/cgroup; echo $?)
+    local check2=$(grep -sq 'containers' /proc/self/mountinfo; echo $?)
+    if [[ $check1 == 0 || $check2 == 0 || -f "/.dockerenv" ]]; then
+        echo -n "$FLAG_Y"
+    else
+        echo -n "$FLAG_N"
+    fi 
+}
+
+POSTGRES_USER=999
+NGINX_USER=104
+NGINX_GROUP=107
+ES_USER=1000
+REDIS_USER=999
+MONGO_USER=999
+RABBITMQ_USER=999
+LOG_FILE_PERMISSION=640
+PID_FILE_PERMISSION=644
+
+# Copy file
+copyFile(){
+    local source=$1
+    local target=$2
+    local mode=${3:-overwrite}
+    local enableVerbose=${4:-"${FLAG_N}"}
+    local verboseFlag=""
+
+    if [ ! -z "${enableVerbose}" ] && [ "${enableVerbose}" == "${FLAG_Y}" ]; then
+        verboseFlag="-v"
+    fi
+
+    if [[ ! ( $source && $target ) ]]; then
+        warn "Source and target is mandatory to copy file"
+        return 1
+    fi
+
+    if [[ -f "${target}" ]]; then
+        [[ "$mode" = "overwrite" ]] && ( cp ${verboseFlag} -f "$source" "$target" || errorExit "Unable to copy file, command : cp -f ${source} ${target}") || true
+    else
+        cp ${verboseFlag} -f "$source" "$target" || errorExit "Unable to copy file, command : cp -f ${source} ${target}"
+    fi
+}
+
+# Copy files recursively from given source directory to destination directory
+# This method wil copy but will NOT overwrite
+# Destination will be created if its not available
+copyFilesNoOverwrite(){
+    local src=$1
+    local dest=$2
+    local enableVerboseCopy="${3:-${FLAG_Y}}"
+
+    if [[ -z "${src}" || -z "${dest}" ]]; then
+        return
+    fi
+
+    if [ -d "${src}" ] && [ "$(ls -A ${src})" ]; then
+        local relativeFilePath=""
+        local targetFilePath=""
+
+        for file in $(find ${src} -type f 2>/dev/null) ; do
+            # Derive relative path and attach it to destination 
+            # Example : 
+            #       src=/extra_config
+            #       dest=/var/opt/jfrog/artifactory/etc
+            #       file=/extra_config/config.xml
+            #       relativeFilePath=config.xml
+            #       targetFilePath=/var/opt/jfrog/artifactory/etc/config.xml
+            relativeFilePath=${file/${src}/}
+            targetFilePath=${dest}${relativeFilePath}
+
+            createDir "$(dirname "$targetFilePath")"
+            copyFile "${file}" "${targetFilePath}" "no_overwrite" "${enableVerboseCopy}"
+        done
+    fi    
+}
+
+#    TODO : WINDOWS ?
+#  Check the max open files and open processes set on the system
+checkULimits () {
+    local minMaxOpenFiles=${1:-32000}
+    local minMaxOpenProcesses=${2:-1024}
+    local setValue=${3:-true}
+    local warningMsgForFiles=${4}
+    local warningMsgForProcesses=${5}
+
+    logger "Checking open files and processes limits"
+
+    local currentMaxOpenFiles=$(ulimit -n)
+    logger "Current max open files is $currentMaxOpenFiles"
+    if [ ${currentMaxOpenFiles} != "unlimited" ] && [ "$currentMaxOpenFiles" -lt "$minMaxOpenFiles" ]; then
+        if [ "${setValue}" ]; then
+            ulimit -n "${minMaxOpenFiles}" >/dev/null 2>&1 || warn "Max number of open files $currentMaxOpenFiles is low!"
+            [ -z "${warningMsgForFiles}" ] || warn "${warningMsgForFiles}"
+        else
+            errorExit "Max number of open files $currentMaxOpenFiles, is too low. Cannot run the application!"
+        fi
+    fi
+
+    local currentMaxOpenProcesses=$(ulimit -u)
+    logger "Current max open processes is $currentMaxOpenProcesses"
+    if [ "$currentMaxOpenProcesses" != "unlimited" ] && [ "$currentMaxOpenProcesses" -lt "$minMaxOpenProcesses" ]; then
+        if [ "${setValue}" ]; then
+            ulimit -u "${minMaxOpenProcesses}" >/dev/null 2>&1 || warn "Max number of open files $currentMaxOpenFiles is low!"
+            [ -z "${warningMsgForProcesses}" ] || warn "${warningMsgForProcesses}"
+        else
+            errorExit "Max number of open files $currentMaxOpenProcesses, is too low. Cannot run the application!"
+        fi
+    fi
+}
+
+createDirs() {
+    local appDataDir=$1
+    local serviceName=$2
+    local folders="backup bootstrap data etc logs work"
+
+    [ -z "${appDataDir}" ]  && errorExit "An application directory is mandatory to create its data structure"  || true
+    [ -z "${serviceName}" ] && errorExit "A service name is mandatory to create service data structure"         || true
+
+    for folder in ${folders}
+    do
+        folder=${appDataDir}/${folder}/${serviceName}
+        if [ ! -d "${folder}" ]; then
+            logger "Creating folder : ${folder}"
+            mkdir -p "${folder}" || errorExit "Failed to create ${folder}"
+        fi
+    done
+}
+
+
+testReadWritePermissions () {
+    local dir_to_check=$1
+    local error=false
+
+    [ -d ${dir_to_check} ] || errorExit "'${dir_to_check}' is not a directory"
+
+    local test_file=${dir_to_check}/test-permissions
+
+    # Write file
+    if echo test > ${test_file} 1> /dev/null 2>&1; then
+        # Write succeeded. Testing read...
+        if cat ${test_file} > /dev/null; then
+            rm -f ${test_file}
+        else
+            error=true
+        fi
+    else
+        error=true
+    fi
+
+    if [ ${error} == true ]; then
+        return 1
+    else
+        return 0
+    fi
+}
+
+# Test directory has read/write permissions for current user
+testDirectoryPermissions () {
+    local dir_to_check=$1
+    local error=false
+
+    [ -d ${dir_to_check}  ] || errorExit "'${dir_to_check}' is not a directory"
+
+    local u_id=$(id -u)
+    local id_str="id ${u_id}"
+
+    logger "Testing directory ${dir_to_check} has read/write permissions for user ${id_str}"
+
+    if ! testReadWritePermissions ${dir_to_check}; then
+        error=true
+    fi
+
+    if [ "${error}" == true ]; then
+        local stat_data=$(stat -Lc "Directory: %n, permissions: %a, owner: %U, group: %G" ${dir_to_check})
+        logger "###########################################################"
+        logger "${dir_to_check} DOES NOT have proper permissions for user ${id_str}"
+        logger "${stat_data}"
+        logger "Mounted directory must have read/write permissions for user ${id_str}"
+        logger "###########################################################"
+        errorExit "Directory ${dir_to_check} has bad permissions for user ${id_str}"
+    fi
+    logger "Permissions for ${dir_to_check} are good"
+}
+
+# Utility method to create a directory path recursively with chown feature as
+# Failure conditions:
+## Exits if unable to create a directory
+# Parameters:
+## $1: Root directory from where the path can be created
+## $2: List of recursive child directories separated by space
+## $3: user who should own the directory. Optional
+## $4: group who should own the directory. Optional
+# Depends on global: none
+# Updates global: none
+# Returns: NA
+#
+# Usage:
+# createRecursiveDir "/opt/jfrog/product/var" "bootstrap tomcat lib" "user_name" "group_name"
+createRecursiveDir(){
+    local rootDir=$1
+    local pathDirs=$2
+    local user=$3
+    local group=${4:-${user}}
+    local fullPath=
+
+    [ ! -z "${rootDir}" ] || return 0
+
+    createDir "${rootDir}" "${user}" "${group}"
+
+    [ ! -z "${pathDirs}" ] || return 0
+
+    fullPath=${rootDir}
+
+    for dir in ${pathDirs}; do
+        fullPath=${fullPath}/${dir}
+        createDir "${fullPath}" "${user}" "${group}"
+    done
+}
+
+# Utility method to create a directory
+# Failure conditions:
+## Exits if unable to create a directory
+# Parameters:
+## $1: directory to create
+## $2: user who should own the directory. Optional
+## $3: group who should own the directory. Optional
+# Depends on global: none
+# Updates global: none
+# Returns: NA
+
+createDir(){
+    local dirName="$1"
+    local printMessage=no
+    logSilly "Method ${FUNCNAME[0]} invoked with [$dirName]"
+    [ -z "${dirName}" ] && return
+    
+    logDebug "Attempting to create ${dirName}"
+    mkdir -p "${dirName}" || errorExit "Unable to create directory: [${dirName}]"
+    local userID="$2"
+    local groupID=${3:-$userID}
+
+    # If UID/GID is passed, chown the folder
+    if [ ! -z "$userID" ] && [ ! -z "$groupID" ]; then
+        # Earlier, this line would have returned 1 if it failed. Now it just warns. 
+        # This is intentional. Earlier, this line would NOT be reached if the folder already existed. 
+        # Since it will always come to this line and the script may be running as a non-root user, this method will just warn if
+        # setting permissions fails (so as to not affect any existing flows)
+        io_setOwnershipNonRecursive "$dirName" "$userID" "$groupID" || warn "Could not set owner of [$dirName] to [$userID:$groupID]"
+    fi
+    # logging message to print created dir with user and group
+    local logMessage=${4:-$printMessage}
+    if [[ "${logMessage}" == "yes" ]]; then
+        logger "Successfully created directory [${dirName}].  Owner: [${userID}:${groupID}]"
+    fi
+}
+
+removeSoftLinkAndCreateDir () {
+    local dirName="$1"
+    local userID="$2"
+    local groupID="$3"
+    local logMessage="$4"
+    removeSoftLink "${dirName}"
+    createDir "${dirName}" "${userID}" "${groupID}" "${logMessage}"
+}
+
+# Utility method to remove a soft link
+removeSoftLink () {
+    local dirName="$1"
+    if [[ -L "${dirName}" ]]; then
+        targetLink=$(readlink -f "${dirName}")
+        logger "Removing the symlink [${dirName}] pointing to [${targetLink}]"
+        rm -f "${dirName}"
+    fi
+}
+
+# Check Directory exist in the path
+checkDirExists () {
+    local directoryPath="$1"
+
+    [[ -d "${directoryPath}" ]] && echo -n "true" || echo -n "false"
+}
+
+
+# Utility method to create a file
+# Failure conditions:
+# Parameters:
+## $1: file to create
+# Depends on global: none
+# Updates global: none
+# Returns: NA
+
+createFile(){
+    local fileName="$1"
+    logSilly "Method ${FUNCNAME[0]} [$fileName]"
+    [ -f "${fileName}" ] && return 0
+    touch "${fileName}" || return 1
+
+    local userID="$2"
+    local groupID=${3:-$userID}
+
+    # If UID/GID is passed, chown the folder
+    if [ ! -z "$userID" ] && [ ! -z "$groupID" ]; then
+        io_setOwnership "$fileName" "$userID" "$groupID" || return 1
+    fi
+}
+
+# Check File exist in the filePath
+# IMPORTANT- DON'T ADD LOGGING to this method
+checkFileExists () {
+    local filePath="$1"
+
+    [[ -f "${filePath}" ]] && echo -n "true" || echo -n "false"
+}
+
+# Check for directories contains any (files or sub directories)
+# IMPORTANT- DON'T ADD LOGGING to this method
+checkDirContents () {
+    local directoryPath="$1"
+    if [[ "$(ls -1 "${directoryPath}" | wc -l)" -gt 0 ]]; then
+        echo -n "true"
+    else
+        echo -n "false"
+    fi
+}
+
+# Check contents exist in directory
+# IMPORTANT- DON'T ADD LOGGING to this method
+checkContentExists () {
+    local source="$1"
+
+    if [[ "$(checkDirContents "${source}")" != "true" ]]; then
+        echo -n "false"
+    else
+        echo -n "true"
+    fi
+}
+
+# Resolve the variable
+# IMPORTANT- DON'T ADD LOGGING to this method
+evalVariable () {
+    local output="$1"
+    local input="$2"
+
+    eval "${output}"=\${"${input}"}
+    eval echo \${"${output}"}
+}
+
+# Usage: if [ "$(io_commandExists 'curl')" == "yes" ]
+# IMPORTANT- DON'T ADD LOGGING to this method
+io_commandExists() {
+    local commandToExecute="$1"
+    hash "${commandToExecute}" 2>/dev/null
+    local rt=$?
+    if [ "$rt" == 0 ]; then echo -n "yes"; else echo -n "no"; fi
+}
+
+# Usage: if [ "$(io_curlExists)" != "yes" ]
+# IMPORTANT- DON'T ADD LOGGING to this method
+io_curlExists() {
+    io_commandExists "curl"
+}
+
+
+io_hasMatch() {
+    logSilly "Method ${FUNCNAME[0]}"
+    local result=0
+    logDebug "Executing [echo \"$1\" | grep \"$2\" >/dev/null 2>&1]"
+    echo "$1" | grep "$2" >/dev/null 2>&1 || result=1
+    return $result
+}
+
+# Utility method to check if the string passed (usually a connection url) corresponds to this machine itself
+# Failure conditions: None
+# Parameters:
+## $1: string to check against
+# Depends on global: none
+# Updates global: IS_LOCALHOST with value "yes/no"
+# Returns: NA
+
+io_getIsLocalhost() {
+    logSilly "Method ${FUNCNAME[0]}"
+    IS_LOCALHOST="$FLAG_N"
+    local inputString="$1"
+    logDebug "Parsing [$inputString] to check if we are dealing with this machine itself"
+
+    io_hasMatch "$inputString" "localhost" && {
+        logDebug "Found localhost. Returning [$FLAG_Y]"
+        IS_LOCALHOST="$FLAG_Y" && return;
+    } || logDebug "Did not find match for localhost"
+    
+    local hostIP=$(io_getPublicHostIP)
+    io_hasMatch "$inputString" "$hostIP" && {
+        logDebug "Found $hostIP. Returning [$FLAG_Y]"
+        IS_LOCALHOST="$FLAG_Y" && return;
+    } || logDebug "Did not find match for $hostIP"
+    
+    local hostID=$(io_getPublicHostID)
+    io_hasMatch "$inputString" "$hostID" && {
+        logDebug "Found $hostID. Returning [$FLAG_Y]"
+        IS_LOCALHOST="$FLAG_Y" && return;
+    } || logDebug "Did not find match for $hostID"
+    
+    local hostName=$(io_getPublicHostName)
+    io_hasMatch  "$inputString" "$hostName" && {
+        logDebug "Found $hostName. Returning [$FLAG_Y]"
+        IS_LOCALHOST="$FLAG_Y" && return;
+    } || logDebug "Did not find match for $hostName"
+    
+}
+
+# Usage: if [ "$(io_tarExists)" != "yes" ]
+# IMPORTANT- DON'T ADD LOGGING to this method
+io_tarExists() {
+    io_commandExists "tar"
+}
+
+# IMPORTANT- DON'T ADD LOGGING to this method
+io_getPublicHostIP() {
+    local OS_TYPE=$(uname)
+    local publicHostIP=
+    if [ "${OS_TYPE}" == "Darwin" ]; then
+        ipStatus=$(ifconfig en0 | grep "status" | awk '{print$2}')
+        if [ "${ipStatus}" == "active" ]; then
+            publicHostIP=$(ifconfig en0 | grep inet | grep -v inet6 | awk '{print $2}')
+        else
+            errorExit "Host IP could not be resolved!"
+        fi
+    elif [ "${OS_TYPE}" == "Linux" ]; then
+        publicHostIP=$(hostname -i 2>/dev/null || echo "127.0.0.1")
+    fi
+    publicHostIP=$(echo "${publicHostIP}" | awk '{print $1}')
+    echo -n "${publicHostIP}"
+}
+
+# Will return the short host name (up to the first dot)
+# IMPORTANT- DON'T ADD LOGGING to this method
+io_getPublicHostName() {
+    echo -n "$(hostname -s)"
+}
+
+# Will return the full host name (use this as much as possible)
+# IMPORTANT- DON'T ADD LOGGING to this method
+io_getPublicHostID() {
+    echo -n "$(hostname)"
+}
+
+# Utility method to backup a file
+# Failure conditions: NA
+# Parameters: filePath
+# Depends on global: none,
+# Updates global: none
+# Returns: NA
+io_backupFile() {
+    logSilly "Method ${FUNCNAME[0]}"
+    fileName="$1"
+    if [ ! -f "${filePath}" ]; then
+        logDebug "No file: [${filePath}] to backup"
+        return
+    fi
+    dateTime=$(date +"%Y-%m-%d-%H-%M-%S")
+    targetFileName="${fileName}.backup.${dateTime}"
+    yes | \cp -f "$fileName" "${targetFileName}"
+    logger "File [${fileName}] backedup as [${targetFileName}]"
+}
+
+# Reference https://stackoverflow.com/questions/4023830/how-to-compare-two-strings-in-dot-separated-version-format-in-bash/4025065#4025065
+is_number() {
+    case "$BASH_VERSION" in
+        3.1.*)
+            PATTERN='\^\[0-9\]+\$'
+            ;;
+        *)
+            PATTERN='^[0-9]+$'
+            ;;
+    esac
+
+    [[ "$1" =~ $PATTERN ]]
+}
+
+io_compareVersions() {
+    if [[ $# != 2 ]]
+    then
+        echo "Usage: min_version current minimum"
+        return
+    fi
+
+    A="${1%%.*}"
+    B="${2%%.*}"
+
+    if [[ "$A" != "$1" && "$B" != "$2" && "$A" == "$B" ]]
+    then
+        io_compareVersions "${1#*.}" "${2#*.}"
+    else
+        if is_number "$A" && is_number "$B"
+        then
+            if [[ "$A" -eq "$B" ]]; then
+                echo "0"
+            elif [[ "$A" -gt "$B" ]]; then
+                echo "1"
+            elif [[ "$A" -lt "$B" ]]; then
+                echo "-1"
+            fi
+        fi
+    fi
+}
+
+# Reference https://stackoverflow.com/questions/369758/how-to-trim-whitespace-from-a-bash-variable
+# Strip all leading and trailing spaces
+# IMPORTANT- DON'T ADD LOGGING to this method
+io_trim() {
+    local var="$1"
+    # remove leading whitespace characters
+    var="${var#"${var%%[![:space:]]*}"}"
+    # remove trailing whitespace characters
+    var="${var%"${var##*[![:space:]]}"}"
+    echo -n "$var"
+}
+
+# temporary function will be removing it ASAP
+# search for string and replace text in file
+replaceText_migration_hook () {
+    local regexString="$1"
+    local replaceText="$2"
+    local file="$3"
+
+    if [[ "$(checkFileExists "${file}")" != "true" ]]; then
+        return
+    fi
+    if [[ $(uname) == "Darwin" ]]; then
+        sed -i '' -e "s/${regexString}/${replaceText}/" "${file}" || warn "Failed to replace the text in ${file}"
+    else
+        sed -i -e "s/${regexString}/${replaceText}/" "${file}" || warn "Failed to replace the text in ${file}"
+    fi
+}
+
+# search for string and replace text in file
+replaceText () {
+    local regexString="$1"
+    local replaceText="$2"
+    local file="$3"
+
+    if [[ "$(checkFileExists "${file}")" != "true" ]]; then
+        return
+    fi
+    if [[ $(uname) == "Darwin" ]]; then
+        sed -i '' -e "s#${regexString}#${replaceText}#" "${file}" || warn "Failed to replace the text in ${file}"
+    else
+        sed -i -e "s#${regexString}#${replaceText}#" "${file}" || warn "Failed to replace the text in ${file}"
+        logDebug "Replaced [$regexString] with [$replaceText] in [$file]"
+    fi
+}
+
+# search for string and prepend text in file
+prependText () {
+    local regexString="$1"
+    local text="$2"
+    local file="$3"
+
+    if [[ "$(checkFileExists "${file}")" != "true" ]]; then
+        return
+    fi
+    if [[ $(uname) == "Darwin" ]]; then
+        sed -i '' -e '/'"${regexString}"'/i\'$'\n\\'"${text}"''$'\n' "${file}" || warn "Failed to prepend the text in ${file}"
+    else
+        sed -i -e '/'"${regexString}"'/i\'$'\n\\'"${text}"''$'\n' "${file}" || warn "Failed to prepend the text in ${file}"
+    fi
+}
+
+# add text to beginning of the file
+addText () {
+    local text="$1"
+    local file="$2"
+
+    if [[ "$(checkFileExists "${file}")" != "true" ]]; then
+        return
+    fi
+    if [[ $(uname) == "Darwin" ]]; then
+        sed -i '' -e '1s/^/'"${text}"'\'$'\n/' "${file}" || warn "Failed to add the text in ${file}"
+    else
+        sed -i -e '1s/^/'"${text}"'\'$'\n/' "${file}" || warn "Failed to add the text in ${file}"
+    fi
+}
+
+io_replaceString () {
+    local value="$1"
+    local firstString="$2"
+    local secondString="$3"
+    local separator=${4:-"/"}
+    local updateValue=
+    if [[ $(uname) == "Darwin" ]]; then
+        updateValue=$(echo "${value}" | sed "s${separator}${firstString}${separator}${secondString}${separator}")
+    else
+        updateValue=$(echo "${value}" | sed "s${separator}${firstString}${separator}${secondString}${separator}")
+    fi
+    echo -n "${updateValue}"
+}
+
+_findYQ() {
+    # logSilly "Method ${FUNCNAME[0]}" (Intentionally not logging. Does not add value)
+    local parentDir="$1"
+    if [ -z "$parentDir" ]; then
+        return
+    fi
+    logDebug "Executing command [find "${parentDir}" -name third-party -type d]"
+    local yq=$(find "${parentDir}" -name third-party -type d)
+    if [ -d "${yq}/yq" ]; then
+        export YQ_PATH="${yq}/yq"
+    fi
+}
+
+
+io_setYQPath() {
+    # logSilly "Method ${FUNCNAME[0]}" (Intentionally not logging. Does not add value)
+    if [ "$(io_commandExists 'yq')" == "yes" ]; then
+        return
+    fi
+    
+    if [ ! -z "${JF_PRODUCT_HOME}" ] && [ -d "${JF_PRODUCT_HOME}" ]; then
+        _findYQ "${JF_PRODUCT_HOME}"
+    fi
+    
+    if [ -z "${YQ_PATH}" ] && [ ! -z "${COMPOSE_HOME}" ] && [ -d "${COMPOSE_HOME}" ]; then
+        _findYQ "${COMPOSE_HOME}"
+    fi
+    # TODO We can remove this block after all the code is restructured.
+    if [ -z "${YQ_PATH}" ] && [ ! -z "${SCRIPT_HOME}" ] && [ -d "${SCRIPT_HOME}" ]; then
+        _findYQ "${SCRIPT_HOME}"
+    fi
+    
+}
+
+io_getLinuxDistribution() {
+    LINUX_DISTRIBUTION=
+
+    # Make sure running on Linux
+    [ $(uname -s) != "Linux" ] && return
+
+    # Find out what Linux distribution we are on
+
+    cat /etc/*-release | grep -i Red >/dev/null 2>&1 && LINUX_DISTRIBUTION=RedHat || true
+
+    # OS 6.x
+    cat /etc/issue.net | grep Red >/dev/null 2>&1 && LINUX_DISTRIBUTION=RedHat || true
+
+    # OS 7.x
+    cat /etc/*-release | grep -i centos >/dev/null 2>&1 && LINUX_DISTRIBUTION=CentOS && LINUX_DISTRIBUTION_VER="7" || true
+
+    # OS 8.x
+    grep -q -i "release 8" /etc/redhat-release >/dev/null 2>&1 && LINUX_DISTRIBUTION_VER="8" || true
+
+    # OS 7.x
+    grep -q -i "release 7" /etc/redhat-release >/dev/null 2>&1 && LINUX_DISTRIBUTION_VER="7" || true
+
+    # OS 6.x
+    grep -q -i "release 6" /etc/redhat-release >/dev/null 2>&1 && LINUX_DISTRIBUTION_VER="6" || true
+
+    cat /etc/*-release | grep -i Red | grep -i 'VERSION=7' >/dev/null 2>&1 && LINUX_DISTRIBUTION=RedHat && LINUX_DISTRIBUTION_VER="7" || true
+
+    cat /etc/*-release | grep -i debian >/dev/null 2>&1 && LINUX_DISTRIBUTION=Debian || true
+
+    cat /etc/*-release | grep -i ubuntu >/dev/null 2>&1 && LINUX_DISTRIBUTION=Ubuntu || true
+}
+
+## Utility method to check ownership of folders/files
+## Failure conditions:
+    ## If invoked with incorrect inputs - FATAL
+    ## If file is not owned by the user & group
+## Parameters:
+    ## user
+    ## group
+    ## folder to chown    
+## Globals: none
+## Returns: none
+## NOTE: The method does NOTHING if the OS is Mac
+io_checkOwner () {
+    logSilly "Method ${FUNCNAME[0]}"
+    local osType=$(uname)
+    
+    if [ "${osType}" != "Linux" ]; then
+        logDebug "Unsupported OS. Skipping check"
+        return 0
+    fi
+
+    local file_to_check=$1
+    local user_id_to_check=$2
+    
+
+    if [ -z "$user_id_to_check" ] || [ -z "$file_to_check" ]; then
+        errorExit "Invalid invocation of method. Missing mandatory inputs"
+    fi
+
+    local group_id_to_check=${3:-$user_id_to_check}
+    local check_user_name=${4:-"no"}
+
+    logDebug "Checking permissions on [$file_to_check] for user [$user_id_to_check] & group [$group_id_to_check]"
+
+    local stat=
+
+    if [ "${check_user_name}" == "yes" ]; then
+        stat=( $(stat -Lc "%U %G" ${file_to_check}) )
+    else
+        stat=( $(stat -Lc "%u %g" ${file_to_check}) )
+    fi
+
+    local user_id=${stat[0]}
+    local group_id=${stat[1]}
+
+    if [[ "${user_id}" != "${user_id_to_check}" ]] || [[ "${group_id}" != "${group_id_to_check}" ]] ; then
+        logDebug "Ownership mismatch. [${file_to_check}] is not owned by [${user_id_to_check}:${group_id_to_check}]"
+        return 1
+    else
+        return 0
+    fi
+}
+
+## Utility method to change ownership of a file/folder - NON recursive
+## Failure conditions:
+    ## If invoked with incorrect inputs - FATAL
+    ## If chown operation fails - returns 1
+## Parameters: 
+    ## user
+    ## group
+    ## file to chown    
+## Globals: none
+## Returns: none
+## NOTE: The method does NOTHING if the OS is Mac
+
+io_setOwnershipNonRecursive() {
+    
+    local osType=$(uname)
+    if [ "${osType}" != "Linux" ]; then
+        return
+    fi
+
+    local targetFile=$1
+    local user=$2
+
+    if [ -z "$user" ] || [ -z "$targetFile" ]; then
+        errorExit "Invalid invocation of method. Missing mandatory inputs"
+    fi
+
+    local group=${3:-$user}
+    logDebug "Method ${FUNCNAME[0]}. Executing [chown ${user}:${group} ${targetFile}]"
+    chown ${user}:${group} ${targetFile} || return 1
+}
+
+## Utility method to change ownership of a file. 
+## IMPORTANT 
+## If being called on a folder, should ONLY be called for fresh folders or may cause performance issues
+## Failure conditions:
+    ## If invoked with incorrect inputs - FATAL
+    ## If chown operation fails - returns 1
+## Parameters: 
+    ## user
+    ## group
+    ## file to chown    
+## Globals: none
+## Returns: none
+## NOTE: The method does NOTHING if the OS is Mac
+
+io_setOwnership() {
+    
+    local osType=$(uname)
+    if [ "${osType}" != "Linux" ]; then
+        return
+    fi
+
+    local targetFile=$1
+    local user=$2
+
+    if [ -z "$user" ] || [ -z "$targetFile" ]; then
+        errorExit "Invalid invocation of method. Missing mandatory inputs"
+    fi
+
+    local group=${3:-$user}
+    logDebug "Method ${FUNCNAME[0]}. Executing [chown -R ${user}:${group} ${targetFile}]"
+    chown -R ${user}:${group} ${targetFile} || return 1
+}
+
+## Utility method to create third party folder structure necessary for Postgres
+## Failure conditions:
+## If creation of directory or assigning permissions fails
+## Parameters: none
+## Globals:
+## POSTGRESQL_DATA_ROOT
+## Returns: none
+## NOTE: The method does NOTHING if the folder already exists
+io_createPostgresDir() {
+    logDebug "Method ${FUNCNAME[0]}"
+    [ -z "${POSTGRESQL_DATA_ROOT}" ] && return 0
+
+    logDebug "Property [${POSTGRESQL_DATA_ROOT}] exists. Proceeding"
+
+    createDir "${POSTGRESQL_DATA_ROOT}/data"
+    io_setOwnership  "${POSTGRESQL_DATA_ROOT}" "${POSTGRES_USER}" "${POSTGRES_USER}" || errorExit "Setting ownership of [${POSTGRESQL_DATA_ROOT}] to [${POSTGRES_USER}:${POSTGRES_USER}] failed"
+}
+
+## Utility method to create third party folder structure necessary for Nginx
+## Failure conditions:
+## If creation of directory or assigning permissions fails
+## Parameters: none
+## Globals:
+## NGINX_DATA_ROOT
+## Returns: none
+## NOTE: The method does NOTHING if the folder already exists
+io_createNginxDir() {
+    logDebug "Method ${FUNCNAME[0]}"
+    [ -z "${NGINX_DATA_ROOT}" ] && return 0
+
+    logDebug "Property [${NGINX_DATA_ROOT}] exists. Proceeding"
+
+    createDir "${NGINX_DATA_ROOT}"
+    io_setOwnership  "${NGINX_DATA_ROOT}" "${NGINX_USER}" "${NGINX_GROUP}" || errorExit "Setting ownership of [${NGINX_DATA_ROOT}] to [${NGINX_USER}:${NGINX_GROUP}] failed"
+}
+
+## Utility method to create third party folder structure necessary for ElasticSearch
+## Failure conditions:
+## If creation of directory or assigning permissions fails
+## Parameters: none
+## Globals:
+## ELASTIC_DATA_ROOT
+## Returns: none
+## NOTE: The method does NOTHING if the folder already exists
+io_createElasticSearchDir() {
+    logDebug "Method ${FUNCNAME[0]}"
+    [ -z "${ELASTIC_DATA_ROOT}" ] && return 0
+
+    logDebug "Property [${ELASTIC_DATA_ROOT}] exists. Proceeding"
+
+    createDir "${ELASTIC_DATA_ROOT}/data"
+    io_setOwnership  "${ELASTIC_DATA_ROOT}" "${ES_USER}" "${ES_USER}" || errorExit "Setting ownership of [${ELASTIC_DATA_ROOT}] to [${ES_USER}:${ES_USER}] failed"
+}
+
+## Utility method to create third party folder structure necessary for Redis
+## Failure conditions:
+## If creation of directory or assigning permissions fails
+## Parameters: none
+## Globals:
+## REDIS_DATA_ROOT
+## Returns: none
+## NOTE: The method does NOTHING if the folder already exists
+io_createRedisDir() {
+    logDebug "Method ${FUNCNAME[0]}"
+    [ -z "${REDIS_DATA_ROOT}" ] && return 0
+
+    logDebug "Property [${REDIS_DATA_ROOT}] exists. Proceeding"
+
+    createDir "${REDIS_DATA_ROOT}"
+    io_setOwnership  "${REDIS_DATA_ROOT}" "${REDIS_USER}" "${REDIS_USER}" || errorExit "Setting ownership of [${REDIS_DATA_ROOT}] to [${REDIS_USER}:${REDIS_USER}] failed"
+}
+
+## Utility method to create third party folder structure necessary for Mongo
+## Failure conditions:
+## If creation of directory or assigning permissions fails
+## Parameters: none
+## Globals:
+## MONGODB_DATA_ROOT
+## Returns: none
+## NOTE: The method does NOTHING if the folder already exists
+io_createMongoDir() {
+    logDebug "Method ${FUNCNAME[0]}"
+    [ -z "${MONGODB_DATA_ROOT}" ] && return 0
+
+    logDebug "Property [${MONGODB_DATA_ROOT}] exists. Proceeding"
+
+    createDir "${MONGODB_DATA_ROOT}/logs"
+    createDir "${MONGODB_DATA_ROOT}/configdb"
+    createDir "${MONGODB_DATA_ROOT}/db"
+    io_setOwnership  "${MONGODB_DATA_ROOT}" "${MONGO_USER}" "${MONGO_USER}" || errorExit "Setting ownership of [${MONGODB_DATA_ROOT}] to [${MONGO_USER}:${MONGO_USER}] failed"
+}
+
+## Utility method to create third party folder structure necessary for RabbitMQ
+## Failure conditions:
+## If creation of directory or assigning permissions fails
+## Parameters: none
+## Globals:
+## RABBITMQ_DATA_ROOT
+## Returns: none
+## NOTE: The method does NOTHING if the folder already exists
+io_createRabbitMQDir() {
+    logDebug "Method ${FUNCNAME[0]}"
+    [ -z "${RABBITMQ_DATA_ROOT}" ] && return 0
+
+    logDebug "Property [${RABBITMQ_DATA_ROOT}] exists. Proceeding"
+
+    createDir "${RABBITMQ_DATA_ROOT}"
+    io_setOwnership  "${RABBITMQ_DATA_ROOT}" "${RABBITMQ_USER}" "${RABBITMQ_USER}" || errorExit "Setting ownership of [${RABBITMQ_DATA_ROOT}] to [${RABBITMQ_USER}:${RABBITMQ_USER}] failed"
+}
+
+# Add or replace a property in provided properties file
+addOrReplaceProperty() {
+    local propertyName=$1
+    local propertyValue=$2
+    local propertiesPath=$3
+    local delimiter=${4:-"="}
+
+    # Return if any of the inputs are empty
+    [[ -z "$propertyName"   || "$propertyName"   == "" ]] && return
+    [[ -z "$propertyValue"  || "$propertyValue"  == "" ]] && return
+    [[ -z "$propertiesPath" || "$propertiesPath" == "" ]] && return
+
+    grep "^${propertyName}\s*${delimiter}.*$" ${propertiesPath} > /dev/null 2>&1
+    [ $? -ne 0 ] && echo -e "\n${propertyName}${delimiter}${propertyValue}" >> ${propertiesPath}
+    sed -i -e "s|^${propertyName}\s*${delimiter}.*$|${propertyName}${delimiter}${propertyValue}|g;" ${propertiesPath}
+}
+
+# Set property only if its not set
+io_setPropertyNoOverride(){
+    local propertyName=$1
+    local propertyValue=$2
+    local propertiesPath=$3
+
+    # Return if any of the inputs are empty
+    [[ -z "$propertyName"   || "$propertyName"   == "" ]] && return
+    [[ -z "$propertyValue"  || "$propertyValue"  == "" ]] && return
+    [[ -z "$propertiesPath" || "$propertiesPath" == "" ]] && return
+
+    grep "^${propertyName}:" ${propertiesPath} > /dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        echo -e "${propertyName}: ${propertyValue}" >> ${propertiesPath} || warn "Setting property ${propertyName}: ${propertyValue} in [ ${propertiesPath} ] failed"
+    else
+        logger "Skipping update of property : ${propertyName}" >&6
+    fi
+}
+
+# Add a line to a file if it doesn't already exist
+addLine() {
+    local line_to_add=$1
+    local target_file=$2
+    logger "Trying to add line $1 to $2" >&6 2>&1
+    cat "$target_file" | grep -F "$line_to_add" -wq >&6 2>&1
+    if [ $? != 0  ]; then
+        logger "Line does not exist and will be added" >&6 2>&1
+        echo $line_to_add >> $target_file || errorExit "Could not update $target_file"
+    fi    
+}
+
+# Utility method to check if a value (first parameter) exists in an array (2nd parameter)
+# 1st parameter "value to find"
+# 2nd parameter "The array to search in. Please pass a string with each value separated by space"
+# Example: containsElement "y" "y Y n N"
+containsElement () {
+    local searchElement=$1
+    local searchArray=($2)
+    local found=1
+    for elementInIndex in "${searchArray[@]}";do
+    if [[ $elementInIndex == $searchElement ]]; then
+        found=0
+    fi
+    done
+    return $found
+}
+
+# Utility method to get user's choice
+# 1st parameter "what to ask the user"
+# 2nd parameter "what choices to accept, separated by spaces"
+# 3rd parameter "what is the default choice (to use if the user simply presses Enter)"
+# Example 'getUserChoice "Are you feeling lucky? Punk!" "y n Y N" "y"'
+getUserChoice(){
+    configureLogOutput
+    read_timeout=${read_timeout:-0.5}
+    local choice="na"
+    local text_to_display=$1
+    local choices=$2
+    local default_choice=$3
+    users_choice=
+
+    until containsElement "$choice" "$choices"; do
+        echo "";echo "";
+        sleep $read_timeout #This ensures correct placement of the question.
+        read -p  "$text_to_display :" choice
+        : ${choice:=$default_choice}
+    done
+    users_choice=$choice
+    echo -e "\n$text_to_display: $users_choice" >&6
+    sleep $read_timeout #This ensures correct logging
+}
+
+setFilePermission () {
+    local permission=$1
+    local file=$2
+    chmod "${permission}" "${file}" || warn "Setting permission ${permission} to file [ ${file} ] failed"
+}
+
+
+#setting required paths
+setAppDir (){
+    SCRIPT_DIR=$(dirname $0)
+    SCRIPT_HOME="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    APP_DIR="`cd "${SCRIPT_HOME}";pwd`"
+}
+
+ZIP_TYPE="zip"
+COMPOSE_TYPE="compose"
+HELM_TYPE="helm"
+RPM_TYPE="rpm"
+DEB_TYPE="debian"
+
+sourceScript () {
+    local file="$1"
+
+    [ ! -z "${file}" ] || errorExit "target file is not passed to source a file"
+
+    if [ ! -f "${file}" ]; then
+        errorExit "${file} file is not found"
+    else
+        source "${file}" || errorExit "Unable to source ${file}, please check if the user ${USER} has permissions to perform this action"
+    fi
+}
+# Source required helpers
+initHelpers () {
+    local systemYamlHelper="${APP_DIR}/systemYamlHelper.sh"
+    local thirdPartyDir=$(find ${APP_DIR}/.. -name third-party -type d)
+    export YQ_PATH="${thirdPartyDir}/yq"
+    LIBXML2_PATH="${thirdPartyDir}/libxml2/bin/xmllint"
+    export LD_LIBRARY_PATH="${thirdPartyDir}/libxml2/lib"
+    sourceScript "${systemYamlHelper}"
+}
+# Check migration info yaml file available in the path
+checkMigrationInfoYaml () {
+
+    if [[ -f "${APP_DIR}/migrationHelmInfo.yaml" ]]; then
+        MIGRATION_SYSTEM_YAML_INFO="${APP_DIR}/migrationHelmInfo.yaml"
+        INSTALLER="${HELM_TYPE}"
+    elif [[ -f "${APP_DIR}/migrationZipInfo.yaml" ]]; then
+        MIGRATION_SYSTEM_YAML_INFO="${APP_DIR}/migrationZipInfo.yaml"
+        INSTALLER="${ZIP_TYPE}"
+    elif [[ -f "${APP_DIR}/migrationRpmInfo.yaml" ]]; then
+        MIGRATION_SYSTEM_YAML_INFO="${APP_DIR}/migrationRpmInfo.yaml"
+        INSTALLER="${RPM_TYPE}"
+    elif [[ -f "${APP_DIR}/migrationDebInfo.yaml" ]]; then
+        MIGRATION_SYSTEM_YAML_INFO="${APP_DIR}/migrationDebInfo.yaml"
+        INSTALLER="${DEB_TYPE}"
+    elif [[ -f "${APP_DIR}/migrationComposeInfo.yaml" ]]; then
+        MIGRATION_SYSTEM_YAML_INFO="${APP_DIR}/migrationComposeInfo.yaml"
+        INSTALLER="${COMPOSE_TYPE}"
+    else
+        errorExit "File migration Info yaml does not exist in [${APP_DIR}]"
+    fi
+}
+
+retrieveYamlValue () {
+    local yamlPath="$1"
+    local value="$2"
+    local output="$3"
+    local message="$4"
+
+    [[ -z "${yamlPath}" ]] && errorExit "yamlPath is mandatory to get value from ${MIGRATION_SYSTEM_YAML_INFO}"
+
+    getYamlValue "${yamlPath}" "${MIGRATION_SYSTEM_YAML_INFO}" "false"
+    value="${YAML_VALUE}"
+    if [[ -z "${value}" ]]; then
+        if [[ "${output}" == "Warning" ]]; then
+            warn "Empty value for ${yamlPath} in [${MIGRATION_SYSTEM_YAML_INFO}]"
+        elif [[ "${output}" == "Skip" ]]; then
+            return
+        else
+            errorExit "${message}"
+        fi
+    fi
+}
+
+checkEnv () {
+    
+    if [[ "${INSTALLER}" == "${ZIP_TYPE}" ]]; then
+        # check Environment JF_PRODUCT_HOME is set before migration
+        NEW_DATA_DIR="$(evalVariable "NEW_DATA_DIR" "JF_PRODUCT_HOME")"
+        if [[ -z "${NEW_DATA_DIR}" ]]; then
+            errorExit "Environment variable JF_PRODUCT_HOME is not set, this is required to perform Migration"
+        fi
+        # appending var directory to $JF_PRODUCT_HOME
+        NEW_DATA_DIR="${NEW_DATA_DIR}/var"
+    elif [[ "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        getCustomDataDir_hook
+        NEW_DATA_DIR="${OLD_DATA_DIR}"
+        if [[ -z "${NEW_DATA_DIR}" ]] && [[  -z "${OLD_DATA_DIR}" ]]; then
+            errorExit "Could not find ${PROMPT_DATA_DIR_LOCATION} to perform Migration"
+        fi
+    else
+        # check Environment JF_ROOT_DATA_DIR is set before migration
+        OLD_DATA_DIR="$(evalVariable "OLD_DATA_DIR" "JF_ROOT_DATA_DIR")"
+        # check Environment JF_ROOT_DATA_DIR is set before migration
+        NEW_DATA_DIR="$(evalVariable "NEW_DATA_DIR" "JF_ROOT_DATA_DIR")"
+        if [[ -z "${NEW_DATA_DIR}" ]] && [[  -z "${OLD_DATA_DIR}" ]]; then
+            errorExit "Could not find ${PROMPT_DATA_DIR_LOCATION} to perform Migration"
+        fi
+            # appending var directory to $JF_PRODUCT_HOME
+            NEW_DATA_DIR="${NEW_DATA_DIR}/var"
+    fi
+    
+}
+
+getDataDir () {
+
+    if [[ "${INSTALLER}" == "${ZIP_TYPE}" || "${INSTALLER}" == "${COMPOSE_TYPE}"|| "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        checkEnv
+    else
+        getCustomDataDir_hook
+        NEW_DATA_DIR="`cd "${APP_DIR}"/../../;pwd`"
+        NEW_DATA_DIR="${NEW_DATA_DIR}/var"
+    fi
+}
+
+# Retrieve Product name from MIGRATION_SYSTEM_YAML_INFO
+getProduct () {
+    retrieveYamlValue "migration.product" "${YAML_VALUE}" "Fail" "Empty value under ${yamlPath} in [${MIGRATION_SYSTEM_YAML_INFO}]"
+    PRODUCT="${YAML_VALUE}"
+    PRODUCT=$(echo "${PRODUCT}" | tr '[:upper:]' '[:lower:]' 2>/dev/null)
+    if [[ "${PRODUCT}" != "artifactory" && "${PRODUCT}" != "distribution" && "${PRODUCT}" != "xray" ]]; then
+        errorExit "migration.product in [${MIGRATION_SYSTEM_YAML_INFO}] is not correct, please set based on product as ARTIFACTORY or DISTRIBUTION"
+    fi
+    if [[ "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        JF_USER="${PRODUCT}"
+    fi
+}
+# Compare product version with minProductVersion and maxProductVersion
+migrateCheckVersion () {
+    local productVersion="$1"
+    local minProductVersion="$2"
+    local maxProductVersion="$3"
+    local productVersion618="6.18.0"
+    local unSupportedProductVersions7=("7.2.0 7.2.1")
+
+    if [[ "$(io_compareVersions "${productVersion}" "${maxProductVersion}")" -eq 0 || "$(io_compareVersions "${productVersion}" "${maxProductVersion}")" -eq 1 ]]; then
+        logger "Migration not necessary. ${PRODUCT} is already ${productVersion}"
+        exit 11
+    elif [[ "$(io_compareVersions "${productVersion}" "${minProductVersion}")" -eq 0 || "$(io_compareVersions "${productVersion}" "${minProductVersion}")" -eq 1 ]]; then
+        if [[ ("$(io_compareVersions "${productVersion}" "${productVersion618}")" -eq 0 || "$(io_compareVersions "${productVersion}" "${productVersion618}")" -eq 1) && " ${unSupportedProductVersions7[@]} " =~ " ${CURRENT_VERSION} " ]]; then
+            touch /tmp/error;
+            errorExit "Current ${PRODUCT} version (${productVersion}) does not support migration to ${CURRENT_VERSION}"
+        else
+            bannerStart "Detected ${PRODUCT} ${productVersion}, initiating migration"
+        fi
+    else
+        logger "Current ${PRODUCT} ${productVersion} version is not supported for migration"
+        exit 1
+    fi
+}
+
+getProductVersion () {
+    local minProductVersion="$1"
+    local maxProductVersion="$2"
+    local newfilePath="$3"
+    local oldfilePath="$4"
+    local propertyInDocker="$5"
+    local property="$6"
+    local productVersion=
+    local status=
+
+    if [[ "$INSTALLER" == "${COMPOSE_TYPE}" ]]; then
+        if [[ -f "${oldfilePath}" ]]; then
+            if [[ "${PRODUCT}" == "artifactory" ]]; then
+                productVersion="$(readKey "${property}" "${oldfilePath}")"
+            else
+                productVersion="$(cat "${oldfilePath}")"
+            fi
+            status="success"
+        elif [[ -f "${newfilePath}" ]]; then
+            productVersion="$(readKey "${propertyInDocker}" "${newfilePath}")"
+            status="fail"
+        else
+            logger "File [${oldfilePath}] or [${newfilePath}] not found to get current version."
+            exit 0
+        fi
+    elif [[ "$INSTALLER" == "${HELM_TYPE}" ]]; then
+        if [[ -f "${oldfilePath}" ]]; then
+            if [[ "${PRODUCT}" == "artifactory" ]]; then
+                productVersion="$(readKey "${property}" "${oldfilePath}")"
+            else
+                productVersion="$(cat "${oldfilePath}")"
+            fi
+            status="success"
+        else
+            productVersion="${CURRENT_VERSION}"
+            [[ -z "${productVersion}" || "${productVersion}" == "" ]] && logger "${PRODUCT} CURRENT_VERSION is not set" && exit 0
+        fi
+    else
+        if [[ -f "${newfilePath}" ]]; then
+            productVersion="$(readKey "${property}" "${newfilePath}")"
+            status="fail"
+        elif [[ -f "${oldfilePath}" ]]; then
+            productVersion="$(readKey "${property}" "${oldfilePath}")"
+            status="success"
+        else
+            if [[ "${INSTALLER}" == "${ZIP_TYPE}" ]]; then
+                logger "File [${newfilePath}] not found to get current version."
+            else
+                logger "File [${oldfilePath}] or [${newfilePath}] not found to get current version."
+            fi
+            exit 0
+        fi
+    fi
+    if [[ -z "${productVersion}" || "${productVersion}" == "" ]]; then
+        [[ "${status}" == "success" ]] && logger "No version found in file [${oldfilePath}]."
+        [[ "${status}" == "fail" ]] && logger "No version found in file [${newfilePath}]."
+        exit 0
+    fi
+
+    migrateCheckVersion "${productVersion}" "${minProductVersion}" "${maxProductVersion}"
+}
+
+readKey () {
+    local property="$1"
+    local file="$2"
+    local version=
+
+    while IFS='=' read -r key value || [ -n "${key}" ];
+    do
+        [[ ! "${key}" =~ \#.* && ! -z "${key}" && ! -z "${value}" ]]
+        key="$(io_trim "${key}")"
+        if [[ "${key}" == "${property}" ]]; then
+            version="${value}" && check=true && break
+        else
+            check=false
+        fi
+    done < "${file}"
+    if [[ "${check}" == "false" ]]; then
+        return
+    fi
+    echo "${version}"
+}
+
+# create Log directory
+createLogDir () {
+    if [[ "${INSTALLER}" == "${DEB_TYPE}" || "${INSTALLER}" == "${RPM_TYPE}" ]]; then
+        getUserAndGroupFromFile
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/log" "${USER_TO_CHECK}" "${GROUP_TO_CHECK}"
+    fi
+}
+
+# Creating migration log file
+creationMigrateLog () {
+    local LOG_FILE_NAME="migration.log"
+    createLogDir
+    local MIGRATION_LOG_FILE="${NEW_DATA_DIR}/log/${LOG_FILE_NAME}"
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        MIGRATION_LOG_FILE="${SCRIPT_HOME}/${LOG_FILE_NAME}"
+    fi
+    touch "${MIGRATION_LOG_FILE}"
+    setFilePermission "${LOG_FILE_PERMISSION}" "${MIGRATION_LOG_FILE}"
+    exec &> >(tee -a "${MIGRATION_LOG_FILE}")   
+}
+# Set path where system.yaml should create
+setSystemYamlPath () {
+    SYSTEM_YAML_PATH="${NEW_DATA_DIR}/etc/system.yaml"
+    if [[ "${INSTALLER}" != "${HELM_TYPE}" ]]; then
+        logger "system.yaml will be created in path [${SYSTEM_YAML_PATH}]"
+    fi
+}
+# Create directory
+createDirectory () {
+    local directory="$1"
+    local output="$2"
+    local check=false
+    local message="Could not create directory ${directory}, please check if the user ${USER} has permissions to perform this action"
+    removeSoftLink "${directory}"
+    mkdir -p "${directory}" && check=true || check=false
+    if [[ "${check}" == "false" ]]; then
+        if [[ "${output}" == "Warning" ]]; then
+            warn "${message}"
+        else
+            errorExit "${message}"
+        fi
+    fi
+    setOwnershipBasedOnInstaller "${directory}"
+}
+
+setOwnershipBasedOnInstaller () {
+    local directory="$1"
+    if [[ "${INSTALLER}" == "${DEB_TYPE}" || "${INSTALLER}" == "${RPM_TYPE}" ]]; then
+        getUserAndGroupFromFile
+        chown -R ${USER_TO_CHECK}:${GROUP_TO_CHECK} "${directory}" || warn "Setting ownership on $directory failed"
+    elif [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        io_setOwnership "${directory}" "${JF_USER}" "${JF_USER}"
+    fi
+}
+
+getUserAndGroup () {
+    local file="$1"
+    read uid gid <<<$(stat -c '%U %G' ${file})
+    USER_TO_CHECK="${uid}"
+    GROUP_TO_CHECK="${gid}"
+}
+    
+# set ownership
+getUserAndGroupFromFile () {
+    case $PRODUCT in
+        artifactory)
+            getUserAndGroup "/etc/opt/jfrog/artifactory/artifactory.properties"
+        ;;
+        distribution)
+            getUserAndGroup "${OLD_DATA_DIR}/etc/versions.properties"
+        ;;
+        xray)
+            getUserAndGroup "${OLD_DATA_DIR}/security/master.key"
+        ;;
+        esac
+} 
+
+# creating required directories
+createRequiredDirs () {
+    bannerSubSection "CREATING REQUIRED DIRECTORIES"
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}"  ]]; then
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/etc/security" "${JF_USER}" "${JF_USER}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/data" "${JF_USER}" "${JF_USER}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/log/archived" "${JF_USER}" "${JF_USER}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/work" "${JF_USER}" "${JF_USER}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/backup" "${JF_USER}" "${JF_USER}" "yes"
+        io_setOwnership "${NEW_DATA_DIR}" "${JF_USER}" "${JF_USER}"
+        if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" ]]; then
+            removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/data/postgres" "${POSTGRES_USER}" "${POSTGRES_USER}" "yes"
+        fi
+    elif [[ "${INSTALLER}" == "${DEB_TYPE}" || "${INSTALLER}" == "${RPM_TYPE}" ]]; then
+        getUserAndGroupFromFile
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/etc" "${USER_TO_CHECK}" "${GROUP_TO_CHECK}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/etc/security" "${USER_TO_CHECK}" "${GROUP_TO_CHECK}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/data" "${USER_TO_CHECK}" "${GROUP_TO_CHECK}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/log/archived" "${USER_TO_CHECK}" "${GROUP_TO_CHECK}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/work" "${USER_TO_CHECK}" "${GROUP_TO_CHECK}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/backup" "${USER_TO_CHECK}" "${GROUP_TO_CHECK}" "yes"
+    fi
+}
+
+# Check entry in map is format
+checkMapEntry () {
+    local entry="$1"
+
+    [[ "${entry}" != *"="* ]] && echo -n "false" || echo -n "true"
+}
+# Check value Empty and warn
+warnIfEmpty () {
+    local filePath="$1"
+    local yamlPath="$2"
+    local check=
+
+    if [[ -z "${filePath}" ]]; then
+        warn "Empty value in yamlpath [${yamlPath} in [${MIGRATION_SYSTEM_YAML_INFO}]"
+        check=false
+    else
+        check=true
+    fi
+    echo "${check}"
+}
+
+logCopyStatus () {
+    local status="$1"
+    local logMessage="$2"
+    local warnMessage="$3"
+
+    [[ "${status}" == "success"  ]] && logger "${logMessage}"
+    [[ "${status}" == "fail" ]] && warn "${warnMessage}"
+}
+# copy contents from source to destination
+copyCmd () {
+    local source="$1"
+    local target="$2"
+    local mode="$3"
+    local status=
+    
+    case $mode in
+        unique)
+            cp -up "${source}"/* "${target}"/ && status="success" || status="fail"
+            logCopyStatus "${status}" "Successfully copied directory contents from [${source}] to [${target}]" "Failed to copy directory contents from [${source}] to [${target}]"
+        ;;
+        specific)
+            cp -pf "${source}" "${target}"/ && status="success" || status="fail"
+            logCopyStatus "${status}" "Successfully copied file [${source}] to [${target}]" "Failed to copy file [${source}] to [${target}]"
+        ;;
+        patternFiles)
+            cp -pf "${source}"* "${target}"/ && status="success" || status="fail"
+            logCopyStatus "${status}" "Successfully copied files matching [${source}*] to [${target}]" "Failed to copy files matching [${source}*] to [${target}]"
+        ;;
+        full)
+            cp -prf "${source}"/* "${target}"/ && status="success" || status="fail"
+            logCopyStatus "${status}" "Successfully copied directory contents from [${source}] to [${target}]" "Failed to copy directory contents from [${source}] to [${target}]"
+        ;;
+    esac
+}
+# Check contents exist in source before copying
+copyOnContentExist () {
+    local source="$1"
+    local target="$2"
+    local mode="$3"
+
+    if [[ "$(checkContentExists "${source}")" == "true" ]]; then
+        copyCmd "${source}" "${target}" "${mode}"
+    else
+        logger "No contents to copy from [${source}]"
+    fi
+}
+
+# move source to destination
+moveCmd () {
+    local source="$1"
+    local target="$2"
+    local status=
+    
+    mv -f "${source}" "${target}" && status="success" || status="fail"
+    [[ "${status}" == "success" ]] && logger "Successfully moved directory [${source}] to [${target}]"
+    [[ "${status}" == "fail" ]] && warn "Failed to move directory [${source}] to [${target}]"
+}
+
+# symlink target to source
+symlinkCmd () {
+    local source="$1"
+    local target="$2"
+    local symlinkSubDir="$3"
+    local check=false
+    
+    if [[ "${symlinkSubDir}" == "subDir" ]]; then
+        ln -sf "${source}"/* "${target}" && check=true || check=false
+    else
+        ln -sf "${source}" "${target}"   && check=true || check=false
+    fi
+    
+    [[ "${check}" == "true"  ]] && logger "Successfully symlinked directory [${target}] to old [${source}]"
+    [[ "${check}" == "false" ]] && warn "Symlink operation failed"
+}
+# Check contents exist in source before symlinking
+symlinkOnExist () {
+    local source="$1"
+    local target="$2"
+    local symlinkSubDir="$3"
+
+    if [[ "$(checkContentExists "${source}")" == "true" ]]; then
+        if [[ "${symlinkSubDir}" == "subDir" ]]; then
+            symlinkCmd "${source}" "${target}" "subDir"
+        else
+            symlinkCmd "${source}" "${target}"
+        fi
+    else
+        logger "No contents to symlink from [${source}]"
+    fi
+}
+
+prependDir () {
+    local absolutePath="$1"
+    local fullPath="$2"
+    local sourcePath=
+
+    if [[ "${absolutePath}" = \/* ]]; then
+        sourcePath="${absolutePath}"
+    else
+        sourcePath="${fullPath}"
+    fi
+    echo "${sourcePath}"
+}
+
+getFirstEntry (){
+    local entry="$1"
+
+    [[ -z "${entry}" ]] && return
+    echo "${entry}" | awk -F"=" '{print $1}'
+}
+
+getSecondEntry () {
+    local entry="$1"
+
+    [[ -z "${entry}" ]] && return
+    echo "${entry}" | awk -F"=" '{print $2}'
+}
+# To get absolutePath
+pathResolver () {
+    local directoryPath="$1"
+    local dataDir=
+
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" ||  "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        retrieveYamlValue "migration.oldDataDir" "oldDataDir" "Warning"
+        dataDir="${YAML_VALUE}"
+        cd "${dataDir}"
+    else
+        cd "${OLD_DATA_DIR}"
+    fi
+    absoluteDir="`cd "${directoryPath}";pwd`"
+    echo "${absoluteDir}"
+}
+
+checkPathResolver () {
+    local value="$1"
+
+    if [[ "${value}" == \/* ]]; then
+        value="${value}"
+    else
+        value="$(pathResolver "${value}")"
+    fi
+    echo "${value}"
+}
+
+propertyMigrate () {
+    local entry="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local check=false
+
+    local yamlPath="$(getFirstEntry "${entry}")"
+    local property="$(getSecondEntry "${entry}")"
+    if [[ -z "${property}" ]]; then
+        warn "Property is empty in map [${entry}] in the file [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    if [[ -z "${yamlPath}" ]]; then
+        warn "yamlPath is empty for [${property}] in [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    local keyValues=$(cat "${NEW_DATA_DIR}/${filePath}/${fileName}" | grep "^[^#]" | grep "[*=*]")
+    for i in ${keyValues}; do
+        key=$(echo "${i}" | awk -F"=" '{print $1}')
+        value=$(echo "${i}" | cut -f 2- -d '=')
+        [ -z "${key}" ] && continue
+        [ -z "${value}" ] && continue
+        if [[ "${key}" == "${property}" ]]; then
+            if [[ "${PRODUCT}" == "artifactory" ]]; then
+                value="$(migrateResolveDerbyPath "${key}" "${value}")"
+                value="$(migrateResolveHaDirPath "${key}" "${value}")"
+                if [[ "${INSTALLER}" != "${DOCKER_TYPE}" ]]; then 
+                    value="$(updatePostgresUrlString_Hook "${yamlPath}" "${value}")"
+                fi
+            fi
+            if [[ "${key}" == "context.url" ]]; then
+                local ip=$(echo "${value}" | awk -F/ '{print $3}' | sed 's/:.*//')
+                setSystemValue "shared.node.ip" "${ip}" "${SYSTEM_YAML_PATH}"
+                logger "Setting [shared.node.ip] with [${ip}] in system.yaml"
+            fi
+            setSystemValue "${yamlPath}" "${value}" "${SYSTEM_YAML_PATH}" && logger "Setting [${yamlPath}] with value of the property [${property}] in system.yaml" && check=true && break || check=false
+        fi
+    done
+    [[ "${check}" == "false" ]] && logger "Property [${property}] not found in file [${fileName}]"
+}
+
+setHaEnabled_hook () {
+    echo ""
+}
+
+migratePropertiesFiles () {
+    local fileList=
+    local filePath=
+    local fileName=
+    local map=
+    
+    retrieveYamlValue "migration.propertyFiles.files" "fileList" "Skip"
+    fileList="${YAML_VALUE}"
+    if [[ -z "${fileList}" ]]; then
+        return
+    fi
+    bannerSection "PROCESSING MIGRATION OF PROPERTY FILES"
+    for file in ${fileList};
+    do
+        bannerSubSection "Processing Migration of $file"
+        retrieveYamlValue "migration.propertyFiles.$file.filePath" "filePath" "Warning"
+        filePath="${YAML_VALUE}"
+        retrieveYamlValue "migration.propertyFiles.$file.fileName" "fileName" "Warning"
+        fileName="${YAML_VALUE}"
+        [[ -z "${filePath}" && -z "${fileName}" ]] && continue
+        if [[ "$(checkFileExists "${NEW_DATA_DIR}/${filePath}/${fileName}")" == "true" ]]; then
+            logger "File [${fileName}] found in path [${NEW_DATA_DIR}/${filePath}]"
+            # setting haEnabled with true only if ha-node.properties is present
+            setHaEnabled_hook "${filePath}"
+            retrieveYamlValue "migration.propertyFiles.$file.map" "map" "Warning"
+            map="${YAML_VALUE}"
+            [[ -z "${map}" ]] && continue
+            for entry in $map;
+            do
+                if [[ "$(checkMapEntry "${entry}")" == "true" ]]; then
+                    propertyMigrate "${entry}" "${filePath}" "${fileName}"
+                else
+                    warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e yamlPath=property"
+                fi
+            done
+        else
+            logger "File [${fileName}] was not found in path [${NEW_DATA_DIR}/${filePath}] to migrate"
+        fi
+    done
+}
+
+createTargetDir () {
+    local mountDir="$1"
+    local target="$2"
+
+    logger "Target directory not found [${mountDir}/${target}], creating it"
+    createDirectoryRecursive "${mountDir}" "${target}" "Warning"
+}
+
+createDirectoryRecursive () {
+    local mountDir="$1"
+    local target="$2"
+    local output="$3"
+    local check=false
+    local message="Could not create directory ${directory}, please check if the user ${USER} has permissions to perform this action"
+    removeSoftLink "${mountDir}/${target}"
+    local directory=$(echo "${target}" | tr '/' ' ' )
+    local targetDir="${mountDir}"
+    for dir in ${directory}; 
+    do
+        targetDir="${targetDir}/${dir}"
+        mkdir -p "${targetDir}" && check=true || check=false
+        setOwnershipBasedOnInstaller "${targetDir}"
+    done
+    if [[ "${check}" == "false" ]]; then
+        if [[ "${output}" == "Warning" ]]; then
+            warn "${message}"
+        else
+            errorExit "${message}"
+        fi
+    fi
+}
+
+copyOperation () {
+    local source="$1"
+    local target="$2"
+    local mode="$3"
+    local check=false
+    local targetDataDir=
+    local targetLink=
+    local date=
+
+    # prepend OLD_DATA_DIR only if source is relative path
+    source="$(prependDir "${source}" "${OLD_DATA_DIR}/${source}")"
+    if [[ "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        targetDataDir="${NEW_DATA_DIR}"
+    else
+        targetDataDir="`cd "${NEW_DATA_DIR}"/../;pwd`"
+    fi
+    copyLogMessage "${mode}"
+    #remove source if it is a symlink
+    if [[ -L "${source}" ]]; then
+        targetLink=$(readlink -f "${source}")
+        logger "Removing the symlink [${source}] pointing to [${targetLink}]"
+        rm -f "${source}"
+        source=${targetLink}
+    fi
+    if [[ "$(checkDirExists "${source}")" != "true" ]]; then
+        logger "Source [${source}] directory not found in path"
+        return
+    fi
+    if [[ "$(checkDirContents "${source}")" != "true" ]]; then
+        logger "No contents to copy from [${source}]"
+        return
+    fi
+    if [[ "$(checkDirExists "${targetDataDir}/${target}")" != "true" ]]; then
+        createTargetDir "${targetDataDir}" "${target}"
+    fi
+    copyOnContentExist "${source}" "${targetDataDir}/${target}" "${mode}"
+}
+
+copySpecificFiles () {
+    local source="$1"
+    local target="$2"
+    local mode="$3"
+    
+    # prepend OLD_DATA_DIR only if source is relative path
+    source="$(prependDir "${source}" "${OLD_DATA_DIR}/${source}")"
+    if [[ "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        targetDataDir="${NEW_DATA_DIR}"
+    else
+        targetDataDir="`cd "${NEW_DATA_DIR}"/../;pwd`"
+    fi
+    copyLogMessage "${mode}"
+    if [[ "$(checkFileExists "${source}")" != "true" ]]; then
+        logger "Source file [${source}] does not exist in path"
+        return
+    fi
+    if [[ "$(checkDirExists "${targetDataDir}/${target}")" != "true" ]]; then
+        createTargetDir "${targetDataDir}" "${target}"
+    fi
+    copyCmd "${source}" "${targetDataDir}/${target}" "${mode}"
+}
+
+copyPatternMatchingFiles () {
+    local source="$1"
+    local target="$2"
+    local mode="$3"
+    local sourcePath="${4}"
+
+    # prepend OLD_DATA_DIR only if source is relative path
+    sourcePath="$(prependDir "${sourcePath}" "${OLD_DATA_DIR}/${sourcePath}")"
+    if [[ "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        targetDataDir="${NEW_DATA_DIR}"
+    else
+        targetDataDir="`cd "${NEW_DATA_DIR}"/../;pwd`"
+    fi
+    copyLogMessage "${mode}"
+    if [[ "$(checkDirExists "${sourcePath}")" != "true" ]]; then
+        logger "Source [${sourcePath}] directory not found in path"
+        return
+    fi
+    if ls "${sourcePath}/${source}"* 1> /dev/null 2>&1; then
+        if [[ "$(checkDirExists "${targetDataDir}/${target}")" != "true" ]]; then
+            createTargetDir "${targetDataDir}" "${target}"
+        fi
+        copyCmd "${sourcePath}/${source}" "${targetDataDir}/${target}" "${mode}"
+    else
+        logger "Source file [${sourcePath}/${source}*] does not exist in path"
+    fi
+}
+
+copyLogMessage () {
+    local mode="$1"
+    case $mode in
+        specific)
+            logger "Copy file [${source}] to target [${targetDataDir}/${target}]"
+        ;;
+        patternFiles)
+            logger "Copy files matching [${sourcePath}/${source}*] to target [${targetDataDir}/${target}]"
+        ;;
+        full)
+            logger "Copy directory contents from source [${source}] to target [${targetDataDir}/${target}]"
+        ;;
+        unique)
+            logger "Copy directory contents from source [${source}] to target [${targetDataDir}/${target}]"
+        ;;
+    esac
+}
+
+copyBannerMessages () {
+    local mode="$1"
+    local textMode="$2"
+    case $mode in
+        specific)
+            bannerSection "COPY ${textMode} FILES"
+        ;;
+        patternFiles)
+            bannerSection "COPY MATCHING ${textMode}"
+        ;;
+        full)
+            bannerSection "COPY ${textMode} DIRECTORIES CONTENTS"
+        ;;
+        unique)
+            bannerSection "COPY ${textMode} DIRECTORIES CONTENTS"
+        ;;
+    esac
+}
+
+invokeCopyFunctions () {
+    local mode="$1"
+    local source="$2"
+    local target="$3"
+
+    case $mode in
+        specific)
+            copySpecificFiles "${source}" "${target}" "${mode}"
+        ;;
+        patternFiles)
+            retrieveYamlValue "migration.${copyFormat}.sourcePath" "map" "Warning"
+            local sourcePath="${YAML_VALUE}"
+            copyPatternMatchingFiles "${source}" "${target}" "${mode}" "${sourcePath}"
+        ;;
+        full)
+            copyOperation "${source}" "${target}" "${mode}"
+        ;;
+        unique)
+            copyOperation "${source}" "${target}" "${mode}"
+        ;;
+    esac
+}
+# Copies contents from source directory and target directory
+copyDataDirectories () {
+    local copyFormat="$1"
+    local mode="$2"
+    local map=
+    local source=
+    local target=
+    local textMode=
+    local targetDataDir=
+    local copyFormatValue=
+
+    retrieveYamlValue "migration.${copyFormat}" "${copyFormat}" "Skip"
+    copyFormatValue="${YAML_VALUE}"
+    if [[ -z "${copyFormatValue}" ]]; then
+        return
+    fi
+    textMode=$(echo "${mode}" | tr '[:lower:]' '[:upper:]' 2>/dev/null)
+    copyBannerMessages "${mode}" "${textMode}"
+    retrieveYamlValue "migration.${copyFormat}.map" "map" "Warning"
+    map="${YAML_VALUE}"
+    if [[ "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        targetDataDir="${NEW_DATA_DIR}"
+    else
+        targetDataDir="`cd "${NEW_DATA_DIR}"/../;pwd`"
+    fi
+    for entry in $map;
+    do
+        if [[ "$(checkMapEntry "${entry}")" == "true" ]]; then
+            source="$(getSecondEntry "${entry}")"
+            target="$(getFirstEntry "${entry}")"
+            [[ -z "${source}" ]] && warn "source value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+            [[ -z "${target}" ]] && warn "target value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+            invokeCopyFunctions "${mode}" "${source}" "${target}"
+        else
+            warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e target=source"
+        fi
+        echo "";
+    done
+}
+
+invokeMoveFunctions () {
+    local source="$1"
+    local target="$2"
+    local sourceDataDir=
+    local targetBasename=
+    # prepend OLD_DATA_DIR only if source is relative path
+    sourceDataDir=$(prependDir "${source}" "${OLD_DATA_DIR}/${source}")
+    targetBasename=$(dirname "${target}")
+    logger "Moving directory source [${sourceDataDir}] to target [${NEW_DATA_DIR}/${target}]"
+    if [[ "$(checkDirExists "${sourceDataDir}")" != "true" ]]; then
+        logger "Directory [${sourceDataDir}] not found in path to move"
+        return
+    fi
+    if [[ "$(checkDirExists "${NEW_DATA_DIR}/${targetBasename}")" != "true" ]]; then
+        createTargetDir "${NEW_DATA_DIR}" "${targetBasename}"
+        moveCmd "${sourceDataDir}" "${NEW_DATA_DIR}/${target}"
+    else
+        moveCmd "${sourceDataDir}" "${NEW_DATA_DIR}/tempDir"
+        moveCmd "${NEW_DATA_DIR}/tempDir" "${NEW_DATA_DIR}/${target}"
+    fi
+}
+
+# Move source directory and target directory
+moveDirectories () {
+    local moveDataDirectories=
+    local map=
+    local source=
+    local target=
+
+    retrieveYamlValue "migration.moveDirectories" "moveDirectories" "Skip"
+    moveDirectories="${YAML_VALUE}"
+    if [[ -z "${moveDirectories}" ]]; then
+        return
+    fi
+    bannerSection "MOVE DIRECTORIES"
+    retrieveYamlValue "migration.moveDirectories.map" "map" "Warning"
+    map="${YAML_VALUE}"
+    for entry in $map;
+    do
+        if [[ "$(checkMapEntry "${entry}")" == "true" ]]; then
+            source="$(getSecondEntry "${entry}")"
+            target="$(getFirstEntry "${entry}")"
+            [[ -z "${source}" ]] && warn "source value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+            [[ -z "${target}" ]] && warn "target value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+            invokeMoveFunctions "${source}" "${target}"
+        else
+            warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e target=source"
+        fi
+    echo "";
+    done
+}
+
+# Trim masterKey if its generated using hex 32 
+trimMasterKey () {
+    local masterKeyDir=/opt/jfrog/artifactory/var/etc/security
+    local oldMasterKey=$(<${masterKeyDir}/master.key)
+    local oldMasterKey_Length=$(echo ${#oldMasterKey})
+    local newMasterKey=
+    if [[ ${oldMasterKey_Length} -gt 32 ]]; then
+        bannerSection "TRIM MASTERKEY"
+        newMasterKey=$(echo ${oldMasterKey:0:32})
+        cp ${masterKeyDir}/master.key ${masterKeyDir}/backup_master.key
+        logger "Original masterKey is backed up : ${masterKeyDir}/backup_master.key"
+        rm -rf ${masterKeyDir}/master.key
+        echo ${newMasterKey} > ${masterKeyDir}/master.key
+        logger "masterKey is trimmed : ${masterKeyDir}/master.key"
+    fi
+}
+
+copyDirectories () {
+
+    copyDataDirectories "copyFiles" "full"
+    copyDataDirectories "copyUniqueFiles" "unique"
+    copyDataDirectories "copySpecificFiles" "specific"
+    copyDataDirectories "copyPatternMatchingFiles" "patternFiles"
+}
+
+symlinkDir () {
+    local source="$1"
+    local target="$2"
+    local targetDir=
+    local basename=
+    local targetParentDir=
+    
+    targetDir="$(dirname "${target}")"
+    if [[ "${targetDir}" == "${source}" ]]; then
+        # symlink the sub directories
+        createDirectory "${NEW_DATA_DIR}/${target}" "Warning"
+        if [[ "$(checkDirExists "${NEW_DATA_DIR}/${target}")" == "true" ]]; then
+            symlinkOnExist "${OLD_DATA_DIR}/${source}" "${NEW_DATA_DIR}/${target}" "subDir"
+            basename="$(basename "${target}")"
+            cd "${NEW_DATA_DIR}/${target}" && rm -f "${basename}"
+        fi
+    else
+        targetParentDir="$(dirname "${NEW_DATA_DIR}/${target}")"
+        createDirectory "${targetParentDir}" "Warning"
+        if [[ "$(checkDirExists "${targetParentDir}")" == "true" ]]; then
+            symlinkOnExist "${OLD_DATA_DIR}/${source}" "${NEW_DATA_DIR}/${target}"
+        fi
+    fi
+}
+
+symlinkOperation () {
+    local source="$1"
+    local target="$2"
+    local check=false
+    local targetLink=
+    local date=
+    
+    #   Check if source is a link and do symlink
+    if [[ -L "${OLD_DATA_DIR}/${source}" ]]; then
+        targetLink=$(readlink -f "${OLD_DATA_DIR}/${source}")
+        symlinkOnExist "${targetLink}" "${NEW_DATA_DIR}/${target}"
+    else
+        #  check if source is directory and do symlink
+        if [[ "$(checkDirExists "${OLD_DATA_DIR}/${source}")" != "true" ]]; then
+            logger "Source [${source}] directory not found in path to symlink"
+            return
+        fi
+        if [[ "$(checkDirContents "${OLD_DATA_DIR}/${source}")" != "true" ]]; then
+            logger "No contents found in [${OLD_DATA_DIR}/${source}] to symlink"
+            return
+        fi
+        if [[ "$(checkDirExists "${NEW_DATA_DIR}/${target}")" != "true" ]]; then
+            logger "Target directory [${NEW_DATA_DIR}/${target}] does not exist to create symlink, creating it"
+            symlinkDir "${source}" "${target}"
+        else
+            rm -rf "${NEW_DATA_DIR}/${target}" && check=true || check=false
+            [[ "${check}" == "false" ]] && warn "Failed to remove contents in [${NEW_DATA_DIR}/${target}/]"
+            symlinkDir "${source}" "${target}"
+        fi
+    fi
+}
+# Creates a symlink path - Source directory to which the symbolic link should point.
+symlinkDirectories () {
+    local linkFiles=
+    local map=
+    local source=
+    local target=
+
+    retrieveYamlValue "migration.linkFiles" "linkFiles" "Skip"
+    linkFiles="${YAML_VALUE}"
+    if [[ -z "${linkFiles}" ]]; then
+        return
+    fi
+    bannerSection "SYMLINK DIRECTORIES"
+    retrieveYamlValue "migration.linkFiles.map" "map" "Warning"
+    map="${YAML_VALUE}"
+    for entry in $map;
+    do
+        if [[ "$(checkMapEntry "${entry}")" == "true" ]]; then
+            source="$(getSecondEntry "${entry}")"
+            target="$(getFirstEntry "${entry}")"
+            logger "Symlink directory [${NEW_DATA_DIR}/${target}] to old [${OLD_DATA_DIR}/${source}]"
+            [[ -z "${source}" ]] && warn "source value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+            [[ -z "${target}" ]] && warn "target value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+            symlinkOperation "${source}" "${target}"
+        else
+            warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e target=source"
+        fi
+        echo "";
+    done
+}
+
+updateConnectionString () {
+    local yamlPath="$1"
+    local value="$2"
+    local mongoPath="shared.mongo.url"
+    local rabbitmqPath="shared.rabbitMq.url"
+    local postgresPath="shared.database.url"
+    local redisPath="shared.redis.connectionString"
+    local mongoConnectionString="mongo.connectionString"
+    local sourceKey=
+    local hostIp=$(io_getPublicHostIP)
+    local hostKey=
+    
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" ]]; then 
+    # Replace @postgres:,@mongodb:,@rabbitmq:,@redis: to @{hostIp}: (Compose Installer)
+        hostKey="@${hostIp}:"
+        case $yamlPath in
+            ${postgresPath})
+                sourceKey="@postgres:"
+                value=$(io_replaceString "${value}" "${sourceKey}" "${hostKey}")
+            ;;
+            ${mongoPath})
+                sourceKey="@mongodb:"
+                value=$(io_replaceString "${value}" "${sourceKey}" "${hostKey}")
+            ;;
+            ${rabbitmqPath})
+                sourceKey="@rabbitmq:"
+                value=$(io_replaceString "${value}" "${sourceKey}" "${hostKey}")
+            ;;
+            ${redisPath})
+                sourceKey="@redis:"
+                value=$(io_replaceString "${value}" "${sourceKey}" "${hostKey}")
+            ;;
+            ${mongoConnectionString})
+                sourceKey="@mongodb:"
+                value=$(io_replaceString "${value}" "${sourceKey}" "${hostKey}")
+            ;;
+        esac
+    fi
+    echo -n "${value}"
+}
+
+yamlMigrate () {
+    local entry="$1"
+    local sourceFile="$2"
+    local value=
+    local yamlPath=
+    local key=
+    yamlPath="$(getFirstEntry "${entry}")"
+    key="$(getSecondEntry "${entry}")"
+    if [[ -z "${key}" ]]; then
+        warn "key is empty in map [${entry}] in the file [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    if [[ -z "${yamlPath}" ]]; then
+        warn "yamlPath is empty for [${key}] in [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    getYamlValue "${key}" "${sourceFile}" "false"
+    value="${YAML_VALUE}"
+    if [[ ! -z "${value}" ]]; then
+        value=$(updateConnectionString "${yamlPath}" "${value}")
+    fi
+    if [[ -z "${value}" ]]; then
+        logger "No value for [${key}] in [${sourceFile}]"
+    else
+        setSystemValue "${yamlPath}" "${value}" "${SYSTEM_YAML_PATH}"
+        logger "Setting [${yamlPath}] with value of the key [${key}] in system.yaml"
+    fi
+}
+
+migrateYamlFile () {
+    local files=
+    local filePath=
+    local fileName=
+    local sourceFile=
+    local map=
+    retrieveYamlValue "migration.yaml.files" "files" "Skip"
+    files="${YAML_VALUE}"
+    if [[ -z "${files}" ]]; then
+        return
+    fi
+    bannerSection "MIGRATION OF YAML FILES"
+    for file in $files;
+    do
+        bannerSubSection "Processing Migration of $file"
+        retrieveYamlValue "migration.yaml.$file.filePath" "filePath" "Warning"
+        filePath="${YAML_VALUE}"
+        retrieveYamlValue "migration.yaml.$file.fileName" "fileName" "Warning"
+        fileName="${YAML_VALUE}"
+        [[ -z "${filePath}" && -z "${fileName}" ]] && continue
+        sourceFile="${NEW_DATA_DIR}/${filePath}/${fileName}"
+        if [[ "$(checkFileExists "${sourceFile}")" == "true" ]]; then
+            logger "File [${fileName}] found in path [${NEW_DATA_DIR}/${filePath}]"
+            retrieveYamlValue "migration.yaml.$file.map" "map" "Warning"
+            map="${YAML_VALUE}"
+            [[ -z "${map}" ]] && continue
+            for entry in $map;
+            do
+                if [[ "$(checkMapEntry "${entry}")" == "true" ]]; then
+                    yamlMigrate "${entry}" "${sourceFile}"
+                else
+                    warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e yamlPath=key"
+                fi
+            done
+        else
+            logger "File [${fileName}] is not found in path [${NEW_DATA_DIR}/${filePath}] to migrate"
+        fi
+    done
+}
+# updates the key and value in system.yaml
+updateYamlKeyValue () {
+    local entry="$1"
+    local value=
+    local yamlPath=
+    local key=
+
+    yamlPath="$(getFirstEntry "${entry}")"
+    value="$(getSecondEntry "${entry}")"
+    if [[ -z "${value}" ]]; then
+        warn "value is empty in map [${entry}] in the file [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    if [[ -z "${yamlPath}" ]]; then
+        warn "yamlPath is empty for [${key}] in [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    setSystemValue "${yamlPath}" "${value}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${yamlPath}] with value [${value}] in system.yaml"
+}
+
+updateSystemYamlFile () {
+    local updateYaml=
+    local map=
+
+    retrieveYamlValue "migration.updateSystemYaml" "updateYaml" "Skip"
+    updateSystemYaml="${YAML_VALUE}"
+    if [[ -z "${updateSystemYaml}" ]]; then
+        return
+    fi
+    bannerSection "UPDATE SYSTEM YAML FILE WITH KEY AND VALUES"
+    retrieveYamlValue "migration.updateSystemYaml.map" "map" "Warning"
+    map="${YAML_VALUE}"
+    if [[ -z "${map}" ]]; then
+        return
+    fi
+    for entry in $map;
+    do
+        if [[ "$(checkMapEntry "${entry}")" == "true" ]]; then
+            updateYamlKeyValue "${entry}"
+        else
+            warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e yamlPath=key"
+        fi
+    done
+}
+
+backupFiles_hook () {
+    logSilly "Method ${FUNCNAME[0]}"
+}
+
+backupDirectory () {
+    local backupDir="$1"
+    local dir="$2"
+    local targetDir="$3"
+    local effectiveUser=
+    local effectiveGroup=
+
+    if [[ "${dir}" = \/* ]]; then
+        dir=$(echo "${dir/\//}")
+    fi
+            
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" ]]; then 
+        effectiveUser="${JF_USER}"
+        effectiveGroup="${JF_USER}"
+    elif [[ "${INSTALLER}" == "${DEB_TYPE}" || "${INSTALLER}" == "${RPM_TYPE}" ]]; then
+        effectiveUser="${USER_TO_CHECK}" 
+        effectiveGroup="${GROUP_TO_CHECK}"
+    fi
+    
+    removeSoftLinkAndCreateDir "${backupDir}" "${effectiveUser}" "${effectiveGroup}" "yes"
+    local backupDirectory="${backupDir}/${PRODUCT}"
+    removeSoftLinkAndCreateDir "${backupDirectory}" "${effectiveUser}" "${effectiveGroup}" "yes"
+    removeSoftLinkAndCreateDir "${backupDirectory}/${dir}" "${effectiveUser}" "${effectiveGroup}" "yes"
+    local outputCheckDirExists="$(checkDirExists "${backupDirectory}/${dir}")"
+    if [[ "${outputCheckDirExists}" == "true" ]]; then
+        copyOnContentExist "${targetDir}" "${backupDirectory}/${dir}" "full"
+    fi
+}
+
+removeOldDirectory () {
+    local backupDir="$1"
+    local entry="$2"
+    local check=false
+    
+    # prepend OLD_DATA_DIR only if entry is relative path
+    local targetDir="$(prependDir "${entry}" "${OLD_DATA_DIR}/${entry}")"
+    local outputCheckDirExists="$(checkDirExists "${targetDir}")"
+    if [[ "${outputCheckDirExists}" != "true" ]]; then
+        logger "No [${targetDir}] directory found to delete"
+        echo "";
+        return
+    fi
+    backupDirectory "${backupDir}" "${entry}" "${targetDir}"
+    rm -rf  "${targetDir}" && check=true || check=false
+    [[ "${check}" == "true"  ]] && logger "Successfully removed directory [${targetDir}]"
+    [[ "${check}" == "false" ]] && warn "Failed to remove directory [${targetDir}]"
+    echo "";
+}
+
+cleanUpOldDataDirectories () {
+    local cleanUpOldDataDir=
+    local map=
+    local entry=
+
+    retrieveYamlValue "migration.cleanUpOldDataDir" "cleanUpOldDataDir" "Skip"
+    cleanUpOldDataDir="${YAML_VALUE}"
+    if [[ -z "${cleanUpOldDataDir}" ]]; then
+        return
+    fi
+    bannerSection "CLEAN UP OLD DATA DIRECTORIES"
+    retrieveYamlValue "migration.cleanUpOldDataDir.map" "map" "Warning"
+    map="${YAML_VALUE}"
+    [[ -z "${map}" ]] && continue
+    date="$(date +%Y%m%d%H%M)"
+    backupDir="${NEW_DATA_DIR}/backup/backup-${date}"
+    bannerImportant "****** Old data configurations are backedup in [${backupDir}] directory ******"
+    backupFiles_hook "${backupDir}/${PRODUCT}"
+    for entry in $map;
+    do
+        removeOldDirectory "${backupDir}" "${entry}"
+    done
+}
+
+backupFiles () {
+    local backupDir="$1"
+    local dir="$2"
+    local targetDir="$3"
+    local fileName="$4"
+    local effectiveUser=
+    local effectiveGroup=
+
+    if [[ "${dir}" = \/* ]]; then
+        dir=$(echo "${dir/\//}")
+    fi
+            
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" ]]; then 
+        effectiveUser="${JF_USER}"
+        effectiveGroup="${JF_USER}"
+    elif [[ "${INSTALLER}" == "${DEB_TYPE}" || "${INSTALLER}" == "${RPM_TYPE}" ]]; then
+        effectiveUser="${USER_TO_CHECK}" 
+        effectiveGroup="${GROUP_TO_CHECK}"
+    fi
+
+    removeSoftLinkAndCreateDir "${backupDir}" "${effectiveUser}" "${effectiveGroup}" "yes"
+    local backupDirectory="${backupDir}/${PRODUCT}"
+    removeSoftLinkAndCreateDir "${backupDirectory}" "${effectiveUser}" "${effectiveGroup}" "yes"
+    removeSoftLinkAndCreateDir "${backupDirectory}/${dir}" "${effectiveUser}" "${effectiveGroup}" "yes"
+    local outputCheckDirExists="$(checkDirExists "${backupDirectory}/${dir}")"
+    if [[ "${outputCheckDirExists}" == "true" ]]; then
+        copyCmd "${targetDir}/${fileName}" "${backupDirectory}/${dir}" "specific"
+    fi
+}
+
+removeOldFiles () {
+    local backupDir="$1"
+    local directoryName="$2"
+    local fileName="$3"
+    local check=false
+    
+    # prepend OLD_DATA_DIR only if entry is relative path
+    local targetDir="$(prependDir "${directoryName}" "${OLD_DATA_DIR}/${directoryName}")"
+    local outputCheckFileExists="$(checkFileExists "${targetDir}/${fileName}")"
+    if [[ "${outputCheckFileExists}" != "true" ]]; then
+        logger "No [${targetDir}/${fileName}] file found to delete"
+        return
+    fi
+    backupFiles "${backupDir}" "${directoryName}" "${targetDir}" "${fileName}"
+    rm -f  "${targetDir}/${fileName}" && check=true || check=false
+    [[ "${check}" == "true"  ]] && logger "Successfully removed file [${targetDir}/${fileName}]"
+    [[ "${check}" == "false" ]] && warn "Failed to remove file [${targetDir}/${fileName}]"
+    echo "";
+}
+
+cleanUpOldFiles () {
+    local cleanUpFiles=
+    local map=
+    local entry=
+
+    retrieveYamlValue "migration.cleanUpOldFiles" "cleanUpOldFiles" "Skip"
+    cleanUpOldFiles="${YAML_VALUE}"
+    if [[ -z "${cleanUpOldFiles}" ]]; then
+        return
+    fi
+    bannerSection "CLEAN UP OLD FILES"
+    retrieveYamlValue "migration.cleanUpOldFiles.map" "map" "Warning"
+    map="${YAML_VALUE}"
+    [[ -z "${map}" ]] && continue
+    date="$(date +%Y%m%d%H%M)"
+    backupDir="${NEW_DATA_DIR}/backup/backup-${date}"
+    bannerImportant "****** Old files are backedup in [${backupDir}] directory ******"
+    for entry in $map;
+    do  
+        local outputCheckMapEntry="$(checkMapEntry "${entry}")"
+        if [[ "${outputCheckMapEntry}" != "true" ]]; then
+            warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e directoryName=fileName"
+        fi
+        local fileName="$(getSecondEntry "${entry}")"
+        local directoryName="$(getFirstEntry "${entry}")"
+        [[ -z "${fileName}" ]] && warn "File name value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+        [[ -z "${directoryName}" ]] && warn "Directory name value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+        removeOldFiles "${backupDir}" "${directoryName}" "${fileName}"
+        echo "";
+    done 
+}
+
+startMigration () {
+    bannerSection "STARTING MIGRATION"
+}
+
+endMigration () {
+    bannerSection "MIGRATION COMPLETED SUCCESSFULLY"
+}
+
+initialize () {
+    setAppDir
+    _pauseExecution "setAppDir"
+    initHelpers
+    _pauseExecution "initHelpers"
+    checkMigrationInfoYaml
+    _pauseExecution "checkMigrationInfoYaml"
+    getProduct
+    _pauseExecution "getProduct"
+    getDataDir
+    _pauseExecution "getDataDir"
+}
+
+main () {
+    case $PRODUCT in
+        artifactory)
+            migrateArtifactory
+        ;;
+        distribution)
+            migrateDistribution
+        ;;
+        xray)
+            migrationXray
+        ;;
+    esac
+    exit 0
+}
+
+# Ensures meta data is logged
+LOG_BEHAVIOR_ADD_META="$FLAG_Y"
+
+
+migrateResolveDerbyPath () {
+    local key="$1"
+    local value="$2"
+
+    if [[ "${key}" == "url" && "${value}" == *"db.home"* ]]; then
+        if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" ]]; then
+            derbyPath="/opt/jfrog/artifactory/var/data/artifactory/derby"
+            value=$(echo "${value}" | sed "s|{db.home}|$derbyPath|")
+        else
+            derbyPath="${NEW_DATA_DIR}/data/artifactory/derby"
+            value=$(echo "${value}" | sed "s|{db.home}|$derbyPath|")
+        fi
+    fi
+    echo "${value}"
+}
+
+migrateResolveHaDirPath () {
+    local key="$1"
+    local value="$2"
+
+    if [[ "${INSTALLER}" == "${RPM_TYPE}" || "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" || "${INSTALLER}" == "${DEB_TYPE}" ]]; then
+        if [[ "${key}" == "artifactory.ha.data.dir" || "${key}" == "artifactory.ha.backup.dir" ]]; then
+            value=$(checkPathResolver "${value}")
+        fi
+    fi
+    echo "${value}"
+}
+updatePostgresUrlString_Hook () {
+    local yamlPath="$1"
+    local value="$2"
+    local hostIp=$(io_getPublicHostIP)
+    local sourceKey="//postgresql:"
+    if [[ "${yamlPath}" == "shared.database.url" ]]; then
+        value=$(io_replaceString "${value}" "${sourceKey}" "//${hostIp}:" "#")
+    fi
+    echo "${value}"
+}
+# Check Artifactory product version
+checkArtifactoryVersion () {
+    local minProductVersion="6.0.0"
+    local maxProductVersion="7.0.0"
+    local propertyInDocker="ARTIFACTORY_VERSION"
+    local property="artifactory.version"
+    
+    if [[ "${INSTALLER}" ==  "${COMPOSE_TYPE}" ]]; then
+        local newfilePath="${APP_DIR}/../.env"
+        local oldfilePath="${OLD_DATA_DIR}/etc/artifactory.properties"
+    elif [[ "${INSTALLER}" ==  "${HELM_TYPE}" ]]; then
+        local oldfilePath="${OLD_DATA_DIR}/etc/artifactory.properties"
+    elif [[ "${INSTALLER}" ==  "${ZIP_TYPE}" ]]; then
+        local newfilePath="${NEW_DATA_DIR}/etc/artifactory/artifactory.properties"
+        local oldfilePath="${OLD_DATA_DIR}/etc/artifactory.properties"
+    else
+        local newfilePath="${NEW_DATA_DIR}/etc/artifactory/artifactory.properties"
+        local oldfilePath="/etc/opt/jfrog/artifactory/artifactory.properties"
+    fi
+
+    getProductVersion "${minProductVersion}" "${maxProductVersion}" "${newfilePath}" "${oldfilePath}" "${propertyInDocker}" "${property}"
+}
+
+getCustomDataDir_hook () {
+    retrieveYamlValue "migration.oldDataDir" "oldDataDir" "Fail"
+    OLD_DATA_DIR="${YAML_VALUE}"
+}
+
+# Get protocol value of connector
+getXmlConnectorProtocol () {
+    local i="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local protocolValue=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@protocol' ${filePath}/${fileName} 2>/dev/null |awk -F"=" '{print $2}' | tr -d '"')
+    echo -e "${protocolValue}"
+}
+
+# Get all attributes of connector
+getXmlConnectorAttributes () {
+    local i="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local connectorAttributes=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@*' ${filePath}/${fileName} 2>/dev/null)
+    # strip leading and trailing spaces
+    connectorAttributes=$(io_trim "${connectorAttributes}")
+    echo "${connectorAttributes}"
+}
+
+# Get port value of connector
+getXmlConnectorPort () {
+    local i="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local portValue=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@port' ${filePath}/${fileName} 2>/dev/null | awk -F"=" '{print $2}' | tr -d '"')
+    echo -e "${portValue}"
+}
+
+# Get maxThreads value of connector
+getXmlConnectorMaxThreads () {
+    local i="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local maxThreadValue=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@maxThreads' ${filePath}/${fileName} 2>/dev/null | awk -F"=" '{print $2}' | tr -d '"')
+    echo -e "${maxThreadValue}"
+}
+# Get sendReasonPhrase value of connector
+getXmlConnectorSendReasonPhrase () {
+    local i="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local sendReasonPhraseValue=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@sendReasonPhrase' ${filePath}/${fileName} 2>/dev/null | awk -F"=" '{print $2}' | tr -d '"')
+    echo -e "${sendReasonPhraseValue}"
+}
+# Get relaxedPathChars value of connector
+getXmlConnectorRelaxedPathChars () {
+    local i="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local relaxedPathCharsValue=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@relaxedPathChars' ${filePath}/${fileName} 2>/dev/null | awk -F"=" '{print $2}' | tr -d '"')
+    # strip leading and trailing spaces
+    relaxedPathCharsValue=$(io_trim "${relaxedPathCharsValue}")
+    echo -e "${relaxedPathCharsValue}"
+}
+# Get relaxedQueryChars value of connector
+getXmlConnectorRelaxedQueryChars () {
+    local i="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local relaxedQueryCharsValue=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@relaxedQueryChars' ${filePath}/${fileName} 2>/dev/null | awk -F"=" '{print $2}' | tr -d '"')
+    # strip leading and trailing spaces
+    relaxedQueryCharsValue=$(io_trim "${relaxedQueryCharsValue}")
+    echo -e "${relaxedQueryCharsValue}"
+}
+
+# Updating system.yaml with Connector port 
+setConnectorPort () {
+    local yamlPath="$1"
+    local valuePort="$2"
+    local portYamlPath=
+    if [[ -z "${yamlPath}" ]]; then
+        return
+    fi
+    if [[ -z "${valuePort}" ]]; then
+        warn "port value is empty, could not migrate to system.yaml"
+        return
+    fi
+    ## Getting port yaml path from migration info yaml
+    retrieveYamlValue "${yamlPath}" portYamlPath "Warning"
+    portYamlPath="${YAML_VALUE}"
+    if [[ -z "${portYamlPath}" ]]; then
+        return
+    fi
+    setSystemValue "${portYamlPath}" "${valuePort}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${portYamlPath}] with value [${valuePort}] in system.yaml"
+}
+
+# Updating system.yaml with Connector maxThreads
+setConnectorMaxThread () {
+    local yamlPath="$1"
+    local threadValue="$2"
+    local maxThreadYamlPath=
+    if [[ -z "${yamlPath}" ]]; then
+        return
+    fi
+    if [[ -z  "${threadValue}" ]]; then
+        return
+    fi
+    ## Getting max Threads yaml path from migration info yaml
+    retrieveYamlValue "${yamlPath}" maxThreadYamlPath "Warning"
+    maxThreadYamlPath="${YAML_VALUE}"
+    if [[ -z "${maxThreadYamlPath}" ]]; then
+        return
+    fi
+    setSystemValue "${maxThreadYamlPath}" "${threadValue}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${maxThreadYamlPath}] with value [${threadValue}] in system.yaml"
+}
+
+# Updating system.yaml with Connector sendReasonPhrase
+setConnectorSendReasonPhrase () {
+    local yamlPath="$1"
+    local sendReasonPhraseValue="$2"
+    local sendReasonPhraseYamlPath=
+    if [[ -z "${yamlPath}" ]]; then
+        return
+    fi
+    if [[ -z  "${sendReasonPhraseValue}" ]]; then
+        return
+    fi
+    ## Getting sendReasonPhrase yaml path from migration info yaml
+    retrieveYamlValue "${yamlPath}" sendReasonPhraseYamlPath "Warning"
+    sendReasonPhraseYamlPath="${YAML_VALUE}"
+    if [[ -z "${sendReasonPhraseYamlPath}" ]]; then
+        return
+    fi
+    setSystemValue "${sendReasonPhraseYamlPath}" "${sendReasonPhraseValue}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${sendReasonPhraseYamlPath}] with value [${sendReasonPhraseValue}] in system.yaml"
+}
+
+# Updating system.yaml with Connector relaxedPathChars
+setConnectorRelaxedPathChars () {
+    local yamlPath="$1"
+    local relaxedPathCharsValue="$2"
+    local relaxedPathCharsYamlPath=
+    if [[ -z "${yamlPath}" ]]; then
+        return
+    fi
+    if [[ -z  "${relaxedPathCharsValue}" ]]; then
+        return
+    fi
+    ## Getting relaxedPathChars yaml path from migration info yaml
+    retrieveYamlValue "${yamlPath}" relaxedPathCharsYamlPath "Warning"
+    relaxedPathCharsYamlPath="${YAML_VALUE}"
+    if [[ -z "${relaxedPathCharsYamlPath}" ]]; then
+        return
+    fi
+    setSystemValue "${relaxedPathCharsYamlPath}" "${relaxedPathCharsValue}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${relaxedPathCharsYamlPath}] with value [${relaxedPathCharsValue}] in system.yaml"
+}
+
+# Updating system.yaml with Connector relaxedQueryChars
+setConnectorRelaxedQueryChars () {
+    local yamlPath="$1"
+    local relaxedQueryCharsValue="$2"
+    local relaxedQueryCharsYamlPath=
+    if [[ -z "${yamlPath}" ]]; then
+        return
+    fi
+    if [[ -z  "${relaxedQueryCharsValue}" ]]; then
+        return
+    fi
+    ## Getting relaxedQueryChars yaml path from migration info yaml
+    retrieveYamlValue "${yamlPath}" relaxedQueryCharsYamlPath "Warning"
+    relaxedQueryCharsYamlPath="${YAML_VALUE}"
+    if [[ -z "${relaxedQueryCharsYamlPath}" ]]; then
+        return
+    fi
+    setSystemValue "${relaxedQueryCharsYamlPath}" "${relaxedQueryCharsValue}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${relaxedQueryCharsYamlPath}] with value [${relaxedQueryCharsValue}] in system.yaml"
+}
+
+# Updating system.yaml with Connectors configurations
+setConnectorExtraConfig () {
+    local yamlPath="$1"
+    local connectorAttributes="$2"
+    local extraConfigPath=
+    if [[ -z "${yamlPath}" ]]; then
+        return
+    fi
+    if [[ -z "${connectorAttributes}" ]]; then
+        return
+    fi
+    ## Getting extraConfig yaml path from migration info yaml
+    retrieveYamlValue "${yamlPath}" extraConfig "Warning"
+    extraConfigPath="${YAML_VALUE}"
+    if [[ -z "${extraConfigPath}" ]]; then
+        return
+    fi
+    # strip leading and trailing spaces
+    connectorAttributes=$(io_trim "${connectorAttributes}")
+    setSystemValue "${extraConfigPath}" "${connectorAttributes}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${extraConfigPath}] with connector attributes in system.yaml"
+}
+
+# Updating system.yaml with extra Connectors
+setExtraConnector () {
+    local yamlPath="$1"
+    local extraConnector="$2"
+    local extraConnectorYamlPath=
+    if [[ -z "${yamlPath}" ]]; then
+        return
+    fi
+    if [[ -z "${extraConnector}" ]]; then
+        return
+    fi
+    ## Getting extraConnecotr yaml path from migration info yaml
+    retrieveYamlValue "${yamlPath}" extraConnectorYamlPath "Warning"
+    extraConnectorYamlPath="${YAML_VALUE}"
+    if [[ -z "${extraConnectorYamlPath}" ]]; then
+        return
+    fi
+    getYamlValue  "${extraConnectorYamlPath}"  "${SYSTEM_YAML_PATH}"  "false"
+    local connectorExtra="${YAML_VALUE}"
+    if [[ -z "${connectorExtra}" ]]; then
+        setSystemValue "${extraConnectorYamlPath}" "${extraConnector}" "${SYSTEM_YAML_PATH}"
+        logger "Setting [${extraConnectorYamlPath}] with extra connectors in system.yaml"
+    else    
+        setSystemValue "${extraConnectorYamlPath}" "\"${connectorExtra} ${extraConnector}\"" "${SYSTEM_YAML_PATH}"
+        logger "Setting [${extraConnectorYamlPath}] with extra connectors in system.yaml"
+    fi
+}
+
+# Migrate extra connectors to system.yaml
+migrateExtraConnectors () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    local excludeDefaultPort="$4"
+    local i="$5"
+    local extraConfig= 
+    local extraConnector=
+    if [[ "${excludeDefaultPort}" == "yes" ]]; then
+        for ((i = 1 ; i <= "${connectorCount}" ; i++));
+        do  
+            local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+            [[ "${portValue}" != "${DEFAULT_ACCESS_PORT}" && "${portValue}" != "${DEFAULT_RT_PORT}" ]] || continue
+            extraConnector=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']' ${filePath}/${fileName} 2>/dev/null)
+            setExtraConnector "${EXTRA_CONFIG_YAMLPATH}" "${extraConnector}" 
+        done
+    else
+        extraConnector=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']' ${filePath}/${fileName} 2>/dev/null)
+        setExtraConnector "${EXTRA_CONFIG_YAMLPATH}" "${extraConnector}"
+    fi
+}
+
+# Migrate connector configurations
+migrateConnectorConfig () {
+    local i="$1"
+    local protocolType="$2"
+    local portValue="$3"
+    local connectorPortYamlPath="$4"
+    local connectorMaxThreadYamlPath="$5"
+    local connectorAttributesYamlPath="$6"
+    local filePath="$7"
+    local fileName="$8"
+    local connectorSendReasonPhraseYamlPath="$9"
+    local connectorRelaxedPathCharsYamlPath="${10}"
+    local connectorRelaxedQueryCharsYamlPath="${11}"
+    
+    # migrate port
+    setConnectorPort "${connectorPortYamlPath}" "${portValue}"
+    
+    # migrate maxThreads
+    local maxThreadValue=$(getXmlConnectorMaxThreads "$i" "${filePath}" "${fileName}")
+    setConnectorMaxThread "${connectorMaxThreadYamlPath}" "${maxThreadValue}"
+
+    # migrate sendReasonPhrase
+    local sendReasonPhraseValue=$(getXmlConnectorSendReasonPhrase "$i" "${filePath}" "${fileName}")
+    setConnectorSendReasonPhrase "${connectorSendReasonPhraseYamlPath}" "${sendReasonPhraseValue}"
+    
+    # migrate relaxedPathChars
+    local relaxedPathCharsValue=$(getXmlConnectorRelaxedPathChars "$i" "${filePath}" "${fileName}")
+    setConnectorRelaxedPathChars "${connectorRelaxedPathCharsYamlPath}" "\"${relaxedPathCharsValue}\""
+    # migrate relaxedQueryChars
+    local relaxedQueryCharsValue=$(getXmlConnectorRelaxedQueryChars "$i" "${filePath}" "${fileName}")
+    setConnectorRelaxedQueryChars "${connectorRelaxedQueryCharsYamlPath}" "\"${relaxedQueryCharsValue}\""
+
+    # migrate all attributes to extra config except port , maxThread , sendReasonPhrase ,relaxedPathChars and relaxedQueryChars
+    local connectorAttributes=$(getXmlConnectorAttributes "$i" "${filePath}" "${fileName}")
+    connectorAttributes=$(echo "${connectorAttributes}" | sed 's/port="'${portValue}'"//g' | sed 's/maxThreads="'${maxThreadValue}'"//g' | sed 's/sendReasonPhrase="'${sendReasonPhraseValue}'"//g' | sed 's/relaxedPathChars="\'${relaxedPathCharsValue}'\"//g' | sed 's/relaxedQueryChars="\'${relaxedQueryCharsValue}'\"//g')
+    # strip leading and trailing spaces
+    connectorAttributes=$(io_trim "${connectorAttributes}")
+    setConnectorExtraConfig "${connectorAttributesYamlPath}" "${connectorAttributes}"
+}
+
+# Check for default port 8040 and 8081 in connectors and migrate
+migrateConnectorPort () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    local defaultPort="$4"
+    local connectorPortYamlPath="$5"
+    local connectorMaxThreadYamlPath="$6"
+    local connectorAttributesYamlPath="$7"
+    local connectorSendReasonPhraseYamlPath="$8"
+    local connectorRelaxedPathCharsYamlPath="$9"
+    local connectorRelaxedQueryCharsYamlPath="${10}"
+    local portYamlPath=
+    local maxThreadYamlPath=
+    local status=
+    for ((i = 1 ; i <= "${connectorCount}" ; i++));
+    do  
+        local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+        local protocolType=$(getXmlConnectorProtocol "$i" "${filePath}" "${fileName}")
+        [[ "${protocolType}" == *AJP* ]] && continue
+        [[ "${portValue}" != "${defaultPort}" ]] && continue
+        if [[ "${portValue}" == "${DEFAULT_RT_PORT}" ]]; then
+            RT_DEFAULTPORT_STATUS=success
+        else
+            AC_DEFAULTPORT_STATUS=success
+        fi
+        migrateConnectorConfig "${i}" "${protocolType}" "${portValue}" "${connectorPortYamlPath}" "${connectorMaxThreadYamlPath}" "${connectorAttributesYamlPath}" "${filePath}" "${fileName}" "${connectorSendReasonPhraseYamlPath}" "${connectorRelaxedPathCharsYamlPath}" "${connectorRelaxedQueryCharsYamlPath}"
+    done
+}
+
+# migrate to extra, connector having default port and protocol is AJP
+migrateDefaultPortIfAjp () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    local defaultPort="$4"
+    
+    for ((i = 1 ; i <= "${connectorCount}" ; i++));
+    do  
+        local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+        local protocolType=$(getXmlConnectorProtocol "$i" "${filePath}" "${fileName}")
+        [[ "${protocolType}" != *AJP* ]] && continue
+        [[ "${portValue}" != "${defaultPort}" ]] && continue
+        migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "no" "${i}"
+    done
+
+}
+
+# Comparing max threads in connectors
+compareMaxThreads () {
+    local firstConnectorMaxThread="$1"
+    local firstConnectorNode="$2"
+    local secondConnectorMaxThread="$3"
+    local secondConnectorNode="$4"
+    local filePath="$5"
+    local fileName="$6"
+
+    # choose higher maxThreads connector as Artifactory.
+    if [[ "${firstConnectorMaxThread}" -gt ${secondConnectorMaxThread} || "${firstConnectorMaxThread}" -eq ${secondConnectorMaxThread} ]]; then
+        # maxThread is higher in firstConnector,
+        # Taking firstConnector as Artifactory and SecondConnector as Access
+        # maxThread is equal in both connector,considering firstConnector as Artifactory and SecondConnector as Access
+        local rtPortValue=$(getXmlConnectorPort "${firstConnectorNode}" "${filePath}" "${fileName}")
+        migrateConnectorConfig "${firstConnectorNode}" "${protocolType}" "${rtPortValue}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+        local acPortValue=$(getXmlConnectorPort "${secondConnectorNode}" "${filePath}" "${fileName}")
+        migrateConnectorConfig "${secondConnectorNode}" "${protocolType}" "${acPortValue}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+    else
+        # maxThread is higher in SecondConnector, 
+        # Taking SecondConnector as Artifactory and firstConnector as Access
+        local rtPortValue=$(getXmlConnectorPort "${secondConnectorNode}" "${filePath}" "${fileName}")
+        migrateConnectorConfig "${secondConnectorNode}" "${protocolType}" "${rtPortValue}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+        local acPortValue=$(getXmlConnectorPort "${firstConnectorNode}" "${filePath}" "${fileName}")
+        migrateConnectorConfig "${firstConnectorNode}" "${protocolType}" "${acPortValue}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+    fi
+}
+
+# Check max threads exist to compare
+maxThreadsExistToCompare () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    local firstConnectorMaxThread=
+    local secondConnectorMaxThread=
+    local firstConnectorNode=
+    local secondConnectorNode=
+    local status=success
+    local firstnode=fail
+
+    for ((i = 1 ; i <= "${connectorCount}" ; i++));
+        do 
+        local protocolType=$(getXmlConnectorProtocol "$i" "${filePath}" "${fileName}")
+        if [[ ${protocolType} == *AJP* ]]; then
+            # Migrate Connectors
+            migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "no" "${i}"
+            continue
+        fi
+        # store maxthreads value of each connector
+        if [[ ${firstnode} == "fail" ]]; then
+            firstConnectorMaxThread=$(getXmlConnectorMaxThreads "${i}" "${filePath}" "${fileName}")
+            firstConnectorNode="${i}"
+            firstnode=success
+        else
+            secondConnectorMaxThread=$(getXmlConnectorMaxThreads "${i}" "${filePath}" "${fileName}")
+            secondConnectorNode="${i}"
+        fi
+    done
+    [[ -z "${firstConnectorMaxThread}" ]] && status=fail
+    [[ -z "${secondConnectorMaxThread}" ]] && status=fail
+    # maxThreads is set, now compare MaxThreads
+    if [[ "${status}" == "success" ]]; then
+        compareMaxThreads "${firstConnectorMaxThread}" "${firstConnectorNode}" "${secondConnectorMaxThread}" "${secondConnectorNode}" "${filePath}" "${fileName}"
+    else 
+        # Assume first connector is RT, maxThreads is not set in both connectors
+        local rtPortValue=$(getXmlConnectorPort "${firstConnectorNode}" "${filePath}" "${fileName}")
+        migrateConnectorConfig "${firstConnectorNode}" "${protocolType}" "${rtPortValue}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+        local acPortValue=$(getXmlConnectorPort "${secondConnectorNode}" "${filePath}" "${fileName}")
+        migrateConnectorConfig "${secondConnectorNode}" "${protocolType}" "${acPortValue}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+    fi
+}
+
+migrateExtraBasedOnNonAjpCount () {
+    local nonAjpCount="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local connectorCount="$4"
+    local i="$5"
+
+    local protocolType=$(getXmlConnectorProtocol "$i" "${filePath}" "${fileName}")
+    if [[ "${protocolType}" == *AJP* ]]; then
+        if [[ "${nonAjpCount}" -eq 1  ]]; then
+            # migrateExtraConnectors
+            migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "no" "${i}"
+            continue
+        else
+            # migrateExtraConnectors
+            migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "yes"
+            continue
+        fi
+    fi
+}
+
+# find RT and AC Connector
+findRtAndAcConnector () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    local initialAjpCount=0
+    local nonAjpCount=0
+
+    # get the count of non AJP
+    for ((i = 1 ; i <= "${connectorCount}" ; i++));
+    do  
+        local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+        local protocolType=$(getXmlConnectorProtocol "$i" "${filePath}" "${fileName}")
+        [[ "${protocolType}" != *AJP* ]]  || continue
+        nonAjpCount=$((initialAjpCount+1))
+        initialAjpCount="${nonAjpCount}"
+    done
+    if [[ "${nonAjpCount}" -eq 1 ]]; then  
+        # Add the connector found as access and artifactory connectors
+        # Mark port as 8040 for access
+        for ((i = 1 ; i <= "${connectorCount}" ; i++))
+        do  
+            migrateExtraBasedOnNonAjpCount "${nonAjpCount}" "${filePath}" "${fileName}" "${connectorCount}"  "$i"
+            local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+            migrateConnectorConfig "$i" "${protocolType}" "${portValue}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+            migrateConnectorConfig "$i" "${protocolType}" "${portValue}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+            setConnectorPort "${AC_PORT_YAMLPATH}" "${DEFAULT_ACCESS_PORT}"
+        done
+    elif [[ "${nonAjpCount}" -eq 2 ]]; then
+        # compare maxThreads in both connectors
+        maxThreadsExistToCompare "${filePath}" "${fileName}" "${connectorCount}"
+    elif [[ "${nonAjpCount}" -gt 2 ]]; then
+        # migrateExtraConnectors
+        migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "yes"
+    elif [[ "${nonAjpCount}" -eq 0 ]]; then
+        # setting with default port in system.yaml
+        setConnectorPort "${RT_PORT_YAMLPATH}" "${DEFAULT_RT_PORT}"
+        setConnectorPort "${AC_PORT_YAMLPATH}" "${DEFAULT_ACCESS_PORT}"
+        # migrateExtraConnectors
+        migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "yes"
+    fi
+}
+
+# get the count of non AJP
+getCountOfNonAjp () {
+    local port="$1"
+    local connectorCount="$2"
+    local filePath=$3
+    local fileName=$4
+    local initialNonAjpCount=0
+
+    for ((i = 1 ; i <= "${connectorCount}" ; i++));
+    do  
+        local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+        local protocolType=$(getXmlConnectorProtocol "$i" "${filePath}" "${fileName}")
+        [[ "${portValue}" != "${port}" ]] || continue
+        [[ "${protocolType}" != *AJP* ]]  || continue
+        local nonAjpCount=$((initialNonAjpCount+1))
+        initialNonAjpCount="${nonAjpCount}"
+    done
+    echo -e "${nonAjpCount}"
+}
+
+# Find for access connector
+findAcConnector () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    
+    # get the count of non AJP 
+    local nonAjpCount=$(getCountOfNonAjp "${DEFAULT_RT_PORT}" "${connectorCount}" "${filePath}" "${fileName}")
+    if [[ "${nonAjpCount}" -eq 1 ]]; then
+        # Add the connector found as access connector and mark port as that of connector
+        for ((i = 1 ; i <= "${connectorCount}" ; i++))
+        do  
+            migrateExtraBasedOnNonAjpCount "${nonAjpCount}" "${filePath}" "${fileName}" "${connectorCount}" "$i"
+            local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+            if [[ "${portValue}" != "${DEFAULT_RT_PORT}" ]]; then
+                migrateConnectorConfig "$i" "${protocolType}" "${portValue}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+            fi   
+        done
+    elif [[ "${nonAjpCount}" -gt 1 ]]; then
+        # Take RT properties into access with 8040
+        for ((i = 1 ; i <= "${connectorCount}" ; i++))
+        do  
+            migrateExtraBasedOnNonAjpCount "${nonAjpCount}" "${filePath}" "${fileName}" "${connectorCount}" "$i"
+            local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+            if [[ "${portValue}" == "${DEFAULT_RT_PORT}" ]]; then
+                migrateConnectorConfig "$i" "${protocolType}" "${portValue}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+                setConnectorPort "${AC_PORT_YAMLPATH}" "${DEFAULT_ACCESS_PORT}"
+            fi
+        done
+    elif [[ "${nonAjpCount}" -eq 0 ]]; then 
+        # Add RT connector details as access connector and mark port as 8040  
+        migrateConnectorPort "${filePath}" "${fileName}" "${connectorCount}" "${DEFAULT_RT_PORT}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+        setConnectorPort "${AC_PORT_YAMLPATH}" "${DEFAULT_ACCESS_PORT}"
+        # migrateExtraConnectors
+        migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "yes"
+    fi
+}
+
+# Find for artifactory connector
+findRtConnector () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    
+    # get the count of non AJP 
+    local nonAjpCount=$(getCountOfNonAjp "${DEFAULT_ACCESS_PORT}" "${connectorCount}" "${filePath}" "${fileName}")
+    if [[ "${nonAjpCount}" -eq 1 ]]; then
+        # Add the connector found as RT connector
+        for ((i = 1 ; i <= "${connectorCount}" ; i++))
+        do  
+            migrateExtraBasedOnNonAjpCount "${nonAjpCount}" "${filePath}" "${fileName}" "${connectorCount}" "$i"
+            local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+            if [[ "${portValue}" != "${DEFAULT_ACCESS_PORT}" ]]; then
+                migrateConnectorConfig "$i" "${protocolType}" "${portValue}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+            fi
+        done
+    elif [[ "${nonAjpCount}" -gt 1 ]]; then
+        # Take access properties into artifactory with 8081
+        for ((i = 1 ; i <= "${connectorCount}" ; i++))
+        do  
+            migrateExtraBasedOnNonAjpCount "${nonAjpCount}" "${filePath}" "${fileName}" "${connectorCount}" "$i"
+            local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+            if [[ "${portValue}" == "${DEFAULT_ACCESS_PORT}" ]]; then
+                migrateConnectorConfig "$i" "${protocolType}" "${portValue}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+                setConnectorPort "${RT_PORT_YAMLPATH}" "${DEFAULT_RT_PORT}"
+            fi
+        done
+    elif [[ "${nonAjpCount}" -eq 0 ]]; then   
+        # Add access connector details as RT connector and mark as ${DEFAULT_RT_PORT}
+        migrateConnectorPort "${filePath}" "${fileName}" "${connectorCount}" "${DEFAULT_ACCESS_PORT}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+        setConnectorPort "${RT_PORT_YAMLPATH}" "${DEFAULT_RT_PORT}"
+        # migrateExtraConnectors
+        migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "yes"
+    fi
+}
+
+checkForTlsConnector () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    for ((i = 1 ; i <= "${connectorCount}" ; i++))
+    do
+        local sslProtocolValue=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@sslProtocol' ${filePath}/${fileName} 2>/dev/null | awk -F"=" '{print $2}' | tr -d '"')
+        if [[ "${sslProtocolValue}" == "TLS" ]]; then
+            bannerImportant "NOTE: Ignoring TLS connector during migration, modify the system yaml to enable TLS. Original server.xml is saved in path [${filePath}/${fileName}]"
+            TLS_CONNECTOR_EXISTS=${FLAG_Y}
+            continue
+        fi
+    done
+}
+
+# set custom tomcat server Listeners to system.yaml
+setListenerConnector () {
+    local filePath="$1"
+    local fileName="$2"
+    local listenerCount="$3"
+    for ((i = 1 ; i <= "${listenerCount}" ; i++))
+    do 
+        local listenerConnector=$($LIBXML2_PATH --xpath '//Server/Listener['$i']' ${filePath}/${fileName} 2>/dev/null)
+        local listenerClassName=$($LIBXML2_PATH --xpath '//Server/Listener['$i']/@className' ${filePath}/${fileName} 2>/dev/null | awk -F"=" '{print $2}' | tr -d '"')
+        if [[ "${listenerClassName}" == *Apr* ]]; then
+            setExtraConnector "${EXTRA_LISTENER_CONFIG_YAMLPATH}" "${listenerConnector}"
+        fi
+    done
+}
+# add custom tomcat server Listeners
+addTomcatServerListeners () {
+    local filePath="$1"
+    local fileName="$2"
+    local listenerCount="$3"
+    if [[ "${listenerCount}" == "0" ]]; then
+        logger "No listener connectors found in the [${filePath}/${fileName}],skipping migration of listener connectors"
+    else
+        setListenerConnector "${filePath}" "${fileName}" "${listenerCount}"
+        setSystemValue "${RT_TOMCAT_HTTPSCONNECTOR_ENABLED}" "true" "${SYSTEM_YAML_PATH}"
+        logger "Setting [${RT_TOMCAT_HTTPSCONNECTOR_ENABLED}] with value [true] in system.yaml"
+    fi
+}
+
+# server.xml migration operations
+xmlMigrateOperation () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    local listenerCount="$4"
+    RT_DEFAULTPORT_STATUS=fail
+    AC_DEFAULTPORT_STATUS=fail
+    TLS_CONNECTOR_EXISTS=${FLAG_N}
+
+    # Check for connector with TLS , if found ignore migrating it
+    checkForTlsConnector "${filePath}" "${fileName}" "${connectorCount}"
+    if [[ "${TLS_CONNECTOR_EXISTS}" == "${FLAG_Y}" ]]; then
+        return
+    fi
+    addTomcatServerListeners "${filePath}" "${fileName}" "${listenerCount}"
+    # Migrate RT default port from connectors 
+    migrateConnectorPort "${filePath}" "${fileName}" "${connectorCount}" "${DEFAULT_RT_PORT}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+    # Migrate to extra if RT default ports are AJP
+    migrateDefaultPortIfAjp "${filePath}" "${fileName}" "${connectorCount}" "${DEFAULT_RT_PORT}"
+    # Migrate AC default port from connectors
+    migrateConnectorPort "${filePath}" "${fileName}" "${connectorCount}" "${DEFAULT_ACCESS_PORT}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+    # Migrate to extra if access default ports are AJP
+    migrateDefaultPortIfAjp "${filePath}" "${fileName}" "${connectorCount}" "${DEFAULT_ACCESS_PORT}"
+
+    if [[ "${AC_DEFAULTPORT_STATUS}" == "success" && "${RT_DEFAULTPORT_STATUS}" == "success" ]]; then
+        # RT and AC default port found
+        logger "Artifactory 8081 and Access 8040 default port are found"
+        migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "yes"
+    elif [[ "${AC_DEFAULTPORT_STATUS}" == "success" && "${RT_DEFAULTPORT_STATUS}" == "fail" ]]; then
+        # Only AC default port found,find RT connector
+        logger "Found Access default 8040 port"
+        findRtConnector "${filePath}" "${fileName}" "${connectorCount}"
+    elif [[ "${AC_DEFAULTPORT_STATUS}" == "fail" && "${RT_DEFAULTPORT_STATUS}" == "success" ]]; then
+        # Only RT default port found,find AC connector
+        logger "Found Artifactory default 8081 port"
+        findAcConnector "${filePath}" "${fileName}" "${connectorCount}"
+    elif [[ "${AC_DEFAULTPORT_STATUS}" == "fail" && "${RT_DEFAULTPORT_STATUS}" == "fail" ]]; then    
+        # RT and AC default port not found, find connector
+        logger "Artifactory 8081 and Access 8040 default port are not found"
+        findRtAndAcConnector "${filePath}" "${fileName}" "${connectorCount}"
+    fi
+}
+
+# get count of connectors
+getXmlConnectorCount () {
+    local filePath="$1"
+    local fileName="$2"
+    local count=$($LIBXML2_PATH --xpath 'count(/Server/Service/Connector)' ${filePath}/${fileName})
+    echo -e "${count}"
+}
+
+# get count of listener connectors
+getTomcatServerListenersCount () {
+    local filePath="$1"
+    local fileName="$2"
+    local count=$($LIBXML2_PATH --xpath 'count(/Server/Listener)' ${filePath}/${fileName})
+    echo -e "${count}"
+}
+
+# Migrate server.xml configuration to system.yaml
+migrateXmlFile () {
+    local xmlFiles=
+    local fileName=
+    local filePath=
+    local sourceFilePath=
+    DEFAULT_ACCESS_PORT="8040"
+    DEFAULT_RT_PORT="8081"
+    AC_PORT_YAMLPATH="migration.xmlFiles.serverXml.access.port"
+    AC_MAXTHREADS_YAMLPATH="migration.xmlFiles.serverXml.access.maxThreads"
+    AC_SENDREASONPHRASE_YAMLPATH="migration.xmlFiles.serverXml.access.sendReasonPhrase"
+    AC_EXTRACONFIG_YAMLPATH="migration.xmlFiles.serverXml.access.extraConfig"
+    RT_PORT_YAMLPATH="migration.xmlFiles.serverXml.artifactory.port"
+    RT_MAXTHREADS_YAMLPATH="migration.xmlFiles.serverXml.artifactory.maxThreads"
+    RT_SENDREASONPHRASE_YAMLPATH='migration.xmlFiles.serverXml.artifactory.sendReasonPhrase'
+    RT_RELAXEDPATHCHARS_YAMLPATH='migration.xmlFiles.serverXml.artifactory.relaxedPathChars'
+    RT_RELAXEDQUERYCHARS_YAMLPATH='migration.xmlFiles.serverXml.artifactory.relaxedQueryChars'
+    RT_EXTRACONFIG_YAMLPATH="migration.xmlFiles.serverXml.artifactory.extraConfig"
+    ROUTER_PORT_YAMLPATH="migration.xmlFiles.serverXml.router.port"
+    EXTRA_CONFIG_YAMLPATH="migration.xmlFiles.serverXml.extra.config"
+    EXTRA_LISTENER_CONFIG_YAMLPATH="migration.xmlFiles.serverXml.extra.listener"
+    RT_TOMCAT_HTTPSCONNECTOR_ENABLED="artifactory.tomcat.httpsConnector.enabled"
+
+    retrieveYamlValue "migration.xmlFiles" "xmlFiles" "Skip"
+    xmlFiles="${YAML_VALUE}"
+    if [[ -z "${xmlFiles}" ]]; then
+        return
+    fi
+    bannerSection "PROCESSING MIGRATION OF XML FILES"
+    retrieveYamlValue "migration.xmlFiles.serverXml.fileName" "fileName" "Warning"
+    fileName="${YAML_VALUE}"
+    if [[ -z "${fileName}" ]]; then
+        return
+    fi
+    bannerSubSection "Processing Migration of $fileName"
+    retrieveYamlValue "migration.xmlFiles.serverXml.filePath" "filePath" "Warning"
+    filePath="${YAML_VALUE}"
+    if [[ -z "${filePath}" ]]; then
+        return
+    fi
+    # prepend NEW_DATA_DIR only if filePath is relative path
+    sourceFilePath=$(prependDir "${filePath}" "${NEW_DATA_DIR}/${filePath}")
+    if [[ "$(checkFileExists "${sourceFilePath}/${fileName}")" == "true" ]]; then
+        logger "File [${fileName}] is found in path [${sourceFilePath}]"
+        local connectorCount=$(getXmlConnectorCount "${sourceFilePath}" "${fileName}")
+        if [[ "${connectorCount}" == "0" ]]; then
+            logger "No connectors found in the [${filePath}/${fileName}],skipping migration of xml configuration"
+            return
+        fi
+        local listenerCount=$(getTomcatServerListenersCount "${sourceFilePath}" "${fileName}")
+        xmlMigrateOperation "${sourceFilePath}" "${fileName}" "${connectorCount}" "${listenerCount}"
+    else
+        logger "File [${fileName}] is not found in path [${sourceFilePath}] to migrate"
+    fi   
+}
+
+compareArtifactoryUser () {
+    local property="$1"
+    local oldPropertyValue="$2"
+    local newPropertyValue="$3"
+    local yamlPath="$4"
+    local sourceFile="$5"
+
+    if [[ "${oldPropertyValue}" != "${newPropertyValue}" ]]; then
+        setSystemValue "${yamlPath}" "${oldPropertyValue}" "${SYSTEM_YAML_PATH}"
+        logger "Setting [${yamlPath}] with value of the property [${property}] in system.yaml"
+    else
+        logger "No change in property [${property}] value in [${sourceFile}] to migrate"
+    fi
+}
+
+migrateReplicator () {
+    local property="$1"
+    local oldPropertyValue="$2"
+    local yamlPath="$3"
+
+    setSystemValue "${yamlPath}" "${oldPropertyValue}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${yamlPath}] with value of the property [${property}] in system.yaml"
+}
+
+compareJavaOptions () {
+    local property="$1"
+    local oldPropertyValue="$2"
+    local newPropertyValue="$3"
+    local yamlPath="$4"
+    local sourceFile="$5"
+    local oldJavaOption=
+    local newJavaOption=
+    local extraJavaOption=
+    local check=false
+    local success=true
+    local status=true
+
+    oldJavaOption=$(echo "${oldPropertyValue}" | awk 'BEGIN{FS=OFS="\""}{for(i=2;i<NF;i+=2)gsub(/ /,"@",$i)}1')
+    newJavaOption=$(echo "${newPropertyValue}" | awk 'BEGIN{FS=OFS="\""}{for(i=2;i<NF;i+=2)gsub(/ /,"@",$i)}1')
+    for oldJavaOption in $oldPropertyValue;
+    do
+        for newJavaOption in $newPropertyValue;
+        do
+            if [[ "${oldJavaOption}" == "${newJavaOption}" ]]; then
+                check=true
+                break
+            else
+                check=false
+            fi
+        done
+        if [[ "${check}" == "false" ]]; then
+            oldJavaOption=$(echo "${oldJavaOption}" | tr -s "@" " ")
+            getYamlValue "${yamlPath}" "${SYSTEM_YAML_PATH}" "false"
+            extraJavaOption="${YAML_VALUE}"
+            success=false
+            if [[ -z "${extraJavaOption}" ]]; then
+                setSystemValue "${yamlPath}" "\"${oldJavaOption}\"" "${SYSTEM_YAML_PATH}" && status=false
+            else
+                [[ "${extraJavaOption}" != *"${oldJavaOption}"* ]] && setSystemValue "${yamlPath}" "\"${extraJavaOption} ${oldJavaOption}\"" "${SYSTEM_YAML_PATH}" || status=false
+            fi
+        fi
+    done
+    if [[ "${status}" == "false" ]]; then
+        getYamlValue "${yamlPath}" "${SYSTEM_YAML_PATH}" "false"
+        local extraOpts="${YAML_VALUE}"
+        logger "Setting [${yamlPath}] with value of the property [${property}] in system.yaml"
+    fi
+    [[ "${success}" == "true" && "${check}" == "true" ]] && logger "No change in property [JAVA_OPTIONS] value in [${sourceFile}] to migrate"
+}
+
+defaultPropertyMigrate () {
+    local entry="$1"
+    local sourceFile="$2"
+    local targetFile="$3"
+    local yamlPath=
+    local property=
+    local oldPropertyValue=
+    local newPropertyValue=
+    local check=false
+    
+    local targetDataDir=
+
+    local yamlPath=$(getFirstEntry "${entry}")
+    local property=$(getSecondEntry "${entry}")
+    if [[ -z "${property}" ]]; then
+        warn "Property is empty in map [${entry}] in the file [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    if [[ -z "${yamlPath}" ]]; then
+        warn "yamlPath is empty for [${property}] in [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    unset ${property}
+    source ${sourceFile}
+    oldPropertyValue=$(evalVariable "oldPropertyValue" "${property}")
+
+    unset ${property}
+    source ${targetFile}
+    if [[ "${property}" == "JAVA_OPTIONS" ]]; then
+        property="DEFAULT_JAVA_OPTIONS"
+    fi
+    newPropertyValue="$(evalVariable "newPropertyValue" "${property}")"
+
+    [[ -z "${oldPropertyValue}" ]] && logger "Property [${property}] not found in [${sourceFile}] to migrate" || check=true
+    if [[ "${check}" == "true" ]]; then
+        # migrate ARTIFACTORY_USER
+        [[ "${property}" == "ARTIFACTORY_USER" ]] && compareArtifactoryUser "${property}" "${oldPropertyValue}" "${newPropertyValue}" "${yamlPath}" "${sourceFile}"
+        # migrate JAVA_OPTIONS
+        [[ "${property}" == *"JAVA_OPTIONS"* ]] && compareJavaOptions "${property}" "${oldPropertyValue}" "${newPropertyValue}" "${yamlPath}" "${sourceFile}"
+        # migrate START_LOCAL_REPLICATOR
+        [[ "${property}" == "START_LOCAL_REPLICATOR" ]] && migrateReplicator "${property}" "${oldPropertyValue}" "${yamlPath}"
+    fi
+}
+
+migrateDefaultFile () {
+    local oldDefaultFilePath=
+    local newDefaultFilePath=
+    local oldfileName=
+    local newFileName=
+    local map=
+    local defaultFile=
+    local sourceFilePath=
+    local targetFilePath=
+    local sourceFile=
+    local targetFile=
+    
+    retrieveYamlValue "migration.defaultFile" "defaultFile" "Skip"
+    defaultFile="${YAML_VALUE}"
+    if [[ -z "${defaultFile}" ]]; then
+        return
+    fi
+    bannerSection "PROCESSING MIGRATION OF DEFAULTFILE"
+    retrieveYamlValue "migration.defaultFile.oldFile.defaultFilePath" "oldDefaultFilePath" "Warning"
+    oldDefaultFilePath="${YAML_VALUE}"
+    retrieveYamlValue "migration.defaultFile.oldFile.fileName" "oldFileName" "Warning"
+    oldFileName="${YAML_VALUE}"
+    if [[ "$(warnIfEmpty "${oldDefaultFilePath}" "migration.defaultFile.oldFile.defaultFilePath")" != "true" ]]; then
+        return
+    fi
+    if [[ "$(warnIfEmpty "${oldFileName}" "migration.defaultFile.oldFile.fileName")" != "true" ]]; then
+        return
+    fi
+    retrieveYamlValue "migration.defaultFile.newFile.defaultFilePath" "newDefaultFilePath" "Warning"
+    newDefaultFilePath="${YAML_VALUE}"
+    retrieveYamlValue "migration.defaultFile.newFile.fileName" "newfileName" "Warning"
+    newFileName="${YAML_VALUE}"
+    if [[ "$(warnIfEmpty "${newDefaultFilePath}" "migration.defaultFile.newFile.defaultFilePath")" != "true" ]]; then
+        return
+    fi
+    if [[ "$(warnIfEmpty "${newFileName}" "migration.defaultFile.newFile.fileName")" != "true" ]]; then
+        return
+    fi
+    # prepend NEW_DATA_DIR only if oldDefaultFilePath is relative path
+    sourceFilePath=$(prependDir "${oldDefaultFilePath}" ${NEW_DATA_DIR}/${oldDefaultFilePath})
+    sourceFile="${sourceFilePath}/${oldFileName}"
+    if [[ "$(checkFileExists "${sourceFile}")" != "true" ]]; then
+        logger "OldDefaultFile [${oldFileName}] not found in the path [${sourceFilePath}]"
+        return
+    fi
+    # path newDefaultFilePath will change based installer
+    if [[ "${INSTALLER}" == "${ZIP_TYPE}" ]]; then
+        targetFilePath="${APP_DIR}/../${newDefaultFilePath}"
+    else
+        targetDataDir="`cd "${NEW_DATA_DIR}"/../;pwd`"
+        targetFilePath="${targetDataDir}/${newDefaultFilePath}"
+    fi
+    targetFile="${targetFilePath}/${newFileName}"
+    if [[ "$(checkFileExists "${targetFile}")" != "true" ]]; then
+        logger "NewDefaultFile [${newFileName}] not found in the path [${sourceFilePath}]"
+        return
+    fi
+    logger "OldDefaultFile [${oldFileName}] found in the path [${sourceFilePath}]"
+    logger "NewDefaultFile [${newFileName}] found in the path [${targetFilePath}]"
+    retrieveYamlValue "migration.defaultFile.map" "map" "Warning"
+    map="${YAML_VALUE}"
+    [[ -z "${map}" ]] && continue
+    for entry in $map;
+    do
+        if [[ "$(checkMapEntry "${entry}")" == "true" ]]; then
+            defaultPropertyMigrate "${entry}" "${sourceFile}" "${targetFile}"
+        else
+            warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e yamlPath=property"
+        fi
+    done
+}
+
+# comment node.id in system.yaml
+# Add a commented Line above the node.id in system.yaml
+commentNodeId () {
+    local filePath=
+    local fileName=
+    local idKey=
+
+    retrieveYamlValue "migration.propertyFiles.haNodeProperty.filePath" "filePath" "Skip"
+    filePath="${YAML_VALUE}"
+    if [[ -z "${filePath}" ]]; then
+        return
+    fi
+    retrieveYamlValue "migration.propertyFiles.haNodeProperty.fileName" "fileName" "Skip"
+    fileName="${YAML_VALUE}"
+    if [[ -z "${fileName}" ]]; then
+        return
+    fi
+    if [[ "$(checkFileExists "${NEW_DATA_DIR}/${filePath}/${fileName}")" == "true" ]]; then
+        getYamlValue "shared.node" "${SYSTEM_YAML_PATH}" "false"
+        idKey=$(echo "${YAML_VALUE}" | grep "^id:")
+        local regexString="${idKey}"
+        local replaceText="#&"
+        replaceText_migration_hook "${regexString}" "${replaceText}" "${SYSTEM_YAML_PATH}"
+        local text="# NOTE: node.id can be automatically determined based on the current hostname or be set using the SHARED_NODE_ID environment variable. There is no need to explicitly specify it here."
+        prependText "${regexString}" "${text}" "${SYSTEM_YAML_PATH}"
+    fi
+}
+
+artifactoryInfoMessage () {
+
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        addText "# yamlFile was generated from db.properties and ha-node.properties config files." "${SYSTEM_YAML_PATH}"
+    else
+        addText "# yamlFile was generated from default file,db.properties and ha-node.properties config files." "${SYSTEM_YAML_PATH}"
+    fi
+
+}
+
+setHaEnabled_hook () {
+    local filePath="$1"
+    if [[ "$(checkFileExists "${NEW_DATA_DIR}/${filePath}/ha-node.properties")" == "true" ]]; then
+        setSystemValue "shared.node.haEnabled" "true" "${SYSTEM_YAML_PATH}"
+        logger "Setting [shared.node.haEnabled] with [true] in system.yaml"
+    fi
+}
+
+removeFileOperation () {
+    local backupDir="$1"
+    local file="$2"
+    if [[ "$(checkFileExists "${file}")" == "true" ]]; then
+        cp -pf "${file}" "${backupDir}" || warn "Failed to copy file [${file}] to ${backupDir}"
+        rm -f "${file}" || warn "Failed to remove file [${file}]"
+    else
+        logger "Source file [${file}] does not exist in path to backup and remove"
+    fi
+}
+
+_createBackupOfLogBackDir () {
+    local backupDir="$1"
+    local accessLogbackFile="${NEW_DATA_DIR}/etc/access/logback.xml"
+    local artiLogbackFile="${NEW_DATA_DIR}/etc/artifactory/logback.xml"
+    local effectiveUser=
+    local effectiveGroup=
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        effectiveUser="${JF_USER}"
+        effectiveGroup="${JF_USER}"
+    elif [[ "${INSTALLER}" == "${DEB_TYPE}" || "${INSTALLER}" == "${RPM_TYPE}" ]]; then
+        effectiveUser="${USER_TO_CHECK}" 
+        effectiveGroup="${GROUP_TO_CHECK}"
+    fi
+    removeSoftLinkAndCreateDir "${backupDir}/logbackXmlFiles" "${effectiveUser}" "${effectiveGroup}" "yes"
+    removeSoftLinkAndCreateDir "${backupDir}/logbackXmlFiles/access" "${effectiveUser}" "${effectiveGroup}" "yes" 
+    removeSoftLinkAndCreateDir "${backupDir}/logbackXmlFiles/artifactory" "${effectiveUser}" "${effectiveGroup}" "yes"
+    removeFileOperation "${backupDir}/logbackXmlFiles/access" "${accessLogbackFile}"
+    removeFileOperation "${backupDir}/logbackXmlFiles/artifactory" "${artiLogbackFile}"
+}
+
+backupFiles_hook () {
+    local backupDirectory="$1" 
+    _createBackupOfLogBackDir "${backupDirectory}"
+}
+
+migrateArtifactory () {
+    creationMigrateLog
+    _pauseExecution "creationMigrateLog"
+    checkArtifactoryVersion
+    _pauseExecution "checkArtifactoryVersion"
+    startMigration
+    _pauseExecution "startMigration"
+    setSystemYamlPath
+    _pauseExecution "setSystemYamlPath"
+    createRequiredDirs
+    _pauseExecution "createRequiredDirs"
+    symlinkDirectories
+    _pauseExecution "symlinkDirectories"
+    copyDirectories
+    _pauseExecution "copyDirectories"
+    moveDirectories
+    _pauseExecution "moveDirectories"
+    trimMasterKey
+    _pauseExecution "trimMasterKey"
+    migratePropertiesFiles
+    _pauseExecution "migratePropertiesFiles"
+    migrateXmlFile
+    _pauseExecution "migrateXmlFile"
+    migrateDefaultFile
+    _pauseExecution "migrateDefaultFile"
+    migrateYamlFile
+    _pauseExecution "migrateYamlFile"
+    updateSystemYamlFile
+    _pauseExecution "updateSystemYamlFile"
+    cleanUpOldDataDirectories
+    _pauseExecution "cleanUpOldDataDirectories"
+    cleanUpOldFiles
+    _pauseExecution "cleanUpOldFiles"
+    commentNodeId
+    _pauseExecution "commentNodeId"
+    artifactoryInfoMessage
+    _pauseExecution "artifactoryInfoMessage"
+    endMigration
+    _pauseExecution "endMigration"
+}
+
+initialize
+main
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/files/migrationHelmInfo.yaml b/charts/jfrog/artifactory-ha/107.98.14/files/migrationHelmInfo.yaml
new file mode 100644
index 000000000..016bea02d
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/files/migrationHelmInfo.yaml
@@ -0,0 +1,27 @@
+migration:
+  product: ARTIFACTORY
+  oldDataDir: /var/opt/jfrog/artifactory
+  moveDirectories:
+    map:
+    # Note : $JF_ROOT_DATA_DIR will be prepended to the sourceDirectoryPath value only if relative path and $JF_ROOT_DATA_DIR/var will be prepended to the targetDirectoryPath value
+    # map should be in format example: targetDirectoryPath=sourceDirectoryPath
+      backup/access=access/backup
+      etc/access=access/etc
+      data/access=access/data
+      work/access=access/tmp
+      log/archived/access=access/logs
+      log/archived/artifactory=logs
+  linkFiles:
+    map:
+    # Note : $JF_ROOT_DATA_DIR will be prepended to the sourceDirectoryPath value only if relative path and $JF_ROOT_DATA_DIR will be prepended to the targetDirectoryPath value
+    # map should be in format example: targetDirectoryPath=sourceDirectoryPath
+      etc/artifactory=etc
+      backup/artifactory=backup
+      data/artifactory=data
+      support/artifactory=support
+  cleanUpOldDataDir:
+    # Note $JF_ROOT_DATA_DIR will be prepended to the map entry
+    map:
+      access
+      metadata
+      logs
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/files/migrationStatus.sh b/charts/jfrog/artifactory-ha/107.98.14/files/migrationStatus.sh
new file mode 100644
index 000000000..2ad7c9d31
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/files/migrationStatus.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+statusCheck(){
+local retries=0
+# Max Timeout in seconds  default ~3600
+local maxTimeOutInSeconds=$1
+MaxRetries=$(( maxTimeOutInSeconds/10 ))
+# Wait for DB to start 
+sleep 30
+until [ "`curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1:8082/router/api/v1/system/health`" == "200" ];
+do
+  echo Waiting for Artifactory to start --- sleeping for 10 seconds
+  if [[ ${retries} -eq ${MaxRetries} ]]
+  then 
+    echo Failed to start.
+    exit 1
+  fi
+  retries=$(( retries+1 ))
+  sleep 10
+done
+
+sleep 20
+echo "Artifactory started successfully...in Init Container"
+echo "Stopping artifactory in Init Container..."
+${scriptsPath}/artifactory.sh stop
+echo "Exiting Init Container..."
+
+}
+
+scriptsPath="/opt/jfrog/artifactory/app/bin"
+maxTimeOut=$2
+bash ${scriptsPath}/migrate.sh $1
+status=$?
+if [[ ${status} -eq 1 && -f /tmp/error ]]; then
+  echo "Migration is not supported ...Exiting Init Container"
+  exit 1
+elif [[ ${status} -eq 0 ]]; then
+  echo "Waiting for Artifactory to start in Init Container"
+  /entrypoint-artifactory.sh &
+  statusCheck ${maxTimeOut}
+else
+  echo "Migration not necessary...Exiting Init Container"
+  exit 0
+fi
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/files/nginx-artifactory-conf.yaml b/charts/jfrog/artifactory-ha/107.98.14/files/nginx-artifactory-conf.yaml
new file mode 100644
index 000000000..4671d483c
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/files/nginx-artifactory-conf.yaml
@@ -0,0 +1,108 @@
+{{- if .Values.nginx.https.enabled }}
+ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+ssl_certificate  {{ .Values.nginx.persistence.mountPath }}/ssl/tls.crt;
+ssl_certificate_key  {{ .Values.nginx.persistence.mountPath }}/ssl/tls.key;
+ssl_session_cache shared:SSL:1m;
+ssl_prefer_server_ciphers   on;
+{{- end }}
+## server configuration
+server {
+{{- if .Values.nginx.internalPortHttps }}
+{{- if .Values.nginx.singleStackIPv6Cluster }}
+listen [::]:{{ .Values.nginx.internalPortHttps }} ssl;
+{{- else -}}
+listen {{ .Values.nginx.internalPortHttps }} ssl;
+{{- end }}
+{{- else -}}
+{{- if .Values.nginx.https.enabled }}
+{{- if .Values.nginx.singleStackIPv6Cluster }}
+listen [::]:{{ .Values.nginx.https.internalPort }} ssl;
+{{- else -}}
+listen {{ .Values.nginx.https.internalPort }} ssl;
+{{- end }}
+{{- end }}
+{{- end }}
+{{- if .Values.nginx.internalPortHttp }}
+{{- if .Values.nginx.singleStackIPv6Cluster }}
+listen [::]:{{ .Values.nginx.internalPortHttp }};
+{{- else -}}
+listen {{ .Values.nginx.internalPortHttp }};
+{{- end }}
+{{- else -}}
+{{- if .Values.nginx.http.enabled }}
+{{- if .Values.nginx.singleStackIPv6Cluster }}
+listen [::]:{{ .Values.nginx.http.internalPort }};
+{{- else -}}
+listen {{ .Values.nginx.http.internalPort }};
+{{- end }}
+{{- end }}
+{{- end }}
+server_name ~(?<repo>.+)\.{{ include "artifactory-ha.fullname" . }} {{ include "artifactory-ha.fullname" . }}
+{{ tpl (include "artifactory.nginx.hosts" .) . }};
+
+if ($http_x_forwarded_proto = '') {
+  set $http_x_forwarded_proto  $scheme;
+}
+set $host_port {{ .Values.nginx.https.externalPort }};
+if ( $scheme = "http" ) {
+  set $host_port {{ .Values.nginx.http.externalPort }};
+}
+## Application specific logs
+## access_log /var/log/nginx/artifactory-access.log timing;
+## error_log /var/log/nginx/artifactory-error.log;
+rewrite ^/artifactory/?$ / redirect;
+if ( $repo != "" ) {
+  rewrite ^/(v1|v2)/(.*) /artifactory/api/docker/$repo/$1/$2 break;
+}
+chunked_transfer_encoding on;
+client_max_body_size 0;
+
+location / {
+  proxy_read_timeout  900;
+  proxy_pass_header   Server;
+  proxy_cookie_path   ~*^/.* /;
+  proxy_pass          {{ include "artifactory-ha.scheme" . }}://{{ include "artifactory-ha.fullname" . }}:{{ .Values.artifactory.externalPort }}/;
+  {{- if .Values.nginx.service.ssloffload}}
+  {{- if .Values.nginx.service.ssloffloadForceHttps}}
+  proxy_set_header    X-JFrog-Override-Base-Url https://$host;
+  proxy_set_header    X-Forwarded-Proto https;
+  {{- else }}
+  proxy_set_header    X-JFrog-Override-Base-Url $http_x_forwarded_proto://$host;
+  proxy_set_header    X-Forwarded-Proto $http_x_forwarded_proto;
+  {{- end }}
+  {{- else if or (eq (int .Values.nginx.https.internalPort) 80) (eq (int .Values.nginx.https.externalPort) 443)}}
+  proxy_set_header    X-JFrog-Override-Base-Url $http_x_forwarded_proto://$host;
+  proxy_set_header    X-Forwarded-Port  $server_port;
+  proxy_set_header    X-Forwarded-Proto $http_x_forwarded_proto;
+  {{- else }}
+  proxy_set_header    X-JFrog-Override-Base-Url $http_x_forwarded_proto://$host:$host_port;
+  proxy_set_header    X-Forwarded-Port  $server_port;
+  proxy_set_header    X-Forwarded-Proto $http_x_forwarded_proto;
+  {{- end }}
+  proxy_set_header    Host              $http_host;
+  proxy_set_header    X-Forwarded-For   $proxy_add_x_forwarded_for;
+  {{- if .Values.nginx.disableProxyBuffering}}
+  proxy_http_version 1.1;
+  proxy_request_buffering off;
+  proxy_buffering off;
+  {{- end }}
+  add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
+  location /artifactory/ {
+    if ( $request_uri ~ ^/artifactory/(.*)$ ) {
+      proxy_pass       http://{{ include "artifactory-ha.fullname" . }}:{{ .Values.artifactory.externalArtifactoryPort }}/artifactory/$1;
+    }
+    proxy_pass         http://{{ include "artifactory-ha.fullname" . }}:{{ .Values.artifactory.externalArtifactoryPort }}/artifactory/;
+  }
+  location /pipelines/ {
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header Host $http_host;
+    {{- if .Values.router.tlsEnabled }}
+    proxy_pass  https://{{ include "artifactory-ha.fullname" . }}:{{ .Values.router.internalPort }};
+    {{- else }}
+    proxy_pass  http://{{ include "artifactory-ha.fullname" . }}:{{ .Values.router.internalPort }};
+    {{- end }}
+  }
+}
+}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/files/nginx-main-conf.yaml b/charts/jfrog/artifactory-ha/107.98.14/files/nginx-main-conf.yaml
new file mode 100644
index 000000000..78cecea6a
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/files/nginx-main-conf.yaml
@@ -0,0 +1,83 @@
+# Main Nginx configuration file
+worker_processes  4;
+
+{{- if .Values.nginx.logs.stderr }}
+error_log  stderr {{ .Values.nginx.logs.level }};
+{{- else -}}
+error_log  {{ .Values.nginx.persistence.mountPath }}/logs/error.log {{ .Values.nginx.logs.level }};
+{{- end }}
+pid        /var/run/nginx.pid;
+
+{{- if .Values.artifactory.ssh.enabled }}
+## SSH Server Configuration
+stream {
+  server {
+    {{- if .Values.nginx.singleStackIPv6Cluster }}
+    listen [::]:{{ .Values.nginx.ssh.internalPort }};
+    {{- else -}}
+    listen {{ .Values.nginx.ssh.internalPort }};
+    {{- end }}
+    proxy_pass {{ include "artifactory-ha.fullname" . }}:{{ .Values.artifactory.ssh.externalPort }};
+  }
+}
+{{- end }}
+
+events {
+  worker_connections  1024;
+}
+
+http {
+  include       /etc/nginx/mime.types;
+  default_type  application/octet-stream;
+
+  variables_hash_max_size 1024;
+  variables_hash_bucket_size 64;
+  server_names_hash_max_size 4096;
+  server_names_hash_bucket_size 128;
+  types_hash_max_size 2048;
+  types_hash_bucket_size 64;
+  proxy_read_timeout 2400s;
+  client_header_timeout 2400s;
+  client_body_timeout 2400s;
+  proxy_connect_timeout 75s;
+  proxy_send_timeout 2400s;
+  proxy_buffer_size 128k;
+  proxy_buffers 40 128k;
+  proxy_busy_buffers_size 128k;
+  proxy_temp_file_write_size 250m;
+  proxy_http_version 1.1;
+  client_body_buffer_size 128k;
+
+  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+  '$status $body_bytes_sent "$http_referer" '
+  '"$http_user_agent" "$http_x_forwarded_for"';
+
+  log_format timing 'ip = $remote_addr '
+  'user = \"$remote_user\" '
+  'local_time = \"$time_local\" '
+  'host = $host '
+  'request = \"$request\" '
+  'status = $status '
+  'bytes = $body_bytes_sent '
+  'upstream = \"$upstream_addr\" '
+  'upstream_time = $upstream_response_time '
+  'request_time = $request_time '
+  'referer = \"$http_referer\" '
+  'UA = \"$http_user_agent\"';
+
+  {{- if .Values.nginx.logs.stdout }}
+  access_log /dev/stdout timing;
+  {{- else -}}
+  access_log {{ .Values.nginx.persistence.mountPath }}/logs/access.log timing;
+  {{- end }}
+
+  sendfile        on;
+  #tcp_nopush     on;
+
+  keepalive_timeout  65;
+
+  #gzip  on;
+
+  include /etc/nginx/conf.d/*.conf;
+
+}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/files/system.yaml b/charts/jfrog/artifactory-ha/107.98.14/files/system.yaml
new file mode 100644
index 000000000..5cac766d5
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/files/system.yaml
@@ -0,0 +1,174 @@
+router:
+  serviceRegistry:
+    insecure: {{ .Values.router.serviceRegistry.insecure }}
+shared:
+{{- if .Values.artifactory.coldStorage.enabled }}
+  jfrogColdStorage:
+    coldInstanceEnabled: true
+{{- end }}
+{{- if .Values.artifactory.worker.enabled }}
+  featureToggler:
+    worker: true
+{{- end }}
+{{ tpl (include "artifactory.metrics" .) . }}
+  logging:
+    consoleLog:
+      enabled: {{ .Values.artifactory.consoleLog }}
+  extraJavaOpts: >
+    -Dartifactory.graceful.shutdown.max.request.duration.millis={{ mul .Values.artifactory.terminationGracePeriodSeconds 1000 }}
+    -Dartifactory.access.client.max.connections={{ .Values.access.tomcat.connector.maxThreads }}
+{{- if .Values.artifactory.worker.enabled }}
+    -Dartifactory.workers.addon.support=true
+{{- end }}
+  {{- with .Values.artifactory.primary.javaOpts }}
+    {{- if .corePoolSize }}
+    -Dartifactory.async.corePoolSize={{ .corePoolSize }}
+    {{- end }}
+  {{- if .xms }}
+    -Xms{{ .xms }}
+  {{- end }}
+  {{- if .xmx }}
+    -Xmx{{ .xmx }}
+  {{- end }}
+  {{- if .jmx.enabled }}
+    -Dcom.sun.management.jmxremote
+    -Dcom.sun.management.jmxremote.port={{ .jmx.port }}
+    -Dcom.sun.management.jmxremote.rmi.port={{ .jmx.port }}
+    -Dcom.sun.management.jmxremote.ssl={{ .jmx.ssl }}
+  {{- if .jmx.host }}
+    -Djava.rmi.server.hostname={{ tpl .jmx.host $ }}
+  {{- else }}
+    -Djava.rmi.server.hostname={{ template "artifactory-ha.fullname" $ }}
+  {{- end }}
+  {{- if .jmx.authenticate }}
+    -Dcom.sun.management.jmxremote.authenticate=true
+    -Dcom.sun.management.jmxremote.access.file={{ .jmx.accessFile }}
+    -Dcom.sun.management.jmxremote.password.file={{ .jmx.passwordFile }}
+  {{- else }}
+    -Dcom.sun.management.jmxremote.authenticate=false
+  {{- end }}
+  {{- end }}
+  {{- if .other }}
+    {{ .other }}
+  {{- end }}
+  {{- end }}
+  database:
+    allowNonPostgresql: {{ .Values.database.allowNonPostgresql }}
+  {{- if .Values.postgresql.enabled }}
+    type: postgresql
+    url: "jdbc:postgresql://{{ .Release.Name }}-postgresql:{{ .Values.postgresql.service.port }}/{{ .Values.postgresql.postgresqlDatabase }}"
+    host: ""
+    driver: org.postgresql.Driver
+    username: "{{ .Values.postgresql.postgresqlUsername }}"
+  {{ else }}
+    type: "{{ .Values.database.type }}"
+    driver: "{{ .Values.database.driver }}"
+  {{- end }}
+artifactory:
+{{- if or .Values.artifactory.haDataDir.enabled .Values.artifactory.haBackupDir.enabled }}
+  node:
+  {{- if .Values.artifactory.haDataDir.path }}
+    haDataDir: {{ .Values.artifactory.haDataDir.path }}
+  {{- end }}
+  {{- if .Values.artifactory.haBackupDir.path }}
+    haBackupDir: {{ .Values.artifactory.haBackupDir.path }}
+  {{- end }}
+{{- end }}
+  database:
+    maxOpenConnections: {{ .Values.artifactory.database.maxOpenConnections }}
+  tomcat:
+    maintenanceConnector:
+      port: {{ .Values.artifactory.tomcat.maintenanceConnector.port }}
+    connector:
+      maxThreads: {{ .Values.artifactory.tomcat.connector.maxThreads }}
+      sendReasonPhrase: {{ .Values.artifactory.tomcat.connector.sendReasonPhrase }}
+      extraConfig: {{ .Values.artifactory.tomcat.connector.extraConfig }}
+frontend:
+  session:
+    timeMinutes: {{ .Values.frontend.session.timeoutMinutes | quote }}
+access:
+  runOnArtifactoryTomcat: {{ .Values.access.runOnArtifactoryTomcat | default false }}
+  database:
+    maxOpenConnections: {{ .Values.access.database.maxOpenConnections }}
+  {{- if not (.Values.access.runOnArtifactoryTomcat | default false) }}
+  extraJavaOpts: >
+  {{- if .Values.splitServicesToContainers }}
+    -XX:InitialRAMPercentage=20
+    -XX:MaxRAMPercentage=70
+  {{- end }}
+  {{- with .Values.access.javaOpts }}
+  {{- if .other }}
+    {{ .other }}
+  {{- end }}
+  {{- end }}
+  {{- end }}
+  tomcat:
+    connector:
+      maxThreads: {{ .Values.access.tomcat.connector.maxThreads }}
+      sendReasonPhrase: {{ .Values.access.tomcat.connector.sendReasonPhrase }}
+      extraConfig: {{ .Values.access.tomcat.connector.extraConfig }}
+  {{- if .Values.access.database.enabled }}
+    type: "{{ .Values.access.database.type }}"
+    url: "{{ .Values.access.database.url }}"
+    driver: "{{ .Values.access.database.driver }}"
+    username: "{{ .Values.access.database.user }}"
+    password: "{{ .Values.access.database.password }}"
+  {{- end }}
+{{- if .Values.artifactory.worker.enabled }}
+  worker:
+    enabled: true
+{{- end }}
+{{- if .Values.mc.enabled }}
+mc:
+  enabled: true
+  database:
+    maxOpenConnections: {{ .Values.mc.database.maxOpenConnections }}
+  idgenerator:
+    maxOpenConnections: {{ .Values.mc.idgenerator.maxOpenConnections }}
+  tomcat:
+    connector:
+      maxThreads: {{ .Values.mc.tomcat.connector.maxThreads }}
+      sendReasonPhrase: {{ .Values.mc.tomcat.connector.sendReasonPhrase }}
+      extraConfig: {{ .Values.mc.tomcat.connector.extraConfig }}
+{{- end }}
+metadata:
+  database:
+    maxOpenConnections: {{ .Values.metadata.database.maxOpenConnections }}
+{{- if and .Values.jfconnect.enabled  (not (regexMatch "^.*(oss|cpp-ce|jcr).*$" .Values.artifactory.image.repository)) }}
+jfconnect:
+  enabled: true
+{{- else }}
+jfconnect:
+  enabled: false
+jfconnect_service:
+  enabled: false
+{{- end }}
+
+{{- if and .Values.federation.enabled  (not (regexMatch "^.*(oss|cpp-ce|jcr).*$" .Values.artifactory.image.repository)) }}
+federation:
+  enabled: true
+  embedded: {{ .Values.federation.embedded }}
+  extraJavaOpts: {{ .Values.federation.extraJavaOpts }}
+  port: {{ .Values.federation.internalPort }}
+rtfs:
+  database:
+    driver: org.postgresql.Driver
+    type: postgresql
+    username: {{ .Values.federation.database.username }}
+    password: {{ .Values.federation.database.password }}
+    url: "jdbc:postgresql://{{ .Values.federation.database.host }}:{{ .Values.federation.database.port }}/{{ .Values.federation.database.name }}"
+{{- else }}
+federation:
+  enabled: false
+{{- end }}
+{{- if .Values.event.webhooks }}
+event:
+  webhooks: {{ toYaml .Values.event.webhooks | nindent 6 }}
+{{- end }}
+{{- if .Values.evidence.enabled }}
+evidence:
+  enabled: true
+{{- else }}
+evidence:
+  enabled: false
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/logo/artifactory-logo.png b/charts/jfrog/artifactory-ha/107.98.14/logo/artifactory-logo.png
new file mode 100644
index 000000000..fe6c23c5a
Binary files /dev/null and b/charts/jfrog/artifactory-ha/107.98.14/logo/artifactory-logo.png differ
diff --git a/charts/jfrog/artifactory-ha/107.98.14/questions.yml b/charts/jfrog/artifactory-ha/107.98.14/questions.yml
new file mode 100644
index 000000000..14e9024e6
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/questions.yml
@@ -0,0 +1,424 @@
+questions:
+# Advance Settings
+- variable: artifactory.masterKey
+  default: "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+  description: "Artifactory master key. For security reasons, we strongly recommend you generate your own master key using this command: 'openssl rand -hex 32'"
+  type: string
+  label: Artifactory master key
+  group: "Security Settings"
+
+# Container Images
+- variable: defaultImage
+  default: true
+  description: "Use default Docker image"
+  label: Use Default Image
+  type: boolean
+  show_subquestion_if: false
+  group: "Container Images"
+  subquestions:
+  - variable: initContainerImage
+    default: "docker.bintray.io/alpine:3.12"
+    description: "Init image name"
+    type: string
+    label: Init image name
+  - variable: artifactory.image.repository
+    default: "docker.bintray.io/jfrog/artifactory-pro"
+    description: "Artifactory image name"
+    type: string
+    label: Artifactory Image Name
+  - variable: artifactory.image.version
+    default: "7.6.3"
+    description: "Artifactory image tag"
+    type: string
+    label: Artifactory Image Tag
+  - variable: nginx.image.repository
+    default: "docker.bintray.io/jfrog/nginx-artifactory-pro"
+    description: "Nginx image name"
+    type: string
+    label: Nginx Image Name
+  - variable: nginx.image.version
+    default: "7.6.3"
+    description: "Nginx image tag"
+    type: string
+    label: Nginx Image Tag
+  - variable: imagePullSecrets
+    description: "Image Pull Secret"
+    type: string
+    label: Image Pull Secret
+
+# Services and LoadBalancing Settings
+- variable: artifactory.node.replicaCount
+  default: "2"
+  description: "Number of Secondary Nodes"
+  type: string
+  label: Number of Secondary Nodes
+  show_subquestion_if: true
+  group: "Services and Load Balancing"
+- variable: ingress.enabled
+  default: false
+  description: "Expose app using Layer 7 Load Balancer - ingress"
+  type: boolean
+  label: Expose app using Layer 7 Load Balancer
+  show_subquestion_if: true
+  group: "Services and Load Balancing"
+  required: true
+  subquestions:
+  - variable: ingress.hosts[0]
+    default: "xip.io"
+    description: "Hostname to your artifactory installation"
+    type: hostname
+    required: true
+    label: Hostname
+
+# Nginx Settings
+- variable: nginx.enabled
+  default: true
+  description: "Enable nginx server"
+  type: boolean
+  label: Enable Nginx Server
+  group: "Services and Load Balancing"
+  required: true
+  show_if: "ingress.enabled=false"
+- variable: nginx.service.type
+  default: "LoadBalancer"
+  description: "Nginx service type"
+  type: enum
+  required: true
+  label: Nginx Service Type
+  show_if: "nginx.enabled=true&&ingress.enabled=false"
+  group: "Services and Load Balancing"
+  options:
+  - "ClusterIP"
+  - "NodePort"
+  - "LoadBalancer"
+- variable: nginx.service.loadBalancerIP
+  default: ""
+  description: "Provide Static IP to configure with Nginx"
+  type: string
+  label: Config Nginx LoadBalancer IP
+  show_if: "nginx.enabled=true&&nginx.service.type=LoadBalancer&&ingress.enabled=false"
+  group: "Services and Load Balancing"
+- variable: nginx.tlsSecretName
+  default: ""
+  description: "Provide SSL Secret name to configure with Nginx"
+  type: string
+  label: Config Nginx SSL Secret
+  show_if: "nginx.enabled=true&&ingress.enabled=false"
+  group: "Services and Load Balancing"
+- variable: nginx.customArtifactoryConfigMap
+  default: ""
+  description: "Provide configMap name to configure Nginx with custom `artifactory.conf`"
+  type: string
+  label: ConfigMap for Nginx Artifactory Config
+  show_if: "nginx.enabled=true&&ingress.enabled=false"
+  group: "Services and Load Balancing"
+
+# Artifactory Storage Settings
+- variable: artifactory.persistence.size
+  default: "50Gi"
+  description: "Artifactory persistent volume size"
+  type: string
+  label: Artifactory Persistent Volume Size
+  required: true
+  group: "Artifactory Storage"
+- variable: artifactory.persistence.type
+  default: "file-system"
+  description: "Artifactory persistent volume size"
+  type: enum
+  label: Artifactory Persistent Storage Type
+  required: true
+  options:
+    - "file-system"
+    - "nfs"
+    - "google-storage"
+    - "aws-s3"
+  group: "Artifactory Storage"
+
+#Storage Type Settings
+- variable: artifactory.persistence.nfs.ip
+  default: ""
+  type: string
+  group: "Artifactory Storage"
+  label: NFS Server IP
+  description: "NFS server IP"
+  show_if: "artifactory.persistence.type=nfs"
+- variable: artifactory.persistence.nfs.haDataMount
+  default: "/data"
+  type: string
+  label: NFS Data Directory
+  description: "NFS data directory"
+  group: "Artifactory Storage"
+  show_if: "artifactory.persistence.type=nfs"
+- variable: artifactory.persistence.nfs.haBackupMount
+  default: "/backup"
+  type: string
+  label: NFS Backup Directory
+  description: "NFS backup directory"
+  group: "Artifactory Storage"
+  show_if: "artifactory.persistence.type=nfs"
+- variable: artifactory.persistence.nfs.dataDir
+  default: "/var/opt/jfrog/artifactory-ha"
+  type: string
+  label: HA Data Directory
+  description: "HA data directory"
+  group: "Artifactory Storage"
+  show_if: "artifactory.persistence.type=nfs"
+- variable: artifactory.persistence.nfs.backupDir
+  default: "/var/opt/jfrog/artifactory-backup"
+  type: string
+  label: HA Backup Directory	
+  description: "HA backup directory	"
+  group: "Artifactory Storage"
+  show_if: "artifactory.persistence.type=nfs"
+- variable: artifactory.persistence.nfs.capacity
+  default: "200Gi"
+  type: string
+  label: NFS PVC Size	
+  description: "NFS PVC size	"
+  group: "Artifactory Storage"
+  show_if: "artifactory.persistence.type=nfs"
+
+#Google storage settings
+- variable: artifactory.persistence.googleStorage.bucketName
+  default: "artifactory-ha-gcp"
+  type: string
+  label: Google Storage Bucket Name	
+  description: "Google storage bucket name"
+  group: "Artifactory Storage"
+  show_if: "artifactory.persistence.type=google-storage"
+- variable: artifactory.persistence.googleStorage.identity
+  default: ""
+  type: string
+  label: Google Storage Service Account ID	
+  description: "Google Storage service account id"
+  group: "Artifactory Storage"
+  show_if: "artifactory.persistence.type=google-storage"
+- variable: artifactory.persistence.googleStorage.credential
+  default: ""
+  type: string
+  label: Google Storage Service Account Key	
+  description: "Google Storage service account key"
+  group: "Artifactory Storage"
+  show_if: "artifactory.persistence.type=google-storage"
+- variable: artifactory.persistence.googleStorage.path
+  default: "artifactory-ha/filestore"
+  type: string
+  label: Google Storage Path In Bucket	
+  description: "Google Storage path in bucket"
+  group: "Artifactory Storage"
+  show_if: "artifactory.persistence.type=google-storage"
+# awsS3 storage settings
+- variable: artifactory.persistence.awsS3.bucketName
+  default: "artifactory-ha-aws"
+  type: string
+  label: AWS S3 Bucket Name	
+  description: "AWS S3 bucket name"
+  group: "Artifactory Storage"
+  show_if: "artifactory.persistence.type=aws-s3"
+- variable: artifactory.persistence.awsS3.region
+  default: ""
+  type: string
+  label: AWS S3 Bucket Region	
+  description: "AWS S3 bucket region"
+  group: "Artifactory Storage"
+  show_if: "artifactory.persistence.type=aws-s3"
+- variable: artifactory.persistence.awsS3.identity
+  default: ""
+  type: string
+  label: AWS S3 AWS_ACCESS_KEY_ID
+  description: "AWS S3 AWS_ACCESS_KEY_ID"
+  group: "Artifactory Storage"
+  show_if: "artifactory.persistence.type=aws-s3"
+- variable: artifactory.persistence.awsS3.credential
+  default: ""
+  type: string
+  label: AWS S3 AWS_SECRET_ACCESS_KEY	
+  description: "AWS S3 AWS_SECRET_ACCESS_KEY"
+  group: "Artifactory Storage"
+  show_if: "artifactory.persistence.type=aws-s3"
+- variable: artifactory.persistence.awsS3.path
+  default: "artifactory-ha/filestore"
+  type: string
+  label: AWS S3 Path In Bucket	
+  description: "AWS S3 path in bucket"
+  group: "Artifactory Storage"
+  show_if: "artifactory.persistence.type=aws-s3"
+
+# Database Settings
+- variable: postgresql.enabled
+  default: true
+  description: "Enable PostgreSQL"
+  type: boolean
+  required: true
+  label: Enable PostgreSQL
+  group: "Database Settings"
+  show_subquestion_if: true
+  subquestions:
+  - variable: postgresql.postgresqlPassword
+    default: ""
+    description: "PostgreSQL password"
+    type: password
+    required: true
+    label: PostgreSQL Password
+    group: "Database Settings"
+    show_if: "postgresql.enabled=true"
+  - variable: postgresql.persistence.size
+    default: 20Gi
+    description: "PostgreSQL persistent volume size"
+    type: string
+    label: PostgreSQL Persistent Volume Size
+    show_if: "postgresql.enabled=true"
+  - variable: postgresql.persistence.storageClass
+    default: ""
+    description: "If undefined or null, uses the default StorageClass. Default to null"
+    type: storageclass
+    label: Default StorageClass for PostgreSQL
+    show_if: "postgresql.enabled=true"
+  - variable: postgresql.resources.requests.cpu
+    default: "200m"
+    description: "PostgreSQL initial cpu request"
+    type: string
+    label: PostgreSQL Initial CPU Request
+    show_if: "postgresql.enabled=true"
+  - variable: postgresql.resources.requests.memory
+    default: "500Mi"
+    description: "PostgreSQL initial memory request"
+    type: string
+    label: PostgreSQL Initial Memory Request
+    show_if: "postgresql.enabled=true"
+  - variable: postgresql.resources.limits.cpu
+    default: "1"
+    description: "PostgreSQL cpu limit"
+    type: string
+    label: PostgreSQL CPU Limit
+    show_if: "postgresql.enabled=true"
+  - variable: postgresql.resources.limits.memory
+    default: "1Gi"
+    description: "PostgreSQL memory limit"
+    type: string
+    label: PostgreSQL Memory Limit
+    show_if: "postgresql.enabled=true"
+- variable: database.type
+  default: "postgresql"
+  description: "xternal database type (postgresql, mysql, oracle or mssql)"
+  type: enum
+  required: true
+  label: External Database Type
+  group: "Database Settings"
+  show_if: "postgresql.enabled=false"
+  options:
+    - "postgresql"
+    - "mysql"
+    - "oracle"
+    - "mssql"
+- variable: database.url
+  default: ""
+  description: "External database URL. If you set the url, leave host and port empty"
+  type: string
+  label: External Database URL
+  group: "Database Settings"
+  show_if: "postgresql.enabled=false"
+- variable: database.host
+  default: ""
+  description: "External database hostname"
+  type: string
+  label: External Database Hostname
+  group: "Database Settings"
+  show_if: "postgresql.enabled=false"
+- variable: database.port
+  default: ""
+  description: "External database port"
+  type: string
+  label: External Database Port
+  group: "Database Settings"
+  show_if: "postgresql.enabled=false"
+- variable: database.user
+  default: ""
+  description: "External database username"
+  type: string
+  label: External Database Username
+  group: "Database Settings"
+  show_if: "postgresql.enabled=false"
+- variable: database.password
+  default: ""
+  description: "External database password"
+  type: password
+  label: External Database Password
+  group: "Database Settings"
+  show_if: "postgresql.enabled=false"
+
+# Advance Settings
+- variable: advancedOptions
+  default: false
+  description: "Show advanced configurations"
+  label: Show Advanced Configurations
+  type: boolean
+  show_subquestion_if: true
+  group: "Advanced Options"
+  subquestions:
+  - variable: artifactory.primary.resources.requests.cpu
+    default: "500m"
+    description: "Artifactory primary node initial cpu request"
+    type: string
+    label: Artifactory Primary Node Initial CPU Request
+  - variable: artifactory.primary.resources.requests.memory
+    default: "1Gi"
+    description: "Artifactory primary node initial memory request"
+    type: string
+    label: Artifactory Primary Node Initial Memory Request
+  - variable: artifactory.primary.javaOpts.xms
+    default: "1g"
+    description: "Artifactory primary node java Xms size"
+    type: string
+    label: Artifactory Primary Node Java Xms Size
+  - variable: artifactory.primary.resources.limits.cpu
+    default: "2"
+    description: "Artifactory primary node cpu limit"
+    type: string
+    label: Artifactory Primary Node CPU Limit
+  - variable: artifactory.primary.resources.limits.memory
+    default: "4Gi"
+    description: "Artifactory primary node memory limit"
+    type: string
+    label: Artifactory Primary Node Memory Limit
+  - variable: artifactory.primary.javaOpts.xmx
+    default: "4g"
+    description: "Artifactory primary node java Xmx size"
+    type: string
+    label: Artifactory Primary Node Java Xmx Size
+  - variable: artifactory.node.resources.requests.cpu
+    default: "500m"
+    description: "Artifactory member node initial cpu request"
+    type: string
+    label: Artifactory Member Node Initial CPU Request
+  - variable: artifactory.node.resources.requests.memory
+    default: "2Gi"
+    description: "Artifactory member node initial memory request"
+    type: string
+    label: Artifactory Member Node Initial Memory Request
+  - variable: artifactory.node.javaOpts.xms
+    default: "1g"
+    description: "Artifactory member node java Xms size"
+    type: string
+    label: Artifactory Member Node Java Xms Size
+  - variable: artifactory.node.resources.limits.cpu
+    default: "2"
+    description: "Artifactory member node cpu limit"
+    type: string
+    label: Artifactory Member Node CPU Limit
+  - variable: artifactory.node.resources.limits.memory
+    default: "4Gi"
+    description: "Artifactory member node memory limit"
+    type: string
+    label: Artifactory Member Node Memory Limit
+  - variable: artifactory.node.javaOpts.xmx
+    default: "4g"
+    description: "Artifactory member node java Xmx size"
+    type: string
+    label: Artifactory Member Node Java Xmx Size
+
+# Internal Settings
+- variable: installerInfo
+  default: '\{\"productId\": \"RancherHelm_artifactory-ha/7.17.5\", \"features\": \[\{\"featureId\": \"Partner/ACC-007246\"\}\]\}'
+  type: string
+  group: "Internal Settings (Do not modify)"
diff --git a/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-2xlarge.yaml b/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-2xlarge.yaml
new file mode 100644
index 000000000..a6915d470
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-2xlarge.yaml
@@ -0,0 +1,160 @@
+##############################################################################################
+# The 2xlarge sizing
+# This size is intended for very large organizations. It can be increased with adding replicas
+# [WARNING] Some of the the configuration mentioned in this file are taken inside system.yaml
+# hence this configuration will be overridden when enabling systemYamlOverride
+##############################################################################################
+splitServicesToContainers: true
+artifactory:
+  primary:
+      # Enterprise and above licenses are required for setting replicaCount greater than 1.
+      # Count should be equal or above the total number of licenses available for artifactory.
+    replicaCount: 6
+
+    # Require multiple Artifactory pods to run on separate nodes
+    podAntiAffinity:
+      type: "hard"
+
+    resources:
+      requests:
+        cpu: "4"
+        memory: 20Gi
+      limits:
+        # cpu: "20"
+        memory: 24Gi
+
+    javaOpts:
+      other: >
+        -XX:InitialRAMPercentage=40
+        -XX:MaxRAMPercentage=70
+        -Dartifactory.async.corePoolSize=200
+        -Dartifactory.async.poolMaxQueueSize=100000
+        -Dartifactory.http.client.max.total.connections=150
+        -Dartifactory.http.client.max.connections.per.route=150
+        -Dartifactory.access.client.max.connections=200
+        -Dartifactory.metadata.event.operator.threads=5
+        -XX:MaxMetaspaceSize=512m
+        -Djdk.nio.maxCachedBufferSize=1048576
+        -XX:MaxDirectMemorySize=1024m
+
+  tomcat:
+    connector:
+      maxThreads: 800
+      extraConfig: 'acceptCount="1200" acceptorThreadCount="2" compression="off" connectionLinger="-1" connectionTimeout="120000" enableLookups="false"'
+
+  database:
+    maxOpenConnections: 200
+
+  extraEnvironmentVariables:
+    - name: MALLOC_ARENA_MAX
+      value: "16"
+    - name: SKIP_WAIT_FOR_EXTERNAL_DB
+      value: "true"
+
+router:
+  resources:
+    requests:
+      cpu: "2"
+      memory: 2Gi
+    limits:
+      # cpu: "12"
+      memory: 4Gi
+
+frontend:
+  resources:
+    requests:
+      cpu: "1"
+      memory: 500Mi
+    limits:
+      # cpu: "5"
+      memory: 1Gi
+
+metadata:
+  database:
+    maxOpenConnections: 200
+  resources:
+    requests:
+      cpu: "1"
+      memory: 500Mi
+    limits:
+      # cpu: "5"
+      memory: 2Gi
+
+event:
+  resources:
+    requests:
+      cpu: 200m
+      memory: 100Mi
+    limits:
+      # cpu: "1"
+      memory: 500Mi
+
+access:
+  tomcat:
+    connector:
+      maxThreads: 200
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=20
+      -XX:MaxRAMPercentage=60
+  database:
+    maxOpenConnections: 200
+  resources:
+    requests:
+      cpu: 1
+      memory: 2Gi
+    limits:
+      # cpu: 2
+      memory: 4Gi
+
+observability:
+  resources:
+    requests:
+      cpu: 200m
+      memory: 100Mi
+    limits:
+      # cpu: "1"
+      memory: 500Mi
+
+jfconnect:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 100Mi
+    limits:
+      # cpu: "1"
+      memory: 250Mi
+
+nginx:
+  replicaCount: 3
+  disableProxyBuffering: true
+  resources:
+    requests:
+      cpu: "4"
+      memory: "6Gi"
+    limits:
+      # cpu: "14"
+      memory: "8Gi"
+
+postgresql:
+  postgresqlExtendedConf:
+    maxConnections: "5000"
+  primary:
+    affinity:
+      # Require PostgreSQL pod to run on a different node than Artifactory pods
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                    - artifactory
+            topologyKey: kubernetes.io/hostname
+  resources:
+    requests:
+      memory: 256Gi
+      cpu: "64"
+    limits:
+      memory: 256Gi
+      # cpu: "128"
diff --git a/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-large.yaml b/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-large.yaml
new file mode 100644
index 000000000..63a8c6ce5
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-large.yaml
@@ -0,0 +1,160 @@
+##############################################################################################
+# The large sizing
+# This size is intended for large organizations. It can be increased with adding replicas or moving to the large sizing
+# [WARNING] Some of the the configuration mentioned in this file are taken inside system.yaml
+# hence this configuration will be overridden when enabling systemYamlOverride
+##############################################################################################
+splitServicesToContainers: true
+artifactory:
+  primary:
+    # Enterprise and above licenses are required for setting replicaCount greater than 1.
+    # Count should be equal or above the total number of licenses available for artifactory.
+    replicaCount: 3
+
+    # Require multiple Artifactory pods to run on separate nodes
+    podAntiAffinity:
+      type: "hard"
+
+    resources:
+      requests:
+        cpu: "2"
+        memory: 10Gi
+      limits:
+        # cpu: "14"
+        memory: 12Gi
+
+    javaOpts:
+      other: >
+        -XX:InitialRAMPercentage=40
+        -XX:MaxRAMPercentage=65
+        -Dartifactory.async.corePoolSize=80
+        -Dartifactory.async.poolMaxQueueSize=20000
+        -Dartifactory.http.client.max.total.connections=100
+        -Dartifactory.http.client.max.connections.per.route=100
+        -Dartifactory.access.client.max.connections=125
+        -Dartifactory.metadata.event.operator.threads=4
+        -XX:MaxMetaspaceSize=512m
+        -Djdk.nio.maxCachedBufferSize=524288
+        -XX:MaxDirectMemorySize=512m
+
+  tomcat:
+    connector:
+      maxThreads: 500
+      extraConfig: 'acceptCount="800" acceptorThreadCount="2" compression="off" connectionLinger="-1" connectionTimeout="120000" enableLookups="false"'
+
+  database:
+    maxOpenConnections: 100
+
+  extraEnvironmentVariables:
+    - name: MALLOC_ARENA_MAX
+      value: "8"
+    - name: SKIP_WAIT_FOR_EXTERNAL_DB
+      value: "true"
+
+access:
+  tomcat:
+    connector:
+      maxThreads: 125
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=20
+      -XX:MaxRAMPercentage=60
+  database:
+    maxOpenConnections: 100
+  resources:
+    requests:
+      cpu: 1
+      memory: 2Gi
+    limits:
+      # cpu: 2
+      memory: 3Gi
+
+router:
+  resources:
+    requests:
+      cpu: 400m
+      memory: 800Mi
+    limits:
+      # cpu: "8"
+      memory: 2Gi
+
+frontend:
+  resources:
+    requests:
+      cpu: 200m
+      memory: 300Mi
+    limits:
+      # cpu: "3"
+      memory: 1Gi
+
+metadata:
+  database:
+    maxOpenConnections: 100
+  resources:
+    requests:
+      cpu: 200m
+      memory: 200Mi
+    limits:
+      # cpu: "4"
+      memory: 1Gi
+
+event:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+observability:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+jfconnect:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 100Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+nginx:
+  replicaCount: 2
+  disableProxyBuffering: true
+  resources:
+    requests:
+      cpu: "1"
+      memory: "500Mi"
+    limits:
+      # cpu: "4"
+      memory: "1Gi"
+
+postgresql:
+  postgresqlExtendedConf:
+    maxConnections: "600"
+  primary:
+    affinity:
+      # Require PostgreSQL pod to run on a different node than Artifactory pods
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                    - artifactory
+            topologyKey: kubernetes.io/hostname
+  resources:
+    requests:
+      memory: 64Gi
+      cpu: "16"
+    limits:
+      memory: 64Gi
+      # cpu: "32"
diff --git a/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-medium.yaml b/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-medium.yaml
new file mode 100644
index 000000000..89f9c9e46
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-medium.yaml
@@ -0,0 +1,160 @@
+####################################################################################
+# The medium sizing
+# This size is just 2 replicas of the small size. Vertical sizing of all services is not changed
+# [WARNING] Some of the the configuration mentioned in this file are taken inside system.yaml
+# hence this configuration will be overridden when enabling systemYamlOverride
+####################################################################################
+splitServicesToContainers: true
+artifactory:
+  primary:
+    # Enterprise and above licenses are required for setting replicaCount greater than 1.
+    # Count should be equal or above the total number of licenses available for artifactory.
+    replicaCount: 2
+
+    # Require multiple Artifactory pods to run on separate nodes
+    podAntiAffinity:
+      type: "hard"
+
+    resources:
+      requests:
+        cpu: "1"
+        memory: 4Gi
+      limits:
+        # cpu: "10"
+        memory: 5Gi
+
+    javaOpts:
+      other: >
+        -XX:InitialRAMPercentage=40
+        -XX:MaxRAMPercentage=70
+        -Dartifactory.async.corePoolSize=40
+        -Dartifactory.async.poolMaxQueueSize=10000
+        -Dartifactory.http.client.max.total.connections=50
+        -Dartifactory.http.client.max.connections.per.route=50
+        -Dartifactory.access.client.max.connections=75
+        -Dartifactory.metadata.event.operator.threads=3
+        -XX:MaxMetaspaceSize=512m
+        -Djdk.nio.maxCachedBufferSize=262144
+        -XX:MaxDirectMemorySize=256m
+
+  tomcat:
+    connector:
+      maxThreads: 300
+      extraConfig: 'acceptCount="600" acceptorThreadCount="2" compression="off" connectionLinger="-1" connectionTimeout="120000" enableLookups="false"'
+
+  database:
+    maxOpenConnections: 50
+
+  extraEnvironmentVariables:
+    - name: MALLOC_ARENA_MAX
+      value: "2"
+    - name: SKIP_WAIT_FOR_EXTERNAL_DB
+      value: "true"
+
+router:
+  resources:
+    requests:
+      cpu: 200m
+      memory: 500Mi
+    limits:
+      # cpu: "2"
+      memory: 1Gi
+
+frontend:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 150Mi
+    limits:
+      # cpu: "2"
+      memory: 250Mi
+
+metadata:
+  database:
+    maxOpenConnections: 50
+  resources:
+    requests:
+      cpu: 100m
+      memory: 200Mi
+    limits:
+      # cpu: "2"
+      memory: 1Gi
+
+event:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+access:
+  tomcat:
+    connector:
+      maxThreads: 75
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=20
+      -XX:MaxRAMPercentage=60
+  database:
+    maxOpenConnections: 50
+  resources:
+    requests:
+      cpu: 1
+      memory: 1.5Gi
+    limits:
+      # cpu: 1.5
+      memory: 2Gi
+
+observability:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+jfconnect:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+nginx:
+  replicaCount: 2
+  disableProxyBuffering: true
+  resources:
+    requests:
+      cpu: "100m"
+      memory: "100Mi"
+    limits:
+      # cpu: "2"
+      memory: "500Mi"
+
+postgresql:
+  postgresqlExtendedConf:
+    maxConnections: "200"
+  primary:
+    affinity:
+      # Require PostgreSQL pod to run on a different node than Artifactory pods
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                    - artifactory
+            topologyKey: kubernetes.io/hostname
+  resources:
+    requests:
+      memory: 32Gi
+      cpu: "8"
+    limits:
+      memory: 32Gi
+      # cpu: "16"
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-small.yaml b/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-small.yaml
new file mode 100644
index 000000000..454f159e5
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-small.yaml
@@ -0,0 +1,159 @@
+##############################################################################################
+# The small sizing
+# This is the size recommended for running Artifactory for small teams
+# [WARNING] Some of the the configuration mentioned in this file are taken inside system.yaml
+# hence this configuration will be overridden when enabling systemYamlOverride
+##############################################################################################
+splitServicesToContainers: true
+artifactory:
+  primary:
+    # Enterprise and above licenses are required for setting replicaCount greater than 1.
+    # Count should be equal or above the total number of licenses available for artifactory.
+    replicaCount: 1
+
+    # Require multiple Artifactory pods to run on separate nodes
+    podAntiAffinity:
+      type: "hard"
+
+    resources:
+      requests:
+        cpu: "1"
+        memory: 4Gi
+      limits:
+        # cpu: "10"
+        memory: 5Gi
+
+    javaOpts:
+      other: >
+        -XX:InitialRAMPercentage=40
+        -XX:MaxRAMPercentage=70
+        -Dartifactory.async.corePoolSize=40
+        -Dartifactory.async.poolMaxQueueSize=10000
+        -Dartifactory.http.client.max.total.connections=50
+        -Dartifactory.http.client.max.connections.per.route=50
+        -Dartifactory.access.client.max.connections=75
+        -Dartifactory.metadata.event.operator.threads=3
+        -XX:MaxMetaspaceSize=512m
+        -Djdk.nio.maxCachedBufferSize=262144
+        -XX:MaxDirectMemorySize=256m
+  tomcat:
+    connector:
+      maxThreads: 300
+      extraConfig: 'acceptCount="600" acceptorThreadCount="2" compression="off" connectionLinger="-1" connectionTimeout="120000" enableLookups="false"'
+
+  database:
+    maxOpenConnections: 50
+
+  extraEnvironmentVariables:
+    - name: MALLOC_ARENA_MAX
+      value: "2"
+    - name: SKIP_WAIT_FOR_EXTERNAL_DB
+      value: "true"
+
+router:
+  resources:
+    requests:
+      cpu: 200m
+      memory: 500Mi
+    limits:
+      # cpu: "2"
+      memory: 1Gi
+
+access:
+  tomcat:
+    connector:
+      maxThreads: 75
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=20
+      -XX:MaxRAMPercentage=60
+  database:
+    maxOpenConnections: 50
+  resources:
+    requests:
+      cpu: 500m
+      memory: 1.5Gi
+    limits:
+      # cpu: 1
+      memory: 2Gi
+
+frontend:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 150Mi
+    limits:
+      # cpu: "2"
+      memory: 250Mi
+
+metadata:
+  database:
+    maxOpenConnections: 50
+  resources:
+    requests:
+      cpu: 100m
+      memory: 200Mi
+    limits:
+      # cpu: "2"
+      memory: 1Gi
+
+event:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+observability:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+jfconnect:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+nginx:
+  replicaCount: 1
+  disableProxyBuffering: true
+  resources:
+    requests:
+      cpu: "100m"
+      memory: "100Mi"
+    limits:
+      # cpu: "2"
+      memory: "500Mi"
+
+postgresql:
+  postgresqlExtendedConf:
+    maxConnections: "100"
+  primary:
+    affinity:
+      # Require PostgreSQL pod to run on a different node than Artifactory pods
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                    - artifactory
+            topologyKey: kubernetes.io/hostname
+  resources:
+    requests:
+      memory: 16Gi
+      cpu: "4"
+    limits:
+      memory: 16Gi
+      # cpu: "10"
diff --git a/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-xlarge.yaml b/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-xlarge.yaml
new file mode 100644
index 000000000..f2fe6e952
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-xlarge.yaml
@@ -0,0 +1,159 @@
+##############################################################################################
+# The xlarge sizing
+# This size is intended for very large organizations. It can be increased with adding replicas
+# [WARNING] Some of the the configuration mentioned in this file are taken inside system.yaml
+# hence this configuration will be overridden when enabling systemYamlOverride
+##############################################################################################
+splitServicesToContainers: true
+artifactory:
+  primary:
+    # Enterprise and above licenses are required for setting replicaCount greater than 1.
+    # Count should be equal or above the total number of licenses available for artifactory.
+    replicaCount: 4
+
+    podAntiAffinity:
+      type: "hard"
+
+    resources:
+      requests:
+        cpu: "2"
+        memory: 14Gi
+      limits:
+        # cpu: "14"
+        memory: 16Gi
+
+    javaOpts:
+      other: >
+        -XX:InitialRAMPercentage=40
+        -XX:MaxRAMPercentage=65
+        -Dartifactory.async.corePoolSize=160
+        -Dartifactory.async.poolMaxQueueSize=50000
+        -Dartifactory.http.client.max.total.connections=150
+        -Dartifactory.http.client.max.connections.per.route=150
+        -Dartifactory.access.client.max.connections=150
+        -Dartifactory.metadata.event.operator.threads=5
+        -XX:MaxMetaspaceSize=512m
+        -Djdk.nio.maxCachedBufferSize=1048576
+        -XX:MaxDirectMemorySize=1024m
+  tomcat:
+    connector:
+      maxThreads: 600
+      extraConfig: 'acceptCount="1200" acceptorThreadCount="2" compression="off" connectionLinger="-1" connectionTimeout="120000" enableLookups="false"'
+
+  database:
+    maxOpenConnections: 150
+    # Require multiple Artifactory pods to run on separate nodes
+
+  extraEnvironmentVariables:
+    - name: MALLOC_ARENA_MAX
+      value: "16"
+    - name: SKIP_WAIT_FOR_EXTERNAL_DB
+      value: "true"
+
+access:
+  tomcat:
+    connector:
+      maxThreads: 150
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=20
+      -XX:MaxRAMPercentage=60
+  database:
+    maxOpenConnections: 150
+  resources:
+    requests:
+      cpu: 1
+      memory: 2Gi
+    limits:
+      # cpu: 2
+      memory: 4Gi
+
+router:
+  resources:
+    requests:
+      cpu: 400m
+      memory: 1Gi
+    limits:
+      # cpu: "8"
+      memory: 2Gi
+
+frontend:
+  resources:
+    requests:
+      cpu: 200m
+      memory: 300Mi
+    limits:
+      # cpu: "3"
+      memory: 1Gi
+
+metadata:
+  database:
+    maxOpenConnections: 150
+  resources:
+    requests:
+      cpu: 200m
+      memory: 200Mi
+    limits:
+      # cpu: "4"
+      memory: 1Gi
+
+event:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+observability:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+jfconnect:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 100Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+nginx:
+  replicaCount: 2
+  disableProxyBuffering: true
+  resources:
+    requests:
+      cpu: "4"
+      memory: "4Gi"
+    limits:
+      # cpu: "12"
+      memory: "8Gi"
+
+postgresql:
+  postgresqlExtendedConf:
+    maxConnections: "2000"
+  primary:
+    affinity:
+      # Require PostgreSQL pod to run on a different node than Artifactory pods
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                    - artifactory
+            topologyKey: kubernetes.io/hostname
+  resources:
+    requests:
+      memory: 128Gi
+      cpu: "32"
+    limits:
+      memory: 128Gi
+      # cpu: "64"
diff --git a/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-xsmall.yaml b/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-xsmall.yaml
new file mode 100644
index 000000000..c89a87a54
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/sizing/artifactory-xsmall.yaml
@@ -0,0 +1,161 @@
+##############################################################################################
+
+# The xsmall sizing
+# This is the minimum size recommended for running Artifactory
+# [WARNING] Some of the the configuration mentioned in this file are taken inside system.yaml
+# hence this configuration will be overridden when enabling systemYamlOverride
+##############################################################################################
+splitServicesToContainers: true
+artifactory:
+  primary:
+    # Enterprise and above licenses are required for setting replicaCount greater than 1.
+    # Count should be equal or above the total number of licenses available for artifactory.
+    replicaCount: 1
+
+    # Require multiple Artifactory pods to run on separate nodes
+    podAntiAffinity:
+      type: "hard"
+
+    resources:
+      requests:
+        cpu: "1"
+        memory: 3Gi
+      limits:
+        # cpu: "10"
+        memory: 4Gi
+
+    javaOpts:
+      other: >
+        -XX:InitialRAMPercentage=40
+        -XX:MaxRAMPercentage=70
+        -Dartifactory.async.corePoolSize=10
+        -Dartifactory.async.poolMaxQueueSize=2000
+        -Dartifactory.http.client.max.total.connections=20
+        -Dartifactory.http.client.max.connections.per.route=20
+        -Dartifactory.access.client.max.connections=15
+        -Dartifactory.metadata.event.operator.threads=2
+        -XX:MaxMetaspaceSize=400m
+        -XX:CompressedClassSpaceSize=96m
+        -Djdk.nio.maxCachedBufferSize=131072
+        -XX:MaxDirectMemorySize=128m
+  tomcat:
+    connector:
+      maxThreads: 50
+      extraConfig: 'acceptCount="200" acceptorThreadCount="2" compression="off" connectionLinger="-1" connectionTimeout="120000" enableLookups="false"'
+
+  database:
+    maxOpenConnections: 15
+
+  extraEnvironmentVariables:
+    - name: MALLOC_ARENA_MAX
+      value: "2"
+    - name: SKIP_WAIT_FOR_EXTERNAL_DB
+      value: "true"
+
+access:
+  tomcat:
+    connector:
+      maxThreads: 15
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=20
+      -XX:MaxRAMPercentage=60
+  database:
+    maxOpenConnections: 15
+  resources:
+    requests:
+      cpu: 500m
+      memory: 1.5Gi
+    limits:
+      # cpu: 1
+      memory: 2Gi
+
+router:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 200Mi
+    limits:
+      # cpu: "2"
+      memory: 1Gi
+
+frontend:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 150Mi
+    limits:
+      # cpu: "2"
+      memory: 250Mi
+
+metadata:
+  database:
+    maxOpenConnections: 15
+  resources:
+    requests:
+      cpu: 50m
+      memory: 100Mi
+    limits:
+      # cpu: "2"
+      memory: 1Gi
+
+event:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+observability:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+jfconnect:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+nginx:
+  replicaCount: 1
+  disableProxyBuffering: true
+  resources:
+    requests:
+      cpu: "50m"
+      memory: "50Mi"
+    limits:
+      # cpu: "1"
+      memory: "250Mi"
+
+postgresql:
+  postgresqlExtendedConf:
+    maxConnections: "50"
+  primary:
+    affinity:
+      # Require PostgreSQL pod to run on a different node than Artifactory pods
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                    - artifactory
+            topologyKey: kubernetes.io/hostname
+  resources:
+    requests:
+      memory: 8Gi
+      cpu: "2"
+    limits:
+      memory: 8Gi
+      # cpu: "8"
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/NOTES.txt b/charts/jfrog/artifactory-ha/107.98.14/templates/NOTES.txt
new file mode 100644
index 000000000..30dfab8b8
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/NOTES.txt
@@ -0,0 +1,149 @@
+Congratulations. You have just deployed JFrog Artifactory HA!
+
+{{- if .Values.artifactory.masterKey }}
+{{- if and (not .Values.artifactory.masterKeySecretName) (eq .Values.artifactory.masterKey "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF") }}
+
+
+***************************************** WARNING ******************************************
+* Your Artifactory master key is still set to the provided example:                        *
+* artifactory.masterKey=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF   *
+*                                                                                          *
+* You should change this to your own generated key:                                        *
+* $ export MASTER_KEY=$(openssl rand -hex 32)                                              *
+* $ echo ${MASTER_KEY}                                                                     *
+*                                                                                          *
+* Pass the created master key to helm with '--set artifactory.masterKey=${MASTER_KEY}'     *
+*                                                                                          *
+* Alternatively, you can use a pre-existing secret with a key called master-key with       *
+* '--set artifactory.masterKeySecretName=${SECRET_NAME}'                                   *
+********************************************************************************************
+{{- end }}
+{{- end }}
+
+{{- if .Values.artifactory.joinKey }}
+{{- if eq .Values.artifactory.joinKey "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE" }}
+
+
+***************************************** WARNING ******************************************
+* Your Artifactory join key is still set to the provided example:                          *
+* artifactory.joinKey=EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE                                     *
+*                                                                                          *
+* You should change this to your own generated key:                                        *
+* $ export JOIN_KEY=$(openssl rand -hex 32)                                                *
+* $ echo ${JOIN_KEY}                                                                       *
+*                                                                                          *
+* Pass the created master key to helm with '--set artifactory.joinKey=${JOIN_KEY}'         *
+*                                                                                          *
+********************************************************************************************
+{{- end }}
+{{- end }}
+
+
+{{- if .Values.artifactory.setSecurityContext }}
+****************************************** WARNING **********************************************
+* From chart version 107.84.x, `setSecurityContext` has been renamed to `podSecurityContext`,   *
+  please change your values.yaml before upgrade , For more Info , refer to 107.84.x changelog   *
+*************************************************************************************************
+{{- end }}
+
+{{- if and (or (or (or (or (or ( or ( or ( or (or (or ( or (or .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName) .Values.systemYamlOverride.existingSecret) (or .Values.artifactory.customCertificates.enabled .Values.global.customCertificates.enabled)) .Values.aws.licenseConfigSecretName) .Values.artifactory.persistence.customBinarystoreXmlSecret) .Values.access.customCertificatesSecretName) .Values.systemYamlOverride.existingSecret) .Values.artifactory.license.secret) .Values.artifactory.userPluginSecrets) (and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey)) (and .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName)) (or .Values.artifactory.joinKeySecretName .Values.global.joinKeySecretName)) .Values.artifactory.unifiedSecretInstallation }}
+****************************************** WARNING **************************************************************************************************
+* The unifiedSecretInstallation flag is currently enabled, which creates the unified secret. The existing secrets will continue as separate secrets.*
+* Update the values.yaml with the existing secrets to add them to the unified secret.                                                               *
+*****************************************************************************************************************************************************
+{{- end }}
+
+{{- if .Values.postgresql.enabled }}
+
+DATABASE:
+To extract the database password, run the following
+export DB_PASSWORD=$(kubectl get --namespace {{ .Release.Namespace }} $(kubectl get secret --namespace {{ .Release.Namespace }} -o name | grep postgresql) -o jsonpath="{.data.postgresql-password}" | base64 --decode)
+echo ${DB_PASSWORD}
+{{- end }}
+
+SETUP:
+1. Get the Artifactory IP and URL
+
+   {{- if contains "NodePort" .Values.nginx.service.type }}
+   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "artifactory-ha.nginx.fullname" . }})
+   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+   echo http://$NODE_IP:$NODE_PORT/
+
+   {{- else if contains "LoadBalancer" .Values.nginx.service.type }}
+   NOTE: It may take a few minutes for the LoadBalancer public IP to be available!
+
+   You can watch the status of the service by running 'kubectl get svc -w {{ template "artifactory-ha.nginx.fullname" . }}'
+   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "artifactory-ha.nginx.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+   echo http://$SERVICE_IP/
+
+   {{- else if contains "ClusterIP" .Values.nginx.service.type }}
+   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "component={{ .Values.nginx.name }}" -o jsonpath="{.items[0].metadata.name}")
+   kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME 8080:80
+   echo http://127.0.0.1:8080
+
+   {{- end }}
+
+2. Open Artifactory in your browser
+   Default credential for Artifactory:
+   user:     admin
+   password: password
+
+   {{- if .Values.artifactory.license.secret }}
+
+3. Artifactory license(s) is deployed as a Kubernetes secret. This method is relevant for initial deployment only!
+   Updating the license should be done via Artifactory UI or REST API. If you want to keep managing the artifactory license using the same method, you can use artifactory.copyOnEveryStartup in values.yaml.
+
+   {{- else }}
+
+3. Add HA licenses to activate Artifactory HA through the Artifactory UI
+   NOTE: Each Artifactory node requires a valid license. See https://www.jfrog.com/confluence/display/RTF/HA+Installation+and+Setup for more details.
+
+   {{- end }}
+
+{{ if or .Values.artifactory.primary.javaOpts.jmx.enabled .Values.artifactory.node.javaOpts.jmx.enabled }}
+JMX configuration:
+{{- if not (contains "LoadBalancer"  .Values.artifactory.service.type) }}
+If you want to access JMX from you computer with jconsole, you should set ".Values.artifactory.service.type=LoadBalancer" !!!
+{{ end }}
+
+1. Get the Artifactory service IP:
+{{- if .Values.artifactory.primary.javaOpts.jmx.enabled }}
+export PRIMARY_SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "artifactory-ha.primary.name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+{{- end }}
+{{- if .Values.artifactory.node.javaOpts.jmx.enabled }}
+export MEMBER_SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "artifactory-ha.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+{{- end }}
+
+2. Map the service name to the service IP in /etc/hosts:
+{{- if .Values.artifactory.primary.javaOpts.jmx.enabled }}
+sudo sh -c "echo \"${PRIMARY_SERVICE_IP}    {{ template "artifactory-ha.primary.name" . }}\" >> /etc/hosts"
+{{- end }}
+{{- if .Values.artifactory.node.javaOpts.jmx.enabled }}
+sudo sh -c "echo \"${MEMBER_SERVICE_IP}    {{ template "artifactory-ha.fullname" . }}\" >> /etc/hosts"
+{{- end }}
+
+3. Launch jconsole:
+{{- if .Values.artifactory.primary.javaOpts.jmx.enabled }}
+jconsole {{ template "artifactory-ha.primary.name" . }}:{{ .Values.artifactory.primary.javaOpts.jmx.port }}
+{{- end }}
+{{- if .Values.artifactory.node.javaOpts.jmx.enabled }}
+jconsole {{ template "artifactory-ha.fullname" . }}:{{ .Values.artifactory.node.javaOpts.jmx.port }}
+{{- end }}
+{{- end }}
+
+
+{{- if ge (.Values.artifactory.node.replicaCount | int) 1 }}
+***************************************** WARNING *****************************************************************************
+* Currently member node(s) are enabled, will be deprecated in upcoming releases                                              *
+* It is recommended to upgrade from primary-members to primary-only.                                                          *
+* It can be done by deploying the chart ( >=107.59.x) with the new values. Also, please refer to changelog of 107.59.x chart  *
+* More Info: https://jfrog.com/help/r/jfrog-installation-setup-documentation/cloud-native-high-availability                   *
+*******************************************************************************************************************************
+{{- end }}
+
+{{- if and .Values.nginx.enabled .Values.ingress.hosts }}
+***************************************** WARNING *****************************************************************************
+* when nginx is enabled , .Values.ingress.hosts will be deprecated in upcoming releases                                              *
+* It is recommended to use nginx.hosts instead ingress.hosts 
+*******************************************************************************************************************************
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/_helpers.tpl b/charts/jfrog/artifactory-ha/107.98.14/templates/_helpers.tpl
new file mode 100644
index 000000000..ec9ba34df
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/_helpers.tpl
@@ -0,0 +1,589 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "artifactory-ha.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+The primary node name
+*/}}
+{{- define "artifactory-ha.primary.name" -}}
+{{- if .Values.nameOverride -}}
+{{- printf "%s-primary" .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := .Release.Name | trunc 29 -}}
+{{- printf "%s-%s-primary" $name .Chart.Name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+The member node name
+*/}}
+{{- define "artifactory-ha.node.name" -}}
+{{- if .Values.nameOverride -}}
+{{- printf "%s-member" .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := .Release.Name | trunc 29 -}}
+{{- printf "%s-%s-member" $name .Chart.Name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Expand the name nginx service.
+*/}}
+{{- define "artifactory-ha.nginx.name" -}}
+{{- default .Values.nginx.name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "artifactory-ha.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "artifactory-ha.nginx.fullname" -}}
+{{- if .Values.nginx.fullnameOverride -}}
+{{- .Values.nginx.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nginx.name -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "artifactory-ha.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+{{ default (include "artifactory-ha.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+{{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "artifactory-ha.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Generate SSL certificates
+*/}}
+{{- define "artifactory-ha.gen-certs" -}}
+{{- $altNames := list ( printf "%s.%s" (include "artifactory-ha.fullname" .) .Release.Namespace ) ( printf "%s.%s.svc" (include "artifactory-ha.fullname" .) .Release.Namespace ) -}}
+{{- $ca := genCA "artifactory-ca" 365 -}}
+{{- $cert := genSignedCert ( include "artifactory-ha.fullname" . ) nil $altNames 365 $ca -}}
+tls.crt: {{ $cert.Cert | b64enc }}
+tls.key: {{ $cert.Key | b64enc }}
+{{- end -}}
+
+{{/*
+Scheme (http/https) based on Access or Router TLS enabled/disabled
+*/}}
+{{- define "artifactory-ha.scheme" -}}
+{{- if or .Values.access.accessConfig.security.tls .Values.router.tlsEnabled -}}
+{{- printf "%s" "https" -}}
+{{- else -}}
+{{- printf "%s" "http" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve joinKey value
+*/}}
+{{- define "artifactory-ha.joinKey" -}}
+{{- if .Values.global.joinKey -}}
+{{- .Values.global.joinKey -}}
+{{- else if .Values.artifactory.joinKey -}}
+{{- .Values.artifactory.joinKey -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve jfConnectToken value
+*/}}
+{{- define "artifactory-ha.jfConnectToken" -}}
+{{- .Values.artifactory.jfConnectToken -}}
+{{- end -}}
+
+{{/*
+Resolve masterKey value
+*/}}
+{{- define "artifactory-ha.masterKey" -}}
+{{- if .Values.global.masterKey -}}
+{{- .Values.global.masterKey -}}
+{{- else if .Values.artifactory.masterKey -}}
+{{- .Values.artifactory.masterKey -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve joinKeySecretName value
+*/}}
+{{- define "artifactory-ha.joinKeySecretName" -}}
+{{- if .Values.global.joinKeySecretName -}}
+{{- .Values.global.joinKeySecretName -}}
+{{- else if .Values.artifactory.joinKeySecretName -}}
+{{- .Values.artifactory.joinKeySecretName -}}
+{{- else -}}
+{{ include "artifactory-ha.fullname" . }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve jfConnectTokenSecretName value
+*/}}
+{{- define "artifactory-ha.jfConnectTokenSecretName" -}}
+{{- if .Values.artifactory.jfConnectTokenSecretName -}}
+{{- .Values.artifactory.jfConnectTokenSecretName -}}
+{{- else -}}
+{{ include "artifactory-ha.fullname" . }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve masterKeySecretName value
+*/}}
+{{- define "artifactory-ha.masterKeySecretName" -}}
+{{- if .Values.global.masterKeySecretName -}}
+{{- .Values.global.masterKeySecretName -}}
+{{- else if .Values.artifactory.masterKeySecretName -}}
+{{- .Values.artifactory.masterKeySecretName -}}
+{{- else -}}
+{{ include "artifactory-ha.fullname" . }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve imagePullSecrets value
+*/}}
+{{- define "artifactory-ha.imagePullSecrets" -}}
+{{- if .Values.global.imagePullSecrets }}
+imagePullSecrets:
+{{- range .Values.global.imagePullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- else if .Values.imagePullSecrets }}
+imagePullSecrets:
+{{- range .Values.imagePullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customInitContainersBegin value
+*/}}
+{{- define "artifactory-ha.customInitContainersBegin" -}}
+{{- if .Values.global.customInitContainersBegin -}}
+{{- .Values.global.customInitContainersBegin -}}
+{{- end -}}
+{{- if .Values.artifactory.customInitContainersBegin -}}
+{{- .Values.artifactory.customInitContainersBegin -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customInitContainers value
+*/}}
+{{- define "artifactory-ha.customInitContainers" -}}
+{{- if .Values.global.customInitContainers -}}
+{{- .Values.global.customInitContainers -}}
+{{- end -}}
+{{- if .Values.artifactory.customInitContainers -}}
+{{- .Values.artifactory.customInitContainers -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customVolumes value
+*/}}
+{{- define "artifactory-ha.customVolumes" -}}
+{{- if .Values.global.customVolumes -}}
+{{- .Values.global.customVolumes -}}
+{{- end -}}
+{{- if .Values.artifactory.customVolumes -}}
+{{- .Values.artifactory.customVolumes -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve unifiedCustomSecretVolumeName value
+*/}}
+{{- define "artifactory-ha.unifiedCustomSecretVolumeName" -}}
+{{- printf "%s-%s" (include "artifactory-ha.name" .) ("unified-secret-volume") | trunc 63 -}}
+{{- end -}}
+
+{{/*
+Check the Duplication of volume names for secrets. If unifiedSecretInstallation is enabled then the method is checking for volume names,
+if the volume exists in customVolume then an extra volume with the same name will not be getting added in unifiedSecretInstallation case.*/}}
+{{- define "artifactory-ha.checkDuplicateUnifiedCustomVolume" -}}
+{{- if or .Values.global.customVolumes .Values.artifactory.customVolumes -}}
+{{- $val := (tpl (include "artifactory-ha.customVolumes" .) .) | toJson -}}
+{{- contains (include "artifactory-ha.unifiedCustomSecretVolumeName" .) $val | toString -}}
+{{- else -}}
+{{- printf "%s" "false" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customVolumeMounts value
+*/}}
+{{- define "artifactory-ha.customVolumeMounts" -}}
+{{- if .Values.global.customVolumeMounts -}}
+{{- .Values.global.customVolumeMounts -}}
+{{- end -}}
+{{- if .Values.artifactory.customVolumeMounts -}}
+{{- .Values.artifactory.customVolumeMounts -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customSidecarContainers value
+*/}}
+{{- define "artifactory-ha.customSidecarContainers" -}}
+{{- if .Values.global.customSidecarContainers -}}
+{{- .Values.global.customSidecarContainers -}}
+{{- end -}}
+{{- if .Values.artifactory.customSidecarContainers -}}
+{{- .Values.artifactory.customSidecarContainers -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper artifactory chart image names
+*/}}
+{{- define "artifactory-ha.getImageInfoByValue" -}}
+{{- $dot := index . 0 }}
+{{- $indexReference := index . 1 }}
+{{- $registryName := index $dot.Values $indexReference "image" "registry" -}}
+{{- $repositoryName := index $dot.Values $indexReference "image" "repository" -}}
+{{- $tag := "" -}}
+{{- if and (eq $indexReference "artifactory") (hasKey $dot.Values "artifactoryService") }}
+    {{- if default false $dot.Values.artifactoryService.enabled }}
+        {{- $indexReference = "artifactoryService" -}}
+        {{- $tag = default $dot.Chart.Annotations.artifactoryServiceVersion (index $dot.Values $indexReference "image" "tag") | toString -}}
+        {{- $repositoryName = index $dot.Values $indexReference "image" "repository" -}}
+    {{- else -}}
+        {{- $tag = default $dot.Chart.AppVersion (index $dot.Values $indexReference "image" "tag") | toString -}}
+    {{- end -}}
+{{- else -}}
+    {{- $tag = default $dot.Chart.AppVersion (index $dot.Values $indexReference "image" "tag") | toString -}}
+{{- end -}}
+{{- if and (eq $indexReference "metadata") (hasKey $dot.Values.metadata "standaloneImageEnabled") }}
+    {{- if default false $dot.Values.metadata.standaloneImageEnabled }}
+        {{- $tag = default $dot.Chart.Annotations.metadataVersion (index $dot.Values $indexReference "image" "tag") | toString -}}
+    {{- end -}}
+{{- end -}}
+{{- if and (eq $indexReference "observability") (hasKey $dot.Values.observability "standaloneImageEnabled") }}
+    {{- if default false $dot.Values.observability.standaloneImageEnabled }}
+        {{- $tag = default $dot.Chart.Annotations.observabilityVersion (index $dot.Values $indexReference "image" "tag") | toString -}}
+    {{- end -}}
+{{- end -}}
+{{- if $dot.Values.global }}
+    {{- if and $dot.Values.splitServicesToContainers $dot.Values.global.versions.router (eq $indexReference "router") }}
+        {{- $tag = $dot.Values.global.versions.router | toString -}}
+    {{- end -}}
+    {{- if and $dot.Values.global.versions.initContainers (eq $indexReference "initContainers") }}
+        {{- $tag = $dot.Values.global.versions.initContainers | toString -}}
+    {{- end -}}
+    {{- if $dot.Values.global.versions.artifactory }}
+        {{- if or (eq $indexReference "artifactory") (eq $indexReference "metadata") (eq $indexReference "nginx") (eq $indexReference "observability") }}
+            {{- $tag = $dot.Values.global.versions.artifactory | toString -}}
+        {{- end -}}
+    {{- end -}}
+    {{- if $dot.Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" $dot.Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper artifactory app version
+*/}}
+{{- define "artifactory-ha.app.version" -}}
+{{- $tag := (splitList ":" ((include "artifactory-ha.getImageInfoByValue" (list . "artifactory" )))) | last | toString -}}
+{{- printf "%s" $tag -}}
+{{- end -}}
+
+{{/*
+Custom certificate copy command
+*/}}
+{{- define "artifactory-ha.copyCustomCerts" -}}
+echo "Copy custom certificates to {{ .Values.artifactory.persistence.mountPath }}/etc/security/keys/trusted";
+mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/security/keys/trusted;
+for file in $(ls -1 /tmp/certs/* | grep -v .key | grep -v ":" | grep -v grep); do if [ -f "${file}" ]; then cp -v ${file} {{ .Values.artifactory.persistence.mountPath }}/etc/security/keys/trusted; fi done;
+if [ -f {{ .Values.artifactory.persistence.mountPath }}/etc/security/keys/trusted/tls.crt ]; then mv -v {{ .Values.artifactory.persistence.mountPath }}/etc/security/keys/trusted/tls.crt {{ .Values.artifactory.persistence.mountPath }}/etc/security/keys/trusted/ca.crt; fi;
+{{- end -}}
+
+{{/*
+Circle of trust certificates copy command
+*/}}
+{{- define "artifactory.copyCircleOfTrustCertsCerts" -}}
+echo "Copy circle of trust certificates to {{ .Values.artifactory.persistence.mountPath }}/etc/access/keys/trusted";
+mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/access/keys/trusted;
+for file in $(ls -1 /tmp/circleoftrustcerts/* | grep -v .key | grep -v ":" | grep -v grep); do if [ -f "${file}" ]; then cp -v ${file} {{ .Values.artifactory.persistence.mountPath }}/etc/access/keys/trusted; fi done;
+{{- end -}}
+
+{{/*
+Resolve requiredServiceTypes value
+*/}}
+{{- define "artifactory-ha.router.requiredServiceTypes" -}}
+{{- $requiredTypes := "jfrt,jfac" -}}
+{{- if not .Values.access.enabled -}}
+  {{- $requiredTypes = "jfrt" -}}
+{{- end -}}
+{{- if .Values.observability.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfob" -}}
+{{- end -}}
+{{- if .Values.metadata.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfmd" -}}
+{{- end -}}
+{{- if .Values.event.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfevt" -}}
+{{- end -}}
+{{- if .Values.frontend.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jffe" -}}
+{{- end -}}
+{{- if .Values.jfconnect.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfcon" -}}
+{{- end -}}
+{{- if .Values.evidence.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfevd" -}}
+{{- end -}}
+{{- if .Values.mc.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfmc" -}}
+{{- end -}}
+{{- $requiredTypes -}}
+{{- end -}}
+
+{{/*
+nginx scheme (http/https)
+*/}}
+{{- define "nginx.scheme" -}}
+{{- if .Values.nginx.http.enabled -}}
+{{- printf "%s" "http" -}}
+{{- else -}}
+{{- printf "%s" "https" -}}
+{{- end -}}
+{{- end -}}
+
+
+{{/*
+nginx command
+*/}}
+{{- define "nginx.command" -}}
+{{- if .Values.nginx.customCommand }}
+{{  toYaml .Values.nginx.customCommand }}
+{{- end }}
+{{- end -}}
+
+{{/*
+nginx port (8080/8443) based on http/https enabled
+*/}}
+{{- define "nginx.port" -}}
+{{- if .Values.nginx.http.enabled -}}
+{{- .Values.nginx.http.internalPort -}}
+{{- else -}}
+{{- .Values.nginx.https.internalPort -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customInitContainers value
+*/}}
+{{- define "artifactory.nginx.customInitContainers" -}}
+{{- if .Values.nginx.customInitContainers -}}
+{{- .Values.nginx.customInitContainers -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customVolumes value
+*/}}
+{{- define "artifactory.nginx.customVolumes" -}}
+{{- if .Values.nginx.customVolumes -}}
+{{- .Values.nginx.customVolumes -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customVolumeMounts nginx value
+*/}}
+{{- define "artifactory.nginx.customVolumeMounts" -}}
+{{- if .Values.nginx.customVolumeMounts -}}
+{{- .Values.nginx.customVolumeMounts -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customSidecarContainers value
+*/}}
+{{- define "artifactory.nginx.customSidecarContainers" -}}
+{{- if .Values.nginx.customSidecarContainers -}}
+{{- .Values.nginx.customSidecarContainers -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve Artifactory pod primary node selector value
+*/}}
+{{- define "artifactory.nodeSelector" -}}
+nodeSelector:
+{{- if .Values.global.nodeSelector }}
+{{ toYaml .Values.global.nodeSelector | indent 2 }}
+{{- else if .Values.artifactory.primary.nodeSelector }}
+{{ toYaml .Values.artifactory.primary.nodeSelector | indent 2 }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve Artifactory pod node nodeselector value
+*/}}
+{{- define "artifactory.node.nodeSelector" -}}
+nodeSelector:
+{{- if .Values.global.nodeSelector }}
+{{ toYaml .Values.global.nodeSelector | indent 2 }}
+{{- else if .Values.artifactory.node.nodeSelector }}
+{{ toYaml .Values.artifactory.node.nodeSelector | indent 2 }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve Nginx pods node selector value
+*/}}
+{{- define "nginx.nodeSelector" -}}
+nodeSelector:
+{{- if .Values.global.nodeSelector }}
+{{ toYaml .Values.global.nodeSelector | indent 2 }}
+{{- else if .Values.nginx.nodeSelector }}
+{{ toYaml .Values.nginx.nodeSelector | indent 2 }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Calculate the systemYaml from structured and unstructured text input
+*/}}
+{{- define "artifactory.finalSystemYaml" -}}
+{{ tpl (mergeOverwrite (include "artifactory.systemYaml" . | fromYaml) .Values.artifactory.extraSystemYaml | toYaml) . }}
+{{- end -}}
+
+{{/*
+Calculate the systemYaml from the unstructured text input
+*/}}
+{{- define "artifactory.systemYaml" -}}
+{{ include (print $.Template.BasePath "/_system-yaml-render.tpl") . }}
+{{- end -}}
+
+{{/*
+Metrics enabled
+*/}}
+{{- define "metrics.enabled" -}}
+shared:
+  metrics:
+    enabled: true
+{{- end }}
+
+{{/*
+Resolve artifactory metrics
+*/}}
+{{- define "artifactory.metrics" -}}
+{{- if .Values.artifactory.openMetrics -}} 
+{{- if .Values.artifactory.openMetrics.enabled -}}
+{{ include "metrics.enabled" . }}
+{{- if .Values.artifactory.openMetrics.filebeat }}
+{{- if .Values.artifactory.openMetrics.filebeat.enabled }}
+{{ include "metrics.enabled" . }}
+    filebeat:
+{{ tpl (.Values.artifactory.openMetrics.filebeat | toYaml) . | indent 6 }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- else if .Values.artifactory.metrics -}}
+{{- if .Values.artifactory.metrics.enabled -}}
+{{ include "metrics.enabled" . }}
+{{- if .Values.artifactory.metrics.filebeat }}
+{{- if .Values.artifactory.metrics.filebeat.enabled }}
+{{ include "metrics.enabled" . }}
+    filebeat:
+{{ tpl (.Values.artifactory.metrics.filebeat | toYaml) . | indent 6 }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve unified secret prepend release name
+*/}}
+{{- define "artifactory.unifiedSecretPrependReleaseName" -}}
+{{- if .Values.artifactory.unifiedSecretPrependReleaseName }}
+{{- printf "%s" (include "artifactory-ha.fullname" .) -}}
+{{- else }}
+{{- printf "%s" (include "artifactory-ha.name" .) -}}
+{{- end }}
+{{- end }}
+
+{{/*
+Resolve nginx hosts value
+*/}}
+{{- define "artifactory.nginx.hosts" -}}
+{{- if .Values.ingress.hosts }}
+{{- range .Values.ingress.hosts -}}
+  {{- if contains "." . -}}
+    {{ "" | indent 0 }} ~(?<repo>.+)\.{{ . }}
+  {{- end -}}
+{{- end -}}
+{{- else if .Values.nginx.hosts }}
+{{- range .Values.nginx.hosts -}}
+  {{- if contains "." . -}}
+    {{ "" | indent 0 }} ~(?<repo>.+)\.{{ . }}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified grpc ingress name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "artifactory.ingressGrpc.fullname" -}}
+{{- printf "%s-%s" (include "artifactory-ha.fullname" .) .Values.ingressGrpc.name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified grpc service name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "artifactory.serviceGrpc.fullname" -}}
+{{- printf "%s-%s" (include "artifactory-ha.fullname" .) .Values.artifactory.serviceGrpc.name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/_system-yaml-render.tpl b/charts/jfrog/artifactory-ha/107.98.14/templates/_system-yaml-render.tpl
new file mode 100644
index 000000000..deaa773ea
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/_system-yaml-render.tpl
@@ -0,0 +1,5 @@
+{{- if .Values.artifactory.systemYaml -}}
+{{- tpl .Values.artifactory.systemYaml . -}}
+{{- else -}}
+{{ (tpl ( $.Files.Get "files/system.yaml" ) .) }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/additional-resources.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/additional-resources.yaml
new file mode 100644
index 000000000..c4d06f08a
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/additional-resources.yaml
@@ -0,0 +1,3 @@
+{{ if .Values.additionalResources }}
+{{ tpl .Values.additionalResources . }}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/admin-bootstrap-creds.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/admin-bootstrap-creds.yaml
new file mode 100644
index 000000000..40d91f75e
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/admin-bootstrap-creds.yaml
@@ -0,0 +1,15 @@
+{{- if not (and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey) }}
+{{- if and .Values.artifactory.admin.password (not .Values.artifactory.unifiedSecretInstallation) }}
+kind: Secret
+apiVersion: v1
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-bootstrap-creds
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  bootstrap.creds: {{ (printf "%s@%s=%s" .Values.artifactory.admin.username .Values.artifactory.admin.ip .Values.artifactory.admin.password) | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-access-config.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-access-config.yaml
new file mode 100644
index 000000000..0b96a337d
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-access-config.yaml
@@ -0,0 +1,15 @@
+{{- if and .Values.access.accessConfig (not .Values.artifactory.unifiedSecretInstallation) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-access-config
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+type: Opaque
+stringData:
+  access.config.patch.yml: |
+{{ tpl (toYaml .Values.access.accessConfig) . | indent 4 }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-binarystore-secret.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-binarystore-secret.yaml
new file mode 100644
index 000000000..6824fe90f
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-binarystore-secret.yaml
@@ -0,0 +1,18 @@
+{{- if and (not .Values.artifactory.persistence.customBinarystoreXmlSecret) (not .Values.artifactory.unifiedSecretInstallation) }}
+kind: Secret
+apiVersion: v1
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-binarystore
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+stringData:
+  binarystore.xml: |-
+{{- if .Values.artifactory.persistence.binarystoreXml }} 
+{{ tpl .Values.artifactory.persistence.binarystoreXml . | indent 4 }}
+{{- else }}
+{{ tpl ( .Files.Get "files/binarystore.xml" ) . | indent 4 }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-configmaps.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-configmaps.yaml
new file mode 100644
index 000000000..1385bc578
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-configmaps.yaml
@@ -0,0 +1,13 @@
+{{ if .Values.artifactory.configMaps }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-configmaps
+  labels:
+    app: {{ template "artifactory-ha.fullname" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+{{ tpl .Values.artifactory.configMaps . | indent 2 }}
+{{ end -}}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-custom-secrets.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-custom-secrets.yaml
new file mode 100644
index 000000000..8065fe686
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-custom-secrets.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.artifactory.customSecrets (not .Values.artifactory.unifiedSecretInstallation) }}
+{{- range .Values.artifactory.customSecrets }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "artifactory-ha.fullname" $ }}-{{ .name }}
+  labels:
+    app: "{{ template "artifactory-ha.name" $ }}"
+    chart: "{{ template "artifactory-ha.chart" $ }}"
+    component: "{{ $.Values.artifactory.name }}"
+    heritage: {{ $.Release.Service | quote }}
+    release: {{ $.Release.Name | quote }}
+type: Opaque
+stringData:
+  {{ .key }}: |
+{{ .data | indent 4 -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-database-secrets.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-database-secrets.yaml
new file mode 100644
index 000000000..6daf5db7b
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-database-secrets.yaml
@@ -0,0 +1,24 @@
+{{- if and  (not .Values.database.secrets) (not .Values.postgresql.enabled) (not .Values.artifactory.unifiedSecretInstallation) }}
+{{- if or .Values.database.url .Values.database.user .Values.database.password }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-database-creds
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+type: Opaque
+data:
+  {{- with .Values.database.url }}
+  db-url: {{ tpl . $ | b64enc | quote }}
+  {{- end }}
+  {{- with .Values.database.user }}
+  db-user: {{ tpl . $ | b64enc | quote }}
+  {{- end }}
+  {{- with .Values.database.password }}
+  db-password: {{ tpl . $ | b64enc | quote }}
+  {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-gcp-credentials-secret.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-gcp-credentials-secret.yaml
new file mode 100644
index 000000000..d90769595
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-gcp-credentials-secret.yaml
@@ -0,0 +1,16 @@
+{{- if not .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+{{- if and (.Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled) (not .Values.artifactory.unifiedSecretInstallation) }}
+kind: Secret
+apiVersion: v1
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-gcpcreds
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+stringData:
+  gcp.credentials.json: |-
+{{ tpl .Values.artifactory.persistence.googleStorage.gcpServiceAccount.config . | indent 4 }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-installer-info.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-installer-info.yaml
new file mode 100644
index 000000000..0dff9dc86
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-installer-info.yaml
@@ -0,0 +1,16 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-installer-info
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  installer-info.json: |
+{{- if .Values.installerInfo -}}
+{{- tpl .Values.installerInfo . | nindent 4 -}}
+{{- else -}}
+{{ (tpl ( .Files.Get "files/installer-info.json" | nindent 4 ) .) }}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-license-secret.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-license-secret.yaml
new file mode 100644
index 000000000..0018fa044
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-license-secret.yaml
@@ -0,0 +1,16 @@
+{{ if and (not .Values.artifactory.unifiedSecretInstallation) (not .Values.artifactory.license.secret) }}
+{{- with .Values.artifactory.license.licenseKey }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "artifactory-ha.fullname" $ }}-license
+  labels:
+    app: {{ template "artifactory-ha.name" $ }}
+    chart: {{ template "artifactory-ha.chart" $ }}
+    heritage: {{ $.Release.Service }}
+    release: {{ $.Release.Name }}
+type: Opaque
+data:
+  artifactory.lic: {{ . | b64enc | quote }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-migration-scripts.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-migration-scripts.yaml
new file mode 100644
index 000000000..fe40f980f
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-migration-scripts.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.artifactory.migration.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-migration-scripts
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  migrate.sh: |
+{{ .Files.Get "files/migrate.sh" | indent 4 }}
+  migrationHelmInfo.yaml: |
+{{ .Files.Get "files/migrationHelmInfo.yaml" | indent 4 }}
+  migrationStatus.sh: |
+{{ .Files.Get "files/migrationStatus.sh" | indent 4 }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-networkpolicy.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-networkpolicy.yaml
new file mode 100644
index 000000000..9924448f0
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-networkpolicy.yaml
@@ -0,0 +1,34 @@
+{{- range .Values.networkpolicy }}
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ template "artifactory-ha.fullname" $ }}-{{ .name }}-networkpolicy
+  labels:
+    app: {{ template "artifactory-ha.name" $ }}
+    chart: {{ template "artifactory-ha.chart" $ }}
+    release: {{ $.Release.Name }}
+    heritage: {{ $.Release.Service }}
+spec:
+{{- if .podSelector }}
+  podSelector:
+{{ .podSelector | toYaml | trimSuffix "\n" | indent 4 -}}
+{{ else }}
+  podSelector: {}
+{{- end }}
+  policyTypes:
+  {{- if .ingress }}
+  - Ingress
+  {{- end }}
+  {{- if .egress }}
+  - Egress
+  {{- end }}
+{{- if .ingress }}
+  ingress:
+{{ .ingress | toYaml | trimSuffix "\n" | indent 2 -}}
+{{- end }}
+{{- if .egress }}
+  egress:
+{{ .egress | toYaml | trimSuffix "\n" | indent 2 -}}
+{{- end }}
+---
+{{- end -}}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-nfs-pvc.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-nfs-pvc.yaml
new file mode 100644
index 000000000..6ed7d82f6
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-nfs-pvc.yaml
@@ -0,0 +1,101 @@
+{{- if eq .Values.artifactory.persistence.type "nfs" }}
+### Artifactory HA data
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-data-pv
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    id: {{ template "artifactory-ha.name" . }}-data-pv
+    type: nfs-volume
+spec:
+  {{- if .Values.artifactory.persistence.nfs.mountOptions }}
+  mountOptions:
+{{ toYaml .Values.artifactory.persistence.nfs.mountOptions | indent 4 }}
+  {{- end }}
+  capacity:
+    storage: {{ .Values.artifactory.persistence.nfs.capacity }}
+  accessModes:
+  - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  nfs:
+    server: {{ .Values.artifactory.persistence.nfs.ip }}
+    path: "{{ .Values.artifactory.persistence.nfs.haDataMount }}"
+    readOnly: false
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-data-pvc
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    type: nfs-volume
+spec:
+  accessModes:
+  - ReadWriteOnce
+  storageClassName: ""
+  resources:
+    requests:
+      storage: {{ .Values.artifactory.persistence.nfs.capacity }}
+  selector:
+    matchLabels:
+      id: {{ template "artifactory-ha.name" . }}-data-pv
+      app: {{ template "artifactory-ha.name" . }}
+      release: {{ .Release.Name }}
+---
+### Artifactory HA backup
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-backup-pv
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    id: {{ template "artifactory-ha.name" . }}-backup-pv
+    type: nfs-volume
+spec:
+  {{- if .Values.artifactory.persistence.nfs.mountOptions }}
+  mountOptions:
+{{ toYaml .Values.artifactory.persistence.nfs.mountOptions | indent 4 }}
+  {{- end }}
+  capacity:
+    storage: {{ .Values.artifactory.persistence.nfs.capacity }}
+  accessModes:
+  - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  nfs:
+    server: {{ .Values.artifactory.persistence.nfs.ip }}
+    path: "{{ .Values.artifactory.persistence.nfs.haBackupMount }}"
+    readOnly: false
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-backup-pvc
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    type: nfs-volume
+spec:
+  accessModes:
+  - ReadWriteOnce
+  storageClassName: ""
+  resources:
+    requests:
+      storage: {{ .Values.artifactory.persistence.nfs.capacity }}
+  selector:
+    matchLabels:
+      id: {{ template "artifactory-ha.name" . }}-backup-pv
+      app: {{ template "artifactory-ha.name" . }}
+      release: {{ .Release.Name }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-node-pdb.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-node-pdb.yaml
new file mode 100644
index 000000000..46c6dac21
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-node-pdb.yaml
@@ -0,0 +1,26 @@
+{{- if gt (.Values.artifactory.node.replicaCount | int) 0  -}}
+{{- if .Values.artifactory.node.minAvailable -}}
+{{- if semverCompare "<v1.21.0-0" .Capabilities.KubeVersion.Version }}
+apiVersion: policy/v1beta1
+{{- else }}
+apiVersion: policy/v1
+{{- end }}
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-node
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+spec:
+  selector:
+    matchLabels:
+      component: {{ .Values.artifactory.name }}
+      app: {{ template "artifactory-ha.name" . }}
+      role: {{ template "artifactory-ha.node.name" . }}
+      release: {{ .Release.Name }}
+  minAvailable: {{ .Values.artifactory.node.minAvailable }}
+{{- end }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-node-statefulset.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-node-statefulset.yaml
new file mode 100644
index 000000000..d8e69a238
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-node-statefulset.yaml
@@ -0,0 +1,1596 @@
+{{- if gt (.Values.artifactory.node.replicaCount | int) 0  -}}
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: {{ template "artifactory-ha.node.name" . }}
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+{{- with .Values.artifactory.node.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- with .Values.artifactory.statefulset.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+  serviceName: {{ template "artifactory-ha.node.name" . }}
+  replicas: {{ .Values.artifactory.node.replicaCount }}
+  updateStrategy: {{- toYaml .Values.artifactory.node.updateStrategy | nindent 4}}
+  selector:
+    matchLabels:
+      app: {{ template "artifactory-ha.name" . }}
+      role: {{ template "artifactory-ha.node.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "artifactory-ha.name" . }}
+        chart: {{ template "artifactory-ha.chart" . }}
+        role: {{ template "artifactory-ha.node.name" . }}
+        heritage: {{ .Release.Service }}
+        component: {{ .Values.artifactory.name }}
+        release: {{ .Release.Name }}
+        {{- with .Values.artifactory.node.labels }}
+{{ toYaml . | indent 8 }}
+        {{- end }}
+      annotations:
+      {{- if not .Values.artifactory.unifiedSecretInstallation }}
+        checksum/database-secrets: {{ include (print $.Template.BasePath "/artifactory-database-secrets.yaml") . | sha256sum }}
+        checksum/binarystore: {{ include (print $.Template.BasePath "/artifactory-binarystore-secret.yaml") . | sha256sum }}
+        checksum/systemyaml: {{ include (print $.Template.BasePath "/artifactory-system-yaml.yaml") . | sha256sum }}
+      {{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
+        checksum/gcpcredentials: {{ include (print $.Template.BasePath "/artifactory-gcp-credentials-secret.yaml") . | sha256sum }}
+      {{- end }}
+      {{- else }}
+        checksum/artifactory-unified-secret: {{ include (print $.Template.BasePath "/artifactory-unified-secret.yaml") . | sha256sum }}
+      {{- end }}
+      {{- with .Values.artifactory.annotations }}
+{{ toYaml . | indent 8 }}
+      {{- end }}
+    spec:
+    {{- if .Values.artifactory.schedulerName }}
+      schedulerName: {{ .Values.artifactory.schedulerName | quote }}
+    {{- end }}
+    {{- if .Values.artifactory.priorityClass.existingPriorityClass }}
+      priorityClassName: {{ .Values.artifactory.priorityClass.existingPriorityClass }}
+    {{- else -}}
+      {{- if .Values.artifactory.priorityClass.create }}
+      priorityClassName: {{ default (include "artifactory-ha.fullname" .) .Values.artifactory.priorityClass.name }}
+      {{- end }}
+    {{- end }}
+      serviceAccountName: {{ template "artifactory-ha.serviceAccountName" . }}
+      terminationGracePeriodSeconds: {{ add .Values.artifactory.terminationGracePeriodSeconds 10 }}
+    {{- if or .Values.imagePullSecrets .Values.global.imagePullSecrets }}
+{{- include "artifactory-ha.imagePullSecrets" . | indent 6 }}
+    {{- end }}
+      {{- if .Values.artifactory.podSecurityContext.enabled }}
+      securityContext: {{- omit .Values.artifactory.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if .Values.artifactory.topologySpreadConstraints }}
+      topologySpreadConstraints:
+{{ tpl (toYaml .Values.artifactory.topologySpreadConstraints) . | indent 8 }}
+      {{- end }}
+      initContainers:
+    {{- if or .Values.artifactory.customInitContainersBegin .Values.global.customInitContainersBegin }}
+{{ tpl (include "artifactory-ha.customInitContainersBegin" .)  . | indent 6 }}
+    {{- end }}
+  {{- if .Values.artifactory.persistence.enabled }}
+    {{- if eq .Values.artifactory.persistence.type "file-system" }}
+      {{- if .Values.artifactory.persistence.fileSystem.existingSharedClaim.enabled }}
+      - name: "create-artifactory-data-dir"
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - 'bash'
+        - '-c'
+        - >
+          mkdir -p {{ tpl .Values.artifactory.persistence.fileSystem.existingSharedClaim.dataDir . }};
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        volumeMounts:
+        - mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+          name: volume
+      {{- end }}
+    {{- end }}
+      {{- if .Values.artifactory.deleteDBPropertiesOnStartup }}
+      - name: "delete-db-properties"
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+        command:
+          - 'bash'
+          - '-c'
+          - 'rm -fv {{ .Values.artifactory.persistence.mountPath }}/etc/db.properties'
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        volumeMounts:
+          - mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+            name: volume
+      {{- end }}
+    {{- end }}
+      {{- if and .Values.artifactory.node.waitForPrimaryStartup.enabled }}
+      - name: "wait-for-primary"
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - 'bash'
+        - '-c'
+        - >
+          echo "Waiting for primary node to be ready...";
+          {{- if and .Values.artifactory.node.waitForPrimaryStartup.enabled .Values.artifactory.node.waitForPrimaryStartup.time }}
+          echo "Sleeping to allow time for primary node to come up";
+          sleep {{ .Values.artifactory.node.waitForPrimaryStartup.time }};
+          {{- else }}
+          ready=false;
+          while ! $ready; do echo Primary not ready. Waiting...;
+            timeout 2s bash -c "</dev/tcp/{{ template "artifactory-ha.primary.name" . }}/{{ .Values.artifactory.externalPort }}"; exit_status=$?;
+            if [[ $exit_status -eq 0 ]]; then ready=true; echo "Primary node ready!"; fi; sleep 3; 
+          done
+          {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        {{- end }}
+      - name: 'copy-system-configurations'
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          if [[ -e "{{ .Values.artifactory.persistence.mountPath }}/etc/filebeat.yaml" ]]; then chmod 644 {{ .Values.artifactory.persistence.mountPath }}/etc/filebeat.yaml; fi;
+          echo "Copy system.yaml to {{ .Values.artifactory.persistence.mountPath }}/etc";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc;
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/access/keys/trusted;
+          {{- if .Values.systemYamlOverride.existingSecret }}
+          cp -fv /tmp/etc/{{ .Values.systemYamlOverride.dataKey }} {{ .Values.artifactory.persistence.mountPath }}/etc/system.yaml;
+          {{- else }}
+          cp -fv /tmp/etc/system.yaml {{ .Values.artifactory.persistence.mountPath }}/etc/system.yaml;
+          {{- end }}
+          echo "Copy binarystore.xml file";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/artifactory;
+          cp -fv /tmp/etc/artifactory/binarystore.xml {{ .Values.artifactory.persistence.mountPath }}/etc/artifactory/binarystore.xml;
+          echo "Removing join.key file";
+          rm -fv {{ .Values.artifactory.persistence.mountPath }}/etc/security/join.key;
+        {{- if .Values.access.resetAccessCAKeys }}
+          echo "Resetting Access CA Keys - load from database";
+        {{- end }}
+        {{- if .Values.access.customCertificatesSecretName }}
+          echo "Load custom certificates from database";
+        {{- end }}
+        {{- if .Values.jfconnect.customCertificatesSecretName }}
+          echo "Load custom certificates from database";
+        {{- end }}
+        {{- if or .Values.artifactory.masterKey .Values.global.masterKey .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName }}
+          echo "Copy masterKey to {{ .Values.artifactory.persistence.mountPath }}/etc/security";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/security;
+          echo -n ${ARTIFACTORY_MASTER_KEY} > {{ .Values.artifactory.persistence.mountPath }}/etc/security/master.key;
+        env:
+        - name: ARTIFACTORY_MASTER_KEY
+          valueFrom:
+            secretKeyRef:
+            {{- if or (not .Values.artifactory.unifiedSecretInstallation) (or .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName) }}
+              name: {{ include "artifactory-ha.masterKeySecretName" . }}
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: master-key
+        {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+
+      ######################## SystemYaml #########################
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.systemYamlOverride.existingSecret }}
+        - name: systemyaml
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          {{- if .Values.systemYamlOverride.existingSecret }}
+          mountPath: "/tmp/etc/{{.Values.systemYamlOverride.dataKey}}"
+          subPath: {{ .Values.systemYamlOverride.dataKey }}
+          {{- else }}
+          mountPath: "/tmp/etc/system.yaml"
+          subPath: system.yaml
+          {{- end }}
+
+        ######################## Binarystore  ##########################
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+        - name: binarystore-xml
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/tmp/etc/artifactory/binarystore.xml"
+          subPath: binarystore.xml
+
+      ######################## CustomCertificates  ##########################
+      {{- if or .Values.artifactory.customCertificates.enabled .Values.global.customCertificates.enabled }}
+      - name: copy-custom-certificates
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        command:
+        - 'bash'
+        - '-c'
+        - >
+{{ include "artifactory-ha.copyCustomCerts" . | indent 10 }}
+        volumeMounts:
+          - name: volume
+            mountPath: {{ .Values.artifactory.persistence.mountPath }}
+          - name: ca-certs
+            mountPath: "/tmp/certs"
+      {{- end }}
+
+      {{- if .Values.artifactory.circleOfTrustCertificatesSecret }}
+      - name: copy-circle-of-trust-certificates
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        command:
+        - 'bash'
+        - '-c'
+        - >
+{{ include "artifactory.copyCircleOfTrustCertsCerts" . | indent 10 }}
+        volumeMounts:
+          - name: volume
+            mountPath: {{ .Values.artifactory.persistence.mountPath }}
+          - name: circle-of-trust-certs
+            mountPath: "/tmp/circleoftrustcerts"
+      {{- end }}
+
+    {{- if .Values.waitForDatabase }}
+      {{- if or .Values.postgresql.enabled }}
+      - name: "wait-for-db"
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+        command:
+        - /bin/bash
+        - -c
+        - |
+          echo "Waiting for postgresql to come up"
+          ready=false;
+          while ! $ready; do echo waiting;
+            timeout 2s bash -c "</dev/tcp/{{ .Release.Name }}-postgresql/{{ .Values.postgresql.service.port }}"; exit_status=$?;
+            if [[ $exit_status -eq 0 ]]; then ready=true; echo "database ok"; fi; sleep 1; 
+          done
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+      {{- end }}
+    {{- end }}
+    {{- if or .Values.artifactory.customInitContainers .Values.global.customInitContainers }}
+{{ tpl (include "artifactory-ha.customInitContainers" .)  . | indent 6 }}
+    {{- end }}
+{{- if .Values.artifactory.migration.enabled }}
+      - name: 'migration-artifactory-ha'
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          {{- if .Values.artifactory.migration.preStartCommand }}
+          echo "Running custom preStartCommand command";
+          {{ tpl .Values.artifactory.migration.preStartCommand . }};
+          {{- end }}
+          scriptsPath="/opt/jfrog/artifactory/app/bin";
+          mkdir -p $scriptsPath;
+          echo "Copy migration scripts and Run migration";
+          cp -fv /tmp/migrate.sh $scriptsPath/migrate.sh;
+          cp -fv /tmp/migrationHelmInfo.yaml $scriptsPath/migrationHelmInfo.yaml;
+          cp -fv /tmp/migrationStatus.sh $scriptsPath/migrationStatus.sh;
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/log;
+          bash $scriptsPath/migrationStatus.sh {{ include "artifactory-ha.app.version" . }} {{ .Values.artifactory.migration.timeoutSeconds }} > >(tee {{ .Values.artifactory.persistence.mountPath }}/log/helm-migration.log) 2>&1;
+        resources:
+{{ toYaml .Values.artifactory.node.resources | indent 10 }}
+        env:
+      {{- if and (not .Values.waitForDatabase) (not .Values.postgresql.enabled) }}
+        - name: SKIP_WAIT_FOR_EXTERNAL_DB
+          value: "true"
+      {{- end }}
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+        - name: JF_SHARED_NODE_HAENABLED
+          value: "true"
+{{- with .Values.artifactory.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: migration-scripts
+          mountPath: "/tmp/migrate.sh"
+          subPath: migrate.sh
+        - name: migration-scripts
+          mountPath: "/tmp/migrationHelmInfo.yaml"
+          subPath: migrationHelmInfo.yaml
+        - name: migration-scripts
+          mountPath: "/tmp/migrationStatus.sh"
+          subPath: migrationStatus.sh
+        - name: volume
+          mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+  {{- if eq .Values.artifactory.persistence.type "file-system" }}
+    {{- if .Values.artifactory.persistence.fileSystem.existingSharedClaim.enabled }}
+      {{- range $sharedClaimNumber, $e := until (.Values.artifactory.persistence.fileSystem.existingSharedClaim.numberOfExistingClaims|int) }}
+        - name: artifactory-ha-data-{{ $sharedClaimNumber }}
+          mountPath: "{{ tpl $.Values.artifactory.persistence.fileSystem.existingSharedClaim.dataDir $ }}/filestore{{ $sharedClaimNumber }}"
+      {{- end }}
+        - name: artifactory-ha-backup
+          mountPath: "{{ $.Values.artifactory.persistence.fileSystem.existingSharedClaim.backupDir }}"
+    {{- end }}
+  {{- end }}
+  {{- if or .Values.artifactory.customVolumeMounts .Values.global.customVolumeMounts }}
+{{ tpl (include "artifactory-ha.customVolumeMounts" .) . | indent 8 }}
+  {{- end }}
+
+      ######################## Artifactory persistence nfs ##########################
+  {{- if eq .Values.artifactory.persistence.type "nfs" }}
+        - name: artifactory-ha-data
+          mountPath: "{{ .Values.artifactory.persistence.nfs.dataDir }}"
+        - name: artifactory-ha-backup
+          mountPath: "{{ .Values.artifactory.persistence.nfs.backupDir }}"
+  {{- else }}
+
+
+      ######################## Artifactory persistence binarystore Xml ##########################
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+        - name: binarystore-xml
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/tmp/etc/artifactory/binarystore.xml"
+          subPath: binarystore.xml
+  {{- end }}
+
+      ######################## Artifactory persistence google storage ##########################
+  {{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+        - name: gcpcreds-json
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/artifactory_bootstrap/gcp.credentials.json"
+          subPath: gcp.credentials.json
+  {{- end }}
+
+{{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+{{ toYaml .Values.hostAliases | indent 6 }}
+      {{- end }}
+      containers:
+    {{- if .Values.splitServicesToContainers }}
+      - name: {{ .Values.router.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "router") }}
+        imagePullPolicy: {{ .Values.router.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/router/app/bin/entrypoint-router.sh
+        {{- with .Values.router.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES
+          value: {{ include "artifactory-ha.router.requiredServiceTypes" . }}
+{{- with .Values.router.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.router.persistence.mountPath | quote }}
+{{- with .Values.router.customVolumeMounts }}
+{{ tpl . $ | indent 8 }}
+{{- end }}
+        resources:
+{{ toYaml .Values.router.resources | indent 10 }}
+      {{- if .Values.router.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.router.startupProbe.config . | indent 10 }}
+      {{- end }}
+{{- if .Values.router.readinessProbe.enabled }}
+        readinessProbe:
+{{ tpl .Values.router.readinessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.router.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.router.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.frontend.enabled }}
+      - name: {{ .Values.frontend.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/third-party/node/bin/node /opt/jfrog/artifactory/app/frontend/bin/server/dist/bundle.js /opt/jfrog/artifactory/app/frontend
+        {{- with .Values.frontend.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name : JF_SHARED_NODE_HAENABLED
+          value: "true"
+{{- with .Values.frontend.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.frontend.resources | indent 10 }}
+      {{- if .Values.frontend.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.frontend.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.frontend.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.frontend.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.evidence.enabled }}
+      - name: {{ .Values.evidence.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          exec /opt/jfrog/artifactory/app/evidence/bin/jf-evidence start
+        {{- with .Values.evidence.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+{{- with .Values.evidence.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        ports:
+        - containerPort: {{ .Values.evidence.internalPort }}
+          name: http-evidence
+        - containerPort: {{ .Values.evidence.externalPort }}
+          name: grpc-evidence
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.evidence.resources | indent 10 }}
+      {{- if .Values.evidence.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.evidence.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.evidence.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.evidence.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.metadata.enabled }}
+      - name: {{ .Values.metadata.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "metadata") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/metadata/bin/jf-metadata start
+        {{- with .Values.metadata.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+{{- with .Values.metadata.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+      {{- if or .Values.artifactory.customVolumeMounts .Values.global.customVolumeMounts }}
+{{ tpl (include "artifactory-ha.customVolumeMounts" .) . | indent 8 }}
+      {{- end }}
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.metadata.resources | indent 10 }}
+      {{- if .Values.metadata.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.metadata.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.metadata.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.metadata.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.event.enabled }}
+      - name: {{ .Values.event.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/event/bin/jf-event start
+        {{- with .Values.event.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+{{- with .Values.event.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.event.resources | indent 10 }}
+      {{- if .Values.event.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.event.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.event.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.event.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.jfconnect.enabled }}
+      - name: {{ .Values.jfconnect.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/jfconnect/bin/jf-connect start
+        {{- with .Values.jfconnect.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+{{- with .Values.jfconnect.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.jfconnect.resources | indent 10 }}
+      {{- if .Values.jfconnect.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.jfconnect.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.jfconnect.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.jfconnect.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if and .Values.federation.enabled .Values.federation.embedded }}
+      - name: {{ .Values.federation.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/third-party/java/bin/java {{ .Values.federation.extraJavaOpts }} -jar /opt/jfrog/artifactory/app/rtfs/lib/jf-rtfs
+        {{- with .Values.federation.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_RTFS_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+{{- with .Values.federation.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+      {{- if .Values.federation.enabled }}
+        ports:
+        - containerPort: {{ .Values.federation.internalPort }}
+          name: http-rtfs
+      {{- end }}
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.federation.resources | indent 10 }}
+      {{- if .Values.federation.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.federation.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.federation.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.federation.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.observability.enabled }}
+      - name: {{ .Values.observability.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "observability") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/observability/bin/jf-observability start
+        {{- with .Values.observability.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+{{- with .Values.observability.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.observability.resources | indent 10 }}
+      {{- if .Values.observability.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.observability.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.observability.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.observability.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if and .Values.access.enabled (not (.Values.access.runOnArtifactoryTomcat | default false)) }}
+      - name: {{ .Values.access.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+      {{- if .Values.access.resources }}
+        resources:
+{{ toYaml .Values.access.resources | indent 10 }}
+      {{- end }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          set -e;
+          {{- if .Values.access.preStartCommand }}
+          echo "Running custom preStartCommand command";
+          {{ tpl .Values.access.preStartCommand . }};
+          {{- end }}
+          exec /opt/jfrog/artifactory/app/access/bin/entrypoint-access.sh
+        {{- with .Values.access.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+      {{- if and (not .Values.waitForDatabase) (not .Values.postgresql.enabled) }}
+        - name: SKIP_WAIT_FOR_EXTERNAL_DB
+          value: "true"
+      {{- end }}
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+{{- with .Values.access.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+       {{- if .Values.artifactory.customPersistentVolumeClaim }}
+        - name: {{ .Values.artifactory.customPersistentVolumeClaim.name }}
+          mountPath: {{ .Values.artifactory.customPersistentVolumeClaim.mountPath }}
+       {{- end }}
+        {{- if .Values.artifactory.customPersistentPodVolumeClaim }}
+        - name: {{ .Values.artifactory.customPersistentPodVolumeClaim.name }}
+          mountPath: {{ .Values.artifactory.customPersistentPodVolumeClaim.mountPath }}
+        {{- end }}
+        {{- if .Values.aws.licenseConfigSecretName }}
+        - name: awsmp-product-license
+          mountPath: "/var/run/secrets/product-license"
+        {{- end }}
+        - name: volume
+          mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+
+      ######################## Artifactory persistence fs ##########################
+      {{- if eq .Values.artifactory.persistence.type "file-system" }}
+        {{- if .Values.artifactory.persistence.fileSystem.existingSharedClaim.enabled }}
+          {{- range $sharedClaimNumber, $e := until (.Values.artifactory.persistence.fileSystem.existingSharedClaim.numberOfExistingClaims|int) }}
+        - name: artifactory-ha-data-{{ $sharedClaimNumber }}
+          mountPath: "{{ tpl $.Values.artifactory.persistence.fileSystem.existingSharedClaim.dataDir $ }}/filestore{{ $sharedClaimNumber }}"
+          {{- end }}
+        - name: artifactory-ha-backup
+          mountPath: "{{ $.Values.artifactory.persistence.fileSystem.existingSharedClaim.backupDir }}"
+        {{- end }}
+      {{- end }}
+
+      ######################## Artifactory persistence nfs ##########################
+      {{- if eq .Values.artifactory.persistence.type "nfs" }}
+        - name: artifactory-ha-data
+          mountPath: "{{ .Values.artifactory.persistence.nfs.dataDir }}"
+        - name: artifactory-ha-backup
+          mountPath: "{{ .Values.artifactory.persistence.nfs.backupDir }}"
+      {{- else }}
+
+      ######################## Artifactory persistence binarystore Xml ##########################
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+        - name: binarystore-xml
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/tmp/etc/artifactory/binarystore.xml"
+          subPath: binarystore.xml
+
+      ######################## Artifactory persistence google storage ##########################
+      {{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+        - name: gcpcreds-json
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/artifactory_bootstrap/gcp.credentials.json"
+          subPath: gcp.credentials.json
+      {{- end }}
+
+      ######################## Artifactory ConfigMap ##########################
+      {{- if .Values.artifactory.configMapName }}
+        - name: bootstrap-config
+          mountPath: "/bootstrap/"
+      {{- end }}
+
+      ######################## Artifactory license ##########################
+      {{- if or .Values.artifactory.license.secret .Values.artifactory.license.licenseKey }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.license.secret }}
+        - name: artifactory-license
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/artifactory_bootstrap/artifactory.cluster.license"
+          {{- if .Values.artifactory.license.secret }}
+          subPath: {{ .Values.artifactory.license.dataKey }}
+          {{- else if .Values.artifactory.license.licenseKey }}
+          subPath: artifactory.lic
+          {{- end }}
+      {{- end }}
+    {{- end }}
+      {{- if or .Values.artifactory.customVolumeMounts .Values.global.customVolumeMounts }}
+{{ tpl (include "artifactory-ha.customVolumeMounts" .) . | indent 8 }}
+      {{- end }}
+      {{- if .Values.access.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.access.startupProbe.config . | indent 10 }}
+        {{- end }}
+    {{- if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}   
+        {{- if .Values.access.readinessProbe.enabled }}
+        readinessProbe:
+{{ tpl .Values.access.readinessProbe.config . | indent 10 }}
+        {{- end }}
+    {{- end }}
+      {{- if .Values.access.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.access.livenessProbe.config . | indent 10 }}
+        {{- end }}
+      {{- end }}
+    {{- end }}
+      - name: {{ .Values.artifactory.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          set -e;
+        {{- range .Values.artifactory.copyOnEveryStartup }}
+          {{- $targetPath := printf "%s/%s" $.Values.artifactory.persistence.mountPath .target }}
+          {{- $baseDirectory := regexFind ".*/" $targetPath }}
+          mkdir -p {{ $baseDirectory }};
+          cp -Lrf {{ .source }} {{ $.Values.artifactory.persistence.mountPath }}/{{ .target }};
+        {{- end }}
+        {{- if .Values.artifactory.preStartCommand }}
+          echo "Running custom preStartCommand command";
+          {{ tpl .Values.artifactory.preStartCommand . }};
+        {{- end }}
+        {{- with .Values.artifactory.node.preStartCommand }}
+          echo "Running member node specific custom preStartCommand command";
+          {{ tpl . $ }};
+        {{- end }}
+          exec /entrypoint-artifactory.sh
+        {{- with .Values.artifactory.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+      {{- if .Values.aws.license.enabled }}
+        - name: IS_AWS_LICENSE
+          value: "true"
+        - name: AWS_REGION
+          value: {{ .Values.aws.region | quote }}
+      {{- if .Values.aws.licenseConfigSecretName }}
+        - name: AWS_WEB_IDENTITY_REFRESH_TOKEN_FILE
+          value: "/var/run/secrets/product-license/license_token"
+        - name: AWS_ROLE_ARN
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.aws.licenseConfigSecretName }}
+              key: iam_role
+      {{- end }}
+      {{- end }}
+      {{- if .Values.splitServicesToContainers }}
+        - name : JF_ROUTER_ENABLED
+          value: "true"
+        - name : JF_ROUTER_SERVICE_ENABLED
+          value: "false"
+        - name : JF_EVENT_ENABLED
+          value: "false"
+        - name : JF_METADATA_ENABLED
+          value: "false"
+        - name : JF_FRONTEND_ENABLED
+          value: "false"
+        - name: JF_FEDERATION_ENABLED
+          value: "false"
+        - name : JF_OBSERVABILITY_ENABLED
+          value: "false"
+        - name : JF_JFCONNECT_SERVICE_ENABLED
+          value: "false"
+        - name : JF_EVIDENCE_ENABLED
+          value: "false"
+        {{- if not (.Values.access.runOnArtifactoryTomcat | default false) }}
+        - name : JF_ACCESS_ENABLED
+          value: "false"
+        {{- end}}
+      {{- end }}
+      {{- if and (not .Values.waitForDatabase) (not .Values.postgresql.enabled) }}
+        - name: SKIP_WAIT_FOR_EXTERNAL_DB
+          value: "true"
+      {{- end }}
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+        - name: JF_SHARED_NODE_HAENABLED
+          value: "true"
+{{- with .Values.artifactory.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        ports:
+        - containerPort: {{ .Values.artifactory.internalPort }}
+          name: http
+        - containerPort: {{ .Values.artifactory.internalArtifactoryPort }}
+          name: http-internal
+      {{- if .Values.federation.enabled }}
+        - containerPort: {{ .Values.federation.internalPort }}
+          name: http-rtfs
+      {{- end }}
+        {{- if .Values.artifactory.node.javaOpts.jmx.enabled }}
+        - containerPort: {{ .Values.artifactory.node.javaOpts.jmx.port }}
+          name: tcp-jmx
+        {{- end }}
+        {{- if .Values.artifactory.ssh.enabled }}
+        - containerPort: {{ .Values.artifactory.ssh.internalPort }}
+          name: tcp-ssh
+        {{- end }}
+        volumeMounts:
+       {{- if .Values.artifactory.customPersistentVolumeClaim }}
+        - name: {{ .Values.artifactory.customPersistentVolumeClaim.name }}
+          mountPath: {{ .Values.artifactory.customPersistentVolumeClaim.mountPath }}
+       {{- end }}
+        {{- if .Values.artifactory.customPersistentPodVolumeClaim }}
+        - name: {{ .Values.artifactory.customPersistentPodVolumeClaim.name }}
+          mountPath: {{ .Values.artifactory.customPersistentPodVolumeClaim.mountPath }}
+        {{- end }}
+        {{- if .Values.aws.licenseConfigSecretName }}
+        - name: awsmp-product-license
+          mountPath: "/var/run/secrets/product-license"
+        {{- end }}
+        - name: volume
+          mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+
+      ######################## Artifactory persistence fs ##########################
+      {{- if eq .Values.artifactory.persistence.type "file-system" }}
+        {{- if .Values.artifactory.persistence.fileSystem.existingSharedClaim.enabled }}
+          {{- range $sharedClaimNumber, $e := until (.Values.artifactory.persistence.fileSystem.existingSharedClaim.numberOfExistingClaims|int) }}
+        - name: artifactory-ha-data-{{ $sharedClaimNumber }}
+          mountPath: "{{ tpl $.Values.artifactory.persistence.fileSystem.existingSharedClaim.dataDir $ }}/filestore{{ $sharedClaimNumber }}"
+          {{- end }}
+        - name: artifactory-ha-backup
+          mountPath: "{{ $.Values.artifactory.persistence.fileSystem.existingSharedClaim.backupDir }}"
+        {{- end }}
+      {{- end }}
+
+      ######################## Artifactory persistence nfs ##########################
+      {{- if eq .Values.artifactory.persistence.type "nfs" }}
+        - name: artifactory-ha-data
+          mountPath: "{{ .Values.artifactory.persistence.nfs.dataDir }}"
+        - name: artifactory-ha-backup
+          mountPath: "{{ .Values.artifactory.persistence.nfs.backupDir }}"
+      {{- else }}
+
+      ######################## Artifactory persistence binarystore Xml ##########################
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+        - name: binarystore-xml
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/tmp/etc/artifactory/binarystore.xml"
+          subPath: binarystore.xml
+
+      ######################## Artifactory persistence google storage ##########################
+      {{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+        - name: gcpcreds-json
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/artifactory_bootstrap/gcp.credentials.json"
+          subPath: gcp.credentials.json
+      {{- end }}
+
+      ######################## Artifactory ConfigMap ##########################
+      {{- if .Values.artifactory.configMapName }}
+        - name: bootstrap-config
+          mountPath: "/bootstrap/"
+      {{- end }}
+
+      ######################## Artifactory license ##########################
+      {{- if or .Values.artifactory.license.secret .Values.artifactory.license.licenseKey }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.license.secret }}
+        - name: artifactory-license
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/artifactory_bootstrap/artifactory.cluster.license"
+          {{- if .Values.artifactory.license.secret }}
+          subPath: {{ .Values.artifactory.license.dataKey }}
+          {{- else if .Values.artifactory.license.licenseKey }}
+          subPath: artifactory.lic
+          {{- end }}
+      {{- end }}
+    {{- end }}
+        - name: installer-info
+          mountPath: "/artifactory_bootstrap/info/installer-info.json"
+          subPath: installer-info.json
+      {{- if or .Values.artifactory.customVolumeMounts .Values.global.customVolumeMounts }}
+{{ tpl (include "artifactory-ha.customVolumeMounts" .) . | indent 8 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.artifactory.node.resources | indent 10 }}
+        {{- if .Values.artifactory.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.artifactory.startupProbe.config . | indent 10 }}
+        {{- end }}
+    {{- if and (not .Values.splitServicesToContainers) (semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version) }}
+        {{- if .Values.artifactory.readinessProbe.enabled }}
+        readinessProbe:
+{{ tpl .Values.artifactory.readinessProbe.config . | indent 10 }}
+        {{- end }}
+    {{- end }}
+        {{- if .Values.artifactory.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.artifactory.livenessProbe.config . | indent 10 }}
+        {{- end }}
+      {{- $mountPath := .Values.artifactory.persistence.mountPath }}
+      {{- range .Values.artifactory.loggers }}
+      - name: {{ . | replace "_" "-" | replace "." "-" }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list $ "initContainers") }}
+        imagePullPolicy: {{ $.Values.initContainers.image.pullPolicy }}
+      {{- if $.Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit $.Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - 'sh'
+          - '-c'
+          - 'sh /scripts/tail-log.sh {{ $mountPath }}/log {{ . }}'
+        volumeMounts:
+        - name: volume
+          mountPath: {{ $mountPath }}
+        - name: tail-logger-script
+          mountPath: /scripts/tail-log.sh
+          subPath: tail-log.sh
+        resources:
+{{ toYaml $.Values.artifactory.loggersResources | indent 10 }}
+      {{- end }}
+      {{- if .Values.artifactory.catalinaLoggers }}
+      {{- range .Values.artifactory.catalinaLoggers }}
+      - name: {{ . | replace "_" "-" | replace "." "-" }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list $ "initContainers") }}
+        imagePullPolicy: {{ $.Values.initContainers.image.pullPolicy }}
+      {{- if $.Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit $.Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - 'sh'
+        - '-c'
+        - 'sh /scripts/tail-log.sh {{ $mountPath }}/log/tomcat {{ . }}'
+        volumeMounts:
+        - name: volume
+          mountPath: {{ $mountPath }}
+        - name: tail-logger-script
+          mountPath: /scripts/tail-log.sh
+          subPath: tail-log.sh
+        resources:
+{{ toYaml $.Values.artifactory.catalinaLoggersResources | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.filebeat.enabled }}
+      - name: {{ .Values.filebeat.name }}
+        image: "{{ .Values.filebeat.image.repository }}:{{ .Values.filebeat.image.version }}"
+        imagePullPolicy: {{ .Values.filebeat.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        args:
+        - "-e"
+        - "-E"
+        - "http.enabled=true"
+        env:
+{{- with .Values.filebeat.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 10 }}
+{{- end }}
+        volumeMounts:
+        - name: filebeat-config
+          mountPath: /usr/share/filebeat/filebeat.yml
+          readOnly: true
+          subPath: filebeat.yml
+        - name: volume
+          mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+        livenessProbe:
+{{ toYaml .Values.filebeat.livenessProbe | indent 10 }}
+        readinessProbe:
+{{ toYaml .Values.filebeat.readinessProbe | indent 10 }}
+        resources:
+{{ toYaml .Values.filebeat.resources | indent 10 }}
+      {{- end }}
+    {{- if or .Values.artifactory.customSidecarContainers .Values.global.customSidecarContainers }}
+{{ tpl (include "artifactory-ha.customSidecarContainers" .) . | indent 6 }}
+    {{- end }}
+    {{- if or .Values.artifactory.node.nodeSelector .Values.global.nodeSelector }}
+{{ tpl (include "artifactory.node.nodeSelector" .) . | indent 6 }}
+    {{- end }}
+    {{- if .Values.artifactory.node.affinity }}
+    {{- with .Values.artifactory.node.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- else if eq .Values.artifactory.node.podAntiAffinity.type "soft" }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              topologyKey: {{ .Values.artifactory.node.podAntiAffinity.topologyKey }}
+              labelSelector:
+                matchLabels:
+                  app: {{ template "artifactory-ha.name" . }}
+                  release: {{ .Release.Name }}
+                  {{- if eq .Values.artifactory.service.pool "members" }}
+                  role: {{ template "artifactory-ha.node.name" . }}
+                  {{- end }}
+    {{- else if eq .Values.artifactory.node.podAntiAffinity.type "hard" }}
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - topologyKey: {{ .Values.artifactory.node.podAntiAffinity.topologyKey }}
+            labelSelector:
+              matchLabels:
+                app: {{ template "artifactory-ha.name" . }}
+                release: {{ .Release.Name }}
+                {{- if eq .Values.artifactory.service.pool "members" }}
+                role: {{ template "artifactory-ha.node.name" . }}
+                {{- end }}
+    {{- end }}
+    {{- with .Values.artifactory.node.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+
+      volumes:
+      ########## External secrets ###########
+      {{- if or .Values.artifactory.customCertificates.enabled .Values.global.customCertificates.enabled }}
+      - name: ca-certs
+        secret:
+          secretName: {{ default .Values.global.customCertificates.certificateSecretName .Values.artifactory.customCertificates.certificateSecretName }}
+      {{- end }}
+
+      {{- if .Values.artifactory.circleOfTrustCertificatesSecret }}
+      - name: circle-of-trust-certs
+        secret:
+          secretName: {{ .Values.artifactory.circleOfTrustCertificatesSecret }}
+      {{- end }}
+
+      {{- if .Values.aws.licenseConfigSecretName }}
+      - name: awsmp-product-license
+        secret:
+          secretName: {{ .Values.aws.licenseConfigSecretName }}
+      {{- end }}
+      {{- if .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+      - name: binarystore-xml
+        secret:
+          secretName: {{ .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+      {{- end }}
+      {{- if .Values.systemYamlOverride.existingSecret }}
+      - name: systemyaml
+        secret:
+          secretName: {{ .Values.systemYamlOverride.existingSecret }}
+      {{- end }}
+      {{- if .Values.artifactory.license.secret }}
+      - name: artifactory-license
+        secret:
+          secretName: {{ .Values.artifactory.license.secret }}
+      {{- end }}
+
+      {{- if and .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+      - name: gcpcreds-json
+        secret:
+          secretName: {{ .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+      {{- end }}
+
+      ############ Config map, Volumes and Custom Volumes ##############
+      {{- if .Values.artifactory.migration.enabled }}
+      - name: migration-scripts
+        configMap:
+          name: {{ template "artifactory-ha.fullname" . }}-migration-scripts
+      {{- end }}
+      - name: installer-info
+        configMap:
+          name: {{ template "artifactory-ha.fullname" . }}-installer-info
+      {{- if .Values.artifactory.configMapName }}
+      - name: bootstrap-config
+        configMap:
+          name: {{ .Values.artifactory.configMapName }}
+      {{- end}}
+      {{- if or .Values.artifactory.loggers .Values.artifactory.catalinaLoggers }}
+      - name: tail-logger-script
+        configMap:
+          name: {{ template "artifactory-ha.fullname" . }}-logger
+      {{- end }}
+      {{- if .Values.artifactory.configMaps }}
+      - name: artifactory-configmaps
+        configMap:
+          name: {{ template "artifactory-ha.fullname" . }}-configmaps
+      {{- end }}
+
+      {{- if eq .Values.artifactory.persistence.type "file-system" }}
+        {{- if .Values.artifactory.persistence.fileSystem.existingSharedClaim.enabled }}
+          {{- range $sharedClaimNumber, $e := until (.Values.artifactory.persistence.fileSystem.existingSharedClaim.numberOfExistingClaims|int) }}
+      - name: artifactory-ha-data-{{ $sharedClaimNumber }}
+        persistentVolumeClaim:
+          claimName: {{ template "artifactory-ha.fullname" $ }}-data-pvc-{{ $sharedClaimNumber }}
+          {{- end }}
+      - name: artifactory-ha-backup
+        persistentVolumeClaim:
+          claimName: {{ template "artifactory-ha.fullname" $ }}-backup-pvc
+        {{- end }}
+      {{- end }}
+
+      {{- if eq .Values.artifactory.persistence.type "nfs" }}
+      - name: artifactory-ha-data
+        persistentVolumeClaim:
+          claimName: {{ template "artifactory-ha.fullname" . }}-data-pvc
+      - name: artifactory-ha-backup
+        persistentVolumeClaim:
+          claimName: {{ template "artifactory-ha.fullname" . }}-backup-pvc
+      {{- end }}
+
+      {{- if .Values.artifactory.customPersistentVolumeClaim }}
+      - name: {{ .Values.artifactory.customPersistentVolumeClaim.name }}
+        persistentVolumeClaim:
+          claimName: {{ .Values.artifactory.customPersistentVolumeClaim.name }}
+      {{- end }}
+      {{- if .Values.filebeat.enabled }}
+      - name: filebeat-config
+        configMap:
+          name: {{ template "artifactory-ha.fullname" . }}-filebeat-config
+      {{- end }}
+      {{- if and (or .Values.artifactory.customVolumes .Values.global.customVolumes) }}
+{{ tpl (include "artifactory-ha.customVolumes" .) . | indent 6 }}
+      {{- end }}
+  {{- if not .Values.artifactory.persistence.enabled }}
+      - name: volume
+        emptyDir:
+          sizeLimit: {{ .Values.artifactory.persistence.size }}
+  {{- end }}
+
+      #########  unifiedSecretInstallation ###########
+    {{- if and .Values.artifactory.unifiedSecretInstallation (eq (include "artifactory-ha.checkDuplicateUnifiedCustomVolume" .) "false" ) }}
+      - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        secret:
+          secretName: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+
+    {{- else if not .Values.artifactory.unifiedSecretInstallation }}
+
+      ############ If single secret installation flag is disable ############
+      {{- if and .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled (not .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName) }}
+      - name: gcpcreds-json
+        secret:
+          secretName: {{ template "artifactory-ha.fullname" . }}-gcpcreds
+      {{- end }}
+      {{- if and .Values.artifactory.license.licenseKey (not .Values.artifactory.license.secret) }}
+      - name: artifactory-license
+        secret:
+          secretName: {{ template "artifactory-ha.fullname" . }}-license
+      {{- end }}
+
+      {{- if and (not .Values.systemYamlOverride.existingSecret) }}
+      - name: systemyaml
+        secret:
+          secretName:  {{ template "artifactory-ha.primary.name" . }}-system-yaml
+      {{- end }}
+
+      {{- if not .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+      - name: binarystore-xml
+        secret:
+          secretName: {{ template "artifactory-ha.fullname" . }}-binarystore
+      {{- end }}
+    {{- end }}
+
+  volumeClaimTemplates:
+  {{- if .Values.artifactory.persistence.enabled }}
+  - metadata:
+      name: volume
+    {{- if not .Values.artifactory.node.persistence.existingClaim }}
+    spec:
+      {{- if .Values.artifactory.persistence.storageClassName }}
+      {{- if (eq "-" .Values.artifactory.persistence.storageClassName) }}
+      storageClassName: ""
+      {{- else }}
+      storageClassName: "{{ .Values.artifactory.persistence.storageClassName }}"
+      {{- end }}
+      {{- end }}
+      accessModes: [ "{{ .Values.artifactory.persistence.accessMode }}" ]
+      resources:
+        requests:
+          storage: {{ .Values.artifactory.persistence.size }}
+    {{- end }}
+  {{- end }}
+  {{- if .Values.artifactory.customPersistentPodVolumeClaim }}
+  - metadata:
+      name: {{ .Values.artifactory.customPersistentPodVolumeClaim.name }}
+    spec:
+    {{- if .Values.artifactory.customPersistentPodVolumeClaim.storageClassName }}
+      {{- if (eq "-" .Values.artifactory.customPersistentPodVolumeClaim.storageClassName) }}
+      storageClassName: ""
+      {{- else }}
+      storageClassName: "{{ .Values.artifactory.customPersistentPodVolumeClaim.storageClassName }}"
+      {{- end }}
+    {{- end }}
+      accessModes:
+     {{- range .Values.artifactory.customPersistentPodVolumeClaim.accessModes }}
+        - {{ . | quote }}
+     {{- end }}
+      resources:
+        requests:
+          storage: {{ .Values.artifactory.customPersistentPodVolumeClaim.size }}
+  {{- end }}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-primary-pdb.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-primary-pdb.yaml
new file mode 100644
index 000000000..da1c70e69
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-primary-pdb.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.artifactory.primary.minAvailable -}}
+{{- if semverCompare "<v1.21.0-0" .Capabilities.KubeVersion.Version }}
+apiVersion: policy/v1beta1
+{{- else }}
+apiVersion: policy/v1
+{{- end }}
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-primary
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+spec:
+  selector:
+    matchLabels:
+      component: {{ .Values.artifactory.name }}
+      app: {{ template "artifactory-ha.name" . }}
+      role: {{ template "artifactory-ha.primary.name" . }}
+      release: {{ .Release.Name }}
+  minAvailable: {{ .Values.artifactory.primary.minAvailable }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-primary-service.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-primary-service.yaml
new file mode 100644
index 000000000..1bd2ebb8c
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-primary-service.yaml
@@ -0,0 +1,61 @@
+{{- if gt (.Values.artifactory.primary.replicaCount | int) 0  -}}
+# Internal service for Artifactory primary node only!
+# Used by member nodes to check readiness of primary node before starting up
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "artifactory-ha.primary.name" . }}
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    {{- with .Values.artifactory.primary.labels }}
+{{ toYaml . | indent 4 }}
+    {{- end }}
+{{- with .Values.artifactory.primary.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+  # Statically setting service type to ClusterIP since this is an internal only service
+  type: ClusterIP
+  {{- if and (eq .Values.artifactory.service.type "ClusterIP") .Values.artifactory.service.clusterIP }}
+  clusterIP: {{ .Values.artifactory.service.clusterIP }}
+  {{- end }}
+  {{- if .Values.artifactory.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.artifactory.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if not (empty .Values.artifactory.service.ipFamilies)}}
+  ipFamilies: {{- toYaml .Values.artifactory.service.ipFamilies | nindent 4 }}
+  {{- end }}
+  ports:
+  - port: {{ .Values.artifactory.externalPort }}
+    targetPort: {{ .Values.artifactory.internalPort }}
+    protocol: TCP
+    name: http-router
+  - port: {{ .Values.artifactory.externalArtifactoryPort }}
+    targetPort: {{ .Values.artifactory.internalArtifactoryPort }}
+    protocol: TCP
+    name: http-artifactory
+  {{- if .Values.artifactory.ssh.enabled }}
+  - port: {{ .Values.artifactory.ssh.externalPort }}
+    targetPort: {{ .Values.artifactory.ssh.internalPort }}
+    protocol: TCP
+    name: tcp-ssh
+  {{- end }}
+  {{- with .Values.artifactory.primary.javaOpts.jmx }}
+  {{- if .enabled }}
+  - port: {{ .port }}
+    targetPort: {{ .port }}
+    protocol: TCP
+    name: tcp-jmx
+  {{- end }}
+  {{- end }}
+  selector:
+    role: {{ template "artifactory-ha.primary.name" . }}
+    app: {{ template "artifactory-ha.name" . }}
+    component: "{{ .Values.artifactory.name }}"
+    release: {{ .Release.Name }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-primary-statefulset.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-primary-statefulset.yaml
new file mode 100644
index 000000000..57c44bd22
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-primary-statefulset.yaml
@@ -0,0 +1,1764 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: {{ template "artifactory-ha.primary.name" . }}
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    version: {{ include "artifactory-ha.app.version" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+{{- with .Values.artifactory.primary.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and .Release.IsUpgrade .Values.postgresql.enabled }}
+    databaseUpgradeReady: {{ required "\n\n*********\nIMPORTANT: UPGRADE STOPPED to prevent data loss!\nReview CHANGELOG.md (https://github.com/jfrog/charts/blob/master/stable/artifactory-ha/CHANGELOG.md) \nNote: This applies only when you are using bundled postgresql (postgresql.enabled=true) \nIf you are upgrading from a chart version (< 107.79.x) that has postgresql.image.tag of 9.x or 10.x or 12.x or 13.x, make sure to set the current postgresql.image.tag to the same tag and databaseUpgradeReady=true \nOR \nIf you are upgrading from a chart version (>= 107.79.x), just set databaseUpgradeReady=true \n" .Values.databaseUpgradeReady | quote }}
+{{- end }}
+{{- if .Values.artifactory.postStartCommand }}
+    {{- fail ".Values.artifactory.postStartCommand is not supported and should be replaced with .Values.artifactory.lifecycle.postStart.exec.command" }}
+{{- end }}
+{{- if eq .Values.artifactory.persistence.type "aws-s3" }}
+    {{- fail "\nPersistence storage type 'aws-s3' is deprecated and is not supported and should be replaced with 'aws-s3-v3'" }}
+{{- end }}
+{{- if or .Values.artifactory.persistence.googleStorage.identity .Values.artifactory.persistence.googleStorage.credential }}
+    {{- fail "\nGCP Bucket Authentication with Identity and Credential is deprecated" }}
+{{- end }}
+{{- if (eq (.Values.artifactory.setSecurityContext | toString) "false" ) }}
+    {{- fail "\n You need to set security context at the pod level. .Values.artifactory.setSecurityContext is no longer supported. Replace it with .Values.artifactory.podSecurityContext" }}
+{{- end }}
+{{- if or .Values.artifactory.uid .Values.artifactory.gid }}
+{{- if or (not (eq (.Values.artifactory.uid | toString) "1030" )) (not (eq (.Values.artifactory.gid | toString) "1030" )) }}
+    {{- fail "\n .Values.artifactory.uid and .Values.artifactory.gid are no longer supported. You need to set these values at the pod security context level. Replace them with .Values.artifactory.podSecurityContext.runAsUser, .Values.artifactory.podSecurityContext.runAsGroup and .Values.artifactory.podSecurityContext.fsGroup" }}
+{{- end }}
+{{- end }}
+{{- if or .Values.artifactory.fsGroupChangePolicy .Values.artifactory.seLinuxOptions }}
+    {{- fail "\n .Values.artifactory.fsGroupChangePolicy and .Values.artifactory.seLinuxOptions are no longer supported. You need to set these values at the pod security context level. Replace them with .Values.artifactory.podSecurityContext.fsGroupChangePolicy and .Values.artifactory.podSecurityContext.seLinuxOptions" }}
+{{- end }}
+{{- if .Values.initContainerImage }}
+    {{- fail "\n .Values.initContainerImage is no longer supported. Replace it with .Values.initContainers.image.registry .Values.initContainers.image.repository and .Values.initContainers.image.tag" }}
+{{- end }}
+{{- with .Values.artifactory.statefulset.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+  serviceName: {{ template "artifactory-ha.primary.name" . }}
+  replicas: {{ .Values.artifactory.primary.replicaCount }}
+  updateStrategy: {{- toYaml .Values.artifactory.primary.updateStrategy | nindent 4}}
+  selector:
+    matchLabels:
+      app: {{ template "artifactory-ha.name" . }}
+      role: {{ template "artifactory-ha.primary.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "artifactory-ha.name" . }}
+        chart: {{ template "artifactory-ha.chart" . }}
+        role: {{ template "artifactory-ha.primary.name" . }}
+        component: {{ .Values.artifactory.name }}
+        heritage: {{ .Release.Service }}
+        release: {{ .Release.Name }}
+        {{- with .Values.artifactory.primary.labels }}
+{{ toYaml . | indent 8 }}
+        {{- end }}
+      annotations:
+      {{- if not .Values.artifactory.unifiedSecretInstallation }}
+        checksum/database-secrets: {{ include (print $.Template.BasePath "/artifactory-database-secrets.yaml") . | sha256sum }}
+        checksum/binarystore: {{ include (print $.Template.BasePath "/artifactory-binarystore-secret.yaml") . | sha256sum }}
+        checksum/systemyaml: {{ include (print $.Template.BasePath "/artifactory-system-yaml.yaml") . | sha256sum }}
+      {{- if .Values.access.accessConfig }}
+        checksum/access-config: {{ include (print $.Template.BasePath "/artifactory-access-config.yaml") . | sha256sum }}
+      {{- end }}
+      {{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
+        checksum/gcpcredentials: {{ include (print $.Template.BasePath "/artifactory-gcp-credentials-secret.yaml") . | sha256sum }}
+      {{- end }}
+      {{- if not (and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey) }}
+        checksum/admin-creds: {{ include (print $.Template.BasePath "/admin-bootstrap-creds.yaml") . | sha256sum }}
+      {{- end }}
+      {{- else }}
+        checksum/artifactory-unified-secret: {{ include (print $.Template.BasePath "/artifactory-unified-secret.yaml") . | sha256sum }}
+      {{- end }}
+      {{- with .Values.artifactory.annotations }}
+{{ toYaml . | indent 8 }}
+      {{- end }}
+    spec:
+    {{- if .Values.artifactory.schedulerName }}
+      schedulerName: {{ .Values.artifactory.schedulerName | quote }}
+    {{- end }}
+    {{- if .Values.artifactory.priorityClass.existingPriorityClass }}
+      priorityClassName: {{ .Values.artifactory.priorityClass.existingPriorityClass }}
+    {{- else -}}
+      {{- if .Values.artifactory.priorityClass.create }}
+      priorityClassName: {{ default (include "artifactory-ha.fullname" .) .Values.artifactory.priorityClass.name }}
+      {{- end }}
+    {{- end }}
+      serviceAccountName: {{ template "artifactory-ha.serviceAccountName" . }}
+      terminationGracePeriodSeconds: {{ add .Values.artifactory.terminationGracePeriodSeconds 10 }}
+    {{- if or .Values.imagePullSecrets .Values.global.imagePullSecrets }}
+{{- include "artifactory-ha.imagePullSecrets" . | indent 6 }}
+    {{- end }}
+      {{- if .Values.artifactory.podSecurityContext.enabled }}
+      securityContext: {{- omit .Values.artifactory.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if .Values.artifactory.topologySpreadConstraints }}
+      topologySpreadConstraints:
+{{ tpl (toYaml .Values.artifactory.topologySpreadConstraints) . | indent 8 }}
+      {{- end }}
+      initContainers:
+    {{- if or .Values.artifactory.customInitContainersBegin .Values.global.customInitContainersBegin }}
+{{ tpl (include "artifactory-ha.customInitContainersBegin" .)  . | indent 6 }}
+    {{- end }}
+  {{- if .Values.artifactory.persistence.enabled }}
+    {{- if eq .Values.artifactory.persistence.type "file-system" }}
+      {{- if .Values.artifactory.persistence.fileSystem.existingSharedClaim.enabled }}
+      - name: "create-artifactory-data-dir"
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        command:
+        - 'bash'
+        - '-c'
+        - >
+          mkdir -p {{ tpl .Values.artifactory.persistence.fileSystem.existingSharedClaim.dataDir . }};
+        volumeMounts:
+        - mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+          name: volume
+      {{- end }}
+    {{- end }}
+      {{- if .Values.artifactory.deleteDBPropertiesOnStartup }}
+      - name: "delete-db-properties"
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        command:
+        - 'bash'
+        - '-c'
+        - 'rm -fv {{ .Values.artifactory.persistence.mountPath }}/etc/db.properties'
+        volumeMounts:
+        - mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+          name: volume
+      {{- end }}
+    {{- if or (and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey) .Values.artifactory.admin.password }}
+      - name: "access-bootstrap-creds"
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        command:
+          - 'bash'
+          - '-c'
+          - >
+            echo "Preparing {{ .Values.artifactory.persistence.mountPath }}/etc/access/bootstrap.creds";
+            mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/access;
+            cp -Lrf /tmp/access/bootstrap.creds {{ .Values.artifactory.persistence.mountPath }}/etc/access/bootstrap.creds;
+            chmod 600 {{ .Values.artifactory.persistence.mountPath }}/etc/access/bootstrap.creds;
+        volumeMounts:
+          - name: volume
+            mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+          {{- if or (not .Values.artifactory.unifiedSecretInstallation) (and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey) }}
+          - name: access-bootstrap-creds
+          {{- else }}
+          - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+          {{- end }}
+            mountPath: "/tmp/access/bootstrap.creds"
+            {{- if and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey }}
+            subPath: {{ .Values.artifactory.admin.dataKey }}
+            {{- else }}
+            subPath: bootstrap.creds
+            {{- end }}
+    {{- end }}
+  {{- end }}
+      - name: 'copy-system-configurations'
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          if [[ -e "{{ .Values.artifactory.persistence.mountPath }}/etc/filebeat.yaml" ]]; then chmod 644 {{ .Values.artifactory.persistence.mountPath }}/etc/filebeat.yaml; fi;
+          echo "Copy system.yaml to {{ .Values.artifactory.persistence.mountPath }}/etc";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc;
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/access/keys/trusted;
+          {{- if .Values.systemYamlOverride.existingSecret }}
+          cp -fv /tmp/etc/{{ .Values.systemYamlOverride.dataKey }} {{ .Values.artifactory.persistence.mountPath }}/etc/system.yaml;
+          {{- else }}
+          cp -fv /tmp/etc/system.yaml {{ .Values.artifactory.persistence.mountPath }}/etc/system.yaml;
+          {{- end }}
+          echo "Copy binarystore.xml file";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/artifactory;
+          cp -fv /tmp/etc/artifactory/binarystore.xml {{ .Values.artifactory.persistence.mountPath }}/etc/artifactory/binarystore.xml;
+        {{- if .Values.access.accessConfig }}
+          echo "Copy access.config.patch.yml to {{ .Values.artifactory.persistence.mountPath }}/etc/access";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/access;
+          cp -fv /tmp/etc/access.config.patch.yml {{ .Values.artifactory.persistence.mountPath }}/etc/access/access.config.patch.yml;
+        {{- end }}
+        {{- if .Values.access.resetAccessCAKeys }}
+          echo "Resetting Access CA Keys";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/bootstrap/etc/access/keys;
+          touch {{ .Values.artifactory.persistence.mountPath }}/bootstrap/etc/access/keys/reset_ca_keys;
+        {{- end }}
+        {{- if .Values.access.customCertificatesSecretName }}
+          echo "Copying custom certificates to {{ .Values.artifactory.persistence.mountPath }}/bootstrap/etc/access/keys";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/bootstrap/etc/access/keys;
+          cp -fv /tmp/etc/tls.crt {{ .Values.artifactory.persistence.mountPath }}/bootstrap/etc/access/keys/ca.crt;
+          cp -fv /tmp/etc/tls.key {{ .Values.artifactory.persistence.mountPath }}/bootstrap/etc/access/keys/ca.private.key;
+        {{- end }}
+        {{- if .Values.jfconnect.customCertificatesSecretName }}
+          echo "Copying custom certificates to {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/etc/keys";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/etc/keys;
+          cp -fv /tmp/etc/tls.crt {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/etc/keys/;
+          cp -fv /tmp/etc/tls.cer {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/etc/keys/;
+          cp -fv /tmp/etc/tls.pem {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/etc/keys/;
+          cp -fv /tmp/etc/tls.key {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/etc/keys/;
+        {{- end }}
+        {{- if or .Values.artifactory.joinKey .Values.global.joinKey .Values.artifactory.joinKeySecretName .Values.global.joinKeySecretName }}
+          echo "Copy joinKey to {{ .Values.artifactory.persistence.mountPath }}/bootstrap/access/etc/security";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/bootstrap/access/etc/security;
+          echo -n ${ARTIFACTORY_JOIN_KEY} > {{ .Values.artifactory.persistence.mountPath }}/bootstrap/access/etc/security/join.key;
+        {{- end }}
+        {{- if or .Values.artifactory.jfConnectToken .Values.artifactory.jfConnectTokenSecretName }}
+          echo "Copy jfConnectToken to {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/registration_token";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/;
+          echo -n ${ARTIFACTORY_JFCONNECT_TOKEN} > {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/registration_token;
+        {{- end }}
+        {{- if or .Values.artifactory.masterKey .Values.global.masterKey .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName }}
+          echo "Copy masterKey to {{ .Values.artifactory.persistence.mountPath }}/etc/security";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/security;
+          echo -n ${ARTIFACTORY_MASTER_KEY} > {{ .Values.artifactory.persistence.mountPath }}/etc/security/master.key;
+        {{- end }}
+        env:
+        {{- if or .Values.artifactory.joinKey .Values.global.joinKey .Values.artifactory.joinKeySecretName .Values.global.joinKeySecretName }}
+        - name: ARTIFACTORY_JOIN_KEY
+          valueFrom:
+            secretKeyRef:
+            {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.joinKeySecretName .Values.global.joinKeySecretName }}
+              name: {{ include "artifactory-ha.joinKeySecretName" . }}
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: join-key
+        {{- end }}
+        {{- if or .Values.artifactory.jfConnectToken .Values.artifactory.jfConnectTokenSecretName }}
+        - name: ARTIFACTORY_JFCONNECT_TOKEN
+          valueFrom:
+            secretKeyRef:
+            {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.jfConnectTokenSecretName }}
+              name: {{ include "artifactory-ha.jfConnectTokenSecretName" . }}
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: jfconnect-token
+        {{- end }}
+        {{- if or .Values.artifactory.masterKey .Values.global.masterKey .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName }}
+        - name: ARTIFACTORY_MASTER_KEY
+          valueFrom:
+            secretKeyRef:
+            {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName }}
+              name: {{ include "artifactory-ha.masterKeySecretName" . }}
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: master-key
+        {{- end }}
+
+      ######################## Volume Mounts For copy-system-configurations ##########################
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+
+      ######################## SystemYaml ##########################
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.systemYamlOverride.existingSecret }}
+        - name: systemyaml
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          {{- if .Values.systemYamlOverride.existingSecret }}
+          mountPath: "/tmp/etc/{{.Values.systemYamlOverride.dataKey}}"
+          subPath: {{ .Values.systemYamlOverride.dataKey }}
+          {{- else }}
+          mountPath: "/tmp/etc/system.yaml"
+          subPath: system.yaml
+          {{- end }}
+
+      ######################## Binarystore  ##########################
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+        - name: binarystore-xml
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/tmp/etc/artifactory/binarystore.xml"
+          subPath: binarystore.xml
+
+      ######################## Access config  ##########################
+      {{- if .Values.access.accessConfig }}
+        {{- if not .Values.artifactory.unifiedSecretInstallation }}
+        - name: access-config
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/tmp/etc/access.config.patch.yml"
+          subPath: access.config.patch.yml
+      {{- end }}
+
+      ######################## Access certs external secret  ##########################
+      {{- if .Values.access.customCertificatesSecretName }}
+        - name: access-certs
+          mountPath: "/tmp/etc/tls.crt"
+          subPath: tls.crt
+        - name: access-certs
+          mountPath: "/tmp/etc/tls.key"
+          subPath: tls.key
+      {{- end }}
+
+      {{- if .Values.jfconnect.customCertificatesSecretName }}
+        - name: jfconnect-certs
+          mountPath: "/tmp/etc/tls.crt"
+          subPath: tls.crt
+        - name: jfconnect-certs
+          mountPath: "/tmp/etc/tls.pem"
+          subPath: tls.pem
+        - name: jfconnect-certs
+          mountPath: "/tmp/etc/tls.cer"
+          subPath: tls.cer
+        - name: jfconnect-certs
+          mountPath: "/tmp/etc/tls.key"
+          subPath: tls.key
+      {{- end }}
+
+      {{- if or .Values.artifactory.customCertificates.enabled .Values.global.customCertificates.enabled }}
+      - name: copy-custom-certificates
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        command:
+        - 'bash'
+        - '-c'
+        - >
+{{ include "artifactory-ha.copyCustomCerts" . | indent 10 }}
+        volumeMounts:
+          - name: volume
+            mountPath: {{ .Values.artifactory.persistence.mountPath }}
+          - name: ca-certs
+            mountPath: "/tmp/certs"
+      {{- end }}
+
+      {{- if .Values.artifactory.circleOfTrustCertificatesSecret }}
+      - name: copy-circle-of-trust-certificates
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        command:
+        - 'bash'
+        - '-c'
+        - >
+{{ include "artifactory.copyCircleOfTrustCertsCerts" . | indent 10 }}
+        volumeMounts:
+          - name: volume
+            mountPath: {{ .Values.artifactory.persistence.mountPath }}
+          - name: circle-of-trust-certs
+            mountPath: "/tmp/circleoftrustcerts"
+      {{- end }}
+
+    {{- if .Values.waitForDatabase }}
+      {{- if or .Values.postgresql.enabled }}
+      - name: "wait-for-db"
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - /bin/bash
+        - -c
+        - |
+          echo "Waiting for postgresql to come up"
+          ready=false;
+          while ! $ready; do echo waiting;
+            timeout 2s bash -c "</dev/tcp/{{ .Release.Name }}-postgresql/{{ .Values.postgresql.service.port }}"; exit_status=$?;
+            if [[ $exit_status -eq 0 ]]; then ready=true; echo "database ok"; fi; sleep 1;
+          done
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+      {{- end }}
+    {{- end }}
+    {{- if or .Values.artifactory.customInitContainers .Values.global.customInitContainers }}
+{{ tpl (include "artifactory-ha.customInitContainers" .)  . | indent 6 }}
+    {{- end }}
+{{- if .Values.artifactory.migration.enabled }}
+      - name: 'migration-artifactory-ha'
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.artifactory.primary.resources | indent 10 }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          {{- if .Values.artifactory.migration.preStartCommand }}
+          echo "Running custom preStartCommand command";
+          {{ tpl .Values.artifactory.migration.preStartCommand . }};
+          {{- end }}
+          scriptsPath="/opt/jfrog/artifactory/app/bin";
+          mkdir -p $scriptsPath;
+          echo "Copy migration scripts and Run migration";
+          cp -fv /tmp/migrate.sh $scriptsPath/migrate.sh;
+          cp -fv /tmp/migrationHelmInfo.yaml $scriptsPath/migrationHelmInfo.yaml;
+          cp -fv /tmp/migrationStatus.sh $scriptsPath/migrationStatus.sh;
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/log;
+          bash $scriptsPath/migrationStatus.sh {{ include "artifactory-ha.app.version" . }} {{ .Values.artifactory.migration.timeoutSeconds }} > >(tee {{ .Values.artifactory.persistence.mountPath }}/log/helm-migration.log) 2>&1;
+        env:
+      {{- if and (not .Values.waitForDatabase)  (not .Values.postgresql.enabled) }}
+        - name: SKIP_WAIT_FOR_EXTERNAL_DB
+          value: "true"
+      {{- end }}
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+        - name: JF_SHARED_NODE_HAENABLED
+          value: "true"
+{{- with .Values.artifactory.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: migration-scripts
+          mountPath: "/tmp/migrate.sh"
+          subPath: migrate.sh
+        - name: migration-scripts
+          mountPath: "/tmp/migrationHelmInfo.yaml"
+          subPath: migrationHelmInfo.yaml
+        - name: migration-scripts
+          mountPath: "/tmp/migrationStatus.sh"
+          subPath: migrationStatus.sh
+        - name: volume
+          mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+
+      ######################## Artifactory persistence fs ##########################
+      {{- if eq .Values.artifactory.persistence.type "file-system" }}
+        {{- if .Values.artifactory.persistence.fileSystem.existingSharedClaim.enabled }}
+          {{- range $sharedClaimNumber, $e := until (.Values.artifactory.persistence.fileSystem.existingSharedClaim.numberOfExistingClaims|int) }}
+        - name: artifactory-ha-data-{{ $sharedClaimNumber }}
+          mountPath: "{{ tpl $.Values.artifactory.persistence.fileSystem.existingSharedClaim.dataDir $ }}/filestore{{ $sharedClaimNumber }}"
+          {{- end }}
+        - name: artifactory-ha-backup
+          mountPath: "{{ $.Values.artifactory.persistence.fileSystem.existingSharedClaim.backupDir }}"
+        {{- end }}
+      {{- end }}
+
+      ######################## CustomVolumeMounts ##########################
+      {{- if or .Values.artifactory.customVolumeMounts .Values.global.customVolumeMounts }}
+{{ tpl (include "artifactory-ha.customVolumeMounts" .) . | indent 8 }}
+      {{- end }}
+
+      ######################## Artifactory persistence nfs ##########################
+      {{- if eq .Values.artifactory.persistence.type "nfs" }}
+        - name: artifactory-ha-data
+          mountPath: "{{ .Values.artifactory.persistence.nfs.dataDir }}"
+        - name: artifactory-ha-backup
+          mountPath: "{{ .Values.artifactory.persistence.nfs.backupDir }}"
+      {{- else }}
+
+      ######################## Artifactory persistence binarystore Xml ##########################
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+        - name: binarystore-xml
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/tmp/etc/artifactory/binarystore.xml"
+          subPath: binarystore.xml
+
+      ######################## Artifactory persistence google storage ##########################
+      {{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+        - name: gcpcreds-json
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/artifactory_bootstrap/gcp.credentials.json"
+          subPath: gcp.credentials.json
+      {{- end }}
+    {{- end }}
+
+{{- end }}
+
+      {{- if .Values.hostAliases }}
+      hostAliases:
+{{ toYaml .Values.hostAliases | indent 6 }}
+      {{- end }}
+      containers:
+    {{- if .Values.splitServicesToContainers }}
+      - name: {{ .Values.router.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "router") }}
+        imagePullPolicy: {{ .Values.router.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/router/app/bin/entrypoint-router.sh;
+        {{- with .Values.router.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES
+          value: {{ include "artifactory-ha.router.requiredServiceTypes" . }}
+{{- with .Values.router.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.router.persistence.mountPath | quote }}
+{{- with .Values.router.customVolumeMounts }}
+{{ tpl . $ | indent 8 }}
+{{- end }}
+        resources:
+{{ toYaml .Values.router.resources | indent 10 }}
+      {{- if .Values.router.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.router.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.router.readinessProbe.enabled }}
+        readinessProbe:
+{{ tpl .Values.router.readinessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.router.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.router.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.frontend.enabled }}
+      - name: {{ .Values.frontend.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/third-party/node/bin/node /opt/jfrog/artifactory/app/frontend/bin/server/dist/bundle.js /opt/jfrog/artifactory/app/frontend
+        {{- with .Values.frontend.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name : JF_SHARED_NODE_HAENABLED
+          value: "true"
+{{- with .Values.frontend.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.frontend.resources | indent 10 }}
+      {{- if .Values.frontend.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.frontend.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.frontend.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.frontend.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.evidence.enabled }}
+      - name: {{ .Values.evidence.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          exec /opt/jfrog/artifactory/app/evidence/bin/jf-evidence start
+        {{- with .Values.evidence.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+{{- with .Values.evidence.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        ports:
+        - containerPort: {{ .Values.evidence.internalPort }}
+          name: http-evidence
+        - containerPort: {{ .Values.evidence.externalPort }}
+          name: grpc-evidence
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.evidence.resources | indent 10 }}
+      {{- if .Values.evidence.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.evidence.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.evidence.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.evidence.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.metadata.enabled }}
+      - name: {{ .Values.metadata.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "metadata") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          {{- if default false .Values.metadata.standaloneImageEnabled }}
+          - exec /opt/jfrog/metadata/app/metadata/bin/jf-metadata
+          {{- else }}
+          - exec /opt/jfrog/artifactory/app/metadata/bin/jf-metadata start
+          {{- end }}
+        {{- with .Values.metadata.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+{{- with .Values.metadata.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+      {{- if or .Values.artifactory.customVolumeMounts .Values.global.customVolumeMounts }}
+{{ tpl (include "artifactory-ha.customVolumeMounts" .) . | indent 8 }}
+      {{- end }}
+        - name: volume
+          {{- if default false .Values.metadata.standaloneImageEnabled }}
+          mountPath: {{ .Values.metadata.persistence.mountPath | quote }}
+          {{- else }}
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+          {{- end }}
+        resources:
+{{ toYaml .Values.metadata.resources | indent 10 }}
+      {{- if .Values.metadata.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.metadata.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.metadata.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.metadata.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.event.enabled }}
+      - name: {{ .Values.event.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/event/bin/jf-event start
+        {{- with .Values.event.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+{{- with .Values.event.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.event.resources | indent 10 }}
+      {{- if .Values.event.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.event.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.event.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.event.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.jfconnect.enabled }}
+      - name: {{ .Values.jfconnect.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/jfconnect/bin/jf-connect start
+        {{- with .Values.jfconnect.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+{{- with .Values.jfconnect.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.jfconnect.resources | indent 10 }}
+      {{- if .Values.jfconnect.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.jfconnect.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.jfconnect.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.jfconnect.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if and .Values.federation.enabled .Values.federation.embedded }}
+      - name: {{ .Values.federation.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/third-party/java/bin/java {{ .Values.federation.extraJavaOpts }} -jar /opt/jfrog/artifactory/app/rtfs/lib/jf-rtfs
+        {{- with .Values.federation.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+      # TODO - Password,Url,Username - should be derived from env variable
+{{- with .Values.federation.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+      {{- if .Values.federation.enabled }}
+        ports:
+        - containerPort: {{ .Values.federation.internalPort }}
+          name: http-rtfs
+      {{- end }}
+        volumeMounts:
+        - name: volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.federation.resources | indent 10 }}
+      {{- if .Values.federation.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.federation.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.federation.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.federation.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.observability.enabled }}
+      - name: {{ .Values.observability.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "observability") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          {{- if default false .Values.observability.standaloneImageEnabled }}
+          - exec /opt/jfrog/observability/app/bin/entrypoint-observability.sh
+          {{- else }}
+          - exec /opt/jfrog/artifactory/app/observability/bin/jf-observability start
+          {{- end }}
+        {{- with .Values.observability.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+{{- with .Values.observability.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: volume
+          {{- if default false .Values.observability.standaloneImageEnabled }}
+          mountPath: {{ .Values.observability.persistence.mountPath | quote }}
+          {{- else }}
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+          {{- end }}
+        resources:
+{{ toYaml .Values.observability.resources | indent 10 }}
+      {{- if .Values.observability.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.observability.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.observability.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.observability.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if and .Values.access.enabled (not (.Values.access.runOnArtifactoryTomcat | default false)) }}
+      - name: {{ .Values.access.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+      {{- if .Values.access.resources }}
+        resources:
+{{ toYaml .Values.access.resources | indent 10 }}
+      {{- end }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          set -e;
+          {{- if .Values.access.preStartCommand }}
+          echo "Running custom preStartCommand command";
+          {{ tpl .Values.access.preStartCommand . }};
+          {{- end }}
+          exec /opt/jfrog/artifactory/app/access/bin/entrypoint-access.sh
+        {{- with .Values.access.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+      {{- if and (not .Values.waitForDatabase) (not .Values.postgresql.enabled) }}
+        - name: SKIP_WAIT_FOR_EXTERNAL_DB
+          value: "true"
+      {{- end }}
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+{{- with .Values.access.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+       {{- if .Values.artifactory.customPersistentVolumeClaim }}
+        - name: {{ .Values.artifactory.customPersistentVolumeClaim.name }}
+          mountPath: {{ .Values.artifactory.customPersistentVolumeClaim.mountPath }}
+       {{- end }}
+        {{- if .Values.artifactory.customPersistentPodVolumeClaim }}
+        - name: {{ .Values.artifactory.customPersistentPodVolumeClaim.name }}
+          mountPath: {{ .Values.artifactory.customPersistentPodVolumeClaim.mountPath }}
+        {{- end }}
+        {{- if .Values.aws.licenseConfigSecretName }}
+        - name: awsmp-product-license
+          mountPath: "/var/run/secrets/product-license"
+        {{- end }}
+        - name: volume
+          mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+
+      ######################## Artifactory persistence fs ##########################
+      {{- if eq .Values.artifactory.persistence.type "file-system" }}
+        {{- if .Values.artifactory.persistence.fileSystem.existingSharedClaim.enabled }}
+          {{- range $sharedClaimNumber, $e := until (.Values.artifactory.persistence.fileSystem.existingSharedClaim.numberOfExistingClaims|int) }}
+        - name: artifactory-ha-data-{{ $sharedClaimNumber }}
+          mountPath: "{{ tpl $.Values.artifactory.persistence.fileSystem.existingSharedClaim.dataDir $ }}/filestore{{ $sharedClaimNumber }}"
+          {{- end }}
+        - name: artifactory-ha-backup
+          mountPath: "{{ $.Values.artifactory.persistence.fileSystem.existingSharedClaim.backupDir }}"
+        {{- end }}
+      {{- end }}
+
+      ######################## Artifactory persistence nfs ##########################
+      {{- if eq .Values.artifactory.persistence.type "nfs" }}
+        - name: artifactory-ha-data
+          mountPath: "{{ .Values.artifactory.persistence.nfs.dataDir }}"
+        - name: artifactory-ha-backup
+          mountPath: "{{ .Values.artifactory.persistence.nfs.backupDir }}"
+      {{- else }}
+
+      ######################## Artifactory persistence binarystore Xml ##########################
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+        - name: binarystore-xml
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/tmp/etc/artifactory/binarystore.xml"
+          subPath: binarystore.xml
+
+      ######################## Artifactory persistence google storage ##########################
+      {{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+        - name: gcpcreds-json
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/artifactory_bootstrap/gcp.credentials.json"
+          subPath: gcp.credentials.json
+      {{- end }}
+
+
+      ######################## Artifactory license ##########################
+      {{- if or .Values.artifactory.license.secret .Values.artifactory.license.licenseKey }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.license.secret }}
+        - name: artifactory-license
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/artifactory_bootstrap/artifactory.cluster.license"
+          {{- if .Values.artifactory.license.secret }}
+          subPath: {{ .Values.artifactory.license.dataKey }}
+          {{- else if .Values.artifactory.license.licenseKey }}
+          subPath: artifactory.lic
+          {{- end }}
+      {{- end }}
+    {{- end }}
+      {{- if or .Values.artifactory.customVolumeMounts .Values.global.customVolumeMounts }}
+{{ tpl (include "artifactory-ha.customVolumeMounts" .) . | indent 8 }}
+      {{- end }}
+      {{- if .Values.access.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.access.startupProbe.config . | indent 10 }}
+        {{- end }}
+    {{- if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}   
+        {{- if .Values.access.readinessProbe.enabled }}
+        readinessProbe:
+{{ tpl .Values.access.readinessProbe.config . | indent 10 }}
+        {{- end }}
+    {{- end }}
+      {{- if .Values.access.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.access.livenessProbe.config . | indent 10 }}
+        {{- end }}
+      {{- end }}
+    {{- end }}
+      - name: {{ .Values.artifactory.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          set -e;
+          if [ -d /artifactory_extra_conf ] && [ -d /artifactory_bootstrap ]; then
+            echo "Copying bootstrap config from /artifactory_extra_conf to /artifactory_bootstrap";
+            cp -Lrfv /artifactory_extra_conf/ /artifactory_bootstrap/;
+          fi;
+        {{- if .Values.artifactory.configMapName }}
+          echo "Copying bootstrap configs";
+          cp -Lrf /bootstrap/* /artifactory_bootstrap/;
+        {{- end }}
+        {{- if .Values.artifactory.userPluginSecrets }}
+          echo "Copying plugins";
+          cp -Lrf /tmp/plugin/*/* /artifactory_bootstrap/plugins;
+        {{- end }}
+        {{- range .Values.artifactory.copyOnEveryStartup }}
+          {{- $targetPath := printf "%s/%s" $.Values.artifactory.persistence.mountPath .target }}
+          {{- $baseDirectory := regexFind ".*/" $targetPath }}
+          mkdir -p {{ $baseDirectory }};
+          cp -Lrf {{ .source }} {{ $.Values.artifactory.persistence.mountPath }}/{{ .target }};
+        {{- end }}
+        {{- with .Values.artifactory.preStartCommand }}
+          echo "Running custom preStartCommand command";
+          {{ tpl . $ }};
+        {{- end }}
+        {{- with .Values.artifactory.primary.preStartCommand }}
+          echo "Running primary specific custom preStartCommand command";
+          {{ tpl . $ }};
+        {{- end }}
+          exec /entrypoint-artifactory.sh
+        {{- with .Values.artifactory.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+      {{- if .Values.aws.license.enabled }}
+        - name: IS_AWS_LICENSE
+          value: "true"
+        - name: AWS_REGION
+          value: {{ .Values.aws.region | quote }}
+      {{- if .Values.aws.licenseConfigSecretName }}
+        - name: AWS_WEB_IDENTITY_REFRESH_TOKEN_FILE
+          value: "/var/run/secrets/product-license/license_token"
+        - name: AWS_ROLE_ARN
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.aws.licenseConfigSecretName }}
+              key: iam_role
+      {{- end }}
+      {{- end }}
+      {{- if .Values.splitServicesToContainers }}
+        - name : JF_ROUTER_ENABLED
+          value: "true"
+        - name : JF_ROUTER_SERVICE_ENABLED
+          value: "false"
+        - name : JF_EVENT_ENABLED
+          value: "false"
+        - name : JF_METADATA_ENABLED
+          value: "false"
+        - name : JF_FRONTEND_ENABLED
+          value: "false"
+        - name: JF_FEDERATION_ENABLED
+          value: "false"
+        - name : JF_OBSERVABILITY_ENABLED
+          value: "false"
+        - name : JF_JFCONNECT_SERVICE_ENABLED
+          value: "false"
+        - name : JF_EVIDENCE_ENABLED
+          value: "false"
+        {{- if not (.Values.access.runOnArtifactoryTomcat | default false) }}
+        - name : JF_ACCESS_ENABLED
+          value: "false"
+        {{- end}}
+      {{- end }}
+      {{- if and (not .Values.waitForDatabase) (not .Values.postgresql.enabled) }}
+        - name: SKIP_WAIT_FOR_EXTERNAL_DB
+          value: "true"
+      {{- end }}
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+            {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+        - name: JF_SHARED_NODE_HAENABLED
+          value: "true"
+{{- with .Values.artifactory.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        ports:
+        - containerPort: {{ .Values.artifactory.internalPort }}
+          name: http
+        - containerPort: {{ .Values.artifactory.internalArtifactoryPort }}
+          name: http-internal
+        {{- if .Values.federation.enabled }}
+        - containerPort: {{ .Values.federation.internalPort }}
+          name: http-rtfs
+        {{- end }}
+        {{- if .Values.artifactory.primary.javaOpts.jmx.enabled }}
+        - containerPort: {{ .Values.artifactory.primary.javaOpts.jmx.port }}
+          name: tcp-jmx
+        {{- end }}
+        {{- if .Values.artifactory.ssh.enabled }}
+        - containerPort: {{ .Values.artifactory.ssh.internalPort }}
+          name: tcp-ssh
+        {{- end }}
+
+        volumeMounts:
+        {{- if .Values.artifactory.customPersistentVolumeClaim }}
+        - name: {{ .Values.artifactory.customPersistentVolumeClaim.name }}
+          mountPath: {{ .Values.artifactory.customPersistentVolumeClaim.mountPath }}
+        {{- end }}
+        {{- if .Values.artifactory.customPersistentPodVolumeClaim }}
+        - name: {{ .Values.artifactory.customPersistentPodVolumeClaim.name }}
+          mountPath: {{ .Values.artifactory.customPersistentPodVolumeClaim.mountPath }}
+        {{- end }}
+        {{- if .Values.aws.licenseConfigSecretName }}
+        - name: awsmp-product-license
+          mountPath: "/var/run/secrets/product-license"
+        {{- end }}
+        {{- if .Values.artifactory.userPluginSecrets }}
+        - name: bootstrap-plugins
+          mountPath: "/artifactory_bootstrap/plugins/"
+        {{- range .Values.artifactory.userPluginSecrets }}
+        - name: {{ tpl . $ }}
+          mountPath: "/tmp/plugin/{{ tpl . $ }}"
+        {{- end }}
+        {{- end }}
+        - name: volume
+          mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+
+      ######################## Artifactory persistence fs ##########################
+      {{- if eq .Values.artifactory.persistence.type "file-system" }}
+        {{- if .Values.artifactory.persistence.fileSystem.existingSharedClaim.enabled }}
+          {{- range $sharedClaimNumber, $e := until (.Values.artifactory.persistence.fileSystem.existingSharedClaim.numberOfExistingClaims|int) }}
+        - name: artifactory-ha-data-{{ $sharedClaimNumber }}
+          mountPath: "{{ tpl $.Values.artifactory.persistence.fileSystem.existingSharedClaim.dataDir $ }}/filestore{{ $sharedClaimNumber }}"
+          {{- end }}
+        - name: artifactory-ha-backup
+          mountPath: "{{ $.Values.artifactory.persistence.fileSystem.existingSharedClaim.backupDir }}"
+        {{- end }}
+      {{- end }}
+
+      ######################## Artifactory persistence nfs ##########################
+      {{- if eq .Values.artifactory.persistence.type "nfs" }}
+        - name: artifactory-ha-data
+          mountPath: "{{ .Values.artifactory.persistence.nfs.dataDir }}"
+        - name: artifactory-ha-backup
+          mountPath: "{{ .Values.artifactory.persistence.nfs.backupDir }}"
+      {{- else }}
+
+      ######################## Artifactory persistence binarystoreXml ##########################
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+        - name: binarystore-xml
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/tmp/etc/artifactory/binarystore.xml"
+          subPath: binarystore.xml
+
+      ######################## Artifactory persistence googleStorage ##########################
+      {{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+        - name: gcpcreds-json
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/artifactory_bootstrap/gcp.credentials.json"
+          subPath: gcp.credentials.json
+        {{- end }}
+      {{- end }}
+
+      ######################## Artifactory configMapName ##########################
+      {{- if .Values.artifactory.configMapName }}
+        - name: bootstrap-config
+          mountPath: "/bootstrap/"
+      {{- end }}
+
+      ######################## Artifactory license ##########################
+      {{- if or .Values.artifactory.license.secret .Values.artifactory.license.licenseKey }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.license.secret }}
+        - name: artifactory-license
+        {{- else }}
+        - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/artifactory_bootstrap/artifactory.cluster.license"
+          {{- if .Values.artifactory.license.secret }}
+          subPath: {{ .Values.artifactory.license.dataKey }}
+          {{- else if .Values.artifactory.license.licenseKey }}
+          subPath: artifactory.lic
+          {{- end }}
+      {{- end }}
+
+        - name: installer-info
+          mountPath: "/artifactory_bootstrap/info/installer-info.json"
+          subPath: installer-info.json
+      {{- if or .Values.artifactory.customVolumeMounts .Values.global.customVolumeMounts }}
+{{ tpl (include "artifactory-ha.customVolumeMounts" .) . | indent 8 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.artifactory.primary.resources | indent 10 }}
+        {{- if .Values.artifactory.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.artifactory.startupProbe.config . | indent 10 }}
+        {{- end }}
+    {{- if and (not .Values.splitServicesToContainers) (semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version) }}
+        {{- if .Values.artifactory.readinessProbe.enabled }}
+        readinessProbe:
+{{ tpl .Values.artifactory.readinessProbe.config . | indent 10 }}
+        {{- end }}
+    {{- end }}
+        {{- if .Values.artifactory.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.artifactory.livenessProbe.config . | indent 10 }}
+        {{- end }}
+      {{- $mountPath := .Values.artifactory.persistence.mountPath }}
+      {{- range .Values.artifactory.loggers }}
+      - name: {{ . | replace "_" "-" | replace "." "-" }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list $ "initContainers") }}
+        imagePullPolicy: {{ $.Values.initContainers.image.pullPolicy }}
+      {{- if $.Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit $.Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - 'sh'
+          - '-c'
+          - 'sh /scripts/tail-log.sh {{ $mountPath }}/log {{ . }}'
+        volumeMounts:
+        - name: volume
+          mountPath: {{ $mountPath }}
+        - name: tail-logger-script
+          mountPath: /scripts/tail-log.sh
+          subPath: tail-log.sh
+        resources:
+{{ toYaml $.Values.artifactory.loggersResources | indent 10 }}
+      {{- end }}
+      {{ if .Values.artifactory.catalinaLoggers }}
+      {{- range .Values.artifactory.catalinaLoggers }}
+      - name: {{ . | replace "_" "-" | replace "." "-" }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list $ "initContainers") }}
+        imagePullPolicy: {{ $.Values.initContainers.image.pullPolicy }}
+      {{- if $.Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit $.Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - 'sh'
+        - '-c'
+        - 'sh /scripts/tail-log.sh {{ $mountPath }}/log/tomcat {{ . }}'
+        volumeMounts:
+        - name: volume
+          mountPath: {{ $mountPath }}
+        - name: tail-logger-script
+          mountPath: /scripts/tail-log.sh
+          subPath: tail-log.sh
+        resources:
+{{ toYaml $.Values.artifactory.catalinaLoggersResources | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.filebeat.enabled }}
+      - name: {{ .Values.filebeat.name }}
+        image: "{{ .Values.filebeat.image.repository }}:{{ .Values.filebeat.image.version }}"
+        imagePullPolicy: {{ .Values.filebeat.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        args:
+        - "-e"
+        - "-E"
+        - "http.enabled=true"
+        env:
+{{- with .Values.filebeat.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 10 }}
+{{- end }}
+        volumeMounts:
+        - name: filebeat-config
+          mountPath: /usr/share/filebeat/filebeat.yml
+          readOnly: true
+          subPath: filebeat.yml
+        - name: volume
+          mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+        livenessProbe:
+{{ toYaml .Values.filebeat.livenessProbe | indent 10 }}
+        readinessProbe:
+{{ toYaml .Values.filebeat.readinessProbe | indent 10 }}
+        resources:
+{{ toYaml .Values.filebeat.resources | indent 10 }}
+      {{- end }}
+    {{- if or .Values.artifactory.customSidecarContainers .Values.global.customSidecarContainers }}
+{{ tpl (include "artifactory-ha.customSidecarContainers" .) . | indent 6 }}
+    {{- end }}
+    {{- if or .Values.artifactory.primary.nodeSelector .Values.global.nodeSelector }}
+{{ tpl (include "artifactory.nodeSelector" .) . | indent 6 }}
+    {{- end }}
+    {{- if .Values.artifactory.primary.affinity }}
+    {{- with .Values.artifactory.primary.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- else if eq .Values.artifactory.primary.podAntiAffinity.type "soft" }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              topologyKey: {{ .Values.artifactory.primary.podAntiAffinity.topologyKey }}
+              labelSelector:
+                matchLabels:
+                  app: {{ template "artifactory-ha.name" . }}
+                  release: {{ .Release.Name }}
+    {{- else if eq .Values.artifactory.primary.podAntiAffinity.type "hard" }}
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - topologyKey: {{ .Values.artifactory.primary.podAntiAffinity.topologyKey }}
+            labelSelector:
+              matchLabels:
+                app: {{ template "artifactory-ha.name" . }}
+                release: {{ .Release.Name }}
+    {{- end }}
+    {{- with .Values.artifactory.primary.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+      volumes:
+
+      ########## External secrets ###########
+
+      {{- if or .Values.artifactory.customCertificates.enabled .Values.global.customCertificates.enabled }}
+      - name: ca-certs
+        secret:
+          secretName: {{ default .Values.global.customCertificates.certificateSecretName .Values.artifactory.customCertificates.certificateSecretName }}
+      {{- end }}
+
+      {{- if .Values.artifactory.circleOfTrustCertificatesSecret }}
+      - name: circle-of-trust-certs
+        secret:
+          secretName: {{ .Values.artifactory.circleOfTrustCertificatesSecret }}
+      {{- end }}
+
+      {{- if .Values.aws.licenseConfigSecretName }}
+      - name: awsmp-product-license
+        secret:
+          secretName: {{ .Values.aws.licenseConfigSecretName }}
+      {{- end }}
+
+      {{- if .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+      - name: binarystore-xml
+        secret:
+          secretName: {{ .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+      {{- end }}
+      {{- if .Values.access.customCertificatesSecretName }}
+      - name: access-certs
+        secret:
+          secretName: {{ .Values.access.customCertificatesSecretName }}
+      {{- end }}
+      {{- if .Values.jfconnect.customCertificatesSecretName }}
+      - name: jfconnect-certs
+        secret:
+          secretName: {{ .Values.jfconnect.customCertificatesSecretName }}
+      {{- end }}
+      {{- if .Values.systemYamlOverride.existingSecret }}
+      - name: systemyaml
+        secret:
+          secretName: {{ .Values.systemYamlOverride.existingSecret }}
+      {{- end }}
+      {{- if .Values.artifactory.license.secret }}
+      - name: artifactory-license
+        secret:
+          secretName: {{ .Values.artifactory.license.secret }}
+      {{- end }}
+      {{- if and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey }}
+      - name: access-bootstrap-creds
+        secret:
+          secretName: {{ .Values.artifactory.admin.secret }}
+      {{- end }}
+      {{- if and .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+      - name: gcpcreds-json
+        secret:
+          secretName: {{ .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+      {{- end }}
+
+      ############ Config map, Volumes and Custom Volumes ##############
+      {{- if .Values.artifactory.userPluginSecrets }}
+      - name: bootstrap-plugins
+        emptyDir: {}
+      {{- range .Values.artifactory.userPluginSecrets }}
+      - name: {{ tpl . $ }}
+        secret:
+          secretName: {{ tpl . $ }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.artifactory.migration.enabled }}
+      - name: migration-scripts
+        configMap:
+          name: {{ template "artifactory-ha.fullname" . }}-migration-scripts
+      {{- end }}
+      - name: installer-info
+        configMap:
+          name: {{ template "artifactory-ha.fullname" . }}-installer-info
+      {{- if .Values.artifactory.configMapName }}
+      - name: bootstrap-config
+        configMap:
+          name: {{ .Values.artifactory.configMapName }}
+      {{- end}}
+      {{- if or .Values.artifactory.loggers .Values.artifactory.catalinaLoggers }}
+      - name: tail-logger-script
+        configMap:
+          name: {{ template "artifactory-ha.fullname" . }}-logger
+      {{- end }}
+      {{- if .Values.artifactory.configMaps }}
+      - name: artifactory-configmaps
+        configMap:
+          name: {{ template "artifactory-ha.fullname" . }}-configmaps
+      {{- end }}
+      {{- if eq .Values.artifactory.persistence.type "file-system" }}
+        {{- if .Values.artifactory.persistence.fileSystem.existingSharedClaim.enabled }}
+          {{- range $sharedClaimNumber, $e := until (.Values.artifactory.persistence.fileSystem.existingSharedClaim.numberOfExistingClaims|int) }}
+      - name: artifactory-ha-data-{{ $sharedClaimNumber }}
+        persistentVolumeClaim:
+          claimName: {{ template "artifactory-ha.fullname" $ }}-data-pvc-{{ $sharedClaimNumber }}
+          {{- end }}
+      - name: artifactory-ha-backup
+        persistentVolumeClaim:
+          claimName: {{ template "artifactory-ha.fullname" $ }}-backup-pvc
+        {{- end }}
+      {{- end }}
+      {{- if eq .Values.artifactory.persistence.type "nfs" }}
+      - name: artifactory-ha-data
+        persistentVolumeClaim:
+          claimName: {{ template "artifactory-ha.fullname" . }}-data-pvc
+      - name: artifactory-ha-backup
+        persistentVolumeClaim:
+          claimName: {{ template "artifactory-ha.fullname" . }}-backup-pvc
+      {{- end }}
+      {{- if .Values.artifactory.customPersistentVolumeClaim }}
+      - name: {{ .Values.artifactory.customPersistentVolumeClaim.name }}
+        persistentVolumeClaim:
+          claimName: {{ .Values.artifactory.customPersistentVolumeClaim.name }}
+      {{- end }}
+      {{- if .Values.filebeat.enabled }}
+      - name: filebeat-config
+        configMap:
+          name: {{ template "artifactory-ha.fullname" . }}-filebeat-config
+      {{- end }}
+      {{- if (or .Values.artifactory.customVolumes .Values.global.customVolumes) }}
+{{ tpl (include "artifactory-ha.customVolumes" .) . | indent 6 }}
+      {{- end }}
+  {{- if not .Values.artifactory.persistence.enabled }}
+      - name: volume
+        emptyDir:
+          sizeLimit: {{ .Values.artifactory.persistence.size }}
+  {{- end }}
+
+      #########  unifiedSecretInstallation ###########
+    {{- if and .Values.artifactory.unifiedSecretInstallation (eq (include "artifactory-ha.checkDuplicateUnifiedCustomVolume" .) "false" ) }}
+      - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
+        secret:
+          secretName: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+
+    {{- else if not .Values.artifactory.unifiedSecretInstallation }}
+
+      ############ If single secret installation flag is disable ############
+      {{- if and .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled (not .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName) }}
+      - name: gcpcreds-json
+        secret:
+          secretName: {{ template "artifactory-ha.fullname" . }}-gcpcreds
+      {{- end }}
+      {{- if and .Values.artifactory.license.licenseKey (not .Values.artifactory.license.secret) }}
+      - name: artifactory-license
+        secret:
+          secretName: {{ template "artifactory-ha.fullname" . }}-license
+      {{- end }}
+      {{- if and .Values.artifactory.admin.password (and (not .Values.artifactory.admin.secret) (not .Values.artifactory.admin.dataKey)) }}
+      - name: access-bootstrap-creds
+        secret:
+          secretName: {{ template "artifactory-ha.fullname" . }}-bootstrap-creds
+      {{- end }}
+      {{- if and (not .Values.systemYamlOverride.existingSecret) }}
+      - name: systemyaml
+        secret:
+          secretName: {{ template "artifactory-ha.primary.name" . }}-system-yaml
+      {{- end }}
+      {{- if .Values.access.accessConfig }}
+      - name: access-config
+        secret:
+          secretName: {{ template "artifactory-ha.fullname" . }}-access-config
+      {{- end }}
+      {{- if not .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+      - name: binarystore-xml
+        secret:
+          secretName: {{ template "artifactory-ha.fullname" . }}-binarystore
+      {{- end }}
+    {{- end }}
+
+  volumeClaimTemplates:
+  {{- if .Values.artifactory.persistence.enabled }}
+  - metadata:
+      name: volume
+    {{- if not .Values.artifactory.primary.persistence.existingClaim }}
+    spec:
+      {{- if .Values.artifactory.persistence.storageClassName }}
+      {{- if (eq "-" .Values.artifactory.persistence.storageClassName) }}
+      storageClassName: ""
+      {{- else }}
+      storageClassName: "{{ .Values.artifactory.persistence.storageClassName }}"
+      {{- end }}
+      {{- end }}
+      accessModes: [ "{{ .Values.artifactory.persistence.accessMode }}" ]
+      resources:
+        requests:
+          storage: {{ .Values.artifactory.persistence.size }}
+    {{- end }}
+  {{- end }}
+  {{- if .Values.artifactory.customPersistentPodVolumeClaim }}
+  - metadata:
+      name: {{ .Values.artifactory.customPersistentPodVolumeClaim.name }}
+    spec:
+    {{- if .Values.artifactory.customPersistentPodVolumeClaim.storageClassName }}
+      {{- if (eq "-" .Values.artifactory.customPersistentPodVolumeClaim.storageClassName) }}
+      storageClassName: ""
+      {{- else }}
+      storageClassName: "{{ .Values.artifactory.customPersistentPodVolumeClaim.storageClassName }}"
+      {{- end }}
+    {{- end }}
+      accessModes:
+     {{- range .Values.artifactory.customPersistentPodVolumeClaim.accessModes }}
+        - {{ . | quote }}
+     {{- end }}
+      resources:
+        requests:
+          storage: {{ .Values.artifactory.customPersistentPodVolumeClaim.size }}
+  {{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-priority-class.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-priority-class.yaml
new file mode 100644
index 000000000..417ec5c06
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-priority-class.yaml
@@ -0,0 +1,9 @@
+{{- if .Values.artifactory.priorityClass.create }}
+apiVersion: scheduling.k8s.io/v1
+kind: PriorityClass
+metadata:
+  name: {{ default (include "artifactory-ha.fullname" .) .Values.artifactory.priorityClass.name }}
+value: {{ .Values.artifactory.priorityClass.value }}
+globalDefault: false
+description: "Artifactory priority class"
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-role.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-role.yaml
new file mode 100644
index 000000000..c86bffddd
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-role.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: {{ template "artifactory-ha.fullname" . }}
+rules:
+{{ toYaml .Values.rbac.role.rules }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-rolebinding.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-rolebinding.yaml
new file mode 100644
index 000000000..4412870b1
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-rolebinding.yaml
@@ -0,0 +1,19 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: {{ template "artifactory-ha.fullname" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ template "artifactory-ha.serviceAccountName" . }}
+roleRef:
+  kind: Role
+  apiGroup: rbac.authorization.k8s.io
+  name: {{ template "artifactory-ha.fullname" . }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-secrets.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-secrets.yaml
new file mode 100644
index 000000000..3a16c87ef
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-secrets.yaml
@@ -0,0 +1,30 @@
+{{- if not .Values.artifactory.unifiedSecretInstallation }}
+{{- if or .Values.artifactory.joinKey .Values.global.joinKey .Values.artifactory.jfConnectToken .Values.artifactory.masterKey .Values.global.masterKey }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+type: Opaque
+data:
+  {{- if or .Values.artifactory.masterKey .Values.global.masterKey }}
+  {{- if not (or .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName) }}
+  master-key: {{ include "artifactory-ha.masterKey" . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+  {{- if or .Values.artifactory.joinKey .Values.global.joinKey }}
+  {{- if not (or .Values.artifactory.joinKeySecretName .Values.global.joinKeySecretName) }}
+  join-key: {{ include "artifactory-ha.joinKey" . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.artifactory.jfConnectToken  }}
+  {{- if not .Values.artifactory.jfConnectTokenSecretName }}
+  jfconnect-token: {{ include "artifactory-ha.jfConnectToken" . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-service-grpc.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-service-grpc.yaml
new file mode 100644
index 000000000..a2f1b9233
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-service-grpc.yaml
@@ -0,0 +1,49 @@
+{{- if .Values.ingressGrpc.enabled -}}
+# Service for GRPC communication.
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "artifactory.serviceGrpc.fullname" . }}
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    {{- with .Values.artifactory.node.labels }}
+{{ toYaml .| indent 4 }}
+    {{- end }}
+{{- if .Values.artifactory.serviceGrpc.annotations }}
+  annotations:
+{{ toYaml .Values.artifactory.serviceGrpc.annotations | indent 4 }}
+{{- end }}
+spec:
+  {{- if .Values.artifactory.serviceGrpc.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.artifactory.serviceGrpc.ipFamilyPolicy }}
+  {{- end }}
+  {{- if not (empty .Values.artifactory.serviceGrpc.ipFamilies)}}
+  ipFamilies: {{- toYaml .Values.artifactory.serviceGrpc.ipFamilies | nindent 4 }}
+  {{- end }}
+  type: {{ .Values.artifactory.serviceGrpc.type }}
+  {{- if and (eq .Values.artifactory.serviceGrpc.type "ClusterIP") .Values.artifactory.serviceGrpc.clusterIP }}
+  clusterIP: {{ .Values.artifactory.serviceGrpc.clusterIP }}
+  {{- end }}
+  {{- if .Values.artifactory.serviceGrpc.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+{{ toYaml .Values.artifactory.serviceGrpc.loadBalancerSourceRanges | indent 4 }}
+  {{- end }}
+  ports:
+  - port: {{ .Values.artifactory.externalPort }}
+    targetPort: {{ .Values.artifactory.internalPort }}
+    protocol: TCP
+    name: http-router
+  selector:
+{{- if eq (int .Values.artifactory.node.replicaCount) 0 }}
+    role: {{ template "artifactory-ha.primary.name" . }}
+{{- else if eq .Values.artifactory.serviceGrpc.pool "members" }}
+    role: {{ template "artifactory-ha.node.name" . }}
+{{- end }}
+    app: {{ template "artifactory-ha.name" . }}
+    component: "{{ .Values.artifactory.name }}"
+    release: {{ .Release.Name }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-service.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-service.yaml
new file mode 100644
index 000000000..2739f7a5a
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-service.yaml
@@ -0,0 +1,74 @@
+# Service for all Artifactory cluster nodes.
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    {{- with .Values.artifactory.node.labels }}
+{{ toYaml .| indent 4 }}
+    {{- end }}
+{{- if .Values.artifactory.service.annotations }}
+  annotations:
+{{ toYaml .Values.artifactory.service.annotations | indent 4 }}
+{{- end }}
+spec:
+  {{- if .Values.artifactory.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.artifactory.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if not (empty .Values.artifactory.service.ipFamilies)}}
+  ipFamilies: {{- toYaml .Values.artifactory.service.ipFamilies | nindent 4 }}
+  {{- end }}
+  type: {{ .Values.artifactory.service.type }}
+  {{- if and (eq .Values.artifactory.service.type "ClusterIP") .Values.artifactory.service.clusterIP }}
+  clusterIP: {{ .Values.artifactory.service.clusterIP }}
+  {{- end }}
+  {{- if .Values.artifactory.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+{{ toYaml .Values.artifactory.service.loadBalancerSourceRanges | indent 4 }}
+  {{- end }}
+  ports:
+  - port: {{ .Values.artifactory.externalPort }}
+    targetPort: {{ .Values.artifactory.internalPort }}
+    protocol: TCP
+    name: http-router
+  {{- if .Values.federation.enabled }}
+  - port: {{ .Values.federation.internalPort }}
+    targetPort: {{ .Values.federation.internalPort }}
+    protocol: TCP
+    name: http-rtfs
+  {{- end }}
+  {{- if .Values.artifactory.ssh.enabled }}
+  - port: {{ .Values.artifactory.ssh.externalPort }}
+    targetPort: {{ .Values.artifactory.ssh.internalPort }}
+    protocol: TCP
+    name: tcp-ssh
+  {{- end }}
+  - port: {{ .Values.artifactory.externalArtifactoryPort }}
+    targetPort: {{ .Values.artifactory.internalArtifactoryPort }}
+    protocol: TCP
+    name: http-artifactory
+  {{- with .Values.artifactory.node.javaOpts.jmx }}
+  {{- if .enabled }}
+  - port: {{ .port }}
+    targetPort: {{ .port }}
+  {{- if $.Values.artifactory.service.nodePort }}
+    nodePort: {{ $.Values.artifactory.service.nodePort }}
+  {{- end }}
+    protocol: TCP
+    name: tcp-jmx
+  {{- end }}
+  {{- end }}
+  selector:
+{{- if eq (int .Values.artifactory.node.replicaCount) 0 }}
+    role: {{ template "artifactory-ha.primary.name" . }}
+{{- else if eq .Values.artifactory.service.pool "members" }}
+    role: {{ template "artifactory-ha.node.name" . }}
+{{- end }}
+    app: {{ template "artifactory-ha.name" . }}
+    component: "{{ .Values.artifactory.name }}"
+    release: {{ .Release.Name }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-serviceaccount.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-serviceaccount.yaml
new file mode 100644
index 000000000..c6d345bb7
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-serviceaccount.yaml
@@ -0,0 +1,17 @@
+{{- if .Values.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+{{- with .Values.serviceAccount.annotations }}
+  annotations:
+{{ tpl (toYaml .) $ | indent 4 }}
+{{- end }}
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: {{ template "artifactory-ha.serviceAccountName" . }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-storage-pvc.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-storage-pvc.yaml
new file mode 100644
index 000000000..e0bfa6b11
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-storage-pvc.yaml
@@ -0,0 +1,27 @@
+{{ if .Values.artifactory.customPersistentVolumeClaim }}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ .Values.artifactory.customPersistentVolumeClaim.name }}
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    version: "{{ .Values.artifactory.version }}"
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+spec:
+  accessModes:
+  {{- range .Values.artifactory.customPersistentVolumeClaim.accessModes }}
+    - {{ . | quote }}
+  {{- end }}
+  {{- if .Values.artifactory.customPersistentVolumeClaim.storageClassName }}
+  {{- if (eq "-" .Values.artifactory.customPersistentVolumeClaim.storageClassName) }}
+  storageClassName: ""
+  {{- else }}
+  storageClassName: "{{ .Values.artifactory.customPersistentVolumeClaim.storageClassName }}"
+  {{- end }}
+  {{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.artifactory.customPersistentVolumeClaim.size | quote }}
+{{ end -}}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-system-yaml.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-system-yaml.yaml
new file mode 100644
index 000000000..9e0cb46fe
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-system-yaml.yaml
@@ -0,0 +1,16 @@
+{{- if and (not .Values.systemYamlOverride.existingSecret) (not .Values.artifactory.unifiedSecretInstallation) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "artifactory-ha.primary.name" . }}-system-yaml
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+type: Opaque
+stringData:
+  system.yaml: |
+{{ include "artifactory.finalSystemYaml" . | nindent 4 }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-unified-secret.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-unified-secret.yaml
new file mode 100644
index 000000000..d21045d99
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/artifactory-unified-secret.yaml
@@ -0,0 +1,96 @@
+{{- if .Values.artifactory.unifiedSecretInstallation }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+  labels:
+    app: "{{ template "artifactory-ha.name" $ }}"
+    chart: "{{ template "artifactory-ha.chart" $ }}"
+    component: "{{ $.Values.artifactory.name }}"
+    heritage: {{ $.Release.Service | quote }}
+    release: {{ $.Release.Name | quote }}
+type: Opaque
+stringData:
+
+{{- if .Values.access.accessConfig }}
+  access.config.patch.yml: |
+{{ tpl (toYaml .Values.access.accessConfig) . | indent 4 }}
+{{- end }}
+
+{{- if not .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+  binarystore.xml: |-
+{{- if .Values.artifactory.persistence.binarystoreXml }}
+{{ tpl .Values.artifactory.persistence.binarystoreXml . | indent 4 }}
+{{- else }}
+{{ tpl ( .Files.Get "files/binarystore.xml" ) . | indent 4 }}
+{{- end }}
+{{- end }}
+
+{{- if and (not .Values.systemYamlOverride.existingSecret) }}
+  system.yaml: |
+{{ include "artifactory.finalSystemYaml" . | nindent 4 }}
+{{- end }}
+
+{{- if .Values.artifactory.customSecrets }}
+{{- range .Values.artifactory.customSecrets }}
+  {{ .key }}: |
+{{ .data | indent 4 -}}
+{{- end }}
+{{- end }}
+
+{{- if not .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+{{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
+  gcp.credentials.json: |-
+{{ tpl .Values.artifactory.persistence.googleStorage.gcpServiceAccount.config . | indent 4 }}
+{{- end }}
+{{- end }}
+
+data:
+
+  {{- if and (not .Values.database.secrets) (not .Values.postgresql.enabled) }}
+  {{- if or .Values.database.url .Values.database.user .Values.database.password }}
+
+  {{- with .Values.database.url }}
+  db-url: {{ tpl . $ | b64enc | quote }}
+  {{- end }}
+  {{- with .Values.database.user }}
+  db-user: {{ tpl . $ | b64enc | quote }}
+  {{- end }}
+  {{- with .Values.database.password }}
+  db-password: {{ tpl . $ | b64enc | quote }}
+  {{- end }}
+
+  {{- end }}
+  {{- end }}
+
+  {{- if not (and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey) }}
+  {{- if .Values.artifactory.admin.password }}
+  bootstrap.creds: {{ (printf "%s@%s=%s" .Values.artifactory.admin.username .Values.artifactory.admin.ip .Values.artifactory.admin.password) | b64enc }}
+  {{- end }}
+  {{- end }}
+
+  {{- if not .Values.artifactory.license.secret }}
+  {{- with .Values.artifactory.license.licenseKey }}
+  artifactory.lic: {{ . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+
+  {{- if or .Values.artifactory.masterKey .Values.global.masterKey }}
+  {{- if not (or .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName) }}
+  master-key: {{ include "artifactory-ha.masterKey" . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+
+  {{- if or .Values.artifactory.joinKey .Values.global.joinKey }}
+  {{- if not (or .Values.artifactory.joinKeySecretName .Values.global.joinKeySecretName) }}
+  join-key: {{ include "artifactory-ha.joinKey" . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+
+  {{- if .Values.artifactory.jfConnectToken }}
+  {{- if not .Values.artifactory.jfConnectTokenSecretName }}
+  jfconnect-token: {{ include "artifactory-ha.jfConnectToken" . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/filebeat-configmap.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/filebeat-configmap.yaml
new file mode 100644
index 000000000..1686e83a1
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/filebeat-configmap.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.filebeat.enabled }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-filebeat-config
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
+data:
+  filebeat.yml: |
+{{ tpl .Values.filebeat.filebeatYml . | indent 4 }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/ingress-grpc.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/ingress-grpc.yaml
new file mode 100644
index 000000000..eaa5a54e0
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/ingress-grpc.yaml
@@ -0,0 +1,80 @@
+{{- if .Values.ingressGrpc.enabled -}}
+{{- $serviceName := include "artifactory.serviceGrpc.fullname" . -}}
+{{- $servicePort := .Values.artifactory.externalPort -}}
+{{- $ingressName := include "artifactory.ingressGrpc.fullname" . -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+apiVersion: networking.k8s.io/v1
+{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $ingressName }}
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- if .Values.ingressGrpc.labels }}
+{{ .Values.ingressGrpc.labels | toYaml | trimSuffix "\n"| indent 4 -}}
+{{- end}}
+{{- if .Values.ingressGrpc.annotations }}
+  annotations:
+{{ .Values.ingressGrpc.annotations | toYaml | trimSuffix "\n" | indent 4 -}}
+{{- end }}
+spec:
+  {{- if and .Values.ingressGrpc.className (semverCompare ">=1.18.0-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingressGrpc.className }}
+  {{- end }}
+  {{- if .Values.ingressGrpc.defaultBackend.enabled }}
+    {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+  defaultBackend:
+    service:
+      name: {{ $serviceName }}
+      port:
+        number: {{ $servicePort }}
+    {{- else }}
+  backend:
+    serviceName: {{ $serviceName }}
+    servicePort: {{ $servicePort }}
+    {{- end }}
+  {{- end }}
+  rules:
+{{- if .Values.ingressGrpc.hosts }}
+  {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+    {{- range $host := .Values.ingressGrpc.hosts }}
+  - host: {{ $host | quote }}
+    http:
+      paths:
+        - path: {{ $.Values.ingressGrpc.grpcPath }}
+          pathType: ImplementationSpecific
+          backend:
+            service:
+              name: {{ $serviceName }}
+              port:
+                number: {{ $servicePort }}
+    {{- end }}
+  {{- else }}
+    {{- range $host := .Values.ingressGrpc.hosts }}
+  - host: {{ $host | quote }}
+    http:
+      paths:
+        - path: {{ $.Values.ingressGrpc.grpcPath }}
+          backend:
+            serviceName: {{ $serviceName }}
+            servicePort: {{ $servicePort }}
+    {{- end }}
+  {{- end }}
+{{- end -}}
+  {{- with .Values.ingressGrpc.additionalRules }}
+{{ tpl . $ | indent 2 }}
+  {{- end }}
+
+  {{- if .Values.ingressGrpc.tls }}
+  tls:
+{{ toYaml .Values.ingressGrpc.tls | indent 4 }}
+  {{- end -}}
+
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/ingress.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/ingress.yaml
new file mode 100644
index 000000000..70080a614
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/ingress.yaml
@@ -0,0 +1,106 @@
+{{- if .Values.ingress.enabled -}}
+{{- $serviceName := include "artifactory-ha.fullname" . -}}
+{{- $servicePort := .Values.artifactory.externalPort -}}
+{{- $artifactoryServicePort := .Values.artifactory.externalArtifactoryPort -}}
+{{- $ingressName := default ( include "artifactory-ha.fullname" . ) .Values.ingress.name -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+apiVersion: networking.k8s.io/v1
+{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $ingressName }}
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- if .Values.ingress.labels }}
+{{ .Values.ingress.labels | toYaml | trimSuffix "\n"| indent 4 -}}
+{{- end}}
+{{- if .Values.ingress.annotations }}
+  annotations:
+{{ .Values.ingress.annotations | toYaml | trimSuffix "\n" | indent 4 -}}
+{{- end }}
+spec:
+  {{- if and .Values.ingress.className (semverCompare ">=1.18.0-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
+  {{- if .Values.ingress.defaultBackend.enabled }}
+    {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+  defaultBackend:
+    service:
+      name: {{ $serviceName }}
+      port:
+        number: {{ $servicePort }}
+    {{- else }}
+  backend:
+    serviceName: {{ $serviceName }}
+    servicePort: {{ $servicePort }}
+    {{- end }}
+  {{- end }}
+  rules:
+{{- if .Values.ingress.hosts }}
+  {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+    {{- range $host := .Values.ingress.hosts }}
+  - host: {{ $host | quote }}
+    http:
+      paths:
+        - path: {{ $.Values.ingress.routerPath }}
+          pathType: ImplementationSpecific
+          backend:
+            service:
+              name: {{ $serviceName }}
+              port:
+                number: {{ $servicePort }}
+        {{- if not $.Values.ingress.disableRouterBypass }}
+        - path: {{ $.Values.ingress.artifactoryPath }}
+          pathType: ImplementationSpecific
+          backend:
+            service:
+              name: {{ $serviceName }}
+              port:
+                number: {{ $artifactoryServicePort }}
+        {{- end }}
+        {{- if and $.Values.federation.enabled (not (regexMatch "^.*(oss|cpp-ce|jcr).*$" $.Values.artifactory.image.repository)) }}
+        - path: {{ $.Values.ingress.rtfsPath }}
+          pathType: ImplementationSpecific
+          backend:
+            service:
+              name: {{ $serviceName }}
+              port:
+                number: {{ $.Values.federation.internalPort }}
+        {{- end }}
+    {{- end }}
+  {{- else }}
+    {{- range $host := .Values.ingress.hosts }}
+  - host: {{ $host | quote }}
+    http:
+      paths:
+        - path: {{ $.Values.ingress.routerPath }}
+          backend:
+            serviceName: {{ $serviceName }}
+            servicePort: {{ $servicePort }}
+        - path: {{ $.Values.ingress.artifactoryPath }}
+          backend:
+            serviceName: {{ $serviceName }}
+            servicePort: {{ $artifactoryServicePort }}
+    {{- end }}
+  {{- end }}
+{{- end -}}
+  {{- with .Values.ingress.additionalRules }}
+{{ tpl . $ | indent 2 }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+{{ toYaml .Values.ingress.tls | indent 4 }}
+  {{- end -}}
+
+{{- if .Values.customIngress }}
+---
+{{ .Values.customIngress | toYaml | trimSuffix "\n" }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/logger-configmap.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/logger-configmap.yaml
new file mode 100644
index 000000000..d3597905d
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/logger-configmap.yaml
@@ -0,0 +1,63 @@
+{{- if or .Values.artifactory.loggers .Values.artifactory.catalinaLoggers }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-logger
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  tail-log.sh: |
+    #!/bin/sh
+
+    LOG_DIR=$1
+    LOG_NAME=$2
+    PID=
+
+    # Wait for log dir to appear
+    while [ ! -d ${LOG_DIR} ]; do
+      sleep 1
+    done
+
+    cd ${LOG_DIR}
+
+    LOG_PREFIX=$(echo ${LOG_NAME} | sed 's/.log$//g')
+
+    # Find the log to tail
+    LOG_FILE=$(ls -1t ./${LOG_PREFIX}.log 2>/dev/null)
+
+    # Wait for the log file
+    while [ -z "${LOG_FILE}" ]; do
+      sleep 1
+      LOG_FILE=$(ls -1t ./${LOG_PREFIX}.log 2>/dev/null)
+    done
+
+    echo "Log file ${LOG_FILE} is ready!"
+
+    # Get inode number
+    INODE_ID=$(ls -i ${LOG_FILE})
+
+    # echo "Tailing ${LOG_FILE}"
+    tail -F ${LOG_FILE} &
+    PID=$!
+
+    # Loop forever to see if a new log was created
+    while true; do
+      # Check inode number
+      NEW_INODE_ID=$(ls -i ${LOG_FILE})
+
+      # If inode number changed, this means log was rotated and need to start a new tail
+      if [ "${INODE_ID}" != "${NEW_INODE_ID}" ]; then
+        kill -9 ${PID} 2>/dev/null
+        INODE_ID="${NEW_INODE_ID}"
+
+        # Start a new tail
+        tail -F ${LOG_FILE} &
+        PID=$!
+      fi
+      sleep 1
+    done
+
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-artifactory-conf.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-artifactory-conf.yaml
new file mode 100644
index 000000000..97ae5f27b
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-artifactory-conf.yaml
@@ -0,0 +1,18 @@
+{{- if and (not .Values.nginx.customArtifactoryConfigMap) .Values.nginx.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-nginx-artifactory-conf
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  artifactory.conf: |
+{{- if .Values.nginx.artifactoryConf }} 
+{{ tpl .Values.nginx.artifactoryConf . | indent 4 }}
+{{- else }}
+{{ tpl ( .Files.Get "files/nginx-artifactory-conf.yaml" ) . | indent 4 }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-certificate-secret.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-certificate-secret.yaml
new file mode 100644
index 000000000..29c77ad5a
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-certificate-secret.yaml
@@ -0,0 +1,14 @@
+{{- if and (not .Values.nginx.tlsSecretName) .Values.nginx.enabled .Values.nginx.https.enabled }}
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/tls
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-nginx-certificate
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+{{ ( include "artifactory-ha.gen-certs" . ) | indent 2 }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-conf.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-conf.yaml
new file mode 100644
index 000000000..4f0d65f25
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-conf.yaml
@@ -0,0 +1,18 @@
+{{- if and (not .Values.nginx.customConfigMap) .Values.nginx.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-nginx-conf
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  nginx.conf: |
+{{- if .Values.nginx.mainConf }} 
+{{ tpl .Values.nginx.mainConf . | indent 4 }}
+{{- else }}
+{{ tpl ( .Files.Get "files/nginx-main-conf.yaml" ) . | indent 4 }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-deployment.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-deployment.yaml
new file mode 100644
index 000000000..d43689b8c
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-deployment.yaml
@@ -0,0 +1,221 @@
+{{- if .Values.nginx.enabled -}}
+{{- $serviceName := include "artifactory-ha.fullname" . -}}
+{{- $servicePort := .Values.artifactory.externalPort -}}
+apiVersion: apps/v1
+kind: {{ .Values.nginx.kind }}
+metadata:
+  name: {{ template "artifactory-ha.nginx.fullname" . }}
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    component: {{ .Values.nginx.name }}
+{{- if .Values.nginx.labels }}
+{{ toYaml .Values.nginx.labels | indent 4 }}
+{{- end }}
+{{- with .Values.nginx.deployment.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if ne .Values.nginx.kind "DaemonSet" }}
+  replicas: {{ .Values.nginx.replicaCount }}
+{{- end }}
+  selector:
+    matchLabels:
+      app: {{ template "artifactory-ha.name" . }}
+      release: {{ .Release.Name }}
+      component: {{ .Values.nginx.name }}
+  template:
+    metadata:
+      annotations:
+        checksum/nginx-conf: {{ include (print $.Template.BasePath "/nginx-conf.yaml") . | sha256sum }}
+        checksum/nginx-artifactory-conf: {{ include (print $.Template.BasePath "/nginx-artifactory-conf.yaml") . | sha256sum }}
+      {{- range $key, $value := .Values.nginx.annotations }}
+        {{ $key }}: {{ $value | quote }}
+      {{- end }}
+      labels:
+        app: {{ template "artifactory-ha.name" . }}
+        chart: {{ template "artifactory-ha.chart" . }}
+        component: {{ .Values.nginx.name }}
+        heritage: {{ .Release.Service }}
+        release: {{ .Release.Name }}
+{{- if .Values.nginx.labels }}
+{{ toYaml .Values.nginx.labels | indent 8 }}
+{{- end }}
+    spec:
+    {{- if .Values.nginx.podSecurityContext.enabled }}
+      securityContext: {{- omit .Values.nginx.podSecurityContext "enabled" | toYaml | nindent 8 }}
+    {{- end }}
+      serviceAccountName: {{ template "artifactory-ha.serviceAccountName" . }}
+      terminationGracePeriodSeconds: {{ .Values.nginx.terminationGracePeriodSeconds }}
+    {{- if or .Values.imagePullSecrets .Values.global.imagePullSecrets }}
+{{- include "artifactory-ha.imagePullSecrets" . | indent 6 }}
+    {{- end }}
+      {{- if .Values.nginx.priorityClassName }}
+      priorityClassName: {{ .Values.nginx.priorityClassName | quote }}
+      {{- end }}
+      {{- if .Values.nginx.topologySpreadConstraints }}
+      topologySpreadConstraints:
+{{ tpl (toYaml .Values.nginx.topologySpreadConstraints) . | indent 8 }}
+      {{- end }}
+      initContainers:
+        {{- if .Values.nginx.customInitContainers }}
+{{ tpl (include "artifactory.nginx.customInitContainers" .)  . | indent 6 }}
+        {{- end }}
+      - name: "setup"
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.imagePullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - '/bin/sh'
+        - '-c'
+        - >
+          rm -rfv {{ .Values.nginx.persistence.mountPath }}/lost+found;
+          mkdir -p {{ .Values.nginx.persistence.mountPath }}/logs;
+        resources:
+          {{- toYaml .Values.initContainers.resources | nindent 10 }}
+        volumeMounts:
+        - mountPath: {{ .Values.nginx.persistence.mountPath | quote }}
+          name: nginx-volume
+      containers:
+      - name: {{ .Values.nginx.name }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list . "nginx") }}
+        imagePullPolicy: {{ .Values.nginx.image.pullPolicy }}
+        {{- if .Values.nginx.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.nginx.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+        {{- end }}
+        {{- if .Values.nginx.customCommand }}
+        command:
+{{- tpl (include "nginx.command" .) . | indent 10 }}
+        {{- end }}
+        ports:
+{{ if .Values.nginx.customPorts }}
+{{ toYaml .Values.nginx.customPorts | indent 8 }}
+{{ end }}
+        # DEPRECATION NOTE: The following is to maintain support for values pre 1.3.1 and
+        # will be cleaned up in a later version
+        {{- if .Values.nginx.http }}
+        {{- if .Values.nginx.http.enabled }}
+        - containerPort: {{ .Values.nginx.http.internalPort }}
+          name: http
+        {{- end }}
+        {{- else }} # DEPRECATED
+        - containerPort: {{ .Values.nginx.internalPortHttp }}
+          name: http-internal
+        {{- end }}
+        {{- if .Values.nginx.https }}
+        {{- if .Values.nginx.https.enabled }}
+        - containerPort: {{ .Values.nginx.https.internalPort }}
+          name: https
+        {{- end }}
+        {{- else }} # DEPRECATED
+        - containerPort: {{ .Values.nginx.internalPortHttps }}
+          name: https-internal
+        {{- end }}
+        {{- if .Values.artifactory.ssh.enabled }}
+        - containerPort: {{ .Values.nginx.ssh.internalPort }}
+          name: tcp-ssh
+        {{- end }}
+        {{- with .Values.nginx.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        volumeMounts:
+        - name: nginx-conf
+          mountPath: /etc/nginx/nginx.conf
+          subPath: nginx.conf
+        - name: nginx-artifactory-conf
+          mountPath: "{{ .Values.nginx.persistence.mountPath }}/conf.d/"
+        - name: nginx-volume
+          mountPath: {{ .Values.nginx.persistence.mountPath | quote }}
+        {{- if .Values.nginx.https.enabled }}
+        - name: ssl-certificates
+          mountPath: "{{ .Values.nginx.persistence.mountPath }}/ssl"
+        {{- end }}
+        {{- if .Values.nginx.customVolumeMounts }}
+{{ tpl (include "artifactory.nginx.customVolumeMounts" .) . | indent 8 }}
+        {{- end }}
+        resources:
+{{ toYaml .Values.nginx.resources | indent 10 }}
+        {{- if .Values.nginx.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.nginx.startupProbe.config . | indent 10 }}
+        {{- end }}
+        {{- if .Values.nginx.readinessProbe.enabled }}
+        readinessProbe:
+{{ tpl .Values.nginx.readinessProbe.config . | indent 10 }}
+        {{- end }}
+        {{- if .Values.nginx.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.nginx.livenessProbe.config . | indent 10 }}
+        {{- end }}
+      {{- $mountPath := .Values.nginx.persistence.mountPath }}
+      {{- range .Values.nginx.loggers }}
+      - name: {{ . | replace "_" "-" | replace "." "-" }}
+        image: {{ include "artifactory-ha.getImageInfoByValue" (list $ "initContainers") }}
+        imagePullPolicy: {{ $.Values.initContainers.image.pullPolicy }}
+        command:
+        - tail
+        args:
+        - '-F'
+        - '{{ $mountPath }}/logs/{{ . }}'
+        volumeMounts:
+        - name: nginx-volume
+          mountPath: {{ $mountPath }}
+        resources:
+{{ toYaml $.Values.nginx.loggersResources | indent 10 }}
+      {{- end }}
+        {{- if .Values.nginx.customSidecarContainers }}
+{{ tpl (include "artifactory.nginx.customSidecarContainers" .)  . | indent 6 }}
+        {{- end }}
+    {{- if or .Values.nginx.nodeSelector .Values.global.nodeSelector }}
+{{ tpl (include "nginx.nodeSelector" .) . | indent 6 }}
+    {{- end }}
+    {{- with .Values.nginx.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.nginx.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+      volumes:
+        {{- if .Values.nginx.customVolumes }}
+{{ tpl (include "artifactory.nginx.customVolumes" .)  . | indent 6 }}
+        {{- end }}
+      - name: nginx-conf
+        configMap:
+        {{- if .Values.nginx.customConfigMap }}
+          name: {{ .Values.nginx.customConfigMap }}
+        {{- else }}
+          name: {{ template "artifactory-ha.fullname" . }}-nginx-conf
+        {{- end }}
+      - name: nginx-artifactory-conf
+        configMap:
+      {{- if .Values.nginx.customArtifactoryConfigMap }}
+          name: {{ .Values.nginx.customArtifactoryConfigMap }}
+      {{- else }}
+          name: {{ template "artifactory-ha.fullname" . }}-nginx-artifactory-conf
+      {{- end }}
+
+      - name: nginx-volume
+      {{- if .Values.nginx.persistence.enabled }}
+        persistentVolumeClaim:
+          claimName: {{ .Values.nginx.persistence.existingClaim | default (include "artifactory-ha.nginx.fullname" .) }}
+      {{- else }}
+        emptyDir: {}
+      {{- end }}
+      {{- if .Values.nginx.https.enabled }}
+      - name: ssl-certificates
+        secret:
+      {{- if .Values.nginx.tlsSecretName }}
+          secretName: {{ .Values.nginx.tlsSecretName }}
+      {{- else }}
+          secretName: {{ template "artifactory-ha.fullname" . }}-nginx-certificate
+      {{- end }}
+      {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-pdb.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-pdb.yaml
new file mode 100644
index 000000000..0aed99368
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-pdb.yaml
@@ -0,0 +1,23 @@
+{{- if .Values.nginx.enabled -}}
+{{- if semverCompare "<v1.21.0-0" .Capabilities.KubeVersion.Version }}
+apiVersion: policy/v1beta1
+{{- else }}
+apiVersion: policy/v1
+{{- end }}
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "artifactory-ha.nginx.fullname" . }}
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    component: {{ .Values.nginx.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+spec:
+  selector:
+    matchLabels:
+      component: {{ .Values.nginx.name }}
+      app: {{ template "artifactory-ha.name" . }}
+      release: {{ .Release.Name }}
+  minAvailable: {{ .Values.nginx.minAvailable }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-pvc.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-pvc.yaml
new file mode 100644
index 000000000..0e573f383
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-pvc.yaml
@@ -0,0 +1,26 @@
+{{- if and .Values.nginx.persistence.enabled (.Values.nginx.enabled) (eq (int .Values.nginx.replicaCount) 1) }}
+{{- if (not .Values.nginx.persistence.existingClaim) }}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ template "artifactory-ha.nginx.fullname" . }}
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  accessModes:
+    - {{ .Values.nginx.persistence.accessMode | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.nginx.persistence.size | quote }}
+{{- if .Values.nginx.persistence.storageClassName }}
+{{- if (eq "-" .Values.nginx.persistence.storageClassName) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.nginx.persistence.storageClassName }}"
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-scripts-conf.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-scripts-conf.yaml
new file mode 100644
index 000000000..5338d5adc
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-scripts-conf.yaml
@@ -0,0 +1,52 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "artifactory-ha.fullname" . }}-nginx-scripts
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  configreloader.sh: |
+    #!/bin/sh
+    ####
+    # A helper script to use inotifyd to reload nginx config
+    # upon configmap/ssl secrets changes.
+    #
+    # Synopsis: setup the nginx command via the values file
+    # as follows:
+    #
+    ####
+    # nginx:
+    #   customVolumes: |
+    #     - name: scripts
+    #       configMap:
+    #         name: {{ "{{" }} template "artifactory-ha.fullname" . {{ "}}" }}-nginx-scripts
+    #         defaultMode: 0500
+    #   customVolumeMounts: |
+    #     - name: scripts
+    #       mountPath: /var/opt/jfrog/nginx/scripts/
+    #   customCommand:
+    #     - /bin/sh
+    #     - -c
+    #     - |
+    #       # watch for configmap changes
+    #       /sbin/inotifyd /var/opt/jfrog/nginx/scripts/configreloader.sh {{ "{{" }} .Values.nginx.persistence.mountPath {{ "-}}" }}/conf.d:n &
+    #       {{ "{{" }} if .Values.nginx.https.enabled {{ "-}}" }}
+    #       # watch for tls secret changes
+    #       /sbin/inotifyd /var/opt/jfrog/nginx/scripts/configreloader.sh {{ "{{" }} .Values.nginx.persistence.mountPath {{ "-}}" }}/ssl:n &
+    #       {{ "{{" }} end {{ "-}}" }}
+    #       nginx -g 'daemon off;'
+    if [[ "$3" =~ data_tmp ]] && [ "$1" = "n" ]
+    then
+      # a symlink has changed in one of the watched folders
+      # lets verify the config
+      nginx -t -q
+      if [ $? -eq 0 ]
+      then
+        # config is valid, lets reload nginx config
+        nginx -q -s reload
+      fi
+    fi
+
diff --git a/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-service.yaml b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-service.yaml
new file mode 100644
index 000000000..604831cfe
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/templates/nginx-service.yaml
@@ -0,0 +1,94 @@
+{{- if .Values.nginx.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "artifactory-ha.nginx.fullname" . }}
+  labels:
+    app: {{ template "artifactory-ha.name" . }}
+    chart: {{ template "artifactory-ha.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    component: {{ .Values.nginx.name }}
+  {{- if .Values.nginx.service.labels }}
+{{ toYaml .Values.nginx.service.labels | indent 4 }}
+  {{- end }}
+{{- if .Values.nginx.service.annotations }}
+  annotations:
+{{ toYaml .Values.nginx.service.annotations | indent 4 }}
+{{- end }}
+spec:
+  type: {{ .Values.nginx.service.type }}
+  {{- if and (eq .Values.nginx.service.type "ClusterIP") .Values.nginx.service.clusterIP }}
+  clusterIP: {{ .Values.nginx.service.clusterIP }}
+  {{- end }}
+  {{- if .Values.nginx.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.nginx.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if not (empty .Values.nginx.service.ipFamilies)}}
+  ipFamilies: {{- toYaml .Values.nginx.service.ipFamilies | nindent 4 }}
+  {{- end }}
+{{- if eq .Values.nginx.service.type "LoadBalancer" }}
+  {{ if .Values.nginx.service.loadBalancerIP -}}
+  loadBalancerIP: {{ .Values.nginx.service.loadBalancerIP }}
+  {{ end -}}
+  {{- if .Values.nginx.service.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.nginx.service.externalTrafficPolicy }}
+  {{- end }}
+{{- end }}
+{{- if .Values.nginx.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+{{ toYaml .Values.nginx.service.loadBalancerSourceRanges | indent 4 }}
+{{- end }}
+  ports:
+{{- if .Values.nginx.service.customPorts }}
+{{ toYaml .Values.nginx.service.customPorts | indent 2 }}
+{{ end }}
+  # DEPRECATION NOTE: The following is to maintain support for values pre 1.3.0 and
+  # will be cleaned up in a later verion
+  {{- if .Values.nginx.http }}
+  {{- if .Values.nginx.http.enabled }}
+  - port: {{ .Values.nginx.http.externalPort }}
+    targetPort: {{ .Values.nginx.http.internalPort }}
+    {{- if .Values.nginx.service.nodePort }}
+    nodePort: {{ .Values.nginx.service.nodePort }}
+    {{- end }}
+    protocol: TCP
+    name: http
+  {{- end }}
+  {{- else }} # DEPRECATED
+  - port: {{ .Values.nginx.externalPortHttp }}
+    targetPort: {{ .Values.nginx.internalPortHttp }}
+    protocol: TCP
+    name: http
+  {{- end }}
+  {{- if .Values.nginx.https }}
+  {{- if or .Values.nginx.https.enabled .Values.nginx.service.ssloffload }}
+  - port: {{ .Values.nginx.https.externalPort }}
+    {{- if and .Values.nginx.service.ssloffload (not .Values.nginx.service.ssloffloadForceHttps) }}
+    targetPort: {{ .Values.nginx.http.internalPort }}
+    {{- else }}
+    targetPort: {{ .Values.nginx.https.internalPort}}
+    {{- end }}
+    {{- if .Values.nginx.service.nodePort }}
+    nodePort: {{ .Values.nginx.service.nodePort }}
+    {{- end }}
+    protocol: TCP
+    name: https
+  {{- end }}
+  {{- else }} # DEPRECATED
+  - port: {{ .Values.nginx.externalPortHttps }}
+    targetPort: {{ .Values.nginx.internalPortHttps }}
+    protocol: TCP
+    name: https
+  {{- end }}
+  {{- if .Values.artifactory.ssh.enabled }}
+  - port: {{ .Values.nginx.ssh.externalPort }}
+    targetPort: {{ .Values.nginx.ssh.internalPort }}
+    protocol: TCP
+    name: tcp-ssh
+  {{- end }}
+  selector:
+    app: {{ template "artifactory-ha.name" . }}
+    component: {{ .Values.nginx.name }}
+    release: {{ .Release.Name }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-ha/107.98.14/values.yaml b/charts/jfrog/artifactory-ha/107.98.14/values.yaml
new file mode 100644
index 000000000..93655ea1f
--- /dev/null
+++ b/charts/jfrog/artifactory-ha/107.98.14/values.yaml
@@ -0,0 +1,1905 @@
+## Default values for artifactory-ha.
+## This is a YAML-formatted file.
+## Beware when changing values here. You should know what you are doing!
+## Access the values with {{ .Values.key.subkey }}
+
+global:
+  # imageRegistry: releases-docker.jfrog.io
+  # imagePullSecrets:
+  #   - myRegistryKeySecretName
+  ## Chart.AppVersion can be overidden using global.versions.artifactory or .Values.artifactory.image.tag
+  ## Note: Order of preference is 1) global.versions 2) .Values.artifactory.image.tag 3) Chart.AppVersion
+  ## This applies also for nginx images (.Values.nginx.image.tag)
+  versions: {}
+  # artifactory:
+  # initContainers:
+  # joinKey:
+  # masterKey:
+  # joinKeySecretName:
+  # masterKeySecretName:
+
+  ## Note: tags customInitContainersBegin,customInitContainers,customVolumes,customVolumeMounts,customSidecarContainers can be used both from global and application level simultaneously
+  # customInitContainersBegin: |
+
+  # customInitContainers: |
+
+  # customVolumes: |
+
+  # customVolumeMounts: |
+
+  # customSidecarContainers: |
+
+  ## certificates added to this secret will be copied to $JFROG_HOME/artifactory/var/etc/security/keys/trusted directory
+  customCertificates:
+    enabled: false
+    # certificateSecretName:
+  ## Applies to artifactory and nginx pods
+  nodeSelector: {}
+## String to partially override artifactory-ha.fullname template (will maintain the release name)
+# nameOverride:
+
+## String to fully override artifactory-ha.fullname template
+# fullnameOverride:
+
+# Init containers
+initContainers:
+  image:
+    registry: releases-docker.jfrog.io
+    repository: ubi9/ubi-minimal
+    tag: 9.5.1731604394
+    pullPolicy: IfNotPresent
+  resources:
+    requests:
+      memory: "50Mi"
+      cpu: "10m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+installer:
+  type:
+  platform:
+## The installerInfo is intentionally commented out and the previous content has been moved under `files/installer-info.json`
+## To override the content in `files/installer-info.json`, Uncomment the `installerInfo` and  add relevant data
+# installerInfo: '{}'
+
+# For supporting pulling from private registries
+# imagePullSecrets:
+#   - myRegistryKeySecretName
+
+## Artifactory systemYaml override
+## This is for advanced usecases where users wants to provide their own systemYaml for configuring artifactory
+## Refer: https://www.jfrog.com/confluence/display/JFROG/Artifactory+System+YAML
+## Note: This will override existing (default) .Values.artifactory.systemYaml in values.yaml
+## Alternatively, systemYaml can be overidden via customInitContainers using external sources like vaults, external repositories etc. Please refer customInitContainer section below for an example.
+## Note: Order of preference is 1) customInitContainers 2) systemYamlOverride existingSecret 3) default systemYaml in values.yaml
+systemYamlOverride:
+  ## You can use a pre-existing secret by specifying existingSecret
+  existingSecret:
+  ## The dataKey should be the name of the secret data key created.
+  dataKey:
+## Role Based Access Control
+## Ref: https://kubernetes.io/docs/admin/authorization/rbac/
+rbac:
+  create: false
+  role:
+    ## Rules to create. It follows the role specification
+    rules:
+      - apiGroups:
+          - ''
+        resources:
+          - services
+          - endpoints
+          - pods
+        verbs:
+          - get
+          - watch
+          - list
+## Service Account
+## Ref: https://kubernetes.io/docs/admin/service-accounts-admin/
+##
+serviceAccount:
+  create: false
+  ## The name of the ServiceAccount to use.
+  ## If not set and create is true, a name is generated using the fullname template
+  name:
+  annotations: {}
+  ## Explicitly mounts the  API token for the service account to the pods
+  automountServiceAccountToken: false
+ingress:
+  enabled: false
+  defaultBackend:
+    enabled: true
+  ## Used to create an Ingress record.
+  hosts: []
+  routerPath: /
+  artifactoryPath: /artifactory/
+  rtfsPath: /artifactory/service/rtfs/
+  className: ""
+  annotations: {}
+  # kubernetes.io/tls-acme: "true"
+  # nginx.ingress.kubernetes.io/proxy-body-size: "0"
+  labels: {}
+  # traffic-type: external
+  # traffic-type: internal
+  tls: []
+  ## Secrets must be manually created in the namespace.
+  # - secretName: chart-example-tls
+  #   hosts:
+  #     - artifactory.domain.example
+
+  ## Additional ingress rules
+  additionalRules: []
+  ## This is an experimental feature, enabling this feature will route all traffic through the Router.
+  disableRouterBypass: false
+## Allows to add custom ingress
+customIngress: ""
+## There is a need to separate HTTP1.1 traffic from gRPC (HTTP2) to benefit
+## 1. Use the Nginx keepalive for HTTP1.1
+## 2. Keep gRPC over the HTTP2 connections only
+ingressGrpc:
+  enabled: false
+  name: grpc
+  defaultBackend:
+    enabled: true
+  ## Used to create an Ingress record.
+  hosts: []
+  grpcPath: /com.jfrog
+  className: ""
+  ## For supporting GRPC protocol traffic sent to the backend it is necessary to change the backend protocol
+  ## Example: nginx.ingress.kubernetes.io/backend-protocol: GRPCS
+  annotations: {}
+  # kubernetes.io/tls-acme: "true"
+  # nginx.ingress.kubernetes.io/proxy-body-size: "0"
+  labels: {}
+  # traffic-type: external
+  # traffic-type: internal
+  tls: []
+  ## Secrets must be manually created in the namespace.
+  # - secretName: chart-example-tls
+  #   hosts:
+  #     - artifactory.domain.example
+
+  ## Additional ingress rules
+  additionalRules: []
+networkpolicy: []
+# Allows all ingress and egress
+# - name: artifactory
+#   podSelector:
+#     matchLabels:
+#       app: artifactory-ha
+#   egress:
+#   - {}
+#   ingress:
+#   - {}
+## Uncomment to allow only artifactory pods to communicate with postgresql (if postgresql.enabled is true)
+# - name: postgresql
+#   podSelector:
+#     matchLabels:
+#       app: postgresql
+#   ingress:
+#   - from:
+#     - podSelector:
+#         matchLabels:
+#           app: artifactory-ha
+
+## Database configurations
+## Use the wait-for-db init container. Set to false to skip
+waitForDatabase: true
+## Configuration values for the postgresql dependency
+## ref: https://github.com/bitnami/charts/blob/master/bitnami/postgresql/README.md
+##
+postgresql:
+  enabled: true
+  image:
+    registry: releases-docker.jfrog.io
+    repository: bitnami/postgresql
+    tag: 15.6.0-debian-11-r16
+  postgresqlUsername: artifactory
+  postgresqlPassword: ""
+  postgresqlDatabase: artifactory
+  postgresqlExtendedConf:
+    listenAddresses: "*"
+    maxConnections: "1500"
+  persistence:
+    enabled: true
+    size: 200Gi
+    # existingClaim:
+  service:
+    port: 5432
+  primary:
+    nodeSelector: {}
+    affinity: {}
+    tolerations: []
+  readReplicas:
+    nodeSelector: {}
+    affinity: {}
+    tolerations: []
+  resources: {}
+  securityContext:
+    enabled: true
+  containerSecurityContext:
+    enabled: true
+    # requests:
+    #   memory: "512Mi"
+    #   cpu: "100m"
+    # limits:
+    #   memory: "1Gi"
+    #   cpu: "500m"
+## If NOT using the PostgreSQL in this chart (postgresql.enabled=false),
+## you MUST specify custom database details here or Artifactory will NOT start
+database:
+  ## To run Artifactory with any database other than PostgreSQL allowNonPostgresql set to true.
+  allowNonPostgresql: false
+  type:
+  driver:
+  ## If you set the url, leave host and port empty
+  url:
+  ## If you would like this chart to create the secret containing the db
+  ## password, use these values
+  user:
+  password:
+  ## If you have existing Kubernetes secrets containing db credentials, use
+  ## these values
+  secrets: {}
+  # user:
+  #   name: "rds-artifactory"
+  #   key: "db-user"
+  # password:
+  #   name: "rds-artifactory"
+  #   key: "db-password"
+  # url:
+  #   name: "rds-artifactory"
+  #   key: "db-url"
+## You can use a pre-existing secret with keys license_token and iam_role by specifying licenseConfigSecretName
+## Example : Create a generic secret using `kubectl create secret generic <secret-name> --from-literal=license_token=${TOKEN} --from-literal=iam_role=${ROLE_ARN}`
+aws:
+  license:
+    enabled: false
+  licenseConfigSecretName:
+  region: us-east-1
+## Container Security Context
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
+## @param containerSecurityContext.enabled Enabled containers' Security Context
+## @param containerSecurityContext.runAsNonRoot Set container's Security Context runAsNonRoot
+## @param containerSecurityContext.privileged Set container's Security Context privileged
+## @param containerSecurityContext.allowPrivilegeEscalation Set container's Security Context allowPrivilegeEscalation
+## @param containerSecurityContext.capabilities.drop List of capabilities to be dropped
+## @param containerSecurityContext.seccompProfile.type Set container's Security Context seccomp profile
+##
+containerSecurityContext:
+  enabled: true
+  runAsNonRoot: true
+  privileged: false
+  allowPrivilegeEscalation: false
+  seccompProfile:
+    type: RuntimeDefault
+  capabilities:
+    drop:
+      - ALL
+## The following router settings are to configure only when splitServicesToContainers set to true
+router:
+  name: router
+  image:
+    registry: releases-docker.jfrog.io
+    repository: jfrog/router
+    tag: 7.135.2
+    pullPolicy: IfNotPresent
+  serviceRegistry:
+    ## Service registry (Access) TLS verification skipped if enabled
+    insecure: false
+  internalPort: 8082
+  externalPort: 8082
+  tlsEnabled: false
+  ## Extra environment variables that can be used to tune router to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "1Gi"
+  #   cpu: "1"
+
+  ## Add lifecycle hooks for router container
+  lifecycle:
+    ## From Artifactory versions 7.52.x, Wait for Artifactory to complete any open uploads or downloads before terminating
+    preStop:
+      exec:
+        command: ["sh", "-c", "while [[ $(curl --fail --silent --connect-timeout 2 http://localhost:8081/artifactory/api/v1/system/liveness) =~ OK ]]; do echo Artifactory is still alive; sleep 2; done"]
+        # postStart:
+        #   exec:
+        #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  ## Add custom volumesMounts
+  customVolumeMounts: |
+    # - name: custom-script
+    #   mountPath: /scripts/script.sh
+    #   subPath: script.sh
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "artifactory-ha.scheme" . }}://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      periodSeconds: 10
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      failureThreshold: 5
+      successThreshold: 1
+  readinessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "artifactory-ha.scheme" . }}://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/readiness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}90{{ else }}0{{ end }}
+      periodSeconds: 10
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      failureThreshold: 5
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "artifactory-ha.scheme" . }}://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/readiness
+      initialDelaySeconds: 10
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+  persistence:
+    mountPath: "/var/opt/jfrog/router"
+## Artifactory
+artifactory:
+  name: artifactory-ha
+  ## Note that by default we use appVersion to get image tag/version
+
+  ## refer - https://www.jfrog.com/confluence/display/JFROG/Access+Federation#AccessFederation-EstablishingtheCircleofTrust
+  ## root certificates added will be copied to $JFROG_HOME/artifactory/var/etc/access/keys/trusted folder.
+  circleOfTrustCertificatesSecret:
+  ## unifiedSecretInstallation flag enables single unified secret holding all the artifactory-ha internal(chart) secrets, It won't be affecting external secrets.
+  ## Note: unifiedSecretInstallation flag is enabled by true by default from chart version 107.78.x, Users can switch to false to continue with the old way of secret creation.
+  unifiedSecretInstallation: true
+  ## unifiedSecretPrependReleaseName Set this flag to false if unifiedSecret should not be created with <release-name> prepended.
+  unifiedSecretPrependReleaseName: true
+  image:
+    registry: releases-docker.jfrog.io
+    repository: jfrog/artifactory-pro
+    # tag:
+    pullPolicy: IfNotPresent
+  ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+  schedulerName:
+  ## Create a priority class for the Artifactory pods or use an existing one
+  ## NOTE - Maximum allowed value of a user defined priority is 1000000000
+  priorityClass:
+    create: false
+    value: 1000000000
+    ## Override default name
+    # name:
+    ## Use an existing priority class
+    # existingPriorityClass:
+  ## Delete the db.properties file in ARTIFACTORY_HOME/etc/db.properties
+  deleteDBPropertiesOnStartup: true
+  database:
+    maxOpenConnections: 80
+  tomcat:
+    maintenanceConnector:
+      port: 8091
+    connector:
+      maxThreads: 200
+      sendReasonPhrase: false
+      extraConfig: 'acceptCount="400"'
+  ## certificates added to this secret will be copied to $JFROG_HOME/artifactory/var/etc/security/keys/trusted directory
+  customCertificates:
+    enabled: false
+    # certificateSecretName:
+  ## Support for metrics is only available for Artifactory 7.7.x (appVersions) and above.
+  ## To enable set `.Values.artifactory.metrics.enabled` to `true`
+  ## Note: Depricated `openMetrics` as part of 7.87.x and renamed to `metrics`
+  ## Refer - https://www.jfrog.com/confluence/display/JFROG/Open+Metrics
+  metrics:
+    enabled: false
+    ## Settings for pushing metrics to Insight - enable filebeat to true
+    filebeat:
+      enabled: false
+      log:
+        enabled: false
+        ## Log level for filebeat. Possible values: debug, info, warning, or error.
+        level: "info"
+      ## Elasticsearch details for filebeat to connect
+      elasticsearch:
+        url: "Elasticsearch url where JFrog Insight is installed For example, http://<ip_address>:8082"
+        username: ""
+        password: ""
+  ## Support for Cold Artifact Storage
+  ## set 'coldStorage.enabled' to 'true' only for Artifactory instance that you are designating as the Cold instance
+  ## Refer - https://jfrog.com/help/r/jfrog-platform-administration-documentation/setting-up-cold-artifact-storage
+  coldStorage:
+    enabled: false
+  ## Support for workers
+  ## set 'worker.enabled' to 'true' to enable artifactory addon that executes workers on artifactory events
+  worker:
+    enabled: false
+  ## This directory is intended for use with NFS eventual configuration for HA
+  ## When enabling this section, The system.yaml will include haDataDir section.
+  ## The location of Artifactory Data directory and Artifactory Filestore will be modified accordingly and will be shared among all nodes.
+  ## It's recommended to leave haDataDir disabled, and the default BinarystoreXml will set the Filestore location as configured in artifactory.persistence.nfs.dataDir.
+  haDataDir:
+    enabled: false
+    path:
+  haBackupDir:
+    enabled: false
+    path:
+  ## Files to copy to ARTIFACTORY_HOME/ on each Artifactory startup
+  ## Note : From 107.46.x chart versions, copyOnEveryStartup is not needed for binarystore.xml, it is always copied via initContainers
+  copyOnEveryStartup:
+  ## Absolute path
+  # - source: /artifactory_bootstrap/artifactory.cluster.license
+  ## Relative to ARTIFACTORY_HOME/
+  # target: etc/artifactory/
+
+  ## Sidecar containers for tailing Artifactory logs
+  loggers: []
+  # - access-audit.log
+  # - access-request.log
+  # - access-security-audit.log
+  # - access-service.log
+  # - artifactory-access.log
+  # - artifactory-event.log
+  # - artifactory-import-export.log
+  # - artifactory-request.log
+  # - artifactory-service.log
+  # - frontend-request.log
+  # - frontend-service.log
+  # - metadata-request.log
+  # - metadata-service.log
+  # - router-request.log
+  # - router-service.log
+  # - router-traefik.log
+  # - derby.log
+
+  ## Loggers containers resources
+  loggersResources: {}
+  # requests:
+  #   memory: "10Mi"
+  #   cpu: "10m"
+  # limits:
+  #   memory: "100Mi"
+  #   cpu: "50m"
+
+  ## Sidecar containers for tailing Tomcat (catalina) logs
+  catalinaLoggers: []
+  # - tomcat-catalina.log
+  # - tomcat-localhost.log
+
+  ## Tomcat (catalina) loggers resources
+  catalinaLoggersResources: {}
+  # requests:
+  #   memory: "10Mi"
+  #   cpu: "10m"
+  # limits:
+  #   memory: "100Mi"
+  #   cpu: "50m"
+
+  ## Migration support from 6.x to 7.x.
+  migration:
+    enabled: false
+    timeoutSeconds: 3600
+    ## Extra pre-start command in migration Init Container to install JDBC driver for MySql/MariaDb/Oracle
+    # preStartCommand: "mkdir -p /opt/jfrog/artifactory/var/bootstrap/artifactory/tomcat/lib; cd /opt/jfrog/artifactory/var/bootstrap/artifactory/tomcat/lib && curl -o /opt/jfrog/artifactory/var/bootstrap/artifactory/tomcat/lib/mysql-connector-java-5.1.41.jar https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.41/mysql-connector-java-5.1.41.jar"
+  ## Add custom init containers execution before predefined init containers
+  customInitContainersBegin: |
+    # - name: "custom-setup"
+    #   image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+    #   imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+    #   securityContext:
+    #     runAsNonRoot: true
+    #     allowPrivilegeEscalation: false
+    #     capabilities:
+    #       drop:
+    #         - NET_RAW
+    #   command:
+    #     - 'sh'
+    #     - '-c'
+    #     - 'touch {{ .Values.artifactory.persistence.mountPath }}/example-custom-setup'
+    #   volumeMounts:
+    #     - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+    #       name: volume
+  ## Add custom init containers
+  ## Add custom init containers execution after predefined init containers
+  customInitContainers: |
+    # - name: "custom-systemyaml-setup"
+    #   image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+    #   imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+    #   securityContext:
+    #     runAsNonRoot: true
+    #     allowPrivilegeEscalation: false
+    #     capabilities:
+    #       drop:
+    #         - NET_RAW
+    #   command:
+    #     - 'sh'
+    #     - '-c'
+    #     - 'curl -o {{ .Values.artifactory.persistence.mountPath }}/etc/system.yaml https://<repo-url>/systemyaml'
+    #   volumeMounts:
+    #     - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+    #       name: volume
+  ## Add custom sidecar containers
+  ## - The provided example uses a custom volume (customVolumes)
+  ## - The provided example shows running container as root (id 0)
+  customSidecarContainers: |
+    # - name: "sidecar-list-etc"
+    #   image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+    #   imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+    #   securityContext:
+    #     runAsNonRoot: true
+    #     allowPrivilegeEscalation: false
+    #     capabilities:
+    #       drop:
+    #         - NET_RAW
+    #   command:
+    #     - 'sh'
+    #     - '-c'
+    #     - 'sh /scripts/script.sh'
+    #   volumeMounts:
+    #     - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+    #       name: volume
+    #     - mountPath: "/scripts/script.sh"
+    #       name: custom-script
+    #       subPath: script.sh
+    #   resources:
+    #     requests:
+    #       memory: "32Mi"
+    #       cpu: "50m"
+    #     limits:
+    #       memory: "128Mi"
+    #       cpu: "100m"
+  ## Add custom volumes
+  ## If .Values.artifactory.unifiedSecretInstallation is true then secret name should be '{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret'.
+  customVolumes: |
+    # - name: custom-script
+    #   configMap:
+    #     name: custom-script
+  ## Add custom volumesMounts
+  customVolumeMounts: |
+    # - name: custom-script
+    #   mountPath: "/scripts/script.sh"
+    #   subPath: script.sh
+    # - name: posthook-start
+    #   mountPath: "/scripts/posthoook-start.sh"
+    #   subPath: posthoook-start.sh
+    # - name: prehook-start
+    #   mountPath: "/scripts/prehook-start.sh"
+    #   subPath: prehook-start.sh
+  ## Add custom persistent volume mounts - Available to the entire namespace
+  customPersistentVolumeClaim: {}
+  # name:
+  # mountPath:
+  # accessModes:
+  #   - "-"
+  # size:
+  # storageClassName:
+
+  ## Artifactory HA requires a unique master key. Each Artifactory node must have the same master key!
+  ## You can generate one with the command: "openssl rand -hex 32"
+  ## Pass it to helm with '--set artifactory.masterKey=${MASTER_KEY}'
+  ## Alternatively, you can use a pre-existing secret with a key called master-key by specifying masterKeySecretName
+  ## IMPORTANT: You should NOT use the example masterKey for a production deployment!
+  ## IMPORTANT: This is a mandatory for fresh Install of 7.x (App version)
+  # masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  # masterKeySecretName:
+
+  ## Join Key to connect to other services to Artifactory.
+  ## IMPORTANT: Setting this value overrides the existing joinKey
+  ## IMPORTANT: You should NOT use the example joinKey for a production deployment!
+  # joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+  ## Alternatively, you can use a pre-existing secret with a key called join-key by specifying joinKeySecretName
+  # joinKeySecretName:
+
+  ## Registration Token for JFConnect
+  # jfConnectToken:
+  ## Alternatively, you can use a pre-existing secret with a key called jfconnect-token by specifying jfConnectTokenSecretName
+  # jfConnectTokenSecretName:
+
+  ## Add custom secrets - secret per file
+  ## If .Values.artifactory.unifiedSecretInstallation is true then secret name should be '{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret' common to all secrets
+  customSecrets:
+  # - name: custom-secret
+  #   key: custom-secret.yaml
+  #   data: >
+  #     custom_secret_config:
+  #       parameter1: value1
+  #       parameter2: value2
+  # - name: custom-secret2
+  #   key: custom-secret2.config
+  #   data: |
+  #     here the custom secret 2 config
+
+  ## If false, all service console logs will not redirect to a common console.log
+  consoleLog: false
+  ## admin allows to set the password for the default admin user.
+  ## See: https://www.jfrog.com/confluence/display/JFROG/Users+and+Groups#UsersandGroups-RecreatingtheDefaultAdminUserrecreate
+  admin:
+    ip: "127.0.0.1"
+    username: "admin"
+    password:
+    secret:
+    dataKey:
+  ## Artifactory license.
+  license:
+    ## licenseKey is the license key in plain text. Use either this or the license.secret setting
+    licenseKey:
+    ## If artifactory.license.secret is passed, it will be mounted as
+    ## ARTIFACTORY_HOME/etc/artifactory.cluster.license and loaded at run time.
+    secret:
+    ## The dataKey should be the name of the secret data key created.
+    dataKey:
+  ## Create configMap with artifactory.config.import.xml and security.import.xml and pass name of configMap in following parameter
+  configMapName:
+  ## Add any list of configmaps to Artifactory
+  configMaps: |
+    # posthook-start.sh: |-
+    #   echo "This is a post start script"
+    # posthook-end.sh: |-
+    #   echo "This is a post end script"
+  ## List of secrets for Artifactory user plugins.
+  ## One Secret per plugin's files.
+  userPluginSecrets:
+  # - archive-old-artifacts
+  # - build-cleanup
+  # - webhook
+  # - '{{ template "my-chart.fullname" . }}'
+
+  ## Extra pre-start command to install JDBC driver for MySql/MariaDb/Oracle
+  # preStartCommand: "mkdir -p /opt/jfrog/artifactory/var/bootstrap/artifactory/tomcat/lib; cd /opt/jfrog/artifactory/var/bootstrap/artifactory/tomcat/lib && curl -o /opt/jfrog/artifactory/var/bootstrap/artifactory/tomcat/lib/mysql-connector-java-5.1.41.jar https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.41/mysql-connector-java-5.1.41.jar"
+
+  ## Add lifecycle hooks for artifactory container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## Extra environment variables that can be used to tune Artifactory to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: SERVER_XML_ARTIFACTORY_PORT
+  #   value: "8081"
+  # - name: SERVER_XML_ARTIFACTORY_MAX_THREADS
+  #   value: "200"
+  # - name: SERVER_XML_ACCESS_MAX_THREADS
+  #   value: "50"
+  # - name: SERVER_XML_ARTIFACTORY_EXTRA_CONFIG
+  #   value: ""
+  # - name: SERVER_XML_ACCESS_EXTRA_CONFIG
+  #   value: ""
+  # - name: SERVER_XML_EXTRA_CONNECTOR
+  #   value: ""
+  # - name: DB_POOL_MAX_ACTIVE
+  #   value: "100"
+  # - name: DB_POOL_MAX_IDLE
+  #   value: "10"
+  # - name: MY_SECRET_ENV_VAR
+  #   valueFrom:
+  #     secretKeyRef:
+  #       name: my-secret-name
+  #       key: my-secret-key
+
+  ## System YAML entries now reside under files/system.yaml.
+  ## You can provide the specific values that you want to add or override under 'artifactory.extraSystemYaml'.
+  ## For example:
+  ## extraSystemYaml:
+  ##   shared:
+  ##     node:
+  ##       id: my-instance
+  ## The entries provided under 'artifactory.extraSystemYaml' are merged with files/system.yaml to create the final system.yaml.
+  ## If you have already provided system.yaml under, 'artifactory.systemYaml', the values in that entry take precedence over files/system.yaml
+  ## You can modify specific entries with your own value under `artifactory.extraSystemYaml`, The values under extraSystemYaml overrides the values under 'artifactory.systemYaml' and files/system.yaml
+  extraSystemYaml: {}
+  ## systemYaml is intentionally commented and the previous content has been moved under files/system.yaml.
+  ## You have to add the all entries of the system.yaml file here, and it overrides the values in files/system.yaml.
+  # systemYaml:
+
+  ## IMPORTANT: If overriding artifactory.internalPort:
+  ## DO NOT use port lower than 1024 as Artifactory runs as non-root and cannot bind to ports lower than 1024!
+  externalPort: 8082
+  internalPort: 8082
+  externalArtifactoryPort: 8081
+  internalArtifactoryPort: 8081
+  terminationGracePeriodSeconds: 30
+  ## Pod Security Context
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+  ## @param artifactory.podSecurityContext.enabled Enable security context
+  ## @param artifactory.podSecurityContext.runAsNonRoot Set pod's Security Context runAsNonRoot
+  ## @param artifactory.podSecurityContext.runAsUser User ID for the pod
+  ## @param artifactory.podSecurityContext.runASGroup Group ID for the pod
+  ## @param artifactory.podSecurityContext.fsGroup Group ID for the pod
+  ##
+  podSecurityContext:
+    enabled: true
+    runAsNonRoot: true
+    runAsUser: 1030
+    runAsGroup: 1030
+    fsGroup: 1030
+    # fsGroupChangePolicy: "Always"
+    # seLinuxOptions: {}
+  ## The following settings are to configure the frequency of the liveness and startup probes.
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.artifactory.tomcat.maintenanceConnector.port }}/artifactory/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      periodSeconds: 10
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      failureThreshold: 5
+      successThreshold: 1
+  readinessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.artifactory.tomcat.maintenanceConnector.port }}/artifactory/api/v1/system/readiness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}90{{ else }}0{{ end }}
+      periodSeconds: 10
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      failureThreshold: 5
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.artifactory.tomcat.maintenanceConnector.port }}/artifactory/api/v1/system/readiness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}30{{ else }}0{{ end }}
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+  persistence:
+    enabled: true
+    local: false
+    redundancy: 3
+    mountPath: "/var/opt/jfrog/artifactory"
+    accessMode: ReadWriteOnce
+    size: 200Gi
+    ## Use a custom Secret to be mounted as your binarystore.xml
+    ## NOTE: This will ignore all settings below that make up binarystore.xml
+    customBinarystoreXmlSecret:
+    ## cache-fs binary provider configurations
+    ## Refer: https://jfrog.com/help/r/jfrog-installation-setup-documentation/cache-fs-template-configuration
+    maxCacheSize: 50000000000
+    cacheProviderDir: cache
+    # maxFileSizeLimit:
+    # skipDuringUpload:
+
+    ## artifactory data Persistent Volume Storage Class
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    ##
+    # storageClassName: "-"
+
+    ## Set the persistence storage type. This will apply the matching binarystore.xml to Artifactory config
+    ## Supported types are:
+    ## file-system (default)
+    ## nfs
+    ## google-storage
+    ## google-storage-v2
+    ## google-storage-v2-direct (Recommended for GCS - Google Cloud Storage)
+    ## aws-s3-v3
+    ## s3-storage-v3-direct (Recommended for AWS S3)
+    ## s3-storage-v3-archive
+    ## azure-blob
+    ## azure-blob-storage-direct
+    ## azure-blob-storage-v2-direct (Recommended for Azure Blob Storage)
+    type: file-system
+    ## Use binarystoreXml to provide a custom binarystore.xml
+    ## This is intentionally commented and below previous content of binarystoreXml is moved under files/binarystore.xml
+    ## binarystoreXml:
+
+    ## For artifactory.persistence.type file-system
+    fileSystem:
+      ## Need to have the following set
+      existingSharedClaim:
+        enabled: false
+        numberOfExistingClaims: 1
+        ## Should be a child directory of {{ .Values.artifactory.persistence.mountPath }}
+        dataDir: "{{ .Values.artifactory.persistence.mountPath }}/artifactory-data"
+        backupDir: "/var/opt/jfrog/artifactory-backup"
+        ## You may also use existing shared claims for the data and backup storage. This allows storage (NAS for example) to be used for Data and Backup dirs which are safe to share across multiple artifactory nodes.
+        ## You may specify numberOfExistingClaims to indicate how many of these existing shared claims to mount. (Default = 1)
+        ## Create PVCs with ReadWriteMany that match the naming convetions:
+        ##   {{ template "artifactory-ha.fullname" . }}-data-pvc-<claim-ordinal>
+        ##   {{ template "artifactory-ha.fullname" . }}-backup-pvc
+        ## Example (using numberOfExistingClaims: 2)
+        ##   myexample-data-pvc-0
+        ##   myexample-data-pvc-1
+        ##   myexample-backup-pvc
+        ## Note: While you need two PVC fronting two PVs, multiple PVs can be attached to the same storage in many cases allowing you to share an underlying drive.
+    ## For artifactory.persistence.type nfs
+    ## If using NFS as the shared storage, you must have a running NFS server that is accessible by your Kubernetes
+    ## cluster nodes.
+    ## Need to have the following set
+    nfs:
+      ## Must pass actual IP of NFS server with '--set For artifactory.persistence.nfs.ip=${NFS_IP}'
+      ip:
+      haDataMount: "/data"
+      haBackupMount: "/backup"
+      dataDir: "/var/opt/jfrog/artifactory-ha"
+      backupDir: "/var/opt/jfrog/artifactory-backup"
+      capacity: 200Gi
+      mountOptions: []
+    ## For artifactory.persistence.type google-storage, google-storage-v2, google-storage-v2-direct
+    googleStorage:
+      ## When using GCP buckets as your binary store (Available with enterprise license only)
+      gcpServiceAccount:
+        enabled: false
+        ## Use either an existing secret prepared in advance or put the config (replace the content) in the values
+        ## ref: https://github.com/jfrog/charts/blob/master/stable/artifactory-ha/README.md#google-storage
+        # customSecretName:
+        # config: |
+        #   {
+        #      "type": "service_account",
+        #      "project_id": "<project_id>",
+        #      "private_key_id": "?????",
+        #      "private_key": "-----BEGIN PRIVATE KEY-----\n????????==\n-----END PRIVATE KEY-----\n",
+        #      "client_email": "???@j<project_id>.iam.gserviceaccount.com",
+        #      "client_id": "???????",
+        #      "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+        #      "token_uri": "https://oauth2.googleapis.com/token",
+        #      "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+        #      "client_x509_cert_url": "https://www.googleapis.com/robot/v1....."
+        #   }
+      endpoint: commondatastorage.googleapis.com
+      httpsOnly: false
+      ## Set a unique bucket name
+      bucketName: "artifactory-ha-gcp"
+      ## GCP Bucket Authentication with Identity and Credential is deprecated.
+      ## identity:
+      ## credential:
+      path: "artifactory-ha/filestore"
+      bucketExists: false
+      useInstanceCredentials: false
+      enableSignedUrlRedirect: false
+      # signedUrlExpirySeconds: 30
+    ## For artifactory.persistence.type aws-s3-v3, s3-storage-v3-direct, s3-storage-v3-archive
+    awsS3V3:
+      testConnection: false
+      identity:
+      credential:
+      region:
+      bucketName: artifactory-aws
+      path: artifactory/filestore
+      endpoint:
+      port:
+      useHttp:
+      maxConnections: 50
+      connectionTimeout:
+      socketTimeout:
+      kmsServerSideEncryptionKeyId:
+      kmsKeyRegion:
+      kmsCryptoMode:
+      useInstanceCredentials: true
+      usePresigning: false
+      signatureExpirySeconds: 300
+      signedUrlExpirySeconds: 30
+      cloudFrontDomainName:
+      cloudFrontKeyPairId:
+      cloudFrontPrivateKey:
+      enableSignedUrlRedirect: false
+      enablePathStyleAccess: false
+      multiPartLimit:
+      multipartElementSize:
+    ## For artifactory.persistence.type azure-blob, azure-blob-storage-direct, azure-blob-storage-v2-direct
+    azureBlob:
+      accountName:
+      accountKey:
+      endpoint:
+      containerName:
+      multiPartLimit: 100000000
+      multipartElementSize: 50000000
+      testConnection: false
+  service:
+    name: artifactory
+    type: ClusterIP
+    ## @param service.ipFamilyPolicy Controller Service ipFamilyPolicy (optional, cloud specific)
+    ## This can be either SingleStack, PreferDualStack or RequireDualStack
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services
+    ##
+    ipFamilyPolicy: ""
+    ## @param service.ipFamilies Controller Service ipFamilies (optional, cloud specific)
+    ## This can be either ["IPv4"], ["IPv6"], ["IPv4", "IPv6"] or ["IPv6", "IPv4"]
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services
+    ##
+    ipFamilies: []
+    ## For supporting whitelist on the Artifactory service (useful if setting service.type=LoadBalancer)
+    ## Set this to a list of IP CIDR ranges
+    ## Example: loadBalancerSourceRanges: ['10.10.10.5/32', '10.11.10.5/32']
+    ## or pass from helm command line
+    ## Example: helm install ... --set nginx.service.loadBalancerSourceRanges='{10.10.10.5/32,10.11.10.5/32}'
+    loadBalancerSourceRanges: []
+    annotations: {}
+    ## Which nodes in the cluster should be in the external load balancer pool (have external traffic routed to them)
+    ## Supported pool values
+    ## members
+    ## all
+    pool: members
+    ## If the type is NodePort you can set a fixed port
+    # nodePort: 32082
+  serviceGrpc:
+    name: grpc
+    type: ClusterIP
+    ## @param service.ipFamilyPolicy Controller Service ipFamilyPolicy (optional, cloud specific)
+    ## This can be either SingleStack, PreferDualStack or RequireDualStack
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services
+    ##
+    ipFamilyPolicy: ""
+    ## @param service.ipFamilies Controller Service ipFamilies (optional, cloud specific)
+    ## This can be either ["IPv4"], ["IPv6"], ["IPv4", "IPv6"] or ["IPv6", "IPv4"]
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services
+    ##
+    ipFamilies: []
+    ## For supporting whitelist on the Artifactory service (useful if setting service.type=LoadBalancer)
+    ## Set this to a list of IP CIDR ranges
+    ## Example: loadBalancerSourceRanges: ['10.10.10.5/32', '10.11.10.5/32']
+    ## or pass from helm command line
+    ## Example: helm install ... --set nginx.service.loadBalancerSourceRanges='{10.10.10.5/32,10.11.10.5/32}'
+    loadBalancerSourceRanges: []
+    annotations: {}
+    ## Which nodes in the cluster should be in the external load balancer pool (have external traffic routed to them)
+    ## Supported pool values
+    ## members
+    ## all
+    pool: members
+    ## If the type is NodePort you can set a fixed port
+    # nodePort: 32082
+  statefulset:
+    annotations: {}
+  ssh:
+    enabled: false
+    internalPort: 1339
+    externalPort: 1339
+  annotations: {}
+  ## Spread Artifactory pods evenly across your nodes or some other topology
+  ## Note this applies to both the primary and replicas
+  topologySpreadConstraints: []
+  # - maxSkew: 1
+  #   topologyKey: kubernetes.io/hostname
+  #   whenUnsatisfiable: DoNotSchedule
+  #   labelSelector:
+  #     matchLabels:
+  #       app: '{{ template "artifactory-ha.name" . }}'
+  #       role: '{{ template "artifactory-ha.name" . }}'
+  #       release: "{{ .Release.Name }}"
+
+  ## Type specific configurations.
+  ## There is a difference between the primary and the member nodes.
+  ## Customising their resources and java parameters is done here.
+  primary:
+    name: artifactory-ha-primary
+    ## preStartCommand specific to the primary node, to be run after artifactory.preStartCommand
+    # preStartCommand:
+    labels: {}
+    annotations: {}
+    persistence:
+      ## Set existingClaim to true or false
+      ## If true, you must prepare a PVC with the name e.g `volume-myrelease-artifactory-ha-primary-0`
+      existingClaim: false
+    replicaCount: 3
+    # minAvailable: 1
+
+    updateStrategy:
+      type: RollingUpdate
+    ## Resources for the primary node
+    resources: {}
+    # requests:
+    #   memory: "1Gi"
+    #   cpu: "500m"
+    # limits:
+    #   memory: "2Gi"
+    #   cpu: "1"
+    ## The following Java options are passed to the java process running Artifactory primary node.
+    ## You should set them according to the resources set above
+    javaOpts:
+      # xms: "1g"
+      # xmx: "2g"
+      # corePoolSize: 24
+      jmx:
+        enabled: false
+        port: 9010
+        host:
+        ssl: false
+        # When authenticate is true, accessFile and passwordFile are required
+        authenticate: false
+        accessFile:
+        passwordFile:
+        # other: ""
+    nodeSelector: {}
+    tolerations: []
+    affinity: {}
+    ## Only used if "affinity" is empty
+    podAntiAffinity:
+      ## Valid values are "soft" or "hard"; any other value indicates no anti-affinity
+      type: "soft"
+      topologyKey: "kubernetes.io/hostname"
+  node:
+    name: artifactory-ha-member
+    ## preStartCommand specific to the member node, to be run after artifactory.preStartCommand
+    # preStartCommand:
+    labels: {}
+    persistence:
+      ## Set existingClaim to true or false
+      ## If true, you must prepare a PVC with the name e.g `volume-myrelease-artifactory-ha-member-0`
+      existingClaim: false
+    replicaCount: 0
+    updateStrategy:
+      type: RollingUpdate
+    minAvailable: 1
+    ## Resources for the member nodes
+    resources: {}
+    # requests:
+    #   memory: "1Gi"
+    #   cpu: "500m"
+    # limits:
+    #   memory: "2Gi"
+    #   cpu: "1"
+    ## The following Java options are passed to the java process running Artifactory member nodes.
+    ## You should set them according to the resources set above
+    javaOpts:
+      # xms: "1g"
+      # xmx: "2g"
+      # corePoolSize: 24
+      jmx:
+        enabled: false
+        port: 9010
+        host:
+        ssl: false
+        # When authenticate is true, accessFile and passwordFile are required
+        authenticate: false
+        accessFile:
+        passwordFile:
+        # other: ""
+    nodeSelector: {}
+    ## Wait for Artifactory primary
+    waitForPrimaryStartup:
+      enabled: true
+      ## Setting time will override the built in test and will just wait the set time
+      time:
+    tolerations: []
+    ## Complete specification of the "affinity" of the member nodes; if this is non-empty,
+    ## "podAntiAffinity" values are not used.
+    affinity: {}
+    ## Only used if "affinity" is empty
+    podAntiAffinity:
+      ## Valid values are "soft" or "hard"; any other value indicates no anti-affinity
+      type: "soft"
+      topologyKey: "kubernetes.io/hostname"
+frontend:
+  name: frontend
+  enabled: true
+  internalPort: 8070
+  ## Extra environment variables that can be used to tune frontend to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "1Gi"
+  #   cpu: "1"
+  ## Session settings
+  session:
+    ## Time in minutes after which the frontend token will need to be refreshed
+    timeoutMinutes: '30'
+  ## Add lifecycle hooks for frontend container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## The following settings are to configure the frequency of the liveness and startup probes when splitServicesToContainers set to true
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.frontend.internalPort }}/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.frontend.internalPort }}/api/v1/system/readiness
+      initialDelaySeconds: 30
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+access:
+  name: access
+  enabled: true
+  ## Enable TLS by changing the tls entry (under the security section) in the access.config.yaml file.
+  ## ref: https://www.jfrog.com/confluence/display/JFROG/Managing+TLS+Certificates#ManagingTLSCertificates
+  ## When security.tls is set to true, JFrog Access will act as the Certificate Authority (CA) and sign the TLS certificates used by all the different JFrog Platform nodes.
+  ## This ensures that the node to node communication is done over TLS.
+  accessConfig:
+    security:
+      tls: false
+  ## You can use a pre-existing secret by specifying customCertificatesSecretName
+  ## Example : Create a tls secret using `kubectl create secret tls <secret-name> --cert=ca.crt --key=ca.private.key`
+  # customCertificatesSecretName:
+
+  ## When resetAccessCAKeys is true, Access will regenerate the CA certificate and matching private key
+  # resetAccessCAKeys: false
+  database:
+    maxOpenConnections: 80
+  tomcat:
+    connector:
+      maxThreads: 50
+      sendReasonPhrase: false
+      extraConfig: 'acceptCount="100"'
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:8040/access/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}30{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  readinessProbe:
+    enabled: false
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:8040/access/api/v1/system/readiness
+      initialDelaySeconds: 5
+      failureThreshold: 30
+      periodSeconds: 15
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:8040/access/api/v1/system/readiness
+      initialDelaySeconds: 5
+      failureThreshold: 30
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+  ## access container's resource requests and limits
+  ## ref: https://kubernetes.io/docs/user-guide/compute-resources/
+  ## We usually recommend not to specify default resources and to leave this as a conscious
+  ## choice for the user. This also increases chances charts run on environments with little
+  ## resources, such as Minikube. If you do want to specify resources, uncomment the following
+  ## lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  ## @param access.resources.limits The resources limits for access containers
+  ## @param access.resources.requests The requested resources for access containers
+  ##
+  resources: {}
+  # limits:
+  #   cpu: 1000m
+  #   memory: 2Gi
+  # requests:
+  #   cpu: 1000m
+  #   memory: 2Gi
+
+  javaOpts:
+  # other: ""
+
+  ## Extra environment variables that can be used to tune access to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+evidence:
+  name: evidence
+  enabled: false
+  internalPort: 8051
+  externalPort: 8052
+  ## Extra environment variables that can be used to tune evidence to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  resources: {}
+  #  requests:
+  #    memory: "100Mi"
+  #    cpu: "100m"
+  #  limits:
+  #    memory: "1Gi"
+  #    cpu: "1"
+
+  # Add lifecycle hooks for evidence container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## The following settings are to configure the frequency of the liveness and startup probes when splitServicesToContainers set to true
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.evidence.internalPort }}/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.evidence.internalPort }}/api/v1/system/readiness
+      initialDelaySeconds: 30
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+metadata:
+  name: metadata
+  enabled: true
+  internalPort: 8086
+  ## Extra environment variables that can be used to tune metadata to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  image:
+    pullPolicy: IfNotPresent
+    registry: releases-docker.jfrog.io
+    repository: jfrog/artifactory-pro
+    # tag:
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "1Gi"
+  #   cpu: "1"
+  database:
+    maxOpenConnections: 80
+  ## Add lifecycle hooks for metadata container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## The following settings are to configure the frequency of the liveness and startup probes when splitServicesToContainers set to true
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.metadata.internalPort }}/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.metadata.internalPort }}/api/v1/system/readiness
+      initialDelaySeconds: 30
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+event:
+  name: event
+  enabled: true
+  internalPort: 8061
+  ## WebHook handlers settings for event
+  webhooks: {}
+  # urlStrictPolicy: false
+
+  ## Extra environment variables that can be used to tune event to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "1Gi"
+  #   cpu: "1"
+
+  ## Add lifecycle hooks for event container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## The following settings are to configure the frequency of the liveness and startup probes when splitServicesToContainers set to true
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.event.internalPort }}/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.event.internalPort }}/api/v1/system/readiness
+      initialDelaySeconds: 30
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+jfconnect:
+  name: jfconnect
+  enabled: true
+  internalPort: 8030
+  ## Extra environment variables that can be used to tune jfconnect to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "1Gi"
+  #   cpu: "1"
+
+  ## Add lifecycle hooks for jfconnect container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## You can use a pre-existing secret by specifying customCertificatesSecretName
+  ## Example : Create a tls secret using `kubectl create secret tls <secret-name> --cert=tls.crt --key=tls.key`
+  # customCertificatesSecretName:
+
+  ## The following settings are to configure the frequency of the liveness and startup probes when splitServicesToContainers set to true
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.jfconnect.internalPort }}/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.jfconnect.internalPort }}/api/v1/system/readiness
+      initialDelaySeconds: 30
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: 5
+federation:
+  ## This is an experimental service which is not in production yet, therefore should not be enabled
+  name: federation
+  enabled: false
+  embedded: false
+  internalPort: 8025
+  extraJavaOpts: ""
+  ## This section should be removed once rtfs service is GA
+  database:
+    port: 5432
+    host: postgresql
+    name: rtfs
+    username: rtfs
+    password: ""
+  ## Extra environment variables that can be used to tune federation to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "1Gi"
+  #   cpu: "1"
+
+  ## Add lifecycle hooks for federation container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## The following settings are to configure the frequency of the liveness and startup probes when splitServicesToContainers set to true
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -XPOST --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.federation.internalPort }}/artifactory/service/rtfs/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -XPOST --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.federation.internalPort }}/artifactory/service/rtfs/api/v1/system/readiness
+      initialDelaySeconds: 30
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+observability:
+  name: observability
+  enabled: true
+  internalPort: 8036
+  ## Extra environment variables that can be used to tune observability to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  image:
+    pullPolicy: IfNotPresent
+    registry: releases-docker.jfrog.io
+    repository: jfrog/artifactory-pro
+    # tag:
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "1Gi"
+  #   cpu: "1"
+
+  ## Add lifecycle hooks for observability container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## The following settings are to configure the frequency of the liveness and startup probes when splitServicesToContainers set to true
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.observability.internalPort }}/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: 5
+      periodSeconds: 10
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.observability.internalPort }}/api/v1/system/readiness
+      initialDelaySeconds: 30
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: 5
+## MISSION_CONTROL
+mc:
+  enabled: false
+  database:
+    maxOpenConnections: 10
+  idgenerator:
+    maxOpenConnections: 2
+  tomcat:
+    connector:
+      maxThreads: 50
+      sendReasonPhrase: false
+      extraConfig: 'acceptCount="100"'
+## Nginx
+nginx:
+  enabled: true
+  kind: Deployment
+  name: nginx
+  labels: {}
+  hosts: []
+  replicaCount: 1
+  minAvailable: 0
+  podSecurityContext:
+    enabled: true
+    runAsUser: 104
+    runAsGroup: 107
+    fsGroup: 107
+  containerSecurityContext:
+    enabled: true
+    runAsNonRoot: true
+    privileged: false
+    readOnlyRootFilesystem: false
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop: ["ALL"]
+    seccompProfile:
+      type: "RuntimeDefault"
+  annotations: {}
+  terminationGracePeriodSeconds: 30
+  disableProxyBuffering: false
+  ## singleStackIPv6Cluster flag, which manages the Nginx configuration to enable listening on IPv6 and proxy.
+  ## If .Values.nginx.service.ipFamilies and .Values.artifactory.service.ipFamilies is configured for only IPv6, users need to enable this flag.
+  singleStackIPv6Cluster: false
+  ## Note that by default we use appVersion to get image tag/version
+  image:
+    registry: releases-docker.jfrog.io
+    repository: jfrog/nginx-artifactory-pro
+    # tag:
+    pullPolicy: IfNotPresent
+  deployment:
+    annotations: {}
+  ## Priority Class name to be used in deployment if provided
+  priorityClassName:
+  ## Spread nginx pods evenly across your nodes or some other topology
+  topologySpreadConstraints: []
+  # - maxSkew: 1
+  #   topologyKey: kubernetes.io/hostname
+  #   whenUnsatisfiable: DoNotSchedule
+  #   labelSelector:
+  #     matchLabels:
+  #       app: '{{ template "artifactory-ha.name" . }}'
+  #       release: '{{ .Release.Name }}'
+  #       component: '{{ .Values.nginx.name }}'
+
+  ## Add lifecycle hooks for the nginx pods
+  ## For example, you can add a `preStop` hook that sends a SIGQUIT to nginx and wait for it to terminate gracefully
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /var/opt/jfrog/nginx/message"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","nginx -s quit; while killall -0 nginx; do sleep 1; done"]
+
+  ## Sidecar containers for tailing Nginx logs
+  loggers: []
+  # - access.log
+  # - error.log
+
+  ## Loggers containers resources
+  loggersResources: {}
+  # requests:
+  #   memory: "64Mi"
+  #   cpu: "25m"
+  # limits:
+  #   memory: "128Mi"
+  #   cpu: "50m"
+
+  ## Logs options
+  logs:
+    stderr: false
+    stdout: false
+    level: warn
+  ## A list of custom ports to expose on the NGINX pod. Follows the conventional Kubernetes yaml syntax for container ports.
+  customPorts: []
+  # - containerPort: 8066
+  #   name: docker
+
+  ## The nginx main conf was moved to files/nginx-main-conf.yaml. This key is commented out to keep support for the old configuration
+  # mainConf: |
+
+  ## The nginx artifactory conf was moved to files/nginx-artifactory-conf.yaml. This key is commented out to keep support for the old configuration
+  # artifactoryConf: |
+  customInitContainers: ""
+  customSidecarContainers: ""
+  customVolumes: ""
+  customVolumeMounts: ""
+  customCommand:
+  ##  allows overwriting the command for the nginx container.
+  ##  defaults to [ 'nginx', '-g', 'daemon off;' ]
+
+  service:
+    ## For minikube, set this to NodePort, elsewhere use LoadBalancer
+    type: LoadBalancer
+    ssloffload: false
+    ## @param service.ssloffloadForceHttps Only enabled when service.ssloffload is set to True.
+    ## Force all requests from NGINX to the upstream server are over HTTPS, even when SSL offloading is enabled.
+    ## This is useful in environments where internal traffic must remain secure with https only.
+    ssloffloadForceHttps: false
+    ## @param service.ipFamilyPolicy Controller Service ipFamilyPolicy (optional, cloud specific)
+    ## This can be either SingleStack, PreferDualStack or RequireDualStack
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services
+    ##
+    ipFamilyPolicy: ""
+    ## @param service.ipFamilies Controller Service ipFamilies (optional, cloud specific)
+    ## This can be either ["IPv4"], ["IPv6"], ["IPv4", "IPv6"] or ["IPv6", "IPv4"]
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services
+    ##
+    ipFamilies: []
+    ## For supporting whitelist on the Nginx LoadBalancer service
+    ## Set this to a list of IP CIDR ranges
+    ## Example: loadBalancerSourceRanges: ['10.10.10.5/32', '10.11.10.5/32']
+    ## or pass from helm command line
+    ## Example: helm install ... --set nginx.service.loadBalancerSourceRanges='{10.10.10.5/32,10.11.10.5/32}'
+    loadBalancerSourceRanges: []
+    ## Provide static ip address
+    loadBalancerIP:
+    ## There are two available options: "Cluster" (default) and "Local".
+    externalTrafficPolicy: Cluster
+    labels: {}
+    # label-key: label-value
+    ## If the type is NodePort you can set a fixed port
+    # nodePort: 32082
+    ## A list of custom ports to be exposed on nginx service. Follows the conventional Kubernetes yaml syntax for service ports.
+    customPorts: []
+    # - port: 8066
+    #   targetPort: 8066
+    #   protocol: TCP
+    #   name: docker
+
+    annotations: {}
+  ## Renamed nginx internalPort 80,443 to 8080,8443 to support openshift
+  http:
+    enabled: true
+    externalPort: 80
+    internalPort: 8080
+  https:
+    enabled: true
+    externalPort: 443
+    internalPort: 8443
+  ## DEPRECATED: The following will be replaced by L1065-L1076 in a future release
+  # externalPortHttp: 80
+  # internalPortHttp: 8080
+  # externalPortHttps: 443
+  # internalPortHttps: 8443
+
+  ssh:
+    internalPort: 1339
+    externalPort: 1339
+  ## The following settings are to configure the frequency of the liveness and readiness probes.
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "nginx.scheme" . }}://localhost:{{ include "nginx.port" . }}/
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      periodSeconds: 10
+      timeoutSeconds: 5
+      failureThreshold: 5
+      successThreshold: 1
+  readinessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "nginx.scheme" . }}://localhost:{{ include "nginx.port" . }}/router/api/v1/system/readiness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}90{{ else }}0{{ end }}
+      periodSeconds: 10
+      timeoutSeconds: 5
+      failureThreshold: 5
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "nginx.scheme" . }}://localhost:{{ include "nginx.port" . }}/router/api/v1/system/readiness
+      initialDelaySeconds: 3
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: 5
+  ## The SSL secret that will be used by the Nginx pod
+  # tlsSecretName: chart-example-tls
+  ## Custom ConfigMap for nginx.conf
+  customConfigMap:
+  ## Custom ConfigMap for artifactory.conf
+  customArtifactoryConfigMap:
+  persistence:
+    mountPath: "/var/opt/jfrog/nginx"
+    enabled: false
+    ## A manually managed Persistent Volume and Claim
+    ## Requires persistence.enabled: true
+    ## If defined, PVC must be created manually before volume will be bound
+    # existingClaim:
+
+    accessMode: ReadWriteOnce
+    size: 5Gi
+    ## nginx data Persistent Volume Storage Class
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ## set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ## GKE, AWS & OpenStack)
+    ##
+    # storageClassName: "-"
+  resources: {}
+  # requests:
+  #   memory: "250Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "250Mi"
+  #   cpu: "500m"
+
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+## Filebeat Sidecar container
+## The provided filebeat configuration is for Artifactory logs. It assumes you have a logstash installed and configured properly.
+filebeat:
+  enabled: false
+  name: artifactory-filebeat
+  image:
+    repository: "docker.elastic.co/beats/filebeat"
+    version: 7.16.2
+  logstashUrl: "logstash:5044"
+  terminationGracePeriod: 10
+  livenessProbe:
+    exec:
+      command:
+        - sh
+        - -c
+        - |
+          #!/usr/bin/env bash -e
+          curl --fail 127.0.0.1:5066
+    failureThreshold: 3
+    initialDelaySeconds: 10
+    periodSeconds: 10
+    timeoutSeconds: 5
+  readinessProbe:
+    exec:
+      command:
+        - sh
+        - -c
+        - |
+          #!/usr/bin/env bash -e
+          filebeat test output
+    failureThreshold: 3
+    initialDelaySeconds: 10
+    periodSeconds: 10
+    timeoutSeconds: 5
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+
+  filebeatYml: |
+    logging.level: info
+    path.data: {{ .Values.artifactory.persistence.mountPath }}/log/filebeat
+    name: artifactory-filebeat
+    queue.spool:
+      file:
+        permissions: 0760
+    filebeat.inputs:
+    - type: log
+      enabled: true
+      close_eof: ${CLOSE:false}
+      paths:
+         - {{ .Values.artifactory.persistence.mountPath }}/log/*.log
+      fields:
+        service: "jfrt"
+        log_type: "artifactory"
+    output:
+      logstash:
+         hosts: ["{{ .Values.filebeat.logstashUrl }}"]
+  extraEnvironmentVariables: {}
+  # - name: MY_ENV_VAR
+  #   value: ""
+## Allows to add additional kubernetes resources
+## Use --- as a separator between multiple resources
+## For an example, refer - https://github.com/jfrog/log-analytics-prometheus/blob/master/helm/artifactory-ha-values.yaml
+additionalResources: ""
+## Adding entries to a Pod's /etc/hosts file
+## For an example, refer - https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases
+hostAliases: []
+# - ip: "127.0.0.1"
+#   hostnames:
+#     - "foo.local"
+#     - "bar.local"
+# - ip: "10.1.2.3"
+#   hostnames:
+#     - "foo.remote"
+#     - "bar.remote"
+
+## Toggling this feature is seamless and requires helm upgrade
+## will enable all microservices to run in different containers in a single pod (by default it is true)
+splitServicesToContainers: true
+## Specify common probes parameters
+probes:
+  timeoutSeconds: 5
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/CHANGELOG.md b/charts/jfrog/artifactory-jcr/107.98.14/CHANGELOG.md
new file mode 100644
index 000000000..806a6f1a2
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/CHANGELOG.md
@@ -0,0 +1,206 @@
+# JFrog Container Registry Chart Changelog
+All changes to this chart will be documented in this file.
+
+## [107.98.14] - Feb 20, 2024
+* Updated `artifactory.installerInfo` content
+
+## [107.80.0] - Feb 1, 2024
+* Updated README.md to create a namespace using `--create-namespace` as part of helm install
+
+## [107.74.0] - Nov 23, 2023
+* **IMPORTANT**
+* Added min kubeVersion ">= 1.19.0-0" in chart.yaml
+
+## [107.66.0] - Jul 20, 2023
+* Disabled federation services when splitServicesToContainers=true
+
+## [107.45.0] - Aug 25, 2022
+* Included event service as mandatory and remove the flag from values.yaml
+
+## [107.41.0] - Jul 22, 2022
+* Bumping chart version to align with app version
+* Disabled jfconnect and event services when splitServicesToContainers=true
+
+## [107.19.4] - May 27, 2021
+* Bumping chart version to align with app version
+* Update dependency Artifactory chart version to 107.19.4
+
+## [4.0.0] - Apr 22, 2021
+* **Breaking change:**
+* Increased default postgresql persistence  size to `200Gi` 
+* Update postgresql tag version to `13.2.0-debian-10-r55`
+* Update postgresql chart version to `10.3.18` in chart.yaml - [10.x Upgrade Notes](https://github.com/bitnami/charts/tree/master/bitnami/postgresql#to-1000)
+* If this is a new deployment or you already use an external database (`postgresql.enabled=false`), these changes **do not affect you**!
+* If this is an upgrade and you are using the default PostgreSQL (`postgresql.enabled=true`), you need to pass previous 9.x/10.x/12.x's postgresql.image.tag, previous postgresql.persistence.size and databaseUpgradeReady=true
+* **IMPORTANT**
+* This chart is only helm v3 compatible.
+* Update dependency Artifactory chart version to 12.0.0 (Artifactory 7.18.3)
+
+## [3.8.0] - Apr 5, 2021
+* **IMPORTANT**
+* Added `charts.jfrog.io` as default JFrog Helm repository
+* Update dependency Artifactory chart version to 11.13.0 (Artifactory 7.17.5)
+
+## [3.7.0] - Mar 31, 2021
+* Update dependency Artifactory chart version to 11.12.2 (Artifactory 7.17.4)
+
+## [3.6.0] - Mar 15, 2021
+* Update dependency Artifactory chart version to 11.10.0 (Artifactory 7.16.3)
+
+## [3.5.1] - Mar 03, 2021
+* Update dependency Artifactory chart version to 11.9.3 (Artifactory 7.15.4)
+
+## [3.5.0] - Feb 18, 2021
+* Update dependency Artifactory chart version to 11.9.0 (Artifactory 7.15.3)
+
+## [3.4.1] - Feb 08, 2021
+* Update dependency Artifactory chart version to 11.8.0 (Artifactory 7.12.8)
+
+## [3.4.0] - Jan 4, 2020
+* Update dependency Artifactory chart version to 11.7.4 (Artifactory 7.12.5)
+
+## [3.3.1] - Dec 1, 2020
+* Update dependency Artifactory chart version to 11.5.4 (Artifactory 7.11.5)
+
+## [3.3.0] - Nov 23, 2020
+* Update dependency Artifactory chart version to 11.5.2 (Artifactory 7.11.2)
+
+## [3.2.2] - Nov 9, 2020
+* Update dependency Artifactory chart version to 11.4.5 (Artifactory 7.10.6)
+
+## [3.2.1] - Nov 2, 2020
+* Update dependency Artifactory chart version to 11.4.4 (Artifactory 7.10.5)
+
+## [3.2.0] - Oct 19, 2020
+* Update dependency Artifactory chart version to 11.4.0 (Artifactory 7.10.2)
+
+## [3.1.0] - Sep 30, 2020
+* Update dependency Artifactory chart version to 11.1.0 (Artifactory 7.9.0)
+
+## [3.0.2] - Sep 23, 2020
+* Updates readme
+
+## [3.0.1] - Sep 15, 2020
+* Update dependency Artifactory chart version to 11.0.1 (Artifactory 7.7.8)
+
+## [3.0.0] - Sep 14, 2020
+* **Breaking change:** Added `image.registry` and changed `image.version` to `image.tag` for docker images
+* Update dependency Artifactory chart version to 11.0.0 (Artifactory 7.7.3)
+
+## [2.5.1] - Jul 29, 2020
+* Update dependency Artifactory chart version to 10.0.12 (Artifactory 7.6.3)
+
+## [2.5.0] - Jul 10, 2020
+* Update dependency Artifactory chart version to 10.0.3 (Artifactory 7.6.2)
+* **IMPORTANT**
+* Added ChartCenter Helm repository in README
+
+## [2.4.0] - Jun 30, 2020
+* Update dependency Artifactory chart version to 9.6.0 (Artifactory 7.6.1)
+
+## [2.3.1] - Jun 12, 2020
+* Update dependency Artifactory chart version to 9.5.2 (Artifactory 7.5.7)
+
+## [2.3.0] - Jun 1, 2020
+* Update dependency Artifactory chart version to 9.5.0 (Artifactory 7.5.5)
+
+## [2.2.5] - May 27, 2020
+* Update dependency Artifactory chart version to 9.4.9 (Artifactory 7.4.3)
+
+## [2.2.4] - May 20, 2020
+* Update dependency Artifactory chart version to 9.4.6 (Artifactory 7.4.3)
+
+## [2.2.3] - May 07, 2020
+* Update dependency Artifactory chart version to 9.4.5 (Artifactory 7.4.3)
+* Add `installerInfo` string format
+
+## [2.2.2] - Apr 28, 2020
+* Update dependency Artifactory chart version to 9.4.4 (Artifactory 7.4.3)
+
+## [2.2.1] - Apr 27, 2020
+* Update dependency Artifactory chart version to 9.4.3 (Artifactory 7.4.1)
+
+## [2.2.0] - Apr 14, 2020
+* Update dependency Artifactory chart version to 9.4.0 (Artifactory 7.4.1)
+
+## [2.2.0] - Apr 14, 2020
+* Update dependency Artifactory chart version to 9.4.0 (Artifactory 7.4.1)
+
+## [2.1.6] - Apr 13, 2020
+* Update dependency Artifactory chart version to 9.3.1 (Artifactory 7.3.2)
+
+## [2.1.5] - Apr 8, 2020
+* Update dependency Artifactory chart version to 9.2.8 (Artifactory 7.3.2)
+
+## [2.1.4] - Mar 30, 2020
+* Update dependency Artifactory chart version to 9.2.3 (Artifactory 7.3.2)
+
+## [2.1.3] - Mar 30, 2020
+* Update dependency Artifactory chart version to 9.2.1 (Artifactory 7.3.2)
+
+## [2.1.2] - Mar 26, 2020
+* Update dependency Artifactory chart version to 9.1.5 (Artifactory 7.3.2)
+
+## [2.1.1] - Mar 25, 2020
+* Update dependency Artifactory chart version to 9.1.4 (Artifactory 7.3.2)
+
+## [2.1.0] - Mar 23, 2020
+* Update dependency Artifactory chart version to 9.1.3 (Artifactory 7.3.2)
+
+## [2.0.13] - Mar 19, 2020
+* Update dependency Artifactory chart version to 9.0.28 (Artifactory 7.2.1)
+
+## [2.0.12] - Mar 17, 2020
+* Update dependency Artifactory chart version to 9.0.26 (Artifactory 7.2.1)
+
+## [2.0.11] - Mar 11, 2020
+* Unified charts public release
+
+## [2.0.10] - Mar 8, 2020
+* Update dependency Artifactory chart version to 9.0.20 (Artifactory 7.2.1)
+
+## [2.0.9] - Feb 26, 2020
+* Update dependency Artifactory chart version to 9.0.15 (Artifactory 7.2.1)
+
+## [2.0.0] - Feb 12, 2020
+* Update dependency Artifactory chart version to 9.0.0 (Artifactory 7.0.0)
+
+## [1.1.0] - Jan 19, 2020
+* Update dependency Artifactory chart version to 8.4.1 (Artifactory 6.17.0)
+
+## [1.1.1] - Feb 3, 2020
+* Update dependency Artifactory chart version to 8.4.4
+
+## [1.1.0] - Jan 19, 2020
+* Update dependency Artifactory chart version to 8.4.1 (Artifactory 6.17.0)
+
+## [1.0.1] - Dec 31, 2019
+* Update dependency Artifactory chart version to 8.3.5
+
+## [1.0.0] - Dec 23, 2019
+* Update dependency Artifactory chart version to 8.3.3
+
+## [0.2.1] - Dec 12, 2019
+* Update dependency Artifactory chart version to 8.3.1
+
+## [0.2.0] - Dec 1, 2019
+* Updated Artifactory version to 6.16.0
+
+## [0.1.5] - Nov 28, 2019
+* Update dependency Artifactory chart version to 8.2.6
+
+## [0.1.4] - Nov 20, 2019
+* Update Readme
+
+## [0.1.3] - Nov 20, 2019
+* Fix JCR logo url
+* Update dependency to Artifactory 8.2.2 chart
+
+## [0.1.2] - Nov 20, 2019
+* Update JCR logo
+
+## [0.1.1] - Nov 20, 2019
+* Add `appVersion` to Chart.yaml
+
+## [0.1.0] - Nov 20, 2019
+* Initial release of the JFrog Container Registry helm chart
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/Chart.yaml b/charts/jfrog/artifactory-jcr/107.98.14/Chart.yaml
new file mode 100644
index 000000000..eb371c9bb
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/Chart.yaml
@@ -0,0 +1,30 @@
+annotations:
+  catalog.cattle.io/certified: partner
+  catalog.cattle.io/display-name: JFrog Container Registry
+  catalog.cattle.io/kube-version: '>= 1.19.0-0'
+  catalog.cattle.io/release-name: artifactory-jcr
+apiVersion: v2
+appVersion: 7.98.14
+dependencies:
+- name: artifactory
+  repository: file://charts/artifactory
+  version: 107.98.14
+description: JFrog Container Registry
+home: https://jfrog.com/container-registry/
+icon: file://assets/icons/artifactory-jcr.png
+keywords:
+- artifactory
+- jfrog
+- container
+- registry
+- devops
+- jfrog-container-registry
+kubeVersion: '>= 1.19.0-0'
+maintainers:
+- email: helm@jfrog.com
+  name: Chart Maintainers at JFrog
+name: artifactory-jcr
+sources:
+- https://github.com/jfrog/charts
+type: application
+version: 107.98.14
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/LICENSE b/charts/jfrog/artifactory-jcr/107.98.14/LICENSE
new file mode 100644
index 000000000..8dada3eda
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/README.md b/charts/jfrog/artifactory-jcr/107.98.14/README.md
new file mode 100644
index 000000000..c0051e61d
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/README.md
@@ -0,0 +1,125 @@
+# JFrog Container Registry Helm Chart
+
+JFrog Container Registry is a free Artifactory edition with Docker and Helm repositories support.
+
+**Heads up: Our Helm Chart docs are moving to our main documentation site. For Artifactory installers, see [Installing Artifactory](https://www.jfrog.com/confluence/display/JFROG/Installing+Artifactory).**
+
+## Prerequisites Details
+
+* Kubernetes 1.19+
+
+## Chart Details
+This chart will do the following:
+
+* Deploy JFrog Container Registry
+* Deploy an optional Nginx server
+* Deploy an optional PostgreSQL Database
+* Optionally expose Artifactory with Ingress [Ingress documentation](https://kubernetes.io/docs/concepts/services-networking/ingress/)
+
+## Installing the Chart
+
+### Add JFrog Helm repository
+
+Before installing JFrog helm charts, you need to add the [JFrog helm repository](https://charts.jfrog.io) to your helm client.
+
+```bash
+helm repo add jfrog https://charts.jfrog.io
+helm repo update
+```
+
+### Install Chart
+To install the chart with the release name `jfrog-container-registry`:
+```bash
+helm upgrade --install jfrog-container-registry --set artifactory.postgresql.postgresqlPassword=<postgres_password> jfrog/artifactory-jcr --namespace artifactory-jcr --create-namespace
+```
+
+### Accessing JFrog Container Registry
+**NOTE:** If using artifactory or nginx service type `LoadBalancer`, it might take a few minutes for JFrog Container Registry's public IP to become available.
+
+### Updating JFrog Container Registry
+Once you have a new chart version, you can upgrade your deployment with
+```bash
+helm upgrade jfrog-container-registry jfrog/artifactory-jcr --namespace artifactory-jcr --create-namespace
+```
+
+### Special Upgrade Notes
+#### Artifactory upgrade from 6.x to 7.x (App Version)
+Arifactory 6.x to 7.x upgrade requires a one time migration process. This is done automatically on pod startup if needed.
+It's possible to configure the migration timeout with the following configuration in extreme cases. The provided default should be more than enough for completion of the migration.
+```yaml
+artifactory:
+  artifactory:
+    # Migration support from 6.x to 7.x
+    migration:
+      enabled: true
+      timeoutSeconds: 3600
+```
+* Note: If you are upgrading from 1.x to 3.x and above chart versions, please delete the existing statefulset of postgresql before upgrading the chart due to breaking changes in postgresql subchart.
+```bash
+kubectl delete statefulsets <OLD_RELEASE_NAME>-postgresql
+```
+* For more details about artifactory chart upgrades refer [here](https://github.com/jfrog/charts/blob/master/stable/artifactory/UPGRADE_NOTES.md)
+
+### Deleting JFrog Container Registry
+
+```bash                                                                                                                                                                 
+helm delete jfrog-container-registry --namespace artifactory-jcr                                                                                                                       
+```  
+
+This will delete your JFrog Container Registry deployment.<br>
+**NOTE:** You might have left behind persistent volumes. You should explicitly delete them with
+```bash
+kubectl delete pvc ...
+kubectl delete pv ...
+```
+
+## Database
+The JFrog Container Registry chart comes with PostgreSQL deployed by default.<br>
+For details on the PostgreSQL configuration or customising the database, Look at the options described in the [Artifactory helm chart](https://github.com/jfrog/charts/tree/master/stable/artifactory).
+
+### Ingress and TLS
+To get Helm to create an ingress object with a hostname, add these two lines to your Helm command:
+```bash
+helm upgrade --install jfrog-container-registry \
+  --set artifactory.nginx.enabled=false \
+  --set artifactory.ingress.enabled=true \
+  --set artifactory.ingress.hosts[0]="artifactory.company.com" \
+  --set artifactory.artifactory.service.type=NodePort \
+  jfrog/artifactory-jcr --namespace artifactory-jcr --create-namespace
+```
+
+To manually configure TLS, first create/retrieve a key & certificate pair for the address(es) you wish to protect. Then create a TLS secret in the namespace:
+
+```bash
+kubectl create secret tls artifactory-tls --cert=path/to/tls.cert --key=path/to/tls.key
+```
+
+Include the secret's name, along with the desired hostnames, in the Artifactory Ingress TLS section of your custom `values.yaml` file:
+
+```yaml
+artifactory:
+  artifactory:
+    ingress:
+      ## If true, Artifactory Ingress will be created
+      ##
+      enabled: true
+
+      ## Artifactory Ingress hostnames
+      ## Must be provided if Ingress is enabled
+      ##
+      hosts:
+        - jfrog-container-registry.domain.com
+      annotations:
+        kubernetes.io/tls-acme: "true"
+      ## Artifactory Ingress TLS configuration
+      ## Secrets must be manually created in the namespace
+      ##
+      tls:
+        - secretName: artifactory-tls
+          hosts:
+            - jfrog-container-registry.domain.com
+```
+
+## Useful links
+https://www.jfrog.com
+https://www.jfrog.com/confluence/
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/app-readme.md b/charts/jfrog/artifactory-jcr/107.98.14/app-readme.md
new file mode 100644
index 000000000..9d9b7d85f
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/app-readme.md
@@ -0,0 +1,18 @@
+# JFrog Container Registry Helm Chart
+
+Universal Repository Manager supporting all major packaging formats, build tools and CI servers.
+
+## Chart Details
+This chart will do the following:
+
+* Deploy JFrog Container Registry
+* Deploy an optional Nginx server
+* Optionally expose Artifactory with Ingress [Ingress documentation](https://kubernetes.io/docs/concepts/services-networking/ingress/)
+
+
+## Useful links
+Blog: [Herd Trust Into Your Rancher Labs Multi-Cloud Strategy with Artifactory](https://jfrog.com/blog/herd-trust-into-your-rancher-labs-multi-cloud-strategy-with-artifactory/)
+
+## Activate Your Artifactory Instance 
+Don't have a license? Please send an email to [rancher-jfrog-licenses@jfrog.com](mailto:rancher-jfrog-licenses@jfrog.com) to get it.
+
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/.helmignore b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/.helmignore
new file mode 100644
index 000000000..b6e97f07f
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/.helmignore
@@ -0,0 +1,24 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+OWNERS
+
+tests/
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/CHANGELOG.md b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/CHANGELOG.md
new file mode 100644
index 000000000..9a1030d0b
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/CHANGELOG.md
@@ -0,0 +1,1389 @@
+# JFrog Artifactory Chart Changelog
+All changes to this chart will be documented in this file.
+
+## [107.98.14] - Nov 06, 2024
+* Add support for `extraEnvironmentVariables` on filebeat Sidecar [GH-1377](https://github.com/jfrog/charts/pull/1377)
+* Support for SSL offload HTTPS proto override in Nginx service (ClusterIP, LoadBalancer) layer. Introduced `nginx.service.ssloffloadForceHttps` field with boolean type. [GH-1906](https://github.com/jfrog/charts/pull/1906)
+* Enable Access workers integration when artifactory.worker.enabled is true
+* Added `signedUrlExpirySeconds` option to artifactory.persistence.type of `google-storage`, `google-storage-v2`, and `google-storage-v2-direct` [GH-1858](https://github.com/jfrog/charts/pull/1858)
+* Added support to bootstrap jfconnect custom certs to jfconnect trusted directory
+* Fixed the type of `.Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds` in binarystore.xml from boolean to integer
+
+## [107.96.0] - Sep 10, 2024
+* Merged Artifactory sizing templates to a single file per size
+
+## [107.94.0] - Aug 14, 2024
+* Fixed #Expose rtfs port only when it is enabled
+
+## [107.93.0] - Aug 9, 2024
+* Added support for worker via `artifactory.worker.enabled` flag
+* Fixed creation of duplicate objects in statefulSet
+
+## [107.92.0] - July 31, 2024
+* Updating the example link for downloading the DB driver
+* Adding dedicated ingress and service path for GRPC protocol
+
+## [107.91.0] - July 18, 2024
+* Remove X-JFrog-Override-Base-Url port when using default `443/80` ports
+
+## [107.90.0] - July 18, 2024
+* Fixed #adding colon in image registry which breaks deployment [GH-1892](https://github.com/jfrog/charts/pull/1892)
+* Added new `nginx.hosts` to use Nginx server_name directive instead of `ingress.hosts`
+* Added a deprecation notice of ingress.hosts when `ngnix.enabled` is true
+* Added new evidence service
+* Corrected database connection values based on sizing
+* **IMPORTANT**
+* Separate access from artifactory tomcat to run on its own dedicated tomcat
+  * With this change access will be running in its own dedicated container
+  * This will give the ability to control resources and java options specific to access
+    Can be done by passing the following,
+    `access.javaOpts.other`
+    `access.resources`
+    `access.extraEnvironmentVariables`
+* Added Binary Provider recommendations
+
+## [107.89.0] - June 7, 2024
+* Fix the indentation of the commented-out sections in the values.yaml file
+* Fixed sizing values by removing `JF_SHARED_NODE_HAENABLED` in xsmall/small configurations
+
+## [107.88.0] - May 29, 2024
+* **IMPORTANT**
+* Refactored `nginx.artifactoryConf` and `nginx.mainConf` configuration (moved to files/nginx-artifactory-conf.yaml  and files/nginx-main-conf.yaml instead of keys in values.yaml)
+
+## [107.87.0] - May 29, 2024
+* Renamed `.Values.artifactory.openMetrics` to `.Values.artifactory.metrics`
+
+## [107.85.0] - May 29, 2024
+* Changed `migration.enabled` to false by default. For 6.x to 7.x migration, this flag needs to be set to `true`
+
+## [107.84.0] - May 29, 2024
+* Added image section for `initContainers` instead of `initContainerImage`
+* Renamed `router.image.imagePullPolicy` to `router.image.pullPolicy`
+* Removed image section for `loggers`
+* Added support for `global.verisons.initContainers` to override `initContainers.image.tag`
+* Fixed an issue with extraSystemYaml merge
+* **IMPORTANT**
+* Renamed `artifactory.setSecurityContext` to `artifactory.podSecurityContext` 
+* Renamed `artifactory.uid` to `artifactory.podSecurityContext.runAsUser`
+* Renamed `artifactory.gid` to `artifactory.podSecurityContext.runAsGroup` and `artifactory.podSecurityContext.fsGroup`
+* Renamed `artifactory.fsGroupChangePolicy` to `artifactory.podSecurityContext.fsGroupChangePolicy`
+* Renamed `artifactory.seLinuxOptions` to `artifactory.podSecurityContext.seLinuxOptions`
+* Added flag `allowNonPostgresql` defaults to false
+* Update postgresql tag version to `15.6.0-debian-12-r5`
+* Added a check if `initContainerImage` exists
+* Fixed an issue to generate unified secret to support artifactory fullname [GH-1882](https://github.com/jfrog/charts/issues/1882)
+* Fixed an issue template render on loggers [GH-1883](https://github.com/jfrog/charts/issues/1883)
+* Fixed resource constraints for "setup" initContainer of nginx deployment [GH-962] (https://github.com/jfrog/charts/issues/962)
+* Added .Values.artifactory.unifiedSecretPrependReleaseName` for unified secret to prepend release name
+* Fixed maxCacheSize and cacheProviderDir mix up under azure-blob-storage-v2-direct template in binarystore.xml
+
+## [107.82.0] - Mar 04, 2024
+* Added `disableRouterBypass` flag as experimental feature, to disable the artifactoryPath /artifactory/ and route all traffic through the Router.
+* Removed Replicator service
+
+## [107.81.0] - Feb 20, 2024
+* **IMPORTANT**
+* Refactored systemYaml configuration (moved to files/system.yaml instead of key in values.yaml)
+* Added ability to provide `extraSystemYaml` configuration in values.yaml which will merge with the existing system yaml when `systemYamlOverride` is not given [GH-1848](https://github.com/jfrog/charts/pull/1848)
+* Added option to modify the new cache configs, maxFileSizeLimit and skipDuringUpload
+* Added IPV4/IPV6 Dualstack flag support for Artifactory and nginx service
+* Added `singleStackIPv6Cluster` flag, which manages the Nginx configuration to enable listening on IPv6 and proxying.
+* Fixing broken link for creating additional kubernetes resources. Refer [here](https://github.com/jfrog/log-analytics-prometheus/blob/master/helm/artifactory-values.yaml)
+* Refactored installerInfo configuration (moved to files/installer-info.json instead of key in values.yaml)
+
+## [107.80.0] - Feb 20, 2024
+* Updated README.md to create a namespace using `--create-namespace` as part of helm install
+
+## [107.79.0] - Feb 20, 2024
+* **IMPORTANT**
+* Added `unifiedSecretInstallation` flag which enables single unified secret holding all internal (chart) secrets to `true` by default
+* Added support for azure-blob-storage-v2-direct config
+* Added option to set Nginx to write access_log to container STDOUT
+* **Important change:**
+* Update postgresql tag version to `15.2.0-debian-11-r23`
+* If this is a new deployment or you already use an external database (`postgresql.enabled=false`), these changes **do not affect you**!
+* If this is an upgrade and you are using the default bundles PostgreSQL (`postgresql.enabled=true`), you need to pass previous 9.x/10.x/12.x/13.x's postgresql.image.tag, previous postgresql.persistence.size and databaseUpgradeReady=true
+
+## [107.77.0] - April 22, 2024
+* Removed integration service
+* Added recommended postgresql sizing configurations under sizing directory
+* Updated artifactory-federation (probes, port, embedded mode)
+* Fixed - Removed duplicate keys of the sizing yaml file
+* Fixing broken nginx port [GH-1860](https://github.com/jfrog/charts/issues/1860)
+* Added nginx.customCommand to use custom commands for the nginx container
+
+## [107.76.0] - Dec 13, 2023
+* Added connectionTimeout and socketTimeout paramaters under AWSS3 binarystore section
+* Reduced nginx startupProbe initialDelaySeconds
+
+## [107.74.0] - Nov 30, 2023
+* Added recommended sizing configurations under sizing directory, please refer [here](README.md/#apply-sizing-configurations-to-the-chart)
+* **IMPORTANT**
+* Added min kubeVersion ">= 1.19.0-0" in chart.yaml
+
+## [107.70.0] - Nov 30, 2023
+* Fixed - StatefulSet pod annotations changed from range to toYaml [GH-1828](https://github.com/jfrog/charts/issues/1828)
+* Fixed - Invalid format for awsS3V3 `multiPartLimit,multipartElementSize` in binarystore.xml.
+* Fixed - SecurityContext with runAsGroup in artifactory [GH-1838](https://github.com/jfrog/charts/issues/1838)
+* Added support for custom labels in the Nginx pods [GH-1836](https://github.com/jfrog/charts/pull/1836)
+* Added podSecurityContext and containerSecurityContext for nginx
+* Added support for nginx on openshift, set `podSecurityContext` and `containerSecurityContext` to false
+* Renamed nginx internalPort 80,443 to 8080,8443 to support openshift
+
+## [107.69.0] - Sep 18, 2023
+* Adjust rtfs context
+* Fixed - Metadata service does not respect customVolumeMounts for DB CAs [GH-1815](https://github.com/jfrog/charts/issues/1815)
+
+## [107.68.8] - Sep 18, 2023
+* Reverted - Enabled `unifiedSecretInstallation` by default [GH-1819](https://github.com/jfrog/charts/issues/1819)
+* Removed openshift condition check from NOTES.txt
+
+## [107.68.7] - Aug 28, 2023
+* Enabled `unifiedSecretInstallation` by default
+
+## [107.67.0] - Aug 28, 2023
+* Add 'extraJavaOpts' and 'port' values to federation service
+
+## [107.66.0] - Aug 28, 2023
+* Added federation service container in artifactory
+* Add rtfs service to ingress in artifactory
+
+## [107.64.0] - Aug 28, 2023
+* Added support to configure event.webhooks within generated system.yaml
+* Fixed an issue to generate ssl certificate should support artifactory fullname
+* Added binarystore.xml template to persistence storage type `nfs`. The default Filestore location configured according to artifactory.persistence.nfs.dataDir.
+* Added 'multiPartLimit' and 'multipartElementSize' parameters to awsS3V3 binary providers.
+* Increased default Artifactory Tomcat acceptCount config to 400
+* Fixed Illegal Strict-Transport-Security header in nginx config
+
+## [107.63.0] - Aug 28, 2023
+* Added support for Openshift by adding the securityContext in container level.
+* **IMPORTANT**
+* Disable securityContext in container and pod level to deploy postgres on openshift.
+* Fixed support for fsGroup in non openshift environemnt and runAsGroup in openshift environment.
+* Fixed - Helm Template Error when using artifactory.loggers [GH-1791](https://github.com/jfrog/charts/issues/1791)
+* Removed the nginx disable condition for openshift
+* Fixed jfconnect disabling as micro-service on splitcontainers [GH-1806](https://github.com/jfrog/charts/issues/1806)
+
+## [107.62.0] - Jun 5, 2023
+* Upgraded to autoscaling/v2
+* Added support for 'port' and 'useHttp' parameters for s3-storage-v3 binary provider [GH-1767](https://github.com/jfrog/charts/issues/1767)
+
+## [107.61.0] - May 31, 2023
+* Added new binary provider `google-storage-v2-direct`
+* Added missing parameter 'enableSignedUrlRedirect' to 'googleStorage'
+
+## [107.60.0] - May 31, 2023
+* Enabled `splitServicesToContainers` to true by default
+* Updated the recommended values for small, medium and large installations to support the 'splitServicesToContainers'
+
+## [107.59.0] - May 31, 2023
+* Fixed reference of `terminationGracePeriodSeconds`
+* Added Support for Cold Artifact Storage as part of the systemYaml configuration (disabled by default)
+* Added new binary provider `s3-storage-v3-archive`
+* Fixed jfconnect disabling as micro-service on non-splitcontainers
+* Fixed wrong cache-fs provider ID of cluster-s3-storage-v3 in the binarystore.xml [GH-1772](https://github.com/jfrog/charts/issues/1772)
+
+## [107.58.0] - Mar 23, 2023
+* Updated postgresql multi-arch tag version to `13.10.0-debian-11-r14`
+* Removed obselete remove-lost-found initContainer`
+* Added env JF_SHARED_NODE_HAENABLED under frontend when running in the container split mode 
+
+## [107.57.0] - Mar 02, 2023
+* Updated initContainerImage and logger image to `ubi9/ubi-minimal:9.1.0.1793`
+
+## [107.55.0] - Jan 31, 2023
+* Updated initContainerImage and logger image to `ubi9/ubi-minimal:9.1.0.1760`
+* Adding a custom preStop to Artifactory router for allowing graceful termination to complete
+
+## [107.53.0] - Jan 20, 2023
+* Updated initContainerImage and logger image to `ubi8/ubi-minimal:8.7.1049`
+
+## [107.50.0] - Jan 20, 2023
+* Updated postgresql tag version to `13.9.0-debian-11-11`
+* Fixed an issue for capabilities check of ingress
+* Updated jfrogUrl text path in migrate.sh file
+* Added a note that from 107.46.x chart versions, `copyOnEveryStartup` is not needed for binarystore.xml, it is always copied via initContainers. For more Info, Refer [GH-1723](https://github.com/jfrog/charts/issues/1723)
+
+## [107.49.0] - Jan 16, 2023
+* Added support for setting `seLinuxOptions` in `securityContext` [GH-1699](https://github.com/jfrog/charts/pull/1699)
+* Added option to enable/disable proxy_request_buffering and proxy_buffering_off [GH-1686](https://github.com/jfrog/charts/pull/1686)
+* Updated initContainerImage and logger image to `ubi8/ubi-minimal:8.7.1049`
+
+## [107.48.0] - Oct 27, 2022
+* Updated router version to `7.51.0`
+
+## [107.47.0] - Sep 29, 2022
+* Updated initContainerImage to `ubi8/ubi-minimal:8.6-941`
+* Added support for annotations for artifactory statefulset and nginx deployment [GH-1665](https://github.com/jfrog/charts/pull/1665)
+* Updated router version to `7.49.0`
+
+## [107.46.0] - Sep 14, 2022
+* **IMPORTANT**
+* Added support for lifecycle hooks for all containers, changed `artifactory.postStartCommand` to `.Values.artifactory.lifecycle.postStart.exec.command`
+* Updated initContainerImage to `ubi8/ubi-minimal:8.6-902`
+* Update nginx configuration to allow websocket requests when using pipelines
+* Fixed an issue to allow artifactory to make direct API calls to store  instead via jfconnect service when `splitServicesToContainers=true`
+* Refactor binarystore.xml configuration (moved to `files/binarystore.xml` instead of key in values.yaml)
+* Added new binary providers `cluster-s3-storage-v3`, `s3-storage-v3-direct`, `azure-blob-storage-direct`, `google-storage-v2`
+* Deprecated (removed) `aws-s3` binary provider [JetS3t library](https://www.jfrog.com/confluence/display/JFROG/Configuring+the+Filestore#ConfiguringtheFilestore-BinaryProvider)
+* Deprecated (removed) `google-storage` binary provider and force persistence storage type `google-storage` to work with `google-storage-v2` only
+* Copy binarystore.xml in init Container to fix existing persistence on file system in clear text
+* Removed obselete `.Values.artifactory.binarystore.enabled` key
+* Removed `newProbes.enabled`, default to new probes
+* Added nginx.customCommand using inotifyd to reload nginx's config upon ssl secret or configmap changes [GH-1640](https://github.com/jfrog/charts/pull/1640)
+
+## [107.43.0] - Aug 25, 2022
+* Added flag `artifactory.replicator.ingress.enabled` to enable/disable ingress for replicator
+* Updated initContainerImage to `ubi8/ubi-minimal:8.6-854`
+* Updated router version to `7.45.0`
+* Added flag `artifactory.schedulerName` to set for the pods the value of schedulerName field [GH-1606](https://github.com/jfrog/charts/issues/1606)
+* Enabled TLS based on access or router in values.yaml
+
+## [107.42.0] - Aug 25, 2022
+* Enabled database creds secret to use from unified secret
+* Updated router version to `7.42.0`
+* Fix duplicate volumes for userPluginSecrets [GH-1650] (https://github.com/jfrog/charts/issues/1650)
+* Added support to truncate (> 63 chars) for unifiedCustomSecretVolumeName
+
+## [107.41.0] - June 27, 2022
+* Added support for nginx.terminationGracePeriodSeconds [GH-1645](https://github.com/jfrog/charts/issues/1645)
+* Use an alternate command for `find` to copy custom certificates
+* Added support for circle of trust using `circleOfTrustCertificatesSecret` secret name [GH-1623](https://github.com/jfrog/charts/pull/1623)
+
+## [107.40.0] - June 16, 2022
+* Added support for PodDisruptionBudget [GH-1618](https://github.com/jfrog/charts/issues/1618)
+* From artifactory 7.38.x, joinKey can be retrived from Admin > User Management > Settings in UI
+* Allow templating for pod annotations [GH-1634](https://github.com/jfrog/charts/pull/1634)
+* Fixed `customPersistentPodVolumeClaim` name to `customPersistentVolumeClaim`
+* Added flags to control enable/disable infra services in splitServicesToContainers
+
+## [107.39.0] - May 31, 2022
+* Fix default `artifactory.async.corePoolSize` [GH-1612](https://github.com/jfrog/charts/issues/1612)
+* Added support of nginx annotations
+* Reduce startupProbe `initialDelaySeconds`
+* Align all liveness and readiness probes failureThreshold to `5` seconds
+* Added new flag `unifiedSecretInstallation` to enables single unified secret holding all the artifactory secrets
+* Updated router version to `7.38.0`
+* Add support for NFS config with directories `haBackupDir` and `haDataDir`
+* Fixed - disable jfconnect on oss/jcr/cpp flavours [GH-1630](https://github.com/jfrog/charts/issues/1630)
+
+## [107.38.0] - May 04, 2022
+* Added support for `global.nodeSelector` to artifactory and nginx pods
+* Updated router version to `7.36.1`
+* Added support for custom global probes timeout
+* Updated frontend container command
+* Added topologySpreadConstraints to artifactory and nginx, and add lifecycle hooks to nginx [GH-1596](https://github.com/jfrog/charts/pull/1596)
+* Added support of extraEnvironmentVariables for all infra services containers
+* Enabled the consumption (jfconnect) flag by default
+* Fix jfconnect disabling on non-splitcontainers
+
+## [107.37.0] - Mar 08, 2022
+* Added support for customPorts in nginx deployment
+* Bugfix - Wrong proxy_pass configurations for /artifactory/ in the default artifactory.conf
+* Added signedUrlExpirySeconds option to artifactory.persistence.type aws-S3-V3
+* Updated router version to `7.35.0`
+* Added useInstanceCredentials,enableSignedUrlRedirect option to google-storage-v2
+* Changed dependency charts repo to `charts.jfrog.io`
+
+## [107.36.0] - Mar 03, 2022
+* Remove pdn tracker which starts replicator service
+* Added silent option for curl probes
+* Added readiness health check for the artifactory container for k8s version < 1.20
+* Fix property file migration issue to system.yaml 6.x to 7.x
+
+## [107.35.0] - Feb 08, 2022
+* Updated router version to `7.32.1`
+
+## [107.33.0] - Jan 11, 2022
+* Add more user friendly support for anti-affinity
+* Pod anti-affinity is now enabled by default (soft rule)
+* Readme fixes
+* Added support for setting `fsGroupChangePolicy`
+* Added nginx customInitContainers, customVolumes, customSidecarContainers [GH-1565](https://github.com/jfrog/charts/pull/1565)
+* Updated router version to `7.30.0`
+
+## [107.32.0] - Dec 22, 2021
+* Updated logger image to `jfrog/ubi-minimal:8.5-204`
+* Added default `8091` as `artifactory.tomcat.maintenanceConnector.port` for probes check
+* Refactored probes to replace httpGet probes with basic exec + curl
+* Refactored `database-creds` secret to create only when database values are passed
+* Added new endpoints for probes `/artifactory/api/v1/system/liveness` and `/artifactory/api/v1/system/readiness`
+* Enabled `newProbes:true` by default to use these endpoints
+* Fix filebeat sidecar spool file permissions
+* Updated filebeat sidecar container to `7.16.2`
+
+## [107.31.0] - Dec 17, 2021
+* Added support for HorizontalPodAutoscaler apiVersion `autoscaling/v2beta2`
+* Remove integration service feature flag to make it mandatory service
+* Update postgresql tag version to `13.4.0-debian-10-r39`
+* Fixed `artifactory.resources` indentation in `migration-artifactory` init container [GH-1562](https://github.com/jfrog/charts/issues/1562)
+* Refactored `router.requiredServiceTypes` to support platform chart
+
+## [107.30.0] - Nov 30, 2021
+* Fixed incorrect permission for filebeat.yaml
+* Updated healthcheck (liveness/readiness) api for integration service
+* Disable readiness health check for the artifactory container when running in the container split mode
+* Ability to start replicator on enabling pdn tracker
+
+## [107.29.0] - Nov 26, 2021
+* Added integration service container in artifactory
+* Add support for Ingress Class Name in Ingress Spec [GH-1516](https://github.com/jfrog/charts/pull/1516)
+* Fixed chart values to use curl instead of wget [GH-1529](https://github.com/jfrog/charts/issues/1529)
+* Updated nginx config to allow websockets when pipelines is enabled
+* Moved router.topology.local.requireqservicetypes from system.yaml to router as environment variable
+* Added jfconnect in system.yaml
+* Updated artifactory container’s health probes to use artifactory api on rt-split
+* Updated initContainerImage to `jfrog/ubi-minimal:8.5-204`
+* Updated router version to `7.28.2`
+* Set Jfconnect enabled to `false` in the artifactory container when running in the container split mode
+
+## [107.28.0] - Nov 11, 2021
+* Added default values cpu and memeory in initContainers
+* Updated router version to `7.26.0`
+* Updated (`rbac.create` and `serviceAccount.create` to false by default) for least privileges
+* Fixed incorrect data type for `Values.router.serviceRegistry.insecure` in default values.yaml [GH-1514](https://github.com/jfrog/charts/pull/1514/files)
+* **IMPORTANT**
+* Changed init-container images from `alpine` to `ubi8/ubi-minimal`
+* Added support for AWS License Manager using `.Values.aws.licenseConfigSecretName`
+
+## [107.27.0] - Oct 6, 2021
+* **Breaking change**
+* Aligned probe structure (moved probes variables under config block)
+* Added support for new probes(set to false by default)
+* Bugfix - Invalid format for `multiPartLimit,multipartElementSize,maxCacheSize` in binarystore.xml [GH-1466](https://github.com/jfrog/charts/issues/1466)
+* Added missioncontrol container in artifactory
+* Dropped NET_RAW capability for the containers
+* Added resources to migration-artifactory init container
+* Added resources to all rt split containers
+* Updated router version to `7.25.1`
+* Added support for Ingress networking.k8s.io/v1/Ingress for k8s >=1.22 [GH-1487](https://github.com/jfrog/charts/pull/1487)
+* Added min kubeVersion ">= 1.14.0-0" in chart.yaml
+* Update alpine tag version to `3.14.2`
+* Update busybox tag version to `1.33.1`
+* Artifactory chart support for cluster license
+
+## [107.26.0] - Aug 23, 2021
+* Added Observability container (only when `splitServicesToContainers` is enabled)
+* Support for high availability (when replicaCount > 1)
+* Added min kubeVersion ">= 1.12.0-0" in chart.yaml
+
+## [107.25.0] - Aug 13, 2021
+* Updated readme of chart to point to wiki. Refer [Installing Artifactory](https://www.jfrog.com/confluence/display/JFROG/Installing+Artifactory)
+* Added startupProbe and livenessProbe for RT-split containers
+* Updated router version to 7.24.1
+* Added security hardening fixes
+* Enabled startup probes for k8s >= 1.20.x
+* Changed network policy to allow all ingress and egress traffic
+* Added Observability changes
+* Added support for global.versions.router (only when `splitServicesToContainers` is enabled)
+
+## [107.24.0] - July 27, 2021
+* Support global and product specific tags at the same time
+* Added support for artifactory containers split
+
+## [107.23.0] - July 8, 2021
+* Bug fix - logger sideCar picks up Wrong File in helm
+* Allow filebeat metrics configuration in values.yaml
+
+## [107.22.0] - July 6, 2021
+* Update alpine tag version to `3.14.0`
+* Added `nodePort` support to artifactory-service and nginx-service templates
+* Removed redundant `terminationGracePeriodSeconds` in statefulset
+* Increased `startupProbe.failureThreshold` time
+
+## [107.21.3] - July 2, 2021
+* Added ability to change sendreasonphrase value in server.xml via system yaml
+
+## [107.19.3] - May 20, 2021
+* Fix broken support for startupProbe for k8s < 1.18.x
+* Added support for `nameOverride` and `fullnameOverride` in values.yaml
+
+## [107.18.6] - April 29, 2021
+* Bumping chart version to align with app version
+* Add `securityContext` option on nginx container
+
+## [12.0.0] - April 22, 2021
+* **Breaking change:**
+* Increased default postgresql persistence  size to `200Gi` 
+* Update postgresql tag version to `13.2.0-debian-10-r55`
+* Update postgresql chart version to `10.3.18` in chart.yaml - [10.x Upgrade Notes](https://github.com/bitnami/charts/tree/master/bitnami/postgresql#to-1000)
+* If this is a new deployment or you already use an external database (`postgresql.enabled=false`), these changes **do not affect you**!
+* If this is an upgrade and you are using the default PostgreSQL (`postgresql.enabled=true`), you need to pass previous 9.x/10.x/12.x's postgresql.image.tag, previous postgresql.persistence.size and databaseUpgradeReady=true
+* **IMPORTANT**
+* This chart is only helm v3 compatible.
+* Fixed filebeat-configmap naming
+* Explicitly set ServiceAccount `automountServiceAccountToken` to 'true'
+* Update alpine tag version to `3.13.5`
+
+## [11.13.2] - April 15, 2021
+* Updated Artifactory version to 7.17.9 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.17.9)
+
+## [11.13.1] - April 6, 2021
+* Updated Artifactory version to 7.17.6 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.17.6)
+* Update alpine tag version to `3.13.4`
+
+## [11.13.0] - April 5, 2021
+* **IMPORTANT**
+* Added `charts.jfrog.io` as default JFrog Helm repository
+* Updated Artifactory version to 7.17.5 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.17.5)
+
+## [11.12.2] - Mar 31, 2021
+* Updated Artifactory version to 7.17.4 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.17.4)
+
+## [11.12.1] - Mar 30, 2021
+* Updated Artifactory version to 7.17.3
+* Add `timeoutSeconds` to all exec probes - Please refer [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes)
+
+## [11.12.0] - Mar 24, 2021
+* Updated Artifactory version to 7.17.2
+* Optimized startupProbe time
+
+## [11.11.0] - Mar 18, 2021
+* Add support to startupProbe
+
+## [11.10.0] - Mar 15, 2021
+* Updated Artifactory version to 7.16.3
+
+## [11.9.5] - Mar 09, 2021
+* Added HSTS header to nginx conf
+
+## [11.9.4] - Mar 9, 2021
+* Removed bintray URL references in the chart
+
+## [11.9.3] - Mar 04, 2021
+* Updated Artifactory version to 7.15.4 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.15.4)
+
+## [11.9.2] - Mar 04, 2021
+* Fixed creation of nginx-certificate-secret when Nginx is disabled
+
+## [11.9.1] - Feb 19, 2021
+* Update busybox tag version to `1.32.1`
+
+## [11.9.0] - Feb 18, 2021
+* Updated Artifactory version to 7.15.3 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.15.3)
+* Add option to specify update strategy for Artifactory statefulset
+
+## [11.8.1] - Feb 11, 2021
+* Exposed "multiPartLimit" and "multipartElementSize" for the Azure Blob Storage Binary Provider
+
+## [11.8.0] - Feb 08, 2021
+* Updated Artifactory version to 7.12.8 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.12.8)
+* Support for custom certificates using secrets
+* **Important:** Switched docker images download from `docker.bintray.io` to `releases-docker.jfrog.io`
+* Update alpine tag version to `3.13.1`
+
+## [11.7.8] - Jan 25, 2021
+* Add support for hostAliases
+
+## [11.7.7] - Jan 11, 2021
+* Fix failures when using creds file for configurating google storage
+
+## [11.7.6] - Jan 11, 2021
+* Updated Artifactory version to 7.12.6 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.12.6)
+
+## [11.7.5] - Jan 07, 2021
+* Added support for optional tracker dedicated ingress `.Values.artifactory.replicator.trackerIngress.enabled` (defaults to false)
+
+## [11.7.4] - Jan 04, 2021
+* Fixed gid support for statefulset
+
+## [11.7.3] - Dec 31, 2020
+* Added gid support for statefulset
+* Add setSecurityContext flag to allow securityContext block to be removed from artifactory statefulset
+
+## [11.7.2] - Dec 29, 2020
+* **Important:** Removed `.Values.metrics` and `.Values.fluentd` (Fluentd and Prometheus integrations)
+* Add support for creating additional kubernetes resources - [refer here](https://github.com/jfrog/log-analytics-prometheus/blob/master/artifactory-values.yaml)
+* Updated Artifactory version to 7.12.5
+
+## [11.7.1] - Dec 21, 2020
+* Updated Artifactory version to 7.12.3
+
+## [11.7.0] - Dec 18, 2020
+* Updated Artifactory version to 7.12.2
+* Added `.Values.artifactory.openMetrics.enabled`
+
+## [11.6.1] - Dec 11, 2020
+* Added configurable `.Values.global.versions.artifactory` in values.yaml
+
+## [11.6.0] - Dec 10, 2020
+* Update postgresql tag version to `12.5.0-debian-10-r25`
+* Fixed `artifactory.persistence.googleStorage.endpoint` from `storage.googleapis.com` to `commondatastorage.googleapis.com`
+* Updated chart maintainers email
+
+## [11.5.5] - Dec 4, 2020
+* **Important:** Renamed `.Values.systemYaml` to `.Values.systemYamlOverride`
+
+## [11.5.4] - Dec 1, 2020
+* Improve error message returned when attempting helm upgrade command
+
+## [11.5.3] - Nov 30, 2020
+* Updated Artifactory version to 7.11.5 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.11)
+
+## [11.5.2] - Nov 23, 2020
+* Updated Artifactory version to 7.11.2 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.11)
+* Updated port namings on services and pods to allow for istio protocol discovery
+* Change semverCompare checks to support hosted Kubernetes
+* Add flag to disable creation of ServiceMonitor when enabling prometheus metrics
+* Prevent the PostHook command to be executed if the user did not specify a command in the values file
+* Fix issue with tls file generation when nginx.https.enabled is false
+
+## [11.5.1] - Nov 19, 2020
+* Updated Artifactory version to 7.11.2
+* Bugfix - access.config.import.xml override Access Federation configurations
+
+## [11.5.0] - Nov 17, 2020
+* Updated Artifactory version to 7.11.1
+* Update alpine tag version to `3.12.1`
+
+## [11.4.6] - Nov 10, 2020
+* Pass system.yaml via external secret for advanced usecases
+* Added support for custom ingress
+* Bugfix - stateful set not picking up changes to database secrets
+
+## [11.4.5] - Nov 9, 2020
+* Updated Artifactory version to 7.10.6 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.10.6)
+
+## [11.4.4] - Nov 2, 2020
+* Add enablePathStyleAccess property for aws-s3-v3 binary provider template
+
+## [11.4.3] - Nov 2, 2020
+* Updated Artifactory version to 7.10.5 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.10.5)
+
+## [11.4.2] - Oct 22, 2020
+* Chown bug fix where Linux capability cannot chown all files causing log line warnings
+* Fix Frontend timeout linting issue
+
+## [11.4.1] - Oct 20, 2020
+* Add flag to disable prepare-custom-persistent-volume init container
+
+## [11.4.0] - Oct 19, 2020
+* Updated Artifactory version to 7.10.2 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.10.2)
+
+## [11.3.2] - Oct 15, 2020
+* Add support to specify priorityClassName for nginx deployment
+
+## [11.3.1] - Oct 9, 2020
+* Add support for customInitContainersBegin
+
+## [11.3.0] - Oct 7, 2020
+* Updated Artifactory version to 7.9.1
+* **Breaking change:** Fix `storageClass` to correct `storageClassName` in values.yaml
+
+## [11.2.0] - Oct 5, 2020
+* Expose Prometheus metrics via a ServiceMonitor
+* Parse log files for metric data with Fluentd
+
+## [11.1.0] - Sep 30, 2020
+* Updated Artifactory version to 7.9.0 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.9)
+* Added support for resources in init container
+
+## [11.0.11] - Sep 25, 2020
+* Update to use linux capability CAP_CHOWN instead of root base init container to avoid any use of root containers to pass Redhat security requirements
+
+## [11.0.10] - Sep 28, 2020
+* Setting chart coordinates in migitation yaml
+
+## [11.0.9] - Sep 25, 2020
+* Update filebeat version to `7.9.2`
+
+## [11.0.8] - Sep 24, 2020
+* Fixed broken issue - when setting `waitForDatabase: false` container startup still waits for DB
+
+## [11.0.7] - Sep 22, 2020
+* Readme updates
+
+## [11.0.6] - Sep 22, 2020
+* Fix lint issue in migitation yaml
+
+## [11.0.5] - Sep 22, 2020
+* Fix broken migitation yaml
+
+## [11.0.4] - Sep 21, 2020
+* Added mitigation yaml for Artifactory - [More info](https://github.com/jfrog/chartcenter/blob/master/docs/securitymitigationspec.md)
+
+## [11.0.3] - Sep 17, 2020
+* Added configurable session(UI) timeout in frontend microservice
+
+## [11.0.2] - Sep 17, 2020
+* Added proper required text to be shown while postgres upgrades
+
+## [11.0.1] - Sep 14, 2020
+* Updated Artifactory version to 7.7.8 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.7.8)
+
+## [11.0.0] - Sep 2, 2020
+* **Breaking change:** Changed `imagePullSecrets`values from string to list.
+* **Breaking change:** Added `image.registry` and changed `image.version` to `image.tag` for docker images
+* Added support for global values
+* Updated maintainers in chart.yaml
+* Update postgresql tag version to `12.3.0-debian-10-r71`
+* Update postgresql chart version to `9.3.4` in requirements.yaml - [9.x Upgrade Notes](https://github.com/bitnami/charts/tree/master/bitnami/postgresql#900)
+* **IMPORTANT**
+* If this is a new deployment or you already use an external database (`postgresql.enabled=false`), these changes **do not affect you**!
+* If this is an upgrade and you are using the default PostgreSQL (`postgresql.enabled=true`), you need to pass previous 9.x/10.x's postgresql.image.tag and databaseUpgradeReady=true
+
+## [10.1.0] - Aug 13, 2020
+* Updated Artifactory version to 7.7.3 - [Release Notes](https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.7)
+
+## [10.0.15] - Aug 10, 2020
+* Added enableSignedUrlRedirect for persistent storage type aws-s3-v3.
+
+## [10.0.14] - Jul 31, 2020
+* Update the README section on Nginx SSL termination to reflect the actual YAML structure.
+
+## [10.0.13] - Jul 30, 2020
+* Added condition to disable the migration scripts.
+
+## [10.0.12] - Jul 28, 2020
+* Document Artifactory node affinity.
+
+## [10.0.11] - Jul 28, 2020
+* Added maxConnections for persistent storage type aws-s3-v3.
+
+## [10.0.10] - Jul 28, 2020
+* Bugfix / support for userPluginSecrets with Artifactory 7
+
+## [10.0.9] - Jul 27, 2020
+* Add tpl to external database secrets
+* Modified `scheme`  to `artifactory.scheme`
+
+## [10.0.8] - Jul 23, 2020
+* Added condition to disable the migration init container.
+
+## [10.0.7] - Jul 21, 2020
+* Updated Artifactory Chart to add node and primary labels to pods and service objects.
+
+## [10.0.6] - Jul 20, 2020
+* Support custom CA and certificates
+
+## [10.0.5] - Jul 13, 2020
+* Updated Artifactory version to 7.6.3 - https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.6.3
+* Fixed Mysql database jar path in `preStartCommand` in README
+
+## [10.0.4] - Jul 10, 2020
+* Move some postgresql values to where they should be according to the subchart
+
+## [10.0.3] - Jul 8, 2020
+* Set Artifactory access client connections to the same value as the access threads
+
+## [10.0.2] - Jul 6, 2020
+* Updated Artifactory version to 7.6.2
+* **IMPORTANT**
+* Added ChartCenter Helm repository in README
+
+## [10.0.1] - Jul 01, 2020
+* Add dedicated ingress object for Replicator service when enabled
+
+## [10.0.0] - Jun 30, 2020
+* Update postgresql tag version to `10.13.0-debian-10-r38`
+* Update alpine tag version to `3.12`
+* Update busybox tag version to `1.31.1`
+* **IMPORTANT**
+* If this is a new deployment or you already use an external database (`postgresql.enabled=false`), these changes **do not affect you**!
+* If this is an upgrade and you are using the default PostgreSQL (`postgresql.enabled=true`), you need to pass postgresql.image.tag=9.6.18-debian-10-r7 and databaseUpgradeReady=true
+
+## [9.6.0] - Jun 29, 2020
+* Updated Artifactory version to 7.6.1 - https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.6.1
+* Add tpl for external database secrets
+
+## [9.5.5] - Jun 25, 2020
+* Stop loading the Nginx stream module because it is now a core module
+
+## [9.5.4] - Jun 25, 2020
+* Notes.txt update - add --namespace parameter
+
+## [9.5.3] - Jun 11, 2020
+* Support list of custom secrets
+
+## [9.5.2] - Jun 12, 2020
+* Updated Artifactory version to 7.5.7 - https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.5.7
+
+## [9.5.1] - Jun 8, 2020
+* Readme update - configuring Artifactory with oracledb
+
+## [9.5.0] - Jun 1, 2020
+* Updated Artifactory version to 7.5.5 - https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.5
+* Fixes bootstrap configMap permission issue
+* Update postgresql tag version to `9.6.18-debian-10-r7`
+
+## [9.4.9] - May 27, 2020
+* Added Tomcat maxThreads & acceptCount
+
+## [9.4.8] - May 25, 2020
+* Fixed postgresql README `image` Parameters
+
+## [9.4.7] - May 24, 2020
+* Fixed typo in README regarding migration timeout
+
+## [9.4.6] - May 19, 2020
+* Added metadata maxOpenConnections
+
+## [9.4.5] - May 07, 2020
+* Fix `installerInfo` string format
+
+## [9.4.4] - Apr 27, 2020
+* Updated Artifactory version to 7.4.3
+
+## [9.4.3] - Apr 26, 2020
+* Change order of the customInitContainers to run before the "migration-artifactory" initContainer.
+
+## [9.4.2] - Apr 24, 2020
+* Fix `artifactory.persistence.awsS3V3.useInstanceCredentials` incorrect conditional logic
+* Bump postgresql tag version to `9.6.17-debian-10-r72` in values.yaml
+
+## [9.4.1] - Apr 16, 2020
+* Custom volumes in migration init container.
+
+## [9.4.0] - Apr 14, 2020
+* Updated Artifactory version to 7.4.1
+
+## [9.3.1] - April 13, 2020
+* Update README with helm v3 commands
+
+## [9.3.0] - April 10, 2020
+* Use dependency charts from `https://charts.bitnami.com/bitnami`
+* Bump postgresql chart version to `8.7.3` in requirements.yaml
+* Bump postgresql tag version to `9.6.17-debian-10-r21` in values.yaml
+
+## [9.2.9] - Apr 8, 2020
+* Added recommended ingress annotation to avoid 413 errors
+
+## [9.2.8] - Apr 8, 2020
+* Moved migration scripts under `files` directory
+* Support preStartCommand in migration Init container as `artifactory.migration.preStartCommand`
+
+## [9.2.7] - Apr 6, 2020
+* Fix cache size (should be 5gb instead of 50gb since volume claim is only 20gb).
+
+## [9.2.6] - Apr 1, 2020
+* Support masterKey and joinKey as secrets
+
+## [9.2.5] - Apr 1, 2020
+* Fix readme use to `-hex 32` instead of `-hex 16`
+
+## [9.2.4] - Mar 31, 2020
+* Change the way the artifactory `command:` is set so it will properly pass a SIGTERM to java
+
+## [9.2.3] - Mar 29, 2020
+* Add Nginx log options: stderr as logfile and log level
+
+## [9.2.2] - Mar 30, 2020
+* Use the same defaulting mechanism used for the artifactory version used elsewhere in the chart
+
+## [9.2.1] - Mar 29, 2020
+* Fix loggers sidecars configurations to support new file system layout and new log names
+
+## [9.2.0] - Mar 29, 2020
+* Fix broken admin user bootstrap configuration
+* **Breaking change:** renamed `artifactory.accessAdmin` to `artifactory.admin`
+
+## [9.1.5] - Mar 26, 2020
+* Fix volumeClaimTemplate issue
+
+## [9.1.4] - Mar 25, 2020
+* Fix volume name used by filebeat container
+
+## [9.1.3] - Mar 24, 2020
+* Use `postgresqlExtendedConf` for setting custom PostgreSQL configuration (instead of `postgresqlConfiguration`)
+
+## [9.1.2] - Mar 22, 2020
+* Support for SSL offload in Nginx service(LoadBalancer) layer. Introduced `nginx.service.ssloffload` field with boolean type.
+
+## [9.1.1] - Mar 23, 2020
+* Moved installer info to values.yaml so it is fully customizable
+
+## [9.1.0] - Mar 23, 2020
+* Updated Artifactory version to 7.3.2
+
+## [9.0.29] - Mar 20, 2020
+* Add support for masterKey trim during 6.x to 7.x migration if 6.x masterKey is 32 hex (64 characters)
+
+## [9.0.28] - Mar 18, 2020
+* Increased Nginx proxy_buffers size
+
+## [9.0.27] - Mar 17, 2020
+* Changed all single quotes to double quotes in values files
+* useInstanceCredentials variable was declared in S3 settings but not used in chart. Now it is being used.
+
+## [9.0.26] - Mar 17, 2020
+* Fix rendering of Service Account annotations
+
+## [9.0.25] - Mar 16, 2020
+* Update Artifactory readme with extra ingress annotations needed for Artifactory to be set as SSO provider
+
+## [9.0.24] - Mar 16, 2020
+* Add Unsupported message from 6.18 to 7.2.x (migration)
+
+## [9.0.23] - Mar 12, 2020
+* Fix README.md rendering issue
+
+## [9.0.22] - Mar 11, 2020
+* Upgrade Docs update
+
+## [9.0.21] - Mar 11, 2020
+* Unified charts public release
+
+## [9.0.20] - Mar 6, 2020
+* Fix path to `/artifactory_bootstrap`
+* Add support for controlling the name of the ingress and allow to set more than one cname
+
+## [9.0.19] - Mar 4, 2020
+* Add support for disabling `consoleLog` in `system.yaml` file
+
+## [9.0.18] - Feb 28, 2020
+* Add support to process `valueFrom` for extraEnvironmentVariables
+
+## [9.0.17] - Feb 26, 2020
+* Fix join key secret naming
+
+## [9.0.16] - Feb 26, 2020
+* Store join key to secret
+
+## [9.0.15] - Feb 26, 2020
+* Updated Artifactory version to 7.2.1
+
+## [9.0.10] - Feb 07, 2020
+* Remove protection flag `databaseUpgradeReady` which was added to check internal postgres upgrade
+
+## [9.0.0] - Feb 07, 2020
+* Updated Artifactory version to 7.0.0
+
+## [8.4.8] - Feb 13, 2020
+* Add support for SSH authentication to Artifactory
+
+## [8.4.7] - Feb 11, 2020
+* Change Artifactory service port name to be hard-coded to `http` instead of using `{{ .Release.Name }}`
+
+## [8.4.6] - Feb 9, 2020
+* Add support for `tpl` in the `postStartCommand`
+
+## [8.4.5] - Feb 4, 2020
+* Support customisable Nginx kind
+
+## [8.4.4] - Feb 2, 2020
+* Add a comment stating that it is recommended to use an external PostgreSQL with a static password for production installations
+
+## [8.4.3] - Jan 30, 2020
+* Add the option to configure resources for the logger containers
+
+## [8.4.2] - Jan 26, 2020
+* Improve `database.user` and `database.password` logic in order to support more use cases and make the configuration less repetitive
+
+## [8.4.1] - Jan 19, 2020
+* Fix replicator port config in nginx replicator configmap
+
+## [8.4.0] - Jan 19, 2020
+* Updated Artifactory version to 6.17.0
+
+## [8.3.6] - Jan 16, 2020
+* Added example for external nginx-ingress
+
+## [8.3.5] - Dec 30, 2019
+* Fix for nginx probes failing when launched with http disabled
+
+## [8.3.4] - Dec 24, 2019
+* Better support for custom `artifactory.internalPort`
+
+## [8.3.3] - Dec 23, 2019
+* Mark empty map values with `{}`
+
+## [8.3.2] - Dec 16, 2019
+* Fix for toggling nginx service ports
+
+## [8.3.1] - Dec 12, 2019
+* Add support for toggling nginx service ports
+
+## [8.3.0] - Dec 1, 2019
+* Updated Artifactory version to 6.16.0
+
+## [8.2.6] - Nov 28, 2019
+* Add support for using existing PriorityClass
+
+## [8.2.5] - Nov 27, 2019
+* Add support for PriorityClass
+
+## [8.2.4] - Nov 21, 2019
+* Add an option to use a file system cache-fs with the file-system binarystore template
+
+## [8.2.3] - Nov 20, 2019
+* Update Artifactory Readme
+
+## [8.2.2] - Nov 20, 2019
+* Update Artfactory logo
+
+## [8.2.1] - Nov 18, 2019
+* Add the option to provide service account annotations (in order to support stuff like https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.html)
+
+## [8.2.0] - Nov 18, 2019
+* Updated Artifactory version to 6.15.0
+
+## [8.1.11] - Nov 17, 2019
+* Do not provide a default master key. Allow it to be auto generated by Artifactory on first startup
+
+## [8.1.10] - Nov 17, 2019
+* Fix creation of double slash in nginx artifactory configuration
+
+## [8.1.9] - Nov 14, 2019
+* Set explicit `postgresql.postgresqlPassword=""` to avoid helm v3 error
+
+## [8.1.8] - Nov 12, 2019
+* Updated Artifactory version to 6.14.1
+
+## [8.1.7] - Nov 9, 2019
+* Additional documentation for masterKey
+
+## [8.1.6] - Nov 10, 2019
+* Update PostgreSQL chart version to 7.0.1
+* Use formal PostgreSQL configuration format
+
+## [8.1.5] - Nov 8, 2019
+* Add support `artifactory.service.loadBalancerSourceRanges` for whitelisting when setting `artifactory.service.type=LoadBalancer`
+
+## [8.1.4] - Nov 6, 2019
+* Add support for any type of environment variable by using `extraEnvironmentVariables` as-is
+
+## [8.1.3] - Nov 6, 2019
+* Add nodeselector support for Postgresql
+
+## [8.1.2] - Nov 5, 2019
+* Add support for the aws-s3-v3 filestore, which adds support for pod IAM roles
+
+## [8.1.1] - Nov 4, 2019
+* When using `copyOnEveryStartup`, make sure that the target base directories are created before copying the files
+
+## [8.1.0] - Nov 3, 2019
+* Updated Artifactory version to 6.14.0
+
+## [8.0.1] - Nov 3, 2019
+* Make sure the artifactory pod exits when one of the pre-start stages fail
+
+## [8.0.0] - Oct 27, 2019
+**IMPORTANT - BREAKING CHANGES!**<br>
+**DOWNTIME MIGHT BE REQUIRED FOR AN UPGRADE!**
+* If this is a new deployment or you already use an external database (`postgresql.enabled=false`), these changes **do not affect you**!
+* If this is an upgrade and you are using the default PostgreSQL (`postgresql.enabled=true`), must use the upgrade instructions in [UPGRADE_NOTES.md](UPGRADE_NOTES.md)!
+* PostgreSQL sub chart was upgraded to version `6.5.x`. This version is **not backward compatible** with the old version (`0.9.5`)!
+* Note the following **PostgreSQL** Helm chart changes
+  * The chart configuration has changed! See [values.yaml](values.yaml) for the new keys used
+  * **PostgreSQL** is deployed as a StatefulSet
+  * See [PostgreSQL helm chart](https://hub.helm.sh/charts/stable/postgresql) for all available configurations
+
+## [7.18.3] - Oct 24, 2019
+* Change the preStartCommand to support templating
+
+## [7.18.2] - Oct 21, 2019
+* Add support for setting `artifactory.labels`
+* Add support for setting `nginx.labels`
+
+## [7.18.1] - Oct 10, 2019
+* Updated Artifactory version to 6.13.1
+
+## [7.18.0] - Oct 7, 2019
+* Updated Artifactory version to 6.13.0
+
+## [7.17.5] - Sep 24, 2019
+* Option to skip wait-for-db init container with '--set waitForDatabase=false'
+
+## [7.17.4] - Sep 11, 2019
+* Updated Artifactory version to 6.12.2
+
+## [7.17.3] - Sep 9, 2019
+* Updated Artifactory version to 6.12.1
+
+## [7.17.2] - Aug 22, 2019
+* Fix the nginx server_name directive used with ingress.hosts
+
+## [7.17.1] - Aug 21, 2019
+* Enable the Artifactory container's liveness and readiness probes
+
+## [7.17.0] - Aug 21, 2019
+* Updated Artifactory version to 6.12.0
+
+## [7.16.11] - Aug 14, 2019
+* Updated Artifactory version to 6.11.6
+
+## [7.16.10] - Aug 11, 2019
+* Fix Ingress routing and add an example
+
+## [7.16.9] - Aug 5, 2019
+* Do not mount `access/etc/bootstrap.creds` unless user specifies a custom password or secret (Access already generates a random password if not provided one)
+* If custom `bootstrap.creds` is provided (using keys or custom secret), prepare it with an init container so the temp file does not persist
+
+## [7.16.8] - Aug 4, 2019
+* Improve binarystore config
+    1. Convert to a secret
+    2. Move config to values.yaml
+    3. Support an external secret
+
+## [7.16.7] - Jul 29, 2019
+* Don't create the nginx configmaps when nginx.enabled is false
+
+## [7.16.6] - Jul 24, 2019
+* Simplify nginx setup and shorten initial wait for probes
+
+## [7.16.5] - Jul 22, 2019
+* Change Ingress API to be compatible with recent kubernetes versions
+
+## [7.16.4] - Jul 22, 2019
+* Updated Artifactory version to 6.11.3
+
+## [7.16.3] - Jul 11, 2019
+* Add ingress.hosts to the Nginx server_name directive when ingress is enabled to help with Docker repository sub domain configuration
+
+## [7.16.2] - Jul 3, 2019
+* Fix values key in reverse proxy example
+
+## [7.16.1] - Jul 1, 2019
+* Updated Artifactory version to 6.11.1
+
+## [7.16.0] - Jun 27, 2019
+* Update Artifactory version to 6.11 and add restart to Artifactory when bootstrap.creds file has been modified
+
+## [7.15.8] - Jun 27, 2019
+* Add the option for changing nginx config using values.yaml and remove outdated reverse proxy documentation
+
+## [7.15.6] - Jun 24, 2019
+* Update chart maintainers
+
+## [7.15.5] - Jun 24, 2019
+* Change Nginx to point to the artifactory externalPort
+
+## [7.15.4] - Jun 23, 2019
+* Add the option to provide an IP for the access-admin endpoints
+
+## [7.15.3] - Jun 23, 2019
+* Add values files for small, medium and large installations
+
+## [7.15.2] - Jun 20, 2019
+* Add missing terminationGracePeriodSeconds to values.yaml
+
+## [7.15.1] - Jun 19, 2019
+* Updated Artifactory version to 6.10.4
+
+## [7.15.0] - Jun 17, 2019
+* Use configmaps for nginx configuration and remove nginx postStart command
+
+## [7.14.8] - Jun 18, 2019
+* Add the option to provide additional ingress rules
+
+## [7.14.7] - Jun 14, 2019
+* Updated readme with improved external database setup example
+
+## [7.14.6] - Jun 11, 2019
+* Updated Artifactory version to 6.10.3
+* Updated installer-info template
+
+## [7.14.5] - Jun 6, 2019
+* Updated Google Cloud Storage API URL and https settings
+
+## [7.14.4] - Jun 5, 2019
+* Delete the db.properties file on Artifactory startup
+
+## [7.14.3] - Jun 3, 2019
+* Updated Artifactory version to 6.10.2
+
+## [7.14.2] - May 21, 2019
+* Updated Artifactory version to 6.10.1
+
+## [7.14.1] - May 19, 2019
+* Fix missing logger image tag
+
+## [7.14.0] - May 7, 2019
+* Updated Artifactory version to 6.10.0
+
+## [7.13.21] - May 5, 2019
+* Add support for setting `artifactory.async.corePoolSize`
+
+## [7.13.20] - May 2, 2019
+* Remove unused property `artifactory.releasebundle.feature.enabled`
+
+## [7.13.19] - May 1, 2019
+* Fix indentation issue with the replicator system property
+
+## [7.13.18] - Apr 30, 2019
+* Add support for JMX monitoring
+
+## [7.13.17] - Apr 25, 2019
+* Added support for `cacheProviderDir`
+
+## [7.13.16] - Apr 18, 2019
+* Changing API StatefulSet version to `v1` and permission fix for custom `artifactory.conf` for Nginx
+
+## [7.13.15] - Apr 16, 2019
+* Updated documentation for Reverse Proxy Configuration
+
+## [7.13.14] - Apr 15, 2019
+* Added support for `customVolumeMounts`
+
+## [7.13.13] - Aprl 12, 2019
+* Added support for `bucketExists` flag for googleStorage
+
+## [7.13.12] - Apr 11, 2019
+* Replace `curl` examples with `wget` due to the new base image
+
+## [7.13.11] - Aprl 07, 2019
+* Add support for providing the Artifactory license as a parameter
+
+## [7.13.10] - Apr 10, 2019
+* Updated Artifactory version to 6.9.1
+
+## [7.13.9] - Aprl 04, 2019
+* Add support for templated extraEnvironmentVariables
+
+## [7.13.8] - Aprl 07, 2019
+* Change network policy API group
+
+## [7.13.7] - Aprl 04, 2019
+* Bugfix for userPluginSecrets
+
+## [7.13.6] - Apr 4, 2019
+* Add information about upgrading Artifactory with auto-generated postgres password
+
+## [7.13.5] - Aprl 03, 2019
+* Added installer info
+
+## [7.13.4] - Aprl 03, 2019
+* Allow secret names for user plugins to contain template language
+
+## [7.13.3] - Apr 02, 2019
+* Allow NetworkPolicy configurations (defaults to allow all)
+
+## [7.13.2] - Aprl 01, 2019
+* Add support for user plugin secret
+
+## [7.13.1] - Mar 27, 2019
+* Add the option to copy a list of files to ARTIFACTORY_HOME on startup
+
+## [7.13.0] - Mar 26, 2019
+* Updated Artifactory version to 6.9.0
+
+## [7.12.18] - Mar 25, 2019
+* Add CI tests for persistence, ingress support and nginx
+
+## [7.12.17] - Mar 22, 2019
+* Add the option to change the default access-admin password
+
+## [7.12.16] - Mar 22, 2019
+* Added support for `<artifactory|nginx>.<readiness|liveness>Probe.path` to customise the paths used for health probes
+
+## [7.12.15] - Mar 21, 2019
+* Added support for `artifactory.customSidecarContainers` to create custom sidecar containers
+* Added support for `artifactory.customVolumes` to create custom volumes
+
+## [7.12.14] - Mar 21, 2019
+* Make ingress path configurable
+
+## [7.12.13] - Mar 19, 2019
+* Move the copy of bootstrap config from postStart to preStart
+
+## [7.12.12] - Mar 19, 2019
+* Fix existingClaim example
+
+## [7.12.11] - Mar 18, 2019
+* Add information about nginx persistence
+
+## [7.12.10] - Mar 15, 2019
+* Wait for nginx configuration file before using it
+
+## [7.12.9] - Mar 15, 2019
+* Revert securityContext changes since they were causing issues
+
+## [7.12.8] - Mar 15, 2019
+* Fix issue #247 (init container failing to run)
+
+## [7.12.7] - Mar 14, 2019
+* Updated Artifactory version to 6.8.7
+* Add support for Artifactory-CE for C++
+
+## [7.12.6] - Mar 13, 2019
+* Move securityContext to container level
+
+## [7.12.5] - Mar 11, 2019
+* Updated Artifactory version to 6.8.6
+
+## [7.12.4] - Mar 8, 2019
+* Fix existingClaim option
+
+## [7.12.3] - Mar 5, 2019
+* Updated Artifactory version to 6.8.4
+
+## [7.12.2] - Mar 4, 2019
+* Add support for catalina logs sidecars
+
+## [7.12.1] - Feb 27, 2019
+* Updated Artifactory version to 6.8.3
+
+## [7.12.0] - Feb 25, 2019
+* Add nginx support for tail sidecars
+
+## [7.11.1] - Feb 20, 2019
+* Added support for enterprise storage
+
+## [7.10.2] - Feb 19, 2019
+* Updated Artifactory version to 6.8.2
+
+## [7.10.1] - Feb 17, 2019
+* Updated Artifactory version to 6.8.1
+* Add example of `SERVER_XML_EXTRA_CONNECTOR` usage
+
+## [7.10.0] - Feb 15, 2019
+* Updated Artifactory version to 6.8.0
+
+## [7.9.6] - Feb 13, 2019
+* Updated Artifactory version to 6.7.3
+
+## [7.9.5] - Feb 12, 2019
+*  Add support for tail sidecars to view logs from k8s api
+
+## [7.9.4] - Feb 6, 2019
+* Fix support for customizing statefulset `terminationGracePeriodSeconds`
+
+## [7.9.3] - Feb 5, 2019
+* Add instructions on how to deploy Artifactory with embedded Derby database
+
+## [7.9.2] - Feb 5, 2019
+* Add support for customizing statefulset `terminationGracePeriodSeconds`
+
+## [7.9.1] - Feb 3, 2019
+* Updated Artifactory version to 6.7.2
+
+## [7.9.0] - Jan 23, 2019
+* Updated Artifactory version to 6.7.0
+
+## [7.8.9] - Jan 22, 2019
+* Added support for `artifactory.customInitContainers` to create custom init containers
+
+## [7.8.8] - Jan 17, 2019
+* Added support of values ingress.labels
+
+## [7.8.7] - Jan 16, 2019
+* Mount replicator.yaml (config) directly to /replicator_extra_conf
+
+## [7.8.6] - Jan 13, 2019
+* Fix documentation about nginx group id
+
+## [7.8.5] - Jan 13, 2019
+* Updated Artifactory version to 6.6.5
+
+## [7.8.4] - Jan 8, 2019
+* Make artifactory.replicator.publicUrl required when the replicator is enabled
+
+## [7.8.3] - Jan 1, 2019
+* Updated Artifactory version to 6.6.3
+* Add support for `artifactory.extraEnvironmentVariables` to pass more environment variables to Artifactory
+
+## [7.8.2] - Dec 28, 2018
+* Fix location `replicator.yaml` is copied to
+
+## [7.8.1] - Dec 27, 2018
+* Updated Artifactory version to 6.6.1
+
+## [7.8.0] - Dec 20, 2018
+* Updated Artifactory version to 6.6.0
+
+## [7.7.13] - Dec 17, 2018
+* Updated Artifactory version to 6.5.13
+
+## [7.7.12] - Dec 12, 2018
+* Fix documentation about Artifactory license setup using secret
+
+## [7.7.11] - Dec 10, 2018
+* Fix issue when using existing claim
+
+## [7.7.10] - Dec 5, 2018
+* Remove Distribution certificates creation.
+
+## [7.7.9] - Nov 30, 2018
+* Updated Artifactory version to 6.5.9
+
+## [7.7.8] - Nov 29, 2018
+* Updated postgresql version to 9.6.11
+
+## [7.7.7] - Nov 27, 2018
+* Updated Artifactory version to 6.5.8
+
+## [7.7.6] - Nov 19, 2018
+* Added support for configMap to use custom Reverse Proxy Configuration with Nginx
+
+## [7.7.5] - Nov 14, 2018
+* Fix location of `nodeSelector`, `affinity` and `tolerations`
+
+## [7.7.4] - Nov 14, 2018
+* Updated Artifactory version to 6.5.3
+
+## [7.7.3] - Nov 12, 2018
+* Support artifactory.preStartCommand for running command before entrypoint starts
+
+## [7.7.2] - Nov 7, 2018
+* Support database.url parameter (DB_URL)
+
+## [7.7.1] - Oct 29, 2018
+* Change probes port to 8040 (so they will not be blocked when all tomcat threads on 8081 are exhausted)
+
+## [7.7.0] - Oct 28, 2018
+* Update postgresql chart to version 0.9.5 to be able and use `postgresConfig` options
+
+## [7.6.8] - Oct 23, 2018
+* Fix providing external secret for database credentials
+
+## [7.6.7] - Oct 23, 2018
+* Allow user to configure externalTrafficPolicy for Loadbalancer
+
+## [7.6.6] - Oct 22, 2018
+* Updated ingress annotation support (with examples) to support docker registry v2
+
+## [7.6.5] - Oct 21, 2018
+* Updated Artifactory version to 6.5.2
+
+## [7.6.4] - Oct 19, 2018
+* Allow providing pre-existing secret containing master key
+* Allow arbitrary annotations on primary and member node pods
+* Enforce size limits when using local storage with `emptyDir`
+* Allow providing pre-existing secrets containing external database credentials
+
+## [7.6.3] - Oct 18, 2018
+* Updated Artifactory version to 6.5.1
+
+## [7.6.2] - Oct 17, 2018
+* Add Apache 2.0 license
+
+## [7.6.1] - Oct 11, 2018
+* Supports master-key in the secrets and stateful-set
+* Allows ingress default `backend` to be enabled or disabled (defaults to enabled)
+
+## [7.6.0] - Oct 11, 2018
+* Updated Artifactory version to 6.5.0
+
+## [7.5.4] - Oct 9, 2018
+* Quote ingress hosts to support wildcard names
+
+## [7.5.3] - Oct 4, 2018
+* Add PostgreSQL resources template
+
+## [7.5.2] - Oct 2, 2018
+* Add `helm repo add jfrog https://charts.jfrog.io` to README
+
+## [7.5.1] - Oct 2, 2018
+* Set Artifactory to 6.4.1
+
+## [7.5.0] - Sep 27, 2018
+* Set Artifactory to 6.4.0
+
+## [7.4.3] - Sep 26, 2018
+* Add ci/test-values.yaml
+
+## [7.4.2] - Sep 2, 2018
+* Updated Artifactory version to 6.3.2
+* Removed unused PVC
+
+## [7.4.0] - Aug 22, 2018
+* Added support to run as non root
+* Updated Artifactory version to 6.2.0
+
+## [7.3.0] - Aug 22, 2018
+* Enabled RBAC Support
+* Added support for PostStartCommand (To download Database JDBC connector)
+* Increased postgresql max_connections
+* Added support for `nginx.conf` ConfigMap
+* Updated Artifactory version to 6.1.0
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/Chart.lock b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/Chart.lock
new file mode 100644
index 000000000..8064c323b
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: postgresql
+  repository: https://charts.jfrog.io/
+  version: 10.3.18
+digest: sha256:404ce007353baaf92a6c5f24b249d5b336c232e5fd2c29f8a0e4d0095a09fd53
+generated: "2022-03-08T08:53:16.293311+05:30"
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/Chart.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/Chart.yaml
new file mode 100644
index 000000000..c5cd17ad3
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v2
+appVersion: 7.98.14
+dependencies:
+- condition: postgresql.enabled
+  name: postgresql
+  repository: https://charts.jfrog.io/
+  version: 10.3.18
+description: Universal Repository Manager supporting all major packaging formats,
+  build tools and CI servers.
+home: https://www.jfrog.com/artifactory/
+icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory/logo/artifactory-logo.png
+keywords:
+- artifactory
+- jfrog
+- devops
+kubeVersion: '>= 1.19.0-0'
+maintainers:
+- email: installers@jfrog.com
+  name: Chart Maintainers at JFrog
+name: artifactory
+sources:
+- https://github.com/jfrog/charts
+type: application
+version: 107.98.14
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/LICENSE b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/LICENSE
new file mode 100644
index 000000000..8dada3eda
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/README.md b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/README.md
new file mode 100644
index 000000000..783101786
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/README.md
@@ -0,0 +1,60 @@
+# JFrog Artifactory Helm Chart
+
+**IMPORTANT!** Our Helm Chart docs have moved to our main documentation site. Below you will find the basic instructions for installing, uninstalling, and deleting Artifactory. For all other information, refer to [Installing Artifactory](https://www.jfrog.com/confluence/display/JFROG/Installing+Artifactory#InstallingArtifactory-HelmInstallation).
+
+## Prerequisites
+* Kubernetes 1.19+
+* Artifactory Pro trial license [get one from here](https://www.jfrog.com/artifactory/free-trial/)
+
+## Chart Details
+This chart will do the following:
+
+* Deploy Artifactory-Pro/Artifactory-Edge (or OSS/CE if custom image is set)
+* Deploy a PostgreSQL database using the stable/postgresql chart (can be changed) **NOTE:** For production grade installations it is recommended to use an external PostgreSQL.
+* Deploy an optional Nginx server
+* Optionally expose Artifactory with Ingress [Ingress documentation](https://kubernetes.io/docs/concepts/services-networking/ingress/)
+
+## Installing the Chart
+
+### Add JFrog Helm repository
+
+Before installing JFrog helm charts, you need to add the [JFrog helm repository](https://charts.jfrog.io) to your helm client
+
+```bash
+helm repo add jfrog https://charts.jfrog.io
+helm repo update
+```
+
+### Install Chart
+To install the chart with the release name `artifactory`:
+```bash
+helm upgrade --install artifactory jfrog/artifactory --namespace artifactory --create-namespace
+```
+
+### Apply Sizing configurations to the Chart
+Note that sizings with more than one replica require an enterprise license for HA . Refer [here](https://jfrog.com/help/r/jfrog-installation-setup-documentation/high-availability)
+To apply the chart with recommended sizing configurations :
+For small configurations :
+```bash
+helm upgrade --install artifactory jfrog/artifactory -f sizing/artifactory-small.yaml --namespace artifactory --create-namespace
+```
+
+## Uninstalling Artifactory
+
+Uninstall is supported only on Helm v3 and on.
+
+Uninstall Artifactory using the following command.
+
+```bash
+helm uninstall artifactory && sleep 90 && kubectl delete pvc -l app=artifactory
+```
+
+## Deleting Artifactory
+
+**IMPORTANT:** Deleting Artifactory will also delete your data volumes and you will lose all of your data. You must back up all this information before deletion. You do not need to uninstall Artifactory before deleting it.
+
+To delete Artifactory use the following command.
+
+```bash
+helm delete artifactory --namespace artifactory
+```
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/.helmignore b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/Chart.lock b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/Chart.lock
new file mode 100644
index 000000000..3687f52df
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: https://charts.bitnami.com/bitnami
+  version: 1.4.2
+digest: sha256:dce0349883107e3ff103f4f17d3af4ad1ea3c7993551b1c28865867d3e53d37c
+generated: "2021-03-30T09:13:28.360322819Z"
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/Chart.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/Chart.yaml
new file mode 100644
index 000000000..4b197b207
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/Chart.yaml
@@ -0,0 +1,29 @@
+annotations:
+  category: Database
+apiVersion: v2
+appVersion: 11.11.0
+dependencies:
+- name: common
+  repository: https://charts.bitnami.com/bitnami
+  version: 1.x.x
+description: Chart for PostgreSQL, an object-relational database management system
+  (ORDBMS) with an emphasis on extensibility and on standards-compliance.
+home: https://github.com/bitnami/charts/tree/master/bitnami/postgresql
+icon: https://bitnami.com/assets/stacks/postgresql/img/postgresql-stack-220x234.png
+keywords:
+- postgresql
+- postgres
+- database
+- sql
+- replication
+- cluster
+maintainers:
+- email: containers@bitnami.com
+  name: Bitnami
+- email: cedric@desaintmartin.fr
+  name: desaintmartin
+name: postgresql
+sources:
+- https://github.com/bitnami/bitnami-docker-postgresql
+- https://www.postgresql.org/
+version: 10.3.18
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/README.md b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/README.md
new file mode 100644
index 000000000..63d3605bb
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/README.md
@@ -0,0 +1,770 @@
+# PostgreSQL
+
+[PostgreSQL](https://www.postgresql.org/) is an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance.
+
+For HA, please see [this repo](https://github.com/bitnami/charts/tree/master/bitnami/postgresql-ha)
+
+## TL;DR
+
+```console
+$ helm repo add bitnami https://charts.bitnami.com/bitnami
+$ helm install my-release bitnami/postgresql
+```
+
+## Introduction
+
+This chart bootstraps a [PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+
+Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. This chart has been tested to work with NGINX Ingress, cert-manager, fluentd and Prometheus on top of the [BKPR](https://kubeprod.io/).
+
+## Prerequisites
+
+- Kubernetes 1.12+
+- Helm 3.1.0
+- PV provisioner support in the underlying infrastructure
+
+## Installing the Chart
+To install the chart with the release name `my-release`:
+
+```console
+$ helm install my-release bitnami/postgresql
+```
+
+The command deploys PostgreSQL on the Kubernetes cluster in the default configuration. The [Parameters](#parameters) section lists the parameters that can be configured during installation.
+
+> **Tip**: List all releases using `helm list`
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```console
+$ helm delete my-release
+```
+
+The command removes all the Kubernetes components but PVC's associated with the chart and deletes the release.
+
+To delete the PVC's associated with `my-release`:
+
+```console
+$ kubectl delete pvc -l release=my-release
+```
+
+> **Note**: Deleting the PVC's will delete postgresql data as well. Please be cautious before doing it.
+
+## Parameters
+
+The following tables lists the configurable parameters of the PostgreSQL chart and their default values.
+
+| Parameter                                     | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Default                                                       |
+|-----------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------|
+| `global.imageRegistry`                        | Global Docker Image registry                                                                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+| `global.postgresql.postgresqlDatabase`        | PostgreSQL database (overrides `postgresqlDatabase`)                                                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `global.postgresql.postgresqlUsername`        | PostgreSQL username (overrides `postgresqlUsername`)                                                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `global.postgresql.existingSecret`            | Name of existing secret to use for PostgreSQL passwords (overrides `existingSecret`)                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `global.postgresql.postgresqlPassword`        | PostgreSQL admin password (overrides `postgresqlPassword`)                                                                                                                                                                                                                                                                                                                                                                                                                 | `nil`                                                         |
+| `global.postgresql.servicePort`               | PostgreSQL port (overrides `service.port`)                                                                                                                                                                                                                                                                                                                                                                                                                                 | `nil`                                                         |
+| `global.postgresql.replicationPassword`       | Replication user password (overrides `replication.password`)                                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+| `global.imagePullSecrets`                     | Global Docker registry secret names as an array                                                                                                                                                                                                                                                                                                                                                                                                                            | `[]` (does not add image pull secrets to deployed pods)       |
+| `global.storageClass`                         | Global storage class for dynamic provisioning                                                                                                                                                                                                                                                                                                                                                                                                                              | `nil`                                                         |
+| `image.registry`                              | PostgreSQL Image registry                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `docker.io`                                                   |
+| `image.repository`                            | PostgreSQL Image name                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `bitnami/postgresql`                                          |
+| `image.tag`                                   | PostgreSQL Image tag                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `{TAG_NAME}`                                                  |
+| `image.pullPolicy`                            | PostgreSQL Image pull policy                                                                                                                                                                                                                                                                                                                                                                                                                                               | `IfNotPresent`                                                |
+| `image.pullSecrets`                           | Specify Image pull secrets                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `nil` (does not add image pull secrets to deployed pods)      |
+| `image.debug`                                 | Specify if debug values should be set                                                                                                                                                                                                                                                                                                                                                                                                                                      | `false`                                                       |
+| `nameOverride`                                | String to partially override common.names.fullname template with a string (will prepend the release name)                                                                                                                                                                                                                                                                                                                                                                    | `nil`                                                         |
+| `fullnameOverride`                            | String to fully override common.names.fullname template with a string                                                                                                                                                                                                                                                                                                                                                                                                        | `nil`                                                         |
+| `volumePermissions.enabled`                   | Enable init container that changes volume permissions in the data directory (for cases where the default k8s `runAsUser` and `fsUser` values do not work)                                                                                                                                                                                                                                                                                                                  | `false`                                                       |
+| `volumePermissions.image.registry`            | Init container volume-permissions image registry                                                                                                                                                                                                                                                                                                                                                                                                                           | `docker.io`                                                   |
+| `volumePermissions.image.repository`          | Init container volume-permissions image name                                                                                                                                                                                                                                                                                                                                                                                                                               | `bitnami/bitnami-shell`                                       |
+| `volumePermissions.image.tag`                 | Init container volume-permissions image tag                                                                                                                                                                                                                                                                                                                                                                                                                                | `"10"`                                                        |
+| `volumePermissions.image.pullPolicy`          | Init container volume-permissions image pull policy                                                                                                                                                                                                                                                                                                                                                                                                                        | `Always`                                                      |
+| `volumePermissions.securityContext.*`         | Other container security context to be included as-is in the container spec                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                                          |
+| `volumePermissions.securityContext.runAsUser` | User ID for the init container (when facing issues in OpenShift or uid unknown, try value "auto")                                                                                                                                                                                                                                                                                                                                                                          | `0`                                                           |
+| `usePasswordFile`                             | Have the secrets mounted as a file instead of env vars                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`                                                       |
+| `ldap.enabled`                                | Enable LDAP support                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `false`                                                       |
+| `ldap.existingSecret`                         | Name of existing secret to use for LDAP passwords                                                                                                                                                                                                                                                                                                                                                                                                                          | `nil`                                                         |
+| `ldap.url`                                    | LDAP URL beginning in the form `ldap[s]://host[:port]/basedn[?[attribute][?[scope][?[filter]]]]`                                                                                                                                                                                                                                                                                                                                                                           | `nil`                                                         |
+| `ldap.server`                                 | IP address or name of the LDAP server.                                                                                                                                                                                                                                                                                                                                                                                                                                     | `nil`                                                         |
+| `ldap.port`                                   | Port number on the LDAP server to connect to                                                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+| `ldap.scheme`                                 | Set to `ldaps` to use LDAPS.                                                                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+| `ldap.tls`                                    | Set to `1` to use TLS encryption                                                                                                                                                                                                                                                                                                                                                                                                                                           | `nil`                                                         |
+| `ldap.prefix`                                 | String to prepend to the user name when forming the DN to bind                                                                                                                                                                                                                                                                                                                                                                                                             | `nil`                                                         |
+| `ldap.suffix`                                 | String to append to the user name when forming the DN to bind                                                                                                                                                                                                                                                                                                                                                                                                              | `nil`                                                         |
+| `ldap.search_attr`                            | Attribute to match against the user name in the search                                                                                                                                                                                                                                                                                                                                                                                                                      | `nil`                                                         |
+| `ldap.search_filter`                          | The search filter to use when doing search+bind authentication                                                                                                                                                                                                                                                                                                                                                                                                             | `nil`                                                         |
+| `ldap.baseDN`                                 | Root DN to begin the search for the user in                                                                                                                                                                                                                                                                                                                                                                                                                                | `nil`                                                         |
+| `ldap.bindDN`                                 | DN of user to bind to LDAP                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `nil`                                                         |
+| `ldap.bind_password`                          | Password for the user to bind to LDAP                                                                                                                                                                                                                                                                                                                                                                                                                                      | `nil`                                                         |
+| `replication.enabled`                         | Enable replication                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                                                       |
+| `replication.user`                            | Replication user                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `repl_user`                                                   |
+| `replication.password`                        | Replication user password                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `repl_password`                                               |
+| `replication.readReplicas`                    | Number of read replicas replicas                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `1`                                                           |
+| `replication.synchronousCommit`               | Set synchronous commit mode. Allowed values: `on`, `remote_apply`, `remote_write`, `local` and `off`                                                                                                                                                                                                                                                                                                                                                                       | `off`                                                         |
+| `replication.numSynchronousReplicas`          | Number of replicas that will have synchronous replication. Note: Cannot be greater than `replication.readReplicas`.                                                                                                                                                                                                                                                                                                                                                       | `0`                                                           |
+| `replication.applicationName`                 | Cluster application name. Useful for advanced replication settings                                                                                                                                                                                                                                                                                                                                                                                                         | `my_application`                                              |
+| `existingSecret`                              | Name of existing secret to use for PostgreSQL passwords. The secret has to contain the keys `postgresql-password` which is the password for `postgresqlUsername` when it is different of `postgres`, `postgresql-postgres-password` which will override `postgresqlPassword`, `postgresql-replication-password` which will override `replication.password` and `postgresql-ldap-password` which will be used to authenticate on LDAP. The value is evaluated as a template. | `nil`                                                         |
+| `postgresqlPostgresPassword`                  | PostgreSQL admin password (used when `postgresqlUsername` is not `postgres`, in which case`postgres` is the admin username).                                                                                                                                                                                                                                                                                                                                               | _random 10 character alphanumeric string_                     |
+| `postgresqlUsername`                          | PostgreSQL user (creates a non-admin user when `postgresqlUsername` is not `postgres`)                                                                                                                                                                                                                                                                                                                                                                                     | `postgres`                                                    |
+| `postgresqlPassword`                          | PostgreSQL user password                                                                                                                                                                                                                                                                                                                                                                                                                                                   | _random 10 character alphanumeric string_                     |
+| `postgresqlDatabase`                          | PostgreSQL database                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `nil`                                                         |
+| `postgresqlDataDir`                           | PostgreSQL data dir folder                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `/bitnami/postgresql` (same value as persistence.mountPath)   |
+| `extraEnv`                                    | Any extra environment variables you would like to pass on to the pod. The value is evaluated as a template.                                                                                                                                                                                                                                                                                                                                                                | `[]`                                                          |
+| `extraEnvVarsCM`                              | Name of a Config Map containing extra environment variables you would like to pass on to the pod. The value is evaluated as a template.                                                                                                                                                                                                                                                                                                                                    | `nil`                                                         |
+| `postgresqlInitdbArgs`                        | PostgreSQL initdb extra arguments                                                                                                                                                                                                                                                                                                                                                                                                                                          | `nil`                                                         |
+| `postgresqlInitdbWalDir`                      | PostgreSQL location for transaction log                                                                                                                                                                                                                                                                                                                                                                                                                                    | `nil`                                                         |
+| `postgresqlConfiguration`                     | Runtime Config Parameters                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `nil`                                                         |
+| `postgresqlExtendedConf`                      | Extended Runtime Config Parameters (appended to main or default configuration)                                                                                                                                                                                                                                                                                                                                                                                             | `nil`                                                         |
+| `pgHbaConfiguration`                          | Content of pg_hba.conf                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `nil (do not create pg_hba.conf)`                             |
+| `postgresqlSharedPreloadLibraries`            | Shared preload libraries (comma-separated list)                                                                                                                                                                                                                                                                                                                                                                                                                            | `pgaudit`                                                     |
+| `postgresqlMaxConnections`                    | Maximum total connections                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `nil`                                                         |
+| `postgresqlPostgresConnectionLimit`           | Maximum total connections for the postgres user                                                                                                                                                                                                                                                                                                                                                                                                                            | `nil`                                                         |
+| `postgresqlDbUserConnectionLimit`             | Maximum total connections for the non-admin user                                                                                                                                                                                                                                                                                                                                                                                                                           | `nil`                                                         |
+| `postgresqlTcpKeepalivesInterval`             | TCP keepalives interval                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `nil`                                                         |
+| `postgresqlTcpKeepalivesIdle`                 | TCP keepalives idle                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `nil`                                                         |
+| `postgresqlTcpKeepalivesCount`                | TCP keepalives count                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `postgresqlStatementTimeout`                  | Statement timeout                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `nil`                                                         |
+| `postgresqlPghbaRemoveFilters`                | Comma-separated list of patterns to remove from the pg_hba.conf file                                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `customStartupProbe`                          | Override default startup probe                                                                                                                                                                                                                                                                                                                                                                                                                                             | `nil`                                                         |
+| `customLivenessProbe`                         | Override default liveness probe                                                                                                                                                                                                                                                                                                                                                                                                                                            | `nil`                                                         |
+| `customReadinessProbe`                        | Override default readiness probe                                                                                                                                                                                                                                                                                                                                                                                                                                           | `nil`                                                         |
+| `audit.logHostname`                           | Add client hostnames to the log file                                                                                                                                                                                                                                                                                                                                                                                                                                       | `false`                                                       |
+| `audit.logConnections`                        | Add client log-in operations to the log file                                                                                                                                                                                                                                                                                                                                                                                                                               | `false`                                                       |
+| `audit.logDisconnections`                     | Add client log-outs operations to the log file                                                                                                                                                                                                                                                                                                                                                                                                                             | `false`                                                       |
+| `audit.pgAuditLog`                            | Add operations to log using the pgAudit extension                                                                                                                                                                                                                                                                                                                                                                                                                          | `nil`                                                         |
+| `audit.clientMinMessages`                     | Message log level to share with the user                                                                                                                                                                                                                                                                                                                                                                                                                                   | `nil`                                                         |
+| `audit.logLinePrefix`                         | Template string for the log line prefix                                                                                                                                                                                                                                                                                                                                                                                                                                    | `nil`                                                         |
+| `audit.logTimezone`                           | Timezone for the log timestamps                                                                                                                                                                                                                                                                                                                                                                                                                                            | `nil`                                                         |
+| `configurationConfigMap`                      | ConfigMap with the PostgreSQL configuration files (Note: Overrides `postgresqlConfiguration` and `pgHbaConfiguration`). The value is evaluated as a template.                                                                                                                                                                                                                                                                                                              | `nil`                                                         |
+| `extendedConfConfigMap`                       | ConfigMap with the extended PostgreSQL configuration files. The value is evaluated as a template.                                                                                                                                                                                                                                                                                                                                                                          | `nil`                                                         |
+| `initdbScripts`                               | Dictionary of initdb scripts                                                                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+| `initdbUser`                                  | PostgreSQL user to execute the .sql and sql.gz scripts                                                                                                                                                                                                                                                                                                                                                                                                                     | `nil`                                                         |
+| `initdbPassword`                              | Password for the user specified in `initdbUser`                                                                                                                                                                                                                                                                                                                                                                                                                            | `nil`                                                         |
+| `initdbScriptsConfigMap`                      | ConfigMap with the initdb scripts (Note: Overrides `initdbScripts`). The value is evaluated as a template.                                                                                                                                                                                                                                                                                                                                                                 | `nil`                                                         |
+| `initdbScriptsSecret`                         | Secret with initdb scripts that contain sensitive information (Note: can be used with `initdbScriptsConfigMap` or `initdbScripts`). The value is evaluated as a template.                                                                                                                                                                                                                                                                                                  | `nil`                                                         |
+| `service.type`                                | Kubernetes Service type                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `ClusterIP`                                                   |
+| `service.port`                                | PostgreSQL port                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `5432`                                                        |
+| `service.nodePort`                            | Kubernetes Service nodePort                                                                                                                                                                                                                                                                                                                                                                                                                                                | `nil`                                                         |
+| `service.annotations`                         | Annotations for PostgreSQL service                                                                                                                                                                                                                                                                                                                                                                                                                                         | `{}` (evaluated as a template)                                |
+| `service.loadBalancerIP`                      | loadBalancerIP if service type is `LoadBalancer`                                                                                                                                                                                                                                                                                                                                                                                                                           | `nil`                                                         |
+| `service.loadBalancerSourceRanges`            | Address that are allowed when svc is LoadBalancer                                                                                                                                                                                                                                                                                                                                                                                                                          | `[]` (evaluated as a template)                                |
+| `schedulerName`                               | Name of the k8s scheduler (other than default)                                                                                                                                                                                                                                                                                                                                                                                                                             | `nil`                                                         |
+| `shmVolume.enabled`                           | Enable emptyDir volume for /dev/shm for primary and read replica(s) Pod(s)                                                                                                                                                                                                                                                                                                                                                                                                         | `true`                                                        |
+| `shmVolume.chmod.enabled`                     | Run at init chmod 777 of the /dev/shm (ignored if `volumePermissions.enabled` is `false`)                                                                                                                                                                                                                                                                                                                                                                                  | `true`                                                        |
+| `persistence.enabled`                         | Enable persistence using PVC                                                                                                                                                                                                                                                                                                                                                                                                                                               | `true`                                                        |
+| `persistence.existingClaim`                   | Provide an existing `PersistentVolumeClaim`, the value is evaluated as a template.                                                                                                                                                                                                                                                                                                                                                                                         | `nil`                                                         |
+| `persistence.mountPath`                       | Path to mount the volume at                                                                                                                                                                                                                                                                                                                                                                                                                                                | `/bitnami/postgresql`                                         |
+| `persistence.subPath`                         | Subdirectory of the volume to mount at                                                                                                                                                                                                                                                                                                                                                                                                                                     | `""`                                                          |
+| `persistence.storageClass`                    | PVC Storage Class for PostgreSQL volume                                                                                                                                                                                                                                                                                                                                                                                                                                    | `nil`                                                         |
+| `persistence.accessModes`                     | PVC Access Mode for PostgreSQL volume                                                                                                                                                                                                                                                                                                                                                                                                                                      | `[ReadWriteOnce]`                                             |
+| `persistence.size`                            | PVC Storage Request for PostgreSQL volume                                                                                                                                                                                                                                                                                                                                                                                                                                  | `8Gi`                                                         |
+| `persistence.annotations`                     | Annotations for the PVC                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `{}`                                                          |
+| `persistence.selector`                        | Selector to match an existing Persistent Volume (this value is evaluated as a template)                                                                                                                                                                                                                                                                                                                                                                                    | `{}`                                                          |
+| `commonAnnotations`                           | Annotations to be added to all deployed resources (rendered as a template)                                                                                                                                                                                                                                                                                                                                                                                                 | `{}`                                                          |
+| `primary.podAffinityPreset`                   | PostgreSQL primary pod affinity preset. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard`            | `""`                                                         |
+| `primary.podAntiAffinityPreset`               | PostgreSQL primary pod anti-affinity preset. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard`       | `soft`                                                       |
+| `primary.nodeAffinityPreset.type`             | PostgreSQL primary node affinity preset type. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard`      | `""`                                                         |
+| `primary.nodeAffinityPreset.key`              | PostgreSQL primary node label key to match Ignored if `primary.affinity` is set.                                          | `""`                                                         |
+| `primary.nodeAffinityPreset.values`           | PostgreSQL primary node label values to match. Ignored if `primary.affinity` is set.                                      | `[]`                                                         |
+| `primary.affinity`                            | Affinity for PostgreSQL primary pods assignment                                                                           | `{}` (evaluated as a template)                               |
+| `primary.nodeSelector`                        | Node labels for PostgreSQL primary pods assignment                                                                        | `{}` (evaluated as a template)                               |
+| `primary.tolerations`                         | Tolerations for PostgreSQL primary pods assignment                                                                        | `[]` (evaluated as a template)                               |
+| `primary.anotations`                          | Map of annotations to add to the statefulset (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                           | `{}`                                                          |
+| `primary.labels`                              | Map of labels to add to the statefulset (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                                          |
+| `primary.podAnnotations`                      | Map of annotations to add to the pods (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                                  | `{}`                                                          |
+| `primary.podLabels`                           | Map of labels to add to the pods (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                                       | `{}`                                                          |
+| `primary.priorityClassName`                   | Priority Class to use for each pod (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                                     | `nil`                                                         |
+| `primary.extraInitContainers`                 | Additional init containers to add to the pods (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                          | `[]`                                                          |
+| `primary.extraVolumeMounts`                   | Additional volume mounts to add to the pods (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                            | `[]`                                                          |
+| `primary.extraVolumes`                        | Additional volumes to add to the pods (postgresql primary)                                                                                                                                                                                                                                                                                                                                                                                                                  | `[]`                                                          |
+| `primary.sidecars`                            | Add additional containers to the pod                                                                                                                                                                                                                                                                                                                                                                                                                                        | `[]`                                                          |
+| `primary.service.type`                        | Allows using a different service type for primary                                                                                                                                                                                                                                                                                                                                                                                                                           | `nil`                                                         |
+| `primary.service.nodePort`                    | Allows using a different nodePort for primary                                                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+| `primary.service.clusterIP`                   | Allows using a different clusterIP for primary                                                                                                                                                                                                                                                                                                                                                                                                                              | `nil`                                                         |
+| `primaryAsStandBy.enabled`                    | Whether to enable current cluster's primary as standby server of another cluster or not.                                                                                                                                                                                                                                                                                                                                                                                    | `false`                                                       |
+| `primaryAsStandBy.primaryHost`                | The Host of replication primary in the other cluster.                                                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `primaryAsStandBy.primaryPort `               | The Port of replication primary in the other cluster.                                                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `readReplicas.podAffinityPreset`              | PostgreSQL read only pod affinity preset. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard`            | `""`                                                         |
+| `readReplicas.podAntiAffinityPreset`          | PostgreSQL read only pod anti-affinity preset. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard`       | `soft`                                                       |
+| `readReplicas.nodeAffinityPreset.type`        | PostgreSQL read only node affinity preset type. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard`      | `""`                                                         |
+| `readReplicas.nodeAffinityPreset.key`         | PostgreSQL read only node label key to match Ignored if `primary.affinity` is set.                                          | `""`                                                         |
+| `readReplicas.nodeAffinityPreset.values`      | PostgreSQL read only node label values to match. Ignored if `primary.affinity` is set.                                      | `[]`                                                         |
+| `readReplicas.affinity`                       | Affinity for PostgreSQL read only pods assignment                                                                           | `{}` (evaluated as a template)                               |
+| `readReplicas.nodeSelector`                   | Node labels for PostgreSQL read only pods assignment                                                                        | `{}` (evaluated as a template)                               |
+| `readReplicas.anotations`                     | Map of annotations to add to the statefulsets (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                           | `{}`                                                          |
+| `readReplicas.resources`                      | CPU/Memory resource requests/limits override for readReplicass. Will fallback to `values.resources` if not defined.                                                                                                                                                                                                                                                                                                                                                               | `{}`                                                          |
+| `readReplicas.labels`                         | Map of labels to add to the statefulsets (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                                          |
+| `readReplicas.podAnnotations`                 | Map of annotations to add to the pods (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                                   | `{}`                                                          |
+| `readReplicas.podLabels`                      | Map of labels to add to the pods (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                                        | `{}`                                                          |
+| `readReplicas.priorityClassName`              | Priority Class to use for each pod (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                                      | `nil`                                                         |
+| `readReplicas.extraInitContainers`            | Additional init containers to add to the pods (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                           | `[]`                                                          |
+| `readReplicas.extraVolumeMounts`              | Additional volume mounts to add to the pods (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                             | `[]`                                                          |
+| `readReplicas.extraVolumes`                   | Additional volumes to add to the pods (postgresql readReplicas)                                                                                                                                                                                                                                                                                                                                                                                                                   | `[]`                                                          |
+| `readReplicas.sidecars`                       | Add additional containers to the pod                                                                                                                                                                                                                                                                                                                                                                                                                                              | `[]`                                                          |
+| `readReplicas.service.type`                   | Allows using a different service type for readReplicas                                                                                                                                                                                                                                                                                                                                                                                                                            | `nil`                                                         |
+| `readReplicas.service.nodePort`               | Allows using a different nodePort for readReplicas                                                                                                                                                                                                                                                                                                                                                                                                                                | `nil`                                                         |
+| `readReplicas.service.clusterIP`              | Allows using a different clusterIP for readReplicas                                                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+| `readReplicas.persistence.enabled`            | Whether to enable readReplicas replicas persistence                                                                                                                                                                                                                                                                                                                                                                                                                               | `true`                                                        |
+| `terminationGracePeriodSeconds`               | Seconds the pod needs to terminate gracefully                                                                                                                                                                                                                                                                                                                                                                                                                              | `nil`                                                         |
+| `resources`                                   | CPU/Memory resource requests/limits                                                                                                                                                                                                                                                                                                                                                                                                                                        | Memory: `256Mi`, CPU: `250m`                                  |
+| `securityContext.*`                           | Other pod security context to be included as-is in the pod spec                                                                                                                                                                                                                                                                                                                                                                                                            | `{}`                                                          |
+| `securityContext.enabled`                     | Enable security context                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `true`                                                        |
+| `securityContext.fsGroup`                     | Group ID for the pod                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `1001`                                                        |
+| `containerSecurityContext.*`                  | Other container security context to be included as-is in the container spec                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                                          |
+| `containerSecurityContext.enabled`            | Enable container security context                                                                                                                                                                                                                                                                                                                                                                                                                                          | `true`                                                        |
+| `containerSecurityContext.runAsUser`          | User ID for the container                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `1001`                                                        |
+| `serviceAccount.enabled`                      | Enable service account (Note: Service Account will only be automatically created if `serviceAccount.name` is not set)                                                                                                                                                                                                                                                                                                                                                      | `false`                                                       |
+| `serviceAccount.name`                         | Name of existing service account                                                                                                                                                                                                                                                                                                                                                                                                                                           | `nil`                                                         |
+| `networkPolicy.enabled`                       | Enable NetworkPolicy                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `false`                                                       |
+| `networkPolicy.allowExternal`                 | Don't require client label for connections                                                                                                                                                                                                                                                                                                                                                                                                                                 | `true`                                                        |
+| `networkPolicy.explicitNamespacesSelector`    | A Kubernetes LabelSelector to explicitly select namespaces from which ingress traffic could be allowed                                                                                                                                                                                                                                                                                                                                                                     | `{}`                                                          |
+| `startupProbe.enabled`                        | Enable startupProbe                                                                          | `false`                                                       |
+| `startupProbe.initialDelaySeconds`            | Delay before liveness probe is initiated                                                     | 30                                                            |
+| `startupProbe.periodSeconds`                  | How often to perform the probe                                                               | 15                                                            |
+| `startupProbe.timeoutSeconds`                 | When the probe times                                                                         | 5                                                             |
+| `startupProbe.failureThreshold`               | Minimum consecutive failures for the probe to be considered failed after having succeeded.   | 10                                                            |
+| `startupProbe.successThreshold`               | Minimum consecutive successes for the probe to be considered successful after having failed. | 1                                                             |
+| `livenessProbe.enabled`                       | Enable livenessProbe                                                                         | `true`                                                        |
+| `livenessProbe.initialDelaySeconds`           | Delay before liveness probe is initiated                                                                                                                                                                                                                                                                                                                                                                                                                                   | 30                                                            |
+| `livenessProbe.periodSeconds`                 | How often to perform the probe                                                                                                                                                                                                                                                                                                                                                                                                                                             | 10                                                            |
+| `livenessProbe.timeoutSeconds`                | When the probe times out                                                                                                                                                                                                                                                                                                                                                                                                                                                   | 5                                                             |
+| `livenessProbe.failureThreshold`              | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                                                                                                                                                                                                                                                                                                                 | 6                                                             |
+| `livenessProbe.successThreshold`              | Minimum consecutive successes for the probe to be considered successful after having failed                                                                                                                                                                                                                                                                                                                                                                                | 1                                                             |
+| `readinessProbe.enabled`                      | Enable readinessProbe                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `true`                                                        |
+| `readinessProbe.initialDelaySeconds`          | Delay before readiness probe is initiated                                                                                                                                                                                                                                                                                                                                                                                                                                  | 5                                                             |
+| `readinessProbe.periodSeconds`                | How often to perform the probe                                                                                                                                                                                                                                                                                                                                                                                                                                             | 10                                                            |
+| `readinessProbe.timeoutSeconds`               | When the probe times out                                                                                                                                                                                                                                                                                                                                                                                                                                                   | 5                                                             |
+| `readinessProbe.failureThreshold`             | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                                                                                                                                                                                                                                                                                                                 | 6                                                             |
+| `readinessProbe.successThreshold`             | Minimum consecutive successes for the probe to be considered successful after having failed                                                                                                                                                                                                                                                                                                                                                                                | 1                                                             |
+| `tls.enabled`                                 | Enable TLS traffic support                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `false`                                                       |
+| `tls.preferServerCiphers`                     | Whether to use the server's TLS cipher preferences rather than the client's                                                                                                                                                                                                                                                                                                                                                                                                | `true`                                                        |
+| `tls.certificatesSecret`                      | Name of an existing secret that contains the certificates                                                                                                                                                                                                                                                                                                                                                                                                                  | `nil`                                                         |
+| `tls.certFilename`                            | Certificate filename                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `""`                                                          |
+| `tls.certKeyFilename`                         | Certificate key filename                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `""`                                                          |
+| `tls.certCAFilename`                          | CA Certificate filename. If provided, PostgreSQL will authenticate TLS/SSL clients by requesting them a certificate.                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `tls.crlFilename`                             | File containing a Certificate Revocation List                                                                                                                                                                                                                                                                                                                                                                                                                              | `nil`                                                         |
+| `metrics.enabled`                             | Start a prometheus exporter                                                                                                                                                                                                                                                                                                                                                                                                                                                | `false`                                                       |
+| `metrics.service.type`                        | Kubernetes Service type                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `ClusterIP`                                                   |
+| `service.clusterIP`                           | Static clusterIP or None for headless services                                                                                                                                                                                                                                                                                                                                                                                                                             | `nil`                                                         |
+| `metrics.service.annotations`                 | Additional annotations for metrics exporter pod                                                                                                                                                                                                                                                                                                                                                                                                                            | `{ prometheus.io/scrape: "true", prometheus.io/port: "9187"}` |
+| `metrics.service.loadBalancerIP`              | loadBalancerIP if redis metrics service type is `LoadBalancer`                                                                                                                                                                                                                                                                                                                                                                                                             | `nil`                                                         |
+| `metrics.serviceMonitor.enabled`              | Set this to `true` to create ServiceMonitor for Prometheus operator                                                                                                                                                                                                                                                                                                                                                                                                        | `false`                                                       |
+| `metrics.serviceMonitor.additionalLabels`     | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus                                                                                                                                                                                                                                                                                                                                                                                      | `{}`                                                          |
+| `metrics.serviceMonitor.namespace`            | Optional namespace in which to create ServiceMonitor                                                                                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                         |
+| `metrics.serviceMonitor.interval`             | Scrape interval. If not set, the Prometheus default scrape interval is used                                                                                                                                                                                                                                                                                                                                                                                                | `nil`                                                         |
+| `metrics.serviceMonitor.scrapeTimeout`        | Scrape timeout. If not set, the Prometheus default scrape timeout is used                                                                                                                                                                                                                                                                                                                                                                                                  | `nil`                                                         |
+| `metrics.prometheusRule.enabled`              | Set this to true to create prometheusRules for Prometheus operator                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                                                       |
+| `metrics.prometheusRule.additionalLabels`     | Additional labels that can be used so prometheusRules will be discovered by Prometheus                                                                                                                                                                                                                                                                                                                                                                                     | `{}`                                                          |
+| `metrics.prometheusRule.namespace`            | namespace where prometheusRules resource should be created                                                                                                                                                                                                                                                                                                                                                                                                                 | the same namespace as postgresql                              |
+| `metrics.prometheusRule.rules`                | [rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) to be created, check values for an example.                                                                                                                                                                                                                                                                                                                                            | `[]`                                                          |
+| `metrics.image.registry`                      | PostgreSQL Exporter Image registry                                                                                                                                                                                                                                                                                                                                                                                                                                         | `docker.io`                                                   |
+| `metrics.image.repository`                    | PostgreSQL Exporter Image name                                                                                                                                                                                                                                                                                                                                                                                                                                             | `bitnami/postgres-exporter`                                   |
+| `metrics.image.tag`                           | PostgreSQL Exporter Image tag                                                                                                                                                                                                                                                                                                                                                                                                                                              | `{TAG_NAME}`                                                  |
+| `metrics.image.pullPolicy`                    | PostgreSQL Exporter Image pull policy                                                                                                                                                                                                                                                                                                                                                                                                                                      | `IfNotPresent`                                                |
+| `metrics.image.pullSecrets`                   | Specify Image pull secrets                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `nil` (does not add image pull secrets to deployed pods)      |
+| `metrics.customMetrics`                       | Additional custom metrics                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `nil`                                                         |
+| `metrics.extraEnvVars`                        | Extra environment variables to add to exporter                                                                                                                                                                                                                                                                                                                                                                                                                             | `{}` (evaluated as a template)                                |
+| `metrics.securityContext.*`                   | Other container security context to be included as-is in the container spec                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                                          |
+| `metrics.securityContext.enabled`             | Enable security context for metrics                                                                                                                                                                                                                                                                                                                                                                                                                                        | `false`                                                       |
+| `metrics.securityContext.runAsUser`           | User ID for the container for metrics                                                                                                                                                                                                                                                                                                                                                                                                                                      | `1001`                                                        |
+| `metrics.livenessProbe.initialDelaySeconds`   | Delay before liveness probe is initiated                                                                                                                                                                                                                                                                                                                                                                                                                                   | 30                                                            |
+| `metrics.livenessProbe.periodSeconds`         | How often to perform the probe                                                                                                                                                                                                                                                                                                                                                                                                                                             | 10                                                            |
+| `metrics.livenessProbe.timeoutSeconds`        | When the probe times out                                                                                                                                                                                                                                                                                                                                                                                                                                                   | 5                                                             |
+| `metrics.livenessProbe.failureThreshold`      | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                                                                                                                                                                                                                                                                                                                 | 6                                                             |
+| `metrics.livenessProbe.successThreshold`      | Minimum consecutive successes for the probe to be considered successful after having failed                                                                                                                                                                                                                                                                                                                                                                                | 1                                                             |
+| `metrics.readinessProbe.enabled`              | would you like a readinessProbe to be enabled                                                                                                                                                                                                                                                                                                                                                                                                                              | `true`                                                        |
+| `metrics.readinessProbe.initialDelaySeconds`  | Delay before liveness probe is initiated                                                                                                                                                                                                                                                                                                                                                                                                                                   | 5                                                             |
+| `metrics.readinessProbe.periodSeconds`        | How often to perform the probe                                                                                                                                                                                                                                                                                                                                                                                                                                             | 10                                                            |
+| `metrics.readinessProbe.timeoutSeconds`       | When the probe times out                                                                                                                                                                                                                                                                                                                                                                                                                                                   | 5                                                             |
+| `metrics.readinessProbe.failureThreshold`     | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                                                                                                                                                                                                                                                                                                                 | 6                                                             |
+| `metrics.readinessProbe.successThreshold`     | Minimum consecutive successes for the probe to be considered successful after having failed                                                                                                                                                                                                                                                                                                                                                                                | 1                                                             |
+| `updateStrategy`                              | Update strategy policy                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `{type: "RollingUpdate"}`                                     |
+| `psp.create`                                  | Create Pod Security Policy                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `false`                                                       |
+| `rbac.create`                                 | Create Role and RoleBinding (required for PSP to work)                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`                                                       |
+| `extraDeploy`                                 | Array of extra objects to deploy with the release (evaluated as a template).                                                                                                                                                                                                                                                                                                                                                                                               | `nil`                                                         |
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+
+```console
+$ helm install my-release \
+  --set postgresqlPassword=secretpassword,postgresqlDatabase=my-database \
+    bitnami/postgresql
+```
+
+The above command sets the PostgreSQL `postgres` account password to `secretpassword`. Additionally it creates a database named `my-database`.
+
+> NOTE: Once this chart is deployed, it is not possible to change the application's access credentials, such as usernames or passwords, using Helm. To change these application credentials after deployment, delete any persistent volumes (PVs) used by the chart and re-deploy it, or use the application's built-in administrative tools if available.
+
+Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example,
+
+```console
+$ helm install my-release -f values.yaml bitnami/postgresql
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml)
+
+## Configuration and installation details
+
+### [Rolling VS Immutable tags](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/)
+
+It is strongly recommended to use immutable tags in a production environment. This ensures your deployment does not change automatically if the same tag is updated with a different image.
+
+Bitnami will release a new chart updating its containers if a new version of the main container, significant changes, or critical vulnerabilities exist.
+
+### Customizing primary and read replica services in a replicated configuration
+
+At the top level, there is a service object which defines the services for both primary and readReplicas. For deeper customization, there are service objects for both the primary and read types individually. This allows you to override the values in the top level service object so that the primary and read can be of different service types and with different clusterIPs / nodePorts. Also in the case you want the primary and read to be of type nodePort, you will need to set the nodePorts to different values to prevent a collision. The values that are deeper in the primary.service or readReplicas.service objects will take precedence over the top level service object.
+
+### Change PostgreSQL version
+
+To modify the PostgreSQL version used in this chart you can specify a [valid image tag](https://hub.docker.com/r/bitnami/postgresql/tags/) using the `image.tag` parameter. For example, `image.tag=X.Y.Z`. This approach is also applicable to other images like exporters.
+
+### postgresql.conf / pg_hba.conf files as configMap
+
+This helm chart also supports to customize the whole configuration file.
+
+Add your custom file to "files/postgresql.conf" in your working directory. This file will be mounted as configMap to the containers and it will be used for configuring the PostgreSQL server.
+
+Alternatively, you can add additional PostgreSQL configuration parameters using the `postgresqlExtendedConf` parameter as a dict, using camelCase, e.g. {"sharedBuffers": "500MB"}. Alternatively, to replace the entire default configuration use `postgresqlConfiguration`.
+
+In addition to these options, you can also set an external ConfigMap with all the configuration files. This is done by setting the `configurationConfigMap` parameter. Note that this will override the two previous options.
+
+### Allow settings to be loaded from files other than the default `postgresql.conf`
+
+If you don't want to provide the whole PostgreSQL configuration file and only specify certain parameters, you can add your extended `.conf` files to "files/conf.d/" in your working directory.
+Those files will be mounted as configMap to the containers adding/overwriting the default configuration using the `include_dir` directive that allows settings to be loaded from files other than the default `postgresql.conf`.
+
+Alternatively, you can also set an external ConfigMap with all the extra configuration files. This is done by setting the `extendedConfConfigMap` parameter. Note that this will override the previous option.
+
+### Initialize a fresh instance
+
+The [Bitnami PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) image allows you to use your custom scripts to initialize a fresh instance. In order to execute the scripts, they must be located inside the chart folder `files/docker-entrypoint-initdb.d` so they can be consumed as a ConfigMap.
+
+Alternatively, you can specify custom scripts using the `initdbScripts` parameter as dict.
+
+In addition to these options, you can also set an external ConfigMap with all the initialization scripts. This is done by setting the `initdbScriptsConfigMap` parameter. Note that this will override the two previous options. If your initialization scripts contain sensitive information such as credentials or passwords, you can use the `initdbScriptsSecret` parameter.
+
+The allowed extensions are `.sh`, `.sql` and `.sql.gz`.
+
+### Securing traffic using TLS
+
+TLS support can be enabled in the chart by specifying the `tls.` parameters while creating a release. The following parameters should be configured to properly enable the TLS support in the chart:
+
+- `tls.enabled`: Enable TLS support. Defaults to `false`
+- `tls.certificatesSecret`: Name of an existing secret that contains the certificates. No defaults.
+- `tls.certFilename`: Certificate filename. No defaults.
+- `tls.certKeyFilename`: Certificate key filename. No defaults.
+
+For example:
+
+* First, create the secret with the cetificates files:
+
+    ```console
+    kubectl create secret generic certificates-tls-secret --from-file=./cert.crt --from-file=./cert.key --from-file=./ca.crt
+    ```
+
+* Then, use the following parameters:
+
+    ```console
+    volumePermissions.enabled=true
+    tls.enabled=true
+    tls.certificatesSecret="certificates-tls-secret"
+    tls.certFilename="cert.crt"
+    tls.certKeyFilename="cert.key"
+    ```
+
+    > Note TLS and VolumePermissions: PostgreSQL requires certain permissions on sensitive files (such as certificate keys) to start up. Due to an on-going [issue](https://github.com/kubernetes/kubernetes/issues/57923) regarding kubernetes permissions and the use of `containerSecurityContext.runAsUser`, you must enable `volumePermissions` to ensure everything works as expected.
+
+### Sidecars
+
+If you need  additional containers to run within the same pod as PostgreSQL (e.g. an additional metrics or logging exporter), you can do so via the `sidecars` config parameter. Simply define your container according to the Kubernetes container spec.
+
+```yaml
+# For the PostgreSQL primary
+primary:
+  sidecars:
+  - name: your-image-name
+    image: your-image
+    imagePullPolicy: Always
+    ports:
+    - name: portname
+     containerPort: 1234
+# For the PostgreSQL replicas
+readReplicas:
+  sidecars:
+  - name: your-image-name
+    image: your-image
+    imagePullPolicy: Always
+    ports:
+    - name: portname
+     containerPort: 1234
+```
+
+### Metrics
+
+The chart optionally can start a metrics exporter for [prometheus](https://prometheus.io). The metrics endpoint (port 9187) is not exposed and it is expected that the metrics are collected from inside the k8s cluster using something similar as the described in the [example Prometheus scrape configuration](https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml).
+
+The exporter allows to create custom metrics from additional SQL queries. See the Chart's `values.yaml` for an example and consult the [exporters documentation](https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file) for more details.
+
+### Use of global variables
+
+In more complex scenarios, we may have the following tree of dependencies
+
+```
+                     +--------------+
+                     |              |
+        +------------+   Chart 1    +-----------+
+        |            |              |           |
+        |            --------+------+           |
+        |                    |                  |
+        |                    |                  |
+        |                    |                  |
+        |                    |                  |
+        v                    v                  v
++-------+------+    +--------+------+  +--------+------+
+|              |    |               |  |               |
+|  PostgreSQL  |    |  Sub-chart 1  |  |  Sub-chart 2  |
+|              |    |               |  |               |
++--------------+    +---------------+  +---------------+
+```
+
+The three charts below depend on the parent chart Chart 1. However, subcharts 1 and 2 may need to connect to PostgreSQL as well. In order to do so, subcharts 1 and 2 need to know the PostgreSQL credentials, so one option for deploying could be deploy Chart 1 with the following parameters:
+
+```
+postgresql.postgresqlPassword=testtest
+subchart1.postgresql.postgresqlPassword=testtest
+subchart2.postgresql.postgresqlPassword=testtest
+postgresql.postgresqlDatabase=db1
+subchart1.postgresql.postgresqlDatabase=db1
+subchart2.postgresql.postgresqlDatabase=db1
+```
+
+If the number of dependent sub-charts increases, installing the chart with parameters can become increasingly difficult. An alternative would be to set the credentials using global variables as follows:
+
+```
+global.postgresql.postgresqlPassword=testtest
+global.postgresql.postgresqlDatabase=db1
+```
+
+This way, the credentials will be available in all of the subcharts.
+
+## Persistence
+
+The [Bitnami PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) image stores the PostgreSQL data and configurations at the `/bitnami/postgresql` path of the container.
+
+Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube.
+See the [Parameters](#parameters) section to configure the PVC or to disable persistence.
+
+If you already have data in it, you will fail to sync to standby nodes for all commits, details can refer to [code](https://github.com/bitnami/bitnami-docker-postgresql/blob/8725fe1d7d30ebe8d9a16e9175d05f7ad9260c93/9.6/debian-9/rootfs/libpostgresql.sh#L518-L556). If you need to use those data, please covert them to sql and import after `helm install` finished.
+
+## NetworkPolicy
+
+To enable network policy for PostgreSQL, install [a networking plugin that implements the Kubernetes NetworkPolicy spec](https://kubernetes.io/docs/tasks/administer-cluster/declare-network-policy#before-you-begin), and set `networkPolicy.enabled` to `true`.
+
+For Kubernetes v1.5 & v1.6, you must also turn on NetworkPolicy by setting the DefaultDeny namespace annotation. Note: this will enforce policy for _all_ pods in the namespace:
+
+```console
+$ kubectl annotate namespace default "net.beta.kubernetes.io/network-policy={\"ingress\":{\"isolation\":\"DefaultDeny\"}}"
+```
+
+With NetworkPolicy enabled, traffic will be limited to just port 5432.
+
+For more precise policy, set `networkPolicy.allowExternal=false`. This will only allow pods with the generated client label to connect to PostgreSQL.
+This label will be displayed in the output of a successful install.
+
+## Differences between Bitnami PostgreSQL image and [Docker Official](https://hub.docker.com/_/postgres) image
+
+- The Docker Official PostgreSQL image does not support replication. If you pass any replication environment variable, this would be ignored. The only environment variables supported by the Docker Official image are POSTGRES_USER, POSTGRES_DB, POSTGRES_PASSWORD, POSTGRES_INITDB_ARGS, POSTGRES_INITDB_WALDIR and PGDATA. All the remaining environment variables are specific to the Bitnami PostgreSQL image.
+- The Bitnami PostgreSQL image is non-root by default. This requires that you run the pod with `securityContext` and updates the permissions of the volume with an `initContainer`. A key benefit of this configuration is that the pod follows security best practices and is prepared to run on Kubernetes distributions with hard security constraints like OpenShift.
+- For OpenShift, one may either define the runAsUser and fsGroup accordingly, or try this more dynamic option: volumePermissions.securityContext.runAsUser="auto",securityContext.enabled=false,containerSecurityContext.enabled=false,shmVolume.chmod.enabled=false
+
+### Deploy chart using Docker Official PostgreSQL Image
+
+From chart version 4.0.0, it is possible to use this chart with the Docker Official PostgreSQL image.
+Besides specifying the new Docker repository and tag, it is important to modify the PostgreSQL data directory and volume mount point. Basically, the PostgreSQL data dir cannot be the mount point directly, it has to be a subdirectory.
+
+```
+image.repository=postgres
+image.tag=10.6
+postgresqlDataDir=/data/pgdata
+persistence.mountPath=/data/
+```
+
+### Setting Pod's affinity
+
+This chart allows you to set your custom affinity using the `XXX.affinity` paremeter(s). Find more infomation about Pod's affinity in the [kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity).
+
+As an alternative, you can use of the preset configurations for pod affinity, pod anti-affinity, and node affinity available at the [bitnami/common](https://github.com/bitnami/charts/tree/master/bitnami/common#affinities) chart. To do so, set the `XXX.podAffinityPreset`, `XXX.podAntiAffinityPreset`, or `XXX.nodeAffinityPreset` parameters.
+
+## Troubleshooting
+
+Find more information about how to deal with common errors related to Bitnami’s Helm charts in [this troubleshooting guide](https://docs.bitnami.com/general/how-to/troubleshoot-helm-chart-issues).
+
+## Upgrading
+
+It's necessary to specify the existing passwords while performing an upgrade to ensure the secrets are not updated with invalid randomly generated passwords. Remember to specify the existing values of the `postgresqlPassword` and `replication.password` parameters when upgrading the chart:
+
+```bash
+$ helm upgrade my-release bitnami/postgresql \
+    --set postgresqlPassword=[POSTGRESQL_PASSWORD] \
+    --set replication.password=[REPLICATION_PASSWORD]
+```
+
+> Note: you need to substitute the placeholders _[POSTGRESQL_PASSWORD]_, and _[REPLICATION_PASSWORD]_ with the values obtained from instructions in the installation notes.
+
+### To 10.0.0
+
+[On November 13, 2020, Helm v2 support was formally finished](https://github.com/helm/charts#status-of-the-project), this major version is the result of the required changes applied to the Helm Chart to be able to incorporate the different features added in Helm v3 and to be consistent with the Helm project itself regarding the Helm v2 EOL.
+
+**What changes were introduced in this major version?**
+
+- Previous versions of this Helm Chart use `apiVersion: v1` (installable by both Helm 2 and 3), this Helm Chart was updated to `apiVersion: v2` (installable by Helm 3 only). [Here](https://helm.sh/docs/topics/charts/#the-apiversion-field) you can find more information about the `apiVersion` field.
+- Move dependency information from the *requirements.yaml* to the *Chart.yaml*
+- After running `helm dependency update`, a *Chart.lock* file is generated containing the same structure used in the previous *requirements.lock*
+- The different fields present in the *Chart.yaml* file has been ordered alphabetically in a homogeneous way for all the Bitnami Helm Chart.
+
+**Considerations when upgrading to this version**
+
+- If you want to upgrade to this version using Helm v2, this scenario is not supported as this version doesn't support Helm v2 anymore
+- If you installed the previous version with Helm v2 and wants to upgrade to this version with Helm v3, please refer to the [official Helm documentation](https://helm.sh/docs/topics/v2_v3_migration/#migration-use-cases) about migrating from Helm v2 to v3
+
+**Useful links**
+
+- https://docs.bitnami.com/tutorials/resolve-helm2-helm3-post-migration-issues/
+- https://helm.sh/docs/topics/v2_v3_migration/
+- https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/
+
+#### Breaking changes
+
+- The term `master` has been replaced with `primary` and `slave` with `readReplicas` throughout the chart. Role names have changed from `master` and `slave` to `primary` and `read`.
+
+To upgrade to `10.0.0`, it should be done reusing the PVCs used to hold the PostgreSQL data on your previous release. To do so, follow the instructions below (the following example assumes that the release name is `postgresql`):
+
+> NOTE: Please, create a backup of your database before running any of those actions.
+
+Obtain the credentials and the names of the PVCs used to hold the PostgreSQL data on your current release:
+
+```console
+$ export POSTGRESQL_PASSWORD=$(kubectl get secret --namespace default postgresql -o jsonpath="{.data.postgresql-password}" | base64 --decode)
+$ export POSTGRESQL_PVC=$(kubectl get pvc -l app.kubernetes.io/instance=postgresql,role=master -o jsonpath="{.items[0].metadata.name}")
+```
+
+Delete the PostgreSQL statefulset. Notice the option `--cascade=false`:
+
+```console
+$ kubectl delete statefulsets.apps postgresql-postgresql --cascade=false
+```
+
+Now the upgrade works:
+
+```console
+$ helm upgrade postgresql bitnami/postgresql --set postgresqlPassword=$POSTGRESQL_PASSWORD --set persistence.existingClaim=$POSTGRESQL_PVC
+```
+
+You will have to delete the existing PostgreSQL pod and the new statefulset is going to create a new one
+
+```console
+$ kubectl delete pod postgresql-postgresql-0
+```
+
+Finally, you should see the lines below in PostgreSQL container logs:
+
+```console
+$ kubectl logs $(kubectl get pods -l app.kubernetes.io/instance=postgresql,app.kubernetes.io/name=postgresql,role=primary -o jsonpath="{.items[0].metadata.name}")
+...
+postgresql 08:05:12.59 INFO  ==> Deploying PostgreSQL with persisted data...
+...
+```
+
+### To 9.0.0
+
+In this version the chart was adapted to follow the Helm label best practices, see [PR 3021](https://github.com/bitnami/charts/pull/3021). That means the backward compatibility is not guarantee when upgrading the chart to this major version.
+
+As a workaround, you can delete the existing statefulset (using the `--cascade=false` flag pods are not deleted) before upgrade the chart. For example, this can be a valid workflow:
+
+- Deploy an old version (8.X.X)
+
+```console
+$ helm install postgresql bitnami/postgresql --version 8.10.14
+```
+
+- Old version is up and running
+
+```console
+$ helm ls
+NAME      	NAMESPACE	REVISION	UPDATED                                	STATUS  	CHART             	APP VERSION
+postgresql	default  	1       	2020-08-04 13:39:54.783480286 +0000 UTC	deployed	postgresql-8.10.14	11.8.0
+
+$ kubectl get pods
+NAME                      READY   STATUS    RESTARTS   AGE
+postgresql-postgresql-0   1/1     Running   0          76s
+```
+
+- The upgrade to the latest one (9.X.X) is going to fail
+
+```console
+$ helm upgrade postgresql bitnami/postgresql
+Error: UPGRADE FAILED: cannot patch "postgresql-postgresql" with kind StatefulSet: StatefulSet.apps "postgresql-postgresql" is invalid: spec: Forbidden: updates to statefulset spec for fields other than 'replicas', 'template', and 'updateStrategy' are forbidden
+```
+
+- Delete the statefulset
+
+```console
+$ kubectl delete statefulsets.apps --cascade=false postgresql-postgresql
+statefulset.apps "postgresql-postgresql" deleted
+```
+
+- Now the upgrade works
+
+```console
+$ helm upgrade postgresql bitnami/postgresql
+$ helm ls
+NAME      	NAMESPACE	REVISION	UPDATED                                	STATUS  	CHART           	APP VERSION
+postgresql	default  	3       	2020-08-04 13:42:08.020385884 +0000 UTC	deployed	postgresql-9.1.2	11.8.0
+```
+
+- We can kill the existing pod and the new statefulset is going to create a new one:
+
+```console
+$ kubectl delete pod postgresql-postgresql-0
+pod "postgresql-postgresql-0" deleted
+
+$ kubectl get pods
+NAME                      READY   STATUS    RESTARTS   AGE
+postgresql-postgresql-0   1/1     Running   0          19s
+```
+
+Please, note that without the `--cascade=false` both objects (statefulset and pod) are going to be removed and both objects will be deployed again with the `helm upgrade` command
+
+### To 8.0.0
+
+Prefixes the port names with their protocols to comply with Istio conventions.
+
+If you depend on the port names in your setup, make sure to update them to reflect this change.
+
+### To 7.1.0
+
+Adds support for LDAP configuration.
+
+### To 7.0.0
+
+Helm performs a lookup for the object based on its group (apps), version (v1), and kind (Deployment). Also known as its GroupVersionKind, or GVK. Changing the GVK is considered a compatibility breaker from Kubernetes' point of view, so you cannot "upgrade" those objects to the new GVK in-place. Earlier versions of Helm 3 did not perform the lookup correctly which has since been fixed to match the spec.
+
+In https://github.com/helm/charts/pull/17281 the `apiVersion` of the statefulset resources was updated to `apps/v1` in tune with the api's deprecated, resulting in compatibility breakage.
+
+This major version bump signifies this change.
+
+### To 6.5.7
+
+In this version, the chart will use PostgreSQL with the Postgis extension included. The version used with Postgresql version 10, 11 and 12 is Postgis 2.5. It has been compiled with the following dependencies:
+
+- protobuf
+- protobuf-c
+- json-c
+- geos
+- proj
+
+### To 5.0.0
+
+In this version, the **chart is using PostgreSQL 11 instead of PostgreSQL 10**. You can find the main difference and notable changes in the following links: [https://www.postgresql.org/about/news/1894/](https://www.postgresql.org/about/news/1894/) and [https://www.postgresql.org/about/featurematrix/](https://www.postgresql.org/about/featurematrix/).
+
+For major releases of PostgreSQL, the internal data storage format is subject to change, thus complicating upgrades, you can see some errors like the following one in the logs:
+
+```console
+Welcome to the Bitnami postgresql container
+Subscribe to project updates by watching https://github.com/bitnami/bitnami-docker-postgresql
+Submit issues and feature requests at https://github.com/bitnami/bitnami-docker-postgresql/issues
+Send us your feedback at containers@bitnami.com
+
+INFO  ==> ** Starting PostgreSQL setup **
+NFO  ==> Validating settings in POSTGRESQL_* env vars..
+INFO  ==> Initializing PostgreSQL database...
+INFO  ==> postgresql.conf file not detected. Generating it...
+INFO  ==> pg_hba.conf file not detected. Generating it...
+INFO  ==> Deploying PostgreSQL with persisted data...
+INFO  ==> Configuring replication parameters
+INFO  ==> Loading custom scripts...
+INFO  ==> Enabling remote connections
+INFO  ==> Stopping PostgreSQL...
+INFO  ==> ** PostgreSQL setup finished! **
+
+INFO  ==> ** Starting PostgreSQL **
+  [1] FATAL:  database files are incompatible with server
+  [1] DETAIL:  The data directory was initialized by PostgreSQL version 10, which is not compatible with this version 11.3.
+```
+
+In this case, you should migrate the data from the old chart to the new one following an approach similar to that described in [this section](https://www.postgresql.org/docs/current/upgrading.html#UPGRADING-VIA-PGDUMPALL) from the official documentation. Basically, create a database dump in the old chart, move and restore it in the new one.
+
+### To 4.0.0
+
+This chart will use by default the Bitnami PostgreSQL container starting from version `10.7.0-r68`. This version moves the initialization logic from node.js to bash. This new version of the chart requires setting the `POSTGRES_PASSWORD` in the slaves as well, in order to properly configure the `pg_hba.conf` file. Users from previous versions of the chart are advised to upgrade immediately.
+
+IMPORTANT: If you do not want to upgrade the chart version then make sure you use the `10.7.0-r68` version of the container. Otherwise, you will get this error
+
+```
+The POSTGRESQL_PASSWORD environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development
+```
+
+### To 3.0.0
+
+This releases make it possible to specify different nodeSelector, affinity and tolerations for master and slave pods.
+It also fixes an issue with `postgresql.master.fullname` helper template not obeying fullnameOverride.
+
+#### Breaking changes
+
+- `affinty` has been renamed to `master.affinity` and `slave.affinity`.
+- `tolerations` has been renamed to `master.tolerations` and `slave.tolerations`.
+- `nodeSelector` has been renamed to `master.nodeSelector` and `slave.nodeSelector`.
+
+### To 2.0.0
+
+In order to upgrade from the `0.X.X` branch to `1.X.X`, you should follow the below steps:
+
+- Obtain the service name (`SERVICE_NAME`) and password (`OLD_PASSWORD`) of the existing postgresql chart. You can find the instructions to obtain the password in the NOTES.txt, the service name can be obtained by running
+
+```console
+$ kubectl get svc
+```
+
+- Install (not upgrade) the new version
+
+```console
+$ helm repo update
+$ helm install my-release bitnami/postgresql
+```
+
+- Connect to the new pod (you can obtain the name by running `kubectl get pods`):
+
+```console
+$ kubectl exec -it NAME bash
+```
+
+- Once logged in, create a dump file from the previous database using `pg_dump`, for that we should connect to the previous postgresql chart:
+
+```console
+$ pg_dump -h SERVICE_NAME -U postgres DATABASE_NAME > /tmp/backup.sql
+```
+
+After run above command you should be prompted for a password, this password is the previous chart password (`OLD_PASSWORD`).
+This operation could take some time depending on the database size.
+
+- Once you have the backup file, you can restore it with a command like the one below:
+
+```console
+$ psql -U postgres DATABASE_NAME < /tmp/backup.sql
+```
+
+In this case, you are accessing to the local postgresql, so the password should be the new one (you can find it in NOTES.txt).
+
+If you want to restore the database and the database schema does not exist, it is necessary to first follow the steps described below.
+
+```console
+$ psql -U postgres
+postgres=# drop database DATABASE_NAME;
+postgres=# create database DATABASE_NAME;
+postgres=# create user USER_NAME;
+postgres=# alter role USER_NAME with password 'BITNAMI_USER_PASSWORD';
+postgres=# grant all privileges on database DATABASE_NAME to USER_NAME;
+postgres=# alter database DATABASE_NAME owner to USER_NAME;
+```
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/.helmignore b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/.helmignore
new file mode 100644
index 000000000..50af03172
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/Chart.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/Chart.yaml
new file mode 100644
index 000000000..bcc3808d0
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/Chart.yaml
@@ -0,0 +1,23 @@
+annotations:
+  category: Infrastructure
+apiVersion: v2
+appVersion: 1.4.2
+description: A Library Helm Chart for grouping common logic between bitnami charts.
+  This chart is not deployable by itself.
+home: https://github.com/bitnami/charts/tree/master/bitnami/common
+icon: https://bitnami.com/downloads/logos/bitnami-mark.png
+keywords:
+- common
+- helper
+- template
+- function
+- bitnami
+maintainers:
+- email: containers@bitnami.com
+  name: Bitnami
+name: common
+sources:
+- https://github.com/bitnami/charts
+- http://www.bitnami.com/
+type: library
+version: 1.4.2
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/README.md b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/README.md
new file mode 100644
index 000000000..7287cbb5f
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/README.md
@@ -0,0 +1,322 @@
+# Bitnami Common Library Chart
+
+A [Helm Library Chart](https://helm.sh/docs/topics/library_charts/#helm) for grouping common logic between bitnami charts.
+
+## TL;DR
+
+```yaml
+dependencies:
+  - name: common
+    version: 0.x.x
+    repository: https://charts.bitnami.com/bitnami
+```
+
+```bash
+$ helm dependency update
+```
+
+```yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.names.fullname" . }}
+data:
+  myvalue: "Hello World"
+```
+
+## Introduction
+
+This chart provides a common template helpers which can be used to develop new charts using [Helm](https://helm.sh) package manager.
+
+Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. This Helm chart has been tested on top of [Bitnami Kubernetes Production Runtime](https://kubeprod.io/) (BKPR). Deploy BKPR to get automated TLS certificates, logging and monitoring for your applications.
+
+## Prerequisites
+
+- Kubernetes 1.12+
+- Helm 3.1.0
+
+## Parameters
+
+The following table lists the helpers available in the library which are scoped in different sections.
+
+### Affinities
+
+| Helper identifier             | Description                                          | Expected Input                                 |
+|-------------------------------|------------------------------------------------------|------------------------------------------------|
+| `common.affinities.node.soft` | Return a soft nodeAffinity definition                | `dict "key" "FOO" "values" (list "BAR" "BAZ")` |
+| `common.affinities.node.hard` | Return a hard nodeAffinity definition                | `dict "key" "FOO" "values" (list "BAR" "BAZ")` |
+| `common.affinities.pod.soft`  | Return a soft podAffinity/podAntiAffinity definition | `dict "component" "FOO" "context" $`           |
+| `common.affinities.pod.hard`  | Return a hard podAffinity/podAntiAffinity definition | `dict "component" "FOO" "context" $`           |
+
+### Capabilities
+
+| Helper identifier                            | Description                                                                                    | Expected Input    |
+|----------------------------------------------|------------------------------------------------------------------------------------------------|-------------------|
+| `common.capabilities.kubeVersion`            | Return the target Kubernetes version (using client default if .Values.kubeVersion is not set). | `.` Chart context |
+| `common.capabilities.deployment.apiVersion`  | Return the appropriate apiVersion for deployment.                                              | `.` Chart context |
+| `common.capabilities.statefulset.apiVersion` | Return the appropriate apiVersion for statefulset.                                             | `.` Chart context |
+| `common.capabilities.ingress.apiVersion`     | Return the appropriate apiVersion for ingress.                                                 | `.` Chart context |
+| `common.capabilities.rbac.apiVersion`        | Return the appropriate apiVersion for RBAC resources.                                          | `.` Chart context |
+| `common.capabilities.crd.apiVersion`         | Return the appropriate apiVersion for CRDs.                                                    | `.` Chart context |
+| `common.capabilities.supportsHelmVersion`    | Returns true if the used Helm version is 3.3+                                                  | `.` Chart context |
+
+### Errors
+
+| Helper identifier                       | Description                                                                                                                                                            | Expected Input                                                                      |
+|-----------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------|
+| `common.errors.upgrade.passwords.empty` | It will ensure required passwords are given when we are upgrading a chart. If `validationErrors` is not empty it will throw an error and will stop the upgrade action. | `dict "validationErrors" (list $validationError00 $validationError01)  "context" $` |
+
+### Images
+
+| Helper identifier           | Description                                          | Expected Input                                                                                          |
+|-----------------------------|------------------------------------------------------|---------------------------------------------------------------------------------------------------------|
+| `common.images.image`       | Return the proper and full image name                | `dict "imageRoot" .Values.path.to.the.image "global" $`, see [ImageRoot](#imageroot) for the structure. |
+| `common.images.pullSecrets` | Return the proper Docker Image Registry Secret Names | `dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "global" .Values.global`   |
+
+### Ingress
+
+| Helper identifier        | Description                                                          | Expected Input                                                                                                                                                                   |
+|--------------------------|----------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `common.ingress.backend` | Generate a proper Ingress backend entry depending on the API version | `dict "serviceName" "foo" "servicePort" "bar"`, see the [Ingress deprecation notice](https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/) for the syntax differences |
+
+### Labels
+
+| Helper identifier           | Description                                          | Expected Input    |
+|-----------------------------|------------------------------------------------------|-------------------|
+| `common.labels.standard`    | Return Kubernetes standard labels                    | `.` Chart context |
+| `common.labels.matchLabels` | Return the proper Docker Image Registry Secret Names | `.` Chart context |
+
+### Names
+
+| Helper identifier       | Description                                                | Expected Inpput   |
+|-------------------------|------------------------------------------------------------|-------------------|
+| `common.names.name`     | Expand the name of the chart or use `.Values.nameOverride` | `.` Chart context |
+| `common.names.fullname` | Create a default fully qualified app name.                 | `.` Chart context |
+| `common.names.chart`    | Chart name plus version                                    | `.` Chart context |
+
+### Secrets
+
+| Helper identifier         | Description                                                  | Expected Input                                                                                                                                                                                                                  |
+|---------------------------|--------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `common.secrets.name`     | Generate the name of the secret.                             | `dict "existingSecret" .Values.path.to.the.existingSecret "defaultNameSuffix" "mySuffix" "context" $` see [ExistingSecret](#existingsecret) for the structure.                                                                  |
+| `common.secrets.key`      | Generate secret key.                                         | `dict "existingSecret" .Values.path.to.the.existingSecret "key" "keyName"` see [ExistingSecret](#existingsecret) for the structure.                                                                                             |
+| `common.passwords.manage` | Generate secret password or retrieve one if already created. | `dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "context" $`, length, strong and chartNAme fields are optional. |
+| `common.secrets.exists`   | Returns whether a previous generated secret already exists.  | `dict "secret" "secret-name" "context" $`                                                                                                                                                                                       |
+
+### Storage
+
+| Helper identifier             | Description                           | Expected Input                                                                                                      |
+|-------------------------------|---------------------------------------|---------------------------------------------------------------------------------------------------------------------|
+| `common.affinities.node.soft` | Return a soft nodeAffinity definition | `dict "persistence" .Values.path.to.the.persistence "global" $`, see [Persistence](#persistence) for the structure. |
+
+### TplValues
+
+| Helper identifier         | Description                            | Expected Input                                                                                                                                           |
+|---------------------------|----------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `common.tplvalues.render` | Renders a value that contains template | `dict "value" .Values.path.to.the.Value "context" $`, value is the value should rendered as template, context frequently is the chart context `$` or `.` |
+
+### Utils
+
+| Helper identifier              | Description                                                                              | Expected Input                                                         |
+|--------------------------------|------------------------------------------------------------------------------------------|------------------------------------------------------------------------|
+| `common.utils.fieldToEnvVar`   | Build environment variable name given a field.                                           | `dict "field" "my-password"`                                           |
+| `common.utils.secret.getvalue` | Print instructions to get a secret value.                                                | `dict "secret" "secret-name" "field" "secret-value-field" "context" $` |
+| `common.utils.getValueFromKey` | Gets a value from `.Values` object given its key path                                    | `dict "key" "path.to.key" "context" $`                                 |
+| `common.utils.getKeyFromList`  | Returns first `.Values` key with a defined value or first of the list if all non-defined | `dict "keys" (list "path.to.key1" "path.to.key2") "context" $`         |
+
+### Validations
+
+| Helper identifier                                | Description                                                                                                                   | Expected Input                                                                                                                                                                                                                                                           |
+|--------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `common.validations.values.single.empty`         | Validate a value must not be empty.                                                                                           | `dict "valueKey" "path.to.value" "secret" "secret.name" "field" "my-password" "subchart" "subchart" "context" $` secret, field and subchart are optional. In case they are given, the helper will generate a how to get instruction. See [ValidateValue](#validatevalue) |
+| `common.validations.values.multiple.empty`       | Validate a multiple values must not be empty. It returns a shared error for all the values.                                   | `dict "required" (list $validateValueConf00 $validateValueConf01) "context" $`. See [ValidateValue](#validatevalue)                                                                                                                                                      |
+| `common.validations.values.mariadb.passwords`    | This helper will ensure required password for MariaDB are not empty. It returns a shared error for all the values.            | `dict "secret" "mariadb-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use mariadb chart and the helper.                                                                                      |
+| `common.validations.values.postgresql.passwords` | This helper will ensure required password for PostgreSQL are not empty. It returns a shared error for all the values.         | `dict "secret" "postgresql-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use postgresql chart and the helper.                                                                                |
+| `common.validations.values.redis.passwords`      | This helper will ensure required password for Redis<sup>TM</sup> are not empty. It returns a shared error for all the values. | `dict "secret" "redis-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use redis chart and the helper.                                                                                          |
+| `common.validations.values.cassandra.passwords`  | This helper will ensure required password for Cassandra are not empty. It returns a shared error for all the values.          | `dict "secret" "cassandra-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use cassandra chart and the helper.                                                                                  |
+| `common.validations.values.mongodb.passwords`    | This helper will ensure required password for MongoDB&reg; are not empty. It returns a shared error for all the values.            | `dict "secret" "mongodb-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use mongodb chart and the helper.                                                                                      |
+
+### Warnings
+
+| Helper identifier            | Description                      | Expected Input                                             |
+|------------------------------|----------------------------------|------------------------------------------------------------|
+| `common.warnings.rollingTag` | Warning about using rolling tag. | `ImageRoot` see [ImageRoot](#imageroot) for the structure. |
+
+## Special input schemas
+
+### ImageRoot
+
+```yaml
+registry:
+  type: string
+  description: Docker registry where the image is located
+  example: docker.io
+
+repository:
+  type: string
+  description: Repository and image name
+  example: bitnami/nginx
+
+tag:
+  type: string
+  description: image tag
+  example: 1.16.1-debian-10-r63
+
+pullPolicy:
+  type: string
+  description: Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+
+pullSecrets:
+  type: array
+  items:
+    type: string
+  description: Optionally specify an array of imagePullSecrets.
+
+debug:
+  type: boolean
+  description: Set to true if you would like to see extra information on logs
+  example: false
+
+## An instance would be:
+# registry: docker.io
+# repository: bitnami/nginx
+# tag: 1.16.1-debian-10-r63
+# pullPolicy: IfNotPresent
+# debug: false
+```
+
+### Persistence
+
+```yaml
+enabled:
+  type: boolean
+  description: Whether enable persistence.
+  example: true
+
+storageClass:
+  type: string
+  description: Ghost data Persistent Volume Storage Class, If set to "-", storageClassName: "" which disables dynamic provisioning.
+  example: "-"
+
+accessMode:
+  type: string
+  description: Access mode for the Persistent Volume Storage.
+  example: ReadWriteOnce
+
+size:
+  type: string
+  description: Size the Persistent Volume Storage.
+  example: 8Gi
+
+path:
+  type: string
+  description: Path to be persisted.
+  example: /bitnami
+
+## An instance would be:
+# enabled: true
+# storageClass: "-"
+# accessMode: ReadWriteOnce
+# size: 8Gi
+# path: /bitnami
+```
+
+### ExistingSecret
+
+```yaml
+name:
+  type: string
+  description: Name of the existing secret.
+  example: mySecret
+keyMapping:
+  description: Mapping between the expected key name and the name of the key in the existing secret.
+  type: object
+
+## An instance would be:
+# name: mySecret
+# keyMapping:
+#   password: myPasswordKey
+```
+
+#### Example of use
+
+When we store sensitive data for a deployment in a secret, some times we want to give to users the possibility of using theirs existing secrets.
+
+```yaml
+# templates/secret.yaml
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    app: {{ include "common.names.fullname" . }}
+type: Opaque
+data:
+  password: {{ .Values.password | b64enc | quote }}
+
+# templates/dpl.yaml
+---
+...
+      env:
+        - name: PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "common.secrets.name" (dict "existingSecret" .Values.existingSecret "context" $) }}
+              key: {{ include "common.secrets.key" (dict "existingSecret" .Values.existingSecret "key" "password") }}
+...
+
+# values.yaml
+---
+name: mySecret
+keyMapping:
+  password: myPasswordKey
+```
+
+### ValidateValue
+
+#### NOTES.txt
+
+```console
+{{- $validateValueConf00 := (dict "valueKey" "path.to.value00" "secret" "secretName" "field" "password-00") -}}
+{{- $validateValueConf01 := (dict "valueKey" "path.to.value01" "secret" "secretName" "field" "password-01") -}}
+
+{{ include "common.validations.values.multiple.empty" (dict "required" (list $validateValueConf00 $validateValueConf01) "context" $) }}
+```
+
+If we force those values to be empty we will see some alerts
+
+```console
+$ helm install test mychart --set path.to.value00="",path.to.value01=""
+    'path.to.value00' must not be empty, please add '--set path.to.value00=$PASSWORD_00' to the command. To get the current value:
+
+        export PASSWORD_00=$(kubectl get secret --namespace default secretName -o jsonpath="{.data.password-00}" | base64 --decode)
+
+    'path.to.value01' must not be empty, please add '--set path.to.value01=$PASSWORD_01' to the command. To get the current value:
+
+        export PASSWORD_01=$(kubectl get secret --namespace default secretName -o jsonpath="{.data.password-01}" | base64 --decode)
+```
+
+## Upgrading
+
+### To 1.0.0
+
+[On November 13, 2020, Helm v2 support was formally finished](https://github.com/helm/charts#status-of-the-project), this major version is the result of the required changes applied to the Helm Chart to be able to incorporate the different features added in Helm v3 and to be consistent with the Helm project itself regarding the Helm v2 EOL.
+
+**What changes were introduced in this major version?**
+
+- Previous versions of this Helm Chart use `apiVersion: v1` (installable by both Helm 2 and 3), this Helm Chart was updated to `apiVersion: v2` (installable by Helm 3 only). [Here](https://helm.sh/docs/topics/charts/#the-apiversion-field) you can find more information about the `apiVersion` field.
+- Use `type: library`. [Here](https://v3.helm.sh/docs/faq/#library-chart-support) you can find more information.
+- The different fields present in the *Chart.yaml* file has been ordered alphabetically in a homogeneous way for all the Bitnami Helm Charts
+
+**Considerations when upgrading to this version**
+
+- If you want to upgrade to this version from a previous one installed with Helm v3, you shouldn't face any issues
+- If you want to upgrade to this version using Helm v2, this scenario is not supported as this version doesn't support Helm v2 anymore
+- If you installed the previous version with Helm v2 and wants to upgrade to this version with Helm v3, please refer to the [official Helm documentation](https://helm.sh/docs/topics/v2_v3_migration/#migration-use-cases) about migrating from Helm v2 to v3
+
+**Useful links**
+
+- https://docs.bitnami.com/tutorials/resolve-helm2-helm3-post-migration-issues/
+- https://helm.sh/docs/topics/v2_v3_migration/
+- https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_affinities.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_affinities.tpl
new file mode 100644
index 000000000..493a6dc7e
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_affinities.tpl
@@ -0,0 +1,94 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Return a soft nodeAffinity definition 
+{{ include "common.affinities.nodes.soft" (dict "key" "FOO" "values" (list "BAR" "BAZ")) -}}
+*/}}
+{{- define "common.affinities.nodes.soft" -}}
+preferredDuringSchedulingIgnoredDuringExecution:
+  - preference:
+      matchExpressions:
+        - key: {{ .key }}
+          operator: In
+          values:
+            {{- range .values }}
+            - {{ . }}
+            {{- end }}
+    weight: 1
+{{- end -}}
+
+{{/*
+Return a hard nodeAffinity definition
+{{ include "common.affinities.nodes.hard" (dict "key" "FOO" "values" (list "BAR" "BAZ")) -}}
+*/}}
+{{- define "common.affinities.nodes.hard" -}}
+requiredDuringSchedulingIgnoredDuringExecution:
+  nodeSelectorTerms:
+    - matchExpressions:
+        - key: {{ .key }}
+          operator: In
+          values:
+            {{- range .values }}
+            - {{ . }}
+            {{- end }}
+{{- end -}}
+
+{{/*
+Return a nodeAffinity definition
+{{ include "common.affinities.nodes" (dict "type" "soft" "key" "FOO" "values" (list "BAR" "BAZ")) -}}
+*/}}
+{{- define "common.affinities.nodes" -}}
+  {{- if eq .type "soft" }}
+    {{- include "common.affinities.nodes.soft" . -}}
+  {{- else if eq .type "hard" }}
+    {{- include "common.affinities.nodes.hard" . -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Return a soft podAffinity/podAntiAffinity definition
+{{ include "common.affinities.pods.soft" (dict "component" "FOO" "context" $) -}}
+*/}}
+{{- define "common.affinities.pods.soft" -}}
+{{- $component := default "" .component -}}
+preferredDuringSchedulingIgnoredDuringExecution:
+  - podAffinityTerm:
+      labelSelector:
+        matchLabels: {{- (include "common.labels.matchLabels" .context) | nindent 10 }}
+          {{- if not (empty $component) }}
+          {{ printf "app.kubernetes.io/component: %s" $component }}
+          {{- end }}
+      namespaces:
+        - {{ .context.Release.Namespace | quote }}
+      topologyKey: kubernetes.io/hostname
+    weight: 1
+{{- end -}}
+
+{{/*
+Return a hard podAffinity/podAntiAffinity definition
+{{ include "common.affinities.pods.hard" (dict "component" "FOO" "context" $) -}}
+*/}}
+{{- define "common.affinities.pods.hard" -}}
+{{- $component := default "" .component -}}
+requiredDuringSchedulingIgnoredDuringExecution:
+  - labelSelector:
+      matchLabels: {{- (include "common.labels.matchLabels" .context) | nindent 8 }}
+        {{- if not (empty $component) }}
+        {{ printf "app.kubernetes.io/component: %s" $component }}
+        {{- end }}
+    namespaces:
+      - {{ .context.Release.Namespace | quote }}
+    topologyKey: kubernetes.io/hostname
+{{- end -}}
+
+{{/*
+Return a podAffinity/podAntiAffinity definition
+{{ include "common.affinities.pods" (dict "type" "soft" "key" "FOO" "values" (list "BAR" "BAZ")) -}}
+*/}}
+{{- define "common.affinities.pods" -}}
+  {{- if eq .type "soft" }}
+    {{- include "common.affinities.pods.soft" . -}}
+  {{- else if eq .type "hard" }}
+    {{- include "common.affinities.pods.hard" . -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_capabilities.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_capabilities.tpl
new file mode 100644
index 000000000..4dde56a38
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_capabilities.tpl
@@ -0,0 +1,95 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Return the target Kubernetes version
+*/}}
+{{- define "common.capabilities.kubeVersion" -}}
+{{- if .Values.global }}
+    {{- if .Values.global.kubeVersion }}
+    {{- .Values.global.kubeVersion -}}
+    {{- else }}
+    {{- default .Capabilities.KubeVersion.Version .Values.kubeVersion -}}
+    {{- end -}}
+{{- else }}
+{{- default .Capabilities.KubeVersion.Version .Values.kubeVersion -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for deployment.
+*/}}
+{{- define "common.capabilities.deployment.apiVersion" -}}
+{{- if semverCompare "<1.14-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "extensions/v1beta1" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for statefulset.
+*/}}
+{{- define "common.capabilities.statefulset.apiVersion" -}}
+{{- if semverCompare "<1.14-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "apps/v1beta1" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for ingress.
+*/}}
+{{- define "common.capabilities.ingress.apiVersion" -}}
+{{- if .Values.ingress -}}
+{{- if .Values.ingress.apiVersion -}}
+{{- .Values.ingress.apiVersion -}}
+{{- else if semverCompare "<1.14-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "extensions/v1beta1" -}}
+{{- else if semverCompare "<1.19-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "networking.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "networking.k8s.io/v1" -}}
+{{- end }}
+{{- else if semverCompare "<1.14-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "extensions/v1beta1" -}}
+{{- else if semverCompare "<1.19-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "networking.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "networking.k8s.io/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for RBAC resources.
+*/}}
+{{- define "common.capabilities.rbac.apiVersion" -}}
+{{- if semverCompare "<1.17-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "rbac.authorization.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "rbac.authorization.k8s.io/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for CRDs.
+*/}}
+{{- define "common.capabilities.crd.apiVersion" -}}
+{{- if semverCompare "<1.19-0" (include "common.capabilities.kubeVersion" .) -}}
+{{- print "apiextensions.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "apiextensions.k8s.io/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns true if the used Helm version is 3.3+.
+A way to check the used Helm version was not introduced until version 3.3.0 with .Capabilities.HelmVersion, which contains an additional "{}}"  structure.
+This check is introduced as a regexMatch instead of {{ if .Capabilities.HelmVersion }} because checking for the key HelmVersion in <3.3 results in a "interface not found" error.
+**To be removed when the catalog's minimun Helm version is 3.3**
+*/}}
+{{- define "common.capabilities.supportsHelmVersion" -}}
+{{- if regexMatch "{(v[0-9])*[^}]*}}$" (.Capabilities | toString ) }}
+  {{- true -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_errors.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_errors.tpl
new file mode 100644
index 000000000..a79cc2e32
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_errors.tpl
@@ -0,0 +1,23 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Through error when upgrading using empty passwords values that must not be empty.
+
+Usage:
+{{- $validationError00 := include "common.validations.values.single.empty" (dict "valueKey" "path.to.password00" "secret" "secretName" "field" "password-00") -}}
+{{- $validationError01 := include "common.validations.values.single.empty" (dict "valueKey" "path.to.password01" "secret" "secretName" "field" "password-01") -}}
+{{ include "common.errors.upgrade.passwords.empty" (dict "validationErrors" (list $validationError00 $validationError01) "context" $) }}
+
+Required password params:
+  - validationErrors - String - Required. List of validation strings to be return, if it is empty it won't throw error.
+  - context - Context - Required. Parent context.
+*/}}
+{{- define "common.errors.upgrade.passwords.empty" -}}
+  {{- $validationErrors := join "" .validationErrors -}}
+  {{- if and $validationErrors .context.Release.IsUpgrade -}}
+    {{- $errorString := "\nPASSWORDS ERROR: You must provide your current passwords when upgrading the release." -}}
+    {{- $errorString = print $errorString "\n                 Note that even after reinstallation, old credentials may be needed as they may be kept in persistent volume claims." -}}
+    {{- $errorString = print $errorString "\n                 Further information can be obtained at https://docs.bitnami.com/general/how-to/troubleshoot-helm-chart-issues/#credential-errors-while-upgrading-chart-releases" -}}
+    {{- $errorString = print $errorString "\n%s" -}}
+    {{- printf $errorString $validationErrors | fail -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_images.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_images.tpl
new file mode 100644
index 000000000..60f04fd6e
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_images.tpl
@@ -0,0 +1,47 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Return the proper image name
+{{ include "common.images.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
+*/}}
+{{- define "common.images.image" -}}
+{{- $registryName := .imageRoot.registry -}}
+{{- $repositoryName := .imageRoot.repository -}}
+{{- $tag := .imageRoot.tag | toString -}}
+{{- if .global }}
+    {{- if .global.imageRegistry }}
+     {{- $registryName = .global.imageRegistry -}}
+    {{- end -}}
+{{- end -}}
+{{- if $registryName }}
+{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- else -}}
+{{- printf "%s:%s" $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper Docker Image Registry Secret Names
+{{ include "common.images.pullSecrets" ( dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "global" .Values.global) }}
+*/}}
+{{- define "common.images.pullSecrets" -}}
+  {{- $pullSecrets := list }}
+
+  {{- if .global }}
+    {{- range .global.imagePullSecrets -}}
+      {{- $pullSecrets = append $pullSecrets . -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- range .images -}}
+    {{- range .pullSecrets -}}
+      {{- $pullSecrets = append $pullSecrets . -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if (not (empty $pullSecrets)) }}
+imagePullSecrets:
+    {{- range $pullSecrets }}
+  - name: {{ . }}
+    {{- end }}
+  {{- end }}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_ingress.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_ingress.tpl
new file mode 100644
index 000000000..622ef50e3
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_ingress.tpl
@@ -0,0 +1,42 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Generate backend entry that is compatible with all Kubernetes API versions.
+
+Usage:
+{{ include "common.ingress.backend" (dict "serviceName" "backendName" "servicePort" "backendPort" "context" $) }}
+
+Params:
+  - serviceName - String. Name of an existing service backend
+  - servicePort - String/Int. Port name (or number) of the service. It will be translated to different yaml depending if it is a string or an integer.
+  - context - Dict - Required. The context for the template evaluation.
+*/}}
+{{- define "common.ingress.backend" -}}
+{{- $apiVersion := (include "common.capabilities.ingress.apiVersion" .context) -}}
+{{- if or (eq $apiVersion "extensions/v1beta1") (eq $apiVersion "networking.k8s.io/v1beta1") -}}
+serviceName: {{ .serviceName }}
+servicePort: {{ .servicePort }}
+{{- else -}}
+service:
+  name: {{ .serviceName }}
+  port:
+    {{- if typeIs "string" .servicePort }}
+    name: {{ .servicePort }}
+    {{- else if typeIs "int" .servicePort }}
+    number: {{ .servicePort }}
+    {{- end }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Print "true" if the API pathType field is supported
+Usage:
+{{ include "common.ingress.supportsPathType" . }}
+*/}}
+{{- define "common.ingress.supportsPathType" -}}
+{{- if (semverCompare "<1.18-0" (include "common.capabilities.kubeVersion" .)) -}}
+{{- print "false" -}}
+{{- else -}}
+{{- print "true" -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_labels.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_labels.tpl
new file mode 100644
index 000000000..252066c7e
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_labels.tpl
@@ -0,0 +1,18 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Kubernetes standard labels
+*/}}
+{{- define "common.labels.standard" -}}
+app.kubernetes.io/name: {{ include "common.names.name" . }}
+helm.sh/chart: {{ include "common.names.chart" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Labels to use on deploy.spec.selector.matchLabels and svc.spec.selector
+*/}}
+{{- define "common.labels.matchLabels" -}}
+app.kubernetes.io/name: {{ include "common.names.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_names.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_names.tpl
new file mode 100644
index 000000000..adf2a74f4
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_names.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "common.names.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "common.names.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "common.names.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_secrets.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_secrets.tpl
new file mode 100644
index 000000000..60b84a701
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_secrets.tpl
@@ -0,0 +1,129 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Generate secret name.
+
+Usage:
+{{ include "common.secrets.name" (dict "existingSecret" .Values.path.to.the.existingSecret "defaultNameSuffix" "mySuffix" "context" $) }}
+
+Params:
+  - existingSecret - ExistingSecret/String - Optional. The path to the existing secrets in the values.yaml given by the user
+    to be used instead of the default one. Allows for it to be of type String (just the secret name) for backwards compatibility.
+    +info: https://github.com/bitnami/charts/tree/master/bitnami/common#existingsecret
+  - defaultNameSuffix - String - Optional. It is used only if we have several secrets in the same deployment.
+  - context - Dict - Required. The context for the template evaluation.
+*/}}
+{{- define "common.secrets.name" -}}
+{{- $name := (include "common.names.fullname" .context) -}}
+
+{{- if .defaultNameSuffix -}}
+{{- $name = printf "%s-%s" $name .defaultNameSuffix | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- with .existingSecret -}}
+{{- if not (typeIs "string" .) -}}
+{{- with .name -}}
+{{- $name = . -}}
+{{- end -}}
+{{- else -}}
+{{- $name = . -}}
+{{- end -}}
+{{- end -}}
+
+{{- printf "%s" $name -}}
+{{- end -}}
+
+{{/*
+Generate secret key.
+
+Usage:
+{{ include "common.secrets.key" (dict "existingSecret" .Values.path.to.the.existingSecret "key" "keyName") }}
+
+Params:
+  - existingSecret - ExistingSecret/String - Optional. The path to the existing secrets in the values.yaml given by the user
+    to be used instead of the default one. Allows for it to be of type String (just the secret name) for backwards compatibility.
+    +info: https://github.com/bitnami/charts/tree/master/bitnami/common#existingsecret
+  - key - String - Required. Name of the key in the secret.
+*/}}
+{{- define "common.secrets.key" -}}
+{{- $key := .key -}}
+
+{{- if .existingSecret -}}
+  {{- if not (typeIs "string" .existingSecret) -}}
+    {{- if .existingSecret.keyMapping -}}
+      {{- $key = index .existingSecret.keyMapping $.key -}}
+    {{- end -}}
+  {{- end }}
+{{- end -}}
+
+{{- printf "%s" $key -}}
+{{- end -}}
+
+{{/*
+Generate secret password or retrieve one if already created.
+
+Usage:
+{{ include "common.secrets.passwords.manage" (dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "context" $) }}
+
+Params:
+  - secret - String - Required - Name of the 'Secret' resource where the password is stored.
+  - key - String - Required - Name of the key in the secret.
+  - providedValues - List<String> - Required - The path to the validating value in the values.yaml, e.g: "mysql.password". Will pick first parameter with a defined value.
+  - length - int - Optional - Length of the generated random password.
+  - strong - Boolean - Optional - Whether to add symbols to the generated random password.
+  - chartName - String - Optional - Name of the chart used when said chart is deployed as a subchart.
+  - context - Context - Required - Parent context.
+*/}}
+{{- define "common.secrets.passwords.manage" -}}
+
+{{- $password := "" }}
+{{- $subchart := "" }}
+{{- $chartName := default "" .chartName }}
+{{- $passwordLength := default 10 .length }}
+{{- $providedPasswordKey := include "common.utils.getKeyFromList" (dict "keys" .providedValues "context" $.context) }}
+{{- $providedPasswordValue := include "common.utils.getValueFromKey" (dict "key" $providedPasswordKey "context" $.context) }}
+{{- $secret := (lookup "v1" "Secret" $.context.Release.Namespace .secret) }}
+{{- if $secret }}
+  {{- if index $secret.data .key }}
+  {{- $password = index $secret.data .key }}
+  {{- end -}}
+{{- else if $providedPasswordValue }}
+  {{- $password = $providedPasswordValue | toString | b64enc | quote }}
+{{- else }}
+
+  {{- if .context.Values.enabled }}
+    {{- $subchart = $chartName }}
+  {{- end -}}
+
+  {{- $requiredPassword := dict "valueKey" $providedPasswordKey "secret" .secret "field" .key "subchart" $subchart "context" $.context -}}
+  {{- $requiredPasswordError := include "common.validations.values.single.empty" $requiredPassword -}}
+  {{- $passwordValidationErrors := list $requiredPasswordError -}}
+  {{- include "common.errors.upgrade.passwords.empty" (dict "validationErrors" $passwordValidationErrors "context" $.context) -}}
+  
+  {{- if .strong }}
+    {{- $subStr := list (lower (randAlpha 1)) (randNumeric 1) (upper (randAlpha 1)) | join "_" }}
+    {{- $password = randAscii $passwordLength }}
+    {{- $password = regexReplaceAllLiteral "\\W" $password "@" | substr 5 $passwordLength }}
+    {{- $password = printf "%s%s" $subStr $password | toString | shuffle | b64enc | quote }}
+  {{- else }}
+    {{- $password = randAlphaNum $passwordLength | b64enc | quote }}
+  {{- end }}
+{{- end -}}
+{{- printf "%s" $password -}}
+{{- end -}}
+
+{{/*
+Returns whether a previous generated secret already exists
+
+Usage:
+{{ include "common.secrets.exists" (dict "secret" "secret-name" "context" $) }}
+
+Params:
+  - secret - String - Required - Name of the 'Secret' resource where the password is stored.
+  - context - Context - Required - Parent context.
+*/}}
+{{- define "common.secrets.exists" -}}
+{{- $secret := (lookup "v1" "Secret" $.context.Release.Namespace .secret) }}
+{{- if $secret }}
+  {{- true -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_storage.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_storage.tpl
new file mode 100644
index 000000000..60e2a844f
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_storage.tpl
@@ -0,0 +1,23 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Return  the proper Storage Class
+{{ include "common.storage.class" ( dict "persistence" .Values.path.to.the.persistence "global" $) }}
+*/}}
+{{- define "common.storage.class" -}}
+
+{{- $storageClass := .persistence.storageClass -}}
+{{- if .global -}}
+    {{- if .global.storageClass -}}
+        {{- $storageClass = .global.storageClass -}}
+    {{- end -}}
+{{- end -}}
+
+{{- if $storageClass -}}
+  {{- if (eq "-" $storageClass) -}}
+      {{- printf "storageClassName: \"\"" -}}
+  {{- else }}
+      {{- printf "storageClassName: %s" $storageClass -}}
+  {{- end -}}
+{{- end -}}
+
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_tplvalues.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_tplvalues.tpl
new file mode 100644
index 000000000..2db166851
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_tplvalues.tpl
@@ -0,0 +1,13 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Renders a value that contains template.
+Usage:
+{{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }}
+*/}}
+{{- define "common.tplvalues.render" -}}
+    {{- if typeIs "string" .value }}
+        {{- tpl .value .context }}
+    {{- else }}
+        {{- tpl (.value | toYaml) .context }}
+    {{- end }}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_utils.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_utils.tpl
new file mode 100644
index 000000000..ea083a249
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_utils.tpl
@@ -0,0 +1,62 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Print instructions to get a secret value.
+Usage:
+{{ include "common.utils.secret.getvalue" (dict "secret" "secret-name" "field" "secret-value-field" "context" $) }}
+*/}}
+{{- define "common.utils.secret.getvalue" -}}
+{{- $varname := include "common.utils.fieldToEnvVar" . -}}
+export {{ $varname }}=$(kubectl get secret --namespace {{ .context.Release.Namespace | quote }} {{ .secret }} -o jsonpath="{.data.{{ .field }}}" | base64 --decode)
+{{- end -}}
+
+{{/*
+Build env var name given a field
+Usage:
+{{ include "common.utils.fieldToEnvVar" dict "field" "my-password" }}
+*/}}
+{{- define "common.utils.fieldToEnvVar" -}}
+  {{- $fieldNameSplit := splitList "-" .field -}}
+  {{- $upperCaseFieldNameSplit := list -}}
+
+  {{- range $fieldNameSplit -}}
+    {{- $upperCaseFieldNameSplit = append $upperCaseFieldNameSplit ( upper . ) -}}
+  {{- end -}}
+
+  {{ join "_" $upperCaseFieldNameSplit }}
+{{- end -}}
+
+{{/*
+Gets a value from .Values given
+Usage:
+{{ include "common.utils.getValueFromKey" (dict "key" "path.to.key" "context" $) }}
+*/}}
+{{- define "common.utils.getValueFromKey" -}}
+{{- $splitKey := splitList "." .key -}}
+{{- $value := "" -}}
+{{- $latestObj := $.context.Values -}}
+{{- range $splitKey -}}
+  {{- if not $latestObj -}}
+    {{- printf "please review the entire path of '%s' exists in values" $.key | fail -}}
+  {{- end -}}
+  {{- $value = ( index $latestObj . ) -}}
+  {{- $latestObj = $value -}}
+{{- end -}}
+{{- printf "%v" (default "" $value) -}} 
+{{- end -}}
+
+{{/*
+Returns first .Values key with a defined value or first of the list if all non-defined
+Usage:
+{{ include "common.utils.getKeyFromList" (dict "keys" (list "path.to.key1" "path.to.key2") "context" $) }}
+*/}}
+{{- define "common.utils.getKeyFromList" -}}
+{{- $key := first .keys -}}
+{{- $reverseKeys := reverse .keys }}
+{{- range $reverseKeys }}
+  {{- $value := include "common.utils.getValueFromKey" (dict "key" . "context" $.context ) }}
+  {{- if $value -}}
+    {{- $key = . }}
+  {{- end -}}
+{{- end -}}
+{{- printf "%s" $key -}} 
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_warnings.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_warnings.tpl
new file mode 100644
index 000000000..ae10fa41e
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/_warnings.tpl
@@ -0,0 +1,14 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Warning about using rolling tag.
+Usage:
+{{ include "common.warnings.rollingTag" .Values.path.to.the.imageRoot }}
+*/}}
+{{- define "common.warnings.rollingTag" -}}
+
+{{- if and (contains "bitnami/" .repository) (not (.tag | toString | regexFind "-r\\d+$|sha256:")) }}
+WARNING: Rolling tag detected ({{ .repository }}:{{ .tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment.
++info https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/
+{{- end }}
+
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_cassandra.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_cassandra.tpl
new file mode 100644
index 000000000..8679ddffb
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_cassandra.tpl
@@ -0,0 +1,72 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Validate Cassandra required passwords are not empty.
+
+Usage:
+{{ include "common.validations.values.cassandra.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
+Params:
+  - secret - String - Required. Name of the secret where Cassandra values are stored, e.g: "cassandra-passwords-secret"
+  - subchart - Boolean - Optional. Whether Cassandra is used as subchart or not. Default: false
+*/}}
+{{- define "common.validations.values.cassandra.passwords" -}}
+  {{- $existingSecret := include "common.cassandra.values.existingSecret" . -}}
+  {{- $enabled := include "common.cassandra.values.enabled" . -}}
+  {{- $dbUserPrefix := include "common.cassandra.values.key.dbUser" . -}}
+  {{- $valueKeyPassword := printf "%s.password" $dbUserPrefix -}}
+
+  {{- if and (not $existingSecret) (eq $enabled "true") -}}
+    {{- $requiredPasswords := list -}}
+
+    {{- $requiredPassword := dict "valueKey" $valueKeyPassword "secret" .secret "field" "cassandra-password" -}}
+    {{- $requiredPasswords = append $requiredPasswords $requiredPassword -}}
+
+    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
+
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for existingSecret.
+
+Usage:
+{{ include "common.cassandra.values.existingSecret" (dict "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether Cassandra is used as subchart or not. Default: false
+*/}}
+{{- define "common.cassandra.values.existingSecret" -}}
+  {{- if .subchart -}}
+    {{- .context.Values.cassandra.dbUser.existingSecret | quote -}}
+  {{- else -}}
+    {{- .context.Values.dbUser.existingSecret | quote -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for enabled cassandra.
+
+Usage:
+{{ include "common.cassandra.values.enabled" (dict "context" $) }}
+*/}}
+{{- define "common.cassandra.values.enabled" -}}
+  {{- if .subchart -}}
+    {{- printf "%v" .context.Values.cassandra.enabled -}}
+  {{- else -}}
+    {{- printf "%v" (not .context.Values.enabled) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for the key dbUser
+
+Usage:
+{{ include "common.cassandra.values.key.dbUser" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether Cassandra is used as subchart or not. Default: false
+*/}}
+{{- define "common.cassandra.values.key.dbUser" -}}
+  {{- if .subchart -}}
+    cassandra.dbUser
+  {{- else -}}
+    dbUser
+  {{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_mariadb.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_mariadb.tpl
new file mode 100644
index 000000000..bb5ed7253
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_mariadb.tpl
@@ -0,0 +1,103 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Validate MariaDB required passwords are not empty.
+
+Usage:
+{{ include "common.validations.values.mariadb.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
+Params:
+  - secret - String - Required. Name of the secret where MariaDB values are stored, e.g: "mysql-passwords-secret"
+  - subchart - Boolean - Optional. Whether MariaDB is used as subchart or not. Default: false
+*/}}
+{{- define "common.validations.values.mariadb.passwords" -}}
+  {{- $existingSecret := include "common.mariadb.values.auth.existingSecret" . -}}
+  {{- $enabled := include "common.mariadb.values.enabled" . -}}
+  {{- $architecture := include "common.mariadb.values.architecture" . -}}
+  {{- $authPrefix := include "common.mariadb.values.key.auth" . -}}
+  {{- $valueKeyRootPassword := printf "%s.rootPassword" $authPrefix -}}
+  {{- $valueKeyUsername := printf "%s.username" $authPrefix -}}
+  {{- $valueKeyPassword := printf "%s.password" $authPrefix -}}
+  {{- $valueKeyReplicationPassword := printf "%s.replicationPassword" $authPrefix -}}
+
+  {{- if and (not $existingSecret) (eq $enabled "true") -}}
+    {{- $requiredPasswords := list -}}
+
+    {{- $requiredRootPassword := dict "valueKey" $valueKeyRootPassword "secret" .secret "field" "mariadb-root-password" -}}
+    {{- $requiredPasswords = append $requiredPasswords $requiredRootPassword -}}
+
+    {{- $valueUsername := include "common.utils.getValueFromKey" (dict "key" $valueKeyUsername "context" .context) }}
+    {{- if not (empty $valueUsername) -}}
+        {{- $requiredPassword := dict "valueKey" $valueKeyPassword "secret" .secret "field" "mariadb-password" -}}
+        {{- $requiredPasswords = append $requiredPasswords $requiredPassword -}}
+    {{- end -}}
+
+    {{- if (eq $architecture "replication") -}}
+        {{- $requiredReplicationPassword := dict "valueKey" $valueKeyReplicationPassword "secret" .secret "field" "mariadb-replication-password" -}}
+        {{- $requiredPasswords = append $requiredPasswords $requiredReplicationPassword -}}
+    {{- end -}}
+
+    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
+
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for existingSecret.
+
+Usage:
+{{ include "common.mariadb.values.auth.existingSecret" (dict "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether MariaDB is used as subchart or not. Default: false
+*/}}
+{{- define "common.mariadb.values.auth.existingSecret" -}}
+  {{- if .subchart -}}
+    {{- .context.Values.mariadb.auth.existingSecret | quote -}}
+  {{- else -}}
+    {{- .context.Values.auth.existingSecret | quote -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for enabled mariadb.
+
+Usage:
+{{ include "common.mariadb.values.enabled" (dict "context" $) }}
+*/}}
+{{- define "common.mariadb.values.enabled" -}}
+  {{- if .subchart -}}
+    {{- printf "%v" .context.Values.mariadb.enabled -}}
+  {{- else -}}
+    {{- printf "%v" (not .context.Values.enabled) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for architecture
+
+Usage:
+{{ include "common.mariadb.values.architecture" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether MariaDB is used as subchart or not. Default: false
+*/}}
+{{- define "common.mariadb.values.architecture" -}}
+  {{- if .subchart -}}
+    {{- .context.Values.mariadb.architecture -}}
+  {{- else -}}
+    {{- .context.Values.architecture -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for the key auth
+
+Usage:
+{{ include "common.mariadb.values.key.auth" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether MariaDB is used as subchart or not. Default: false
+*/}}
+{{- define "common.mariadb.values.key.auth" -}}
+  {{- if .subchart -}}
+    mariadb.auth
+  {{- else -}}
+    auth
+  {{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_mongodb.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_mongodb.tpl
new file mode 100644
index 000000000..7d5ecbccb
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_mongodb.tpl
@@ -0,0 +1,108 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Validate MongoDB(R) required passwords are not empty.
+
+Usage:
+{{ include "common.validations.values.mongodb.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
+Params:
+  - secret - String - Required. Name of the secret where MongoDB(R) values are stored, e.g: "mongodb-passwords-secret"
+  - subchart - Boolean - Optional. Whether MongoDB(R) is used as subchart or not. Default: false
+*/}}
+{{- define "common.validations.values.mongodb.passwords" -}}
+  {{- $existingSecret := include "common.mongodb.values.auth.existingSecret" . -}}
+  {{- $enabled := include "common.mongodb.values.enabled" . -}}
+  {{- $authPrefix := include "common.mongodb.values.key.auth" . -}}
+  {{- $architecture := include "common.mongodb.values.architecture" . -}}
+  {{- $valueKeyRootPassword := printf "%s.rootPassword" $authPrefix -}}
+  {{- $valueKeyUsername := printf "%s.username" $authPrefix -}}
+  {{- $valueKeyDatabase := printf "%s.database" $authPrefix -}}
+  {{- $valueKeyPassword := printf "%s.password" $authPrefix -}}
+  {{- $valueKeyReplicaSetKey := printf "%s.replicaSetKey" $authPrefix -}}
+  {{- $valueKeyAuthEnabled := printf "%s.enabled" $authPrefix -}}
+
+  {{- $authEnabled := include "common.utils.getValueFromKey" (dict "key" $valueKeyAuthEnabled "context" .context) -}}
+
+  {{- if and (not $existingSecret) (eq $enabled "true") (eq $authEnabled "true") -}}
+    {{- $requiredPasswords := list -}}
+
+    {{- $requiredRootPassword := dict "valueKey" $valueKeyRootPassword "secret" .secret "field" "mongodb-root-password" -}}
+    {{- $requiredPasswords = append $requiredPasswords $requiredRootPassword -}}
+
+    {{- $valueUsername := include "common.utils.getValueFromKey" (dict "key" $valueKeyUsername "context" .context) }}
+    {{- $valueDatabase := include "common.utils.getValueFromKey" (dict "key" $valueKeyDatabase "context" .context) }}
+    {{- if and $valueUsername $valueDatabase -}}
+        {{- $requiredPassword := dict "valueKey" $valueKeyPassword "secret" .secret "field" "mongodb-password" -}}
+        {{- $requiredPasswords = append $requiredPasswords $requiredPassword -}}
+    {{- end -}}
+
+    {{- if (eq $architecture "replicaset") -}}
+        {{- $requiredReplicaSetKey := dict "valueKey" $valueKeyReplicaSetKey "secret" .secret "field" "mongodb-replica-set-key" -}}
+        {{- $requiredPasswords = append $requiredPasswords $requiredReplicaSetKey -}}
+    {{- end -}}
+
+    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
+
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for existingSecret.
+
+Usage:
+{{ include "common.mongodb.values.auth.existingSecret" (dict "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether MongoDb is used as subchart or not. Default: false
+*/}}
+{{- define "common.mongodb.values.auth.existingSecret" -}}
+  {{- if .subchart -}}
+    {{- .context.Values.mongodb.auth.existingSecret | quote -}}
+  {{- else -}}
+    {{- .context.Values.auth.existingSecret | quote -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for enabled mongodb.
+
+Usage:
+{{ include "common.mongodb.values.enabled" (dict "context" $) }}
+*/}}
+{{- define "common.mongodb.values.enabled" -}}
+  {{- if .subchart -}}
+    {{- printf "%v" .context.Values.mongodb.enabled -}}
+  {{- else -}}
+    {{- printf "%v" (not .context.Values.enabled) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for the key auth
+
+Usage:
+{{ include "common.mongodb.values.key.auth" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether MongoDB(R) is used as subchart or not. Default: false
+*/}}
+{{- define "common.mongodb.values.key.auth" -}}
+  {{- if .subchart -}}
+    mongodb.auth
+  {{- else -}}
+    auth
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for architecture
+
+Usage:
+{{ include "common.mongodb.values.architecture" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether MariaDB is used as subchart or not. Default: false
+*/}}
+{{- define "common.mongodb.values.architecture" -}}
+  {{- if .subchart -}}
+    {{- .context.Values.mongodb.architecture -}}
+  {{- else -}}
+    {{- .context.Values.architecture -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_postgresql.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_postgresql.tpl
new file mode 100644
index 000000000..992bcd390
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_postgresql.tpl
@@ -0,0 +1,131 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Validate PostgreSQL required passwords are not empty.
+
+Usage:
+{{ include "common.validations.values.postgresql.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
+Params:
+  - secret - String - Required. Name of the secret where postgresql values are stored, e.g: "postgresql-passwords-secret"
+  - subchart - Boolean - Optional. Whether postgresql is used as subchart or not. Default: false
+*/}}
+{{- define "common.validations.values.postgresql.passwords" -}}
+  {{- $existingSecret := include "common.postgresql.values.existingSecret" . -}}
+  {{- $enabled := include "common.postgresql.values.enabled" . -}}
+  {{- $valueKeyPostgresqlPassword := include "common.postgresql.values.key.postgressPassword" . -}}
+  {{- $valueKeyPostgresqlReplicationEnabled := include "common.postgresql.values.key.replicationPassword" . -}}
+
+  {{- if and (not $existingSecret) (eq $enabled "true") -}}
+    {{- $requiredPasswords := list -}}
+
+    {{- $requiredPostgresqlPassword := dict "valueKey" $valueKeyPostgresqlPassword "secret" .secret "field" "postgresql-password" -}}
+    {{- $requiredPasswords = append $requiredPasswords $requiredPostgresqlPassword -}}
+
+    {{- $enabledReplication := include "common.postgresql.values.enabled.replication" . -}}
+    {{- if (eq $enabledReplication "true") -}}
+        {{- $requiredPostgresqlReplicationPassword := dict "valueKey" $valueKeyPostgresqlReplicationEnabled "secret" .secret "field" "postgresql-replication-password" -}}
+        {{- $requiredPasswords = append $requiredPasswords $requiredPostgresqlReplicationPassword -}}
+    {{- end -}}
+
+    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to decide whether evaluate global values.
+
+Usage:
+{{ include "common.postgresql.values.use.global" (dict "key" "key-of-global" "context" $) }}
+Params:
+  - key - String - Required. Field to be evaluated within global, e.g: "existingSecret"
+*/}}
+{{- define "common.postgresql.values.use.global" -}}
+  {{- if .context.Values.global -}}
+    {{- if .context.Values.global.postgresql -}}
+      {{- index .context.Values.global.postgresql .key | quote -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for existingSecret.
+
+Usage:
+{{ include "common.postgresql.values.existingSecret" (dict "context" $) }}
+*/}}
+{{- define "common.postgresql.values.existingSecret" -}}
+  {{- $globalValue := include "common.postgresql.values.use.global" (dict "key" "existingSecret" "context" .context) -}}
+
+  {{- if .subchart -}}
+    {{- default (.context.Values.postgresql.existingSecret | quote) $globalValue -}}
+  {{- else -}}
+    {{- default (.context.Values.existingSecret | quote) $globalValue -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for enabled postgresql.
+
+Usage:
+{{ include "common.postgresql.values.enabled" (dict "context" $) }}
+*/}}
+{{- define "common.postgresql.values.enabled" -}}
+  {{- if .subchart -}}
+    {{- printf "%v" .context.Values.postgresql.enabled -}}
+  {{- else -}}
+    {{- printf "%v" (not .context.Values.enabled) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for the key postgressPassword.
+
+Usage:
+{{ include "common.postgresql.values.key.postgressPassword" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether postgresql is used as subchart or not. Default: false
+*/}}
+{{- define "common.postgresql.values.key.postgressPassword" -}}
+  {{- $globalValue := include "common.postgresql.values.use.global" (dict "key" "postgresqlUsername" "context" .context) -}}
+
+  {{- if not $globalValue -}}
+    {{- if .subchart -}}
+      postgresql.postgresqlPassword
+    {{- else -}}
+      postgresqlPassword
+    {{- end -}}
+  {{- else -}}
+    global.postgresql.postgresqlPassword
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for enabled.replication.
+
+Usage:
+{{ include "common.postgresql.values.enabled.replication" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether postgresql is used as subchart or not. Default: false
+*/}}
+{{- define "common.postgresql.values.enabled.replication" -}}
+  {{- if .subchart -}}
+    {{- printf "%v" .context.Values.postgresql.replication.enabled -}}
+  {{- else -}}
+    {{- printf "%v" .context.Values.replication.enabled -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for the key replication.password.
+
+Usage:
+{{ include "common.postgresql.values.key.replicationPassword" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether postgresql is used as subchart or not. Default: false
+*/}}
+{{- define "common.postgresql.values.key.replicationPassword" -}}
+  {{- if .subchart -}}
+    postgresql.replication.password
+  {{- else -}}
+    replication.password
+  {{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_redis.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_redis.tpl
new file mode 100644
index 000000000..3e2a47c03
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_redis.tpl
@@ -0,0 +1,72 @@
+
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Validate Redis(TM) required passwords are not empty.
+
+Usage:
+{{ include "common.validations.values.redis.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
+Params:
+  - secret - String - Required. Name of the secret where redis values are stored, e.g: "redis-passwords-secret"
+  - subchart - Boolean - Optional. Whether redis is used as subchart or not. Default: false
+*/}}
+{{- define "common.validations.values.redis.passwords" -}}
+  {{- $existingSecret := include "common.redis.values.existingSecret" . -}}
+  {{- $enabled := include "common.redis.values.enabled" . -}}
+  {{- $valueKeyPrefix := include "common.redis.values.keys.prefix" . -}}
+  {{- $valueKeyRedisPassword := printf "%s%s" $valueKeyPrefix "password" -}}
+  {{- $valueKeyRedisUsePassword := printf "%s%s" $valueKeyPrefix "usePassword" -}}
+
+  {{- if and (not $existingSecret) (eq $enabled "true") -}}
+    {{- $requiredPasswords := list -}}
+
+    {{- $usePassword := include "common.utils.getValueFromKey" (dict "key" $valueKeyRedisUsePassword "context" .context) -}}
+    {{- if eq $usePassword "true" -}}
+      {{- $requiredRedisPassword := dict "valueKey" $valueKeyRedisPassword "secret" .secret "field" "redis-password" -}}
+      {{- $requiredPasswords = append $requiredPasswords $requiredRedisPassword -}}
+    {{- end -}}
+
+    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Redis Auxiliary function to get the right value for existingSecret.
+
+Usage:
+{{ include "common.redis.values.existingSecret" (dict "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether Redis(TM) is used as subchart or not. Default: false
+*/}}
+{{- define "common.redis.values.existingSecret" -}}
+  {{- if .subchart -}}
+    {{- .context.Values.redis.existingSecret | quote -}}
+  {{- else -}}
+    {{- .context.Values.existingSecret | quote -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right value for enabled redis.
+
+Usage:
+{{ include "common.redis.values.enabled" (dict "context" $) }}
+*/}}
+{{- define "common.redis.values.enabled" -}}
+  {{- if .subchart -}}
+    {{- printf "%v" .context.Values.redis.enabled -}}
+  {{- else -}}
+    {{- printf "%v" (not .context.Values.enabled) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Auxiliary function to get the right prefix path for the values
+
+Usage:
+{{ include "common.redis.values.key.prefix" (dict "subchart" "true" "context" $) }}
+Params:
+  - subchart - Boolean - Optional. Whether redis is used as subchart or not. Default: false
+*/}}
+{{- define "common.redis.values.keys.prefix" -}}
+  {{- if .subchart -}}redis.{{- else -}}{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_validations.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_validations.tpl
new file mode 100644
index 000000000..9a814cf40
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/templates/validations/_validations.tpl
@@ -0,0 +1,46 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Validate values must not be empty.
+
+Usage:
+{{- $validateValueConf00 := (dict "valueKey" "path.to.value" "secret" "secretName" "field" "password-00") -}}
+{{- $validateValueConf01 := (dict "valueKey" "path.to.value" "secret" "secretName" "field" "password-01") -}}
+{{ include "common.validations.values.empty" (dict "required" (list $validateValueConf00 $validateValueConf01) "context" $) }}
+
+Validate value params:
+  - valueKey - String - Required. The path to the validating value in the values.yaml, e.g: "mysql.password"
+  - secret - String - Optional. Name of the secret where the validating value is generated/stored, e.g: "mysql-passwords-secret"
+  - field - String - Optional. Name of the field in the secret data, e.g: "mysql-password"
+*/}}
+{{- define "common.validations.values.multiple.empty" -}}
+  {{- range .required -}}
+    {{- include "common.validations.values.single.empty" (dict "valueKey" .valueKey "secret" .secret "field" .field "context" $.context) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Validate a value must not be empty.
+
+Usage:
+{{ include "common.validations.value.empty" (dict "valueKey" "mariadb.password" "secret" "secretName" "field" "my-password" "subchart" "subchart" "context" $) }}
+
+Validate value params:
+  - valueKey - String - Required. The path to the validating value in the values.yaml, e.g: "mysql.password"
+  - secret - String - Optional. Name of the secret where the validating value is generated/stored, e.g: "mysql-passwords-secret"
+  - field - String - Optional. Name of the field in the secret data, e.g: "mysql-password"
+  - subchart - String - Optional - Name of the subchart that the validated password is part of.
+*/}}
+{{- define "common.validations.values.single.empty" -}}
+  {{- $value := include "common.utils.getValueFromKey" (dict "key" .valueKey "context" .context) }}
+  {{- $subchart := ternary "" (printf "%s." .subchart) (empty .subchart) }}
+
+  {{- if not $value -}}
+    {{- $varname := "my-value" -}}
+    {{- $getCurrentValue := "" -}}
+    {{- if and .secret .field -}}
+      {{- $varname = include "common.utils.fieldToEnvVar" . -}}
+      {{- $getCurrentValue = printf " To get the current value:\n\n        %s\n" (include "common.utils.secret.getvalue" .) -}}
+    {{- end -}}
+    {{- printf "\n    '%s' must not be empty, please add '--set %s%s=$%s' to the command.%s" .valueKey $subchart .valueKey $varname $getCurrentValue -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/values.yaml
new file mode 100644
index 000000000..9ecdc93f5
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/charts/common/values.yaml
@@ -0,0 +1,3 @@
+## bitnami/common
+## It is required by CI/CD tools and processes.
+exampleValue: common-chart
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/ci/commonAnnotations.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/ci/commonAnnotations.yaml
new file mode 100644
index 000000000..97e18a4cc
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/ci/commonAnnotations.yaml
@@ -0,0 +1,3 @@
+commonAnnotations:
+  helm.sh/hook: "\"pre-install, pre-upgrade\""
+  helm.sh/hook-weight: "-1"
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/ci/default-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/ci/default-values.yaml
new file mode 100644
index 000000000..fc2ba605a
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/ci/default-values.yaml
@@ -0,0 +1 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/ci/shmvolume-disabled-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/ci/shmvolume-disabled-values.yaml
new file mode 100644
index 000000000..347d3b40a
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/ci/shmvolume-disabled-values.yaml
@@ -0,0 +1,2 @@
+shmVolume:
+  enabled: false
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/files/README.md b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/files/README.md
new file mode 100644
index 000000000..1813a2fea
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/files/README.md
@@ -0,0 +1 @@
+Copy here your postgresql.conf and/or pg_hba.conf files to use it as a config map.
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/files/conf.d/README.md b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/files/conf.d/README.md
new file mode 100644
index 000000000..184c1875d
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/files/conf.d/README.md
@@ -0,0 +1,4 @@
+If you don't want to provide the whole configuration file and only specify certain parameters, you can copy here your extended `.conf` files.
+These files will be injected as a config maps and add/overwrite the default configuration using the `include_dir` directive that allows settings to be loaded from files other than the default `postgresql.conf`.
+
+More info in the [bitnami-docker-postgresql README](https://github.com/bitnami/bitnami-docker-postgresql#configuration-file).
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/files/docker-entrypoint-initdb.d/README.md b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/files/docker-entrypoint-initdb.d/README.md
new file mode 100644
index 000000000..cba38091e
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/files/docker-entrypoint-initdb.d/README.md
@@ -0,0 +1,3 @@
+You can copy here your custom `.sh`, `.sql` or `.sql.gz` file so they are executed during the first boot of the image.
+
+More info in the [bitnami-docker-postgresql](https://github.com/bitnami/bitnami-docker-postgresql#initializing-a-new-instance) repository.
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/NOTES.txt b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/NOTES.txt
new file mode 100644
index 000000000..4e98958c1
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/NOTES.txt
@@ -0,0 +1,59 @@
+** Please be patient while the chart is being deployed **
+
+PostgreSQL can be accessed via port {{ template "postgresql.port" . }} on the following DNS name from within your cluster:
+
+    {{ template "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local - Read/Write connection
+{{- if .Values.replication.enabled }}
+    {{ template "common.names.fullname" . }}-read.{{ .Release.Namespace }}.svc.cluster.local - Read only connection
+{{- end }}
+
+{{- if not (eq (include "postgresql.username" .) "postgres")  }}
+
+To get the password for "postgres" run:
+
+    export POSTGRES_ADMIN_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "postgresql.secretName" . }} -o jsonpath="{.data.postgresql-postgres-password}" | base64 --decode)
+{{- end }}
+
+To get the password for "{{ template "postgresql.username" . }}" run:
+
+    export POSTGRES_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "postgresql.secretName" . }} -o jsonpath="{.data.postgresql-password}" | base64 --decode)
+
+To connect to your database run the following command:
+
+    kubectl run {{ template "common.names.fullname" . }}-client --rm --tty -i --restart='Never' --namespace {{ .Release.Namespace }} --image {{ template "postgresql.image" . }} --env="PGPASSWORD=$POSTGRES_PASSWORD" {{- if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}
+   --labels="{{ template "common.names.fullname" . }}-client=true" {{- end }} --command -- psql --host {{ template "common.names.fullname" . }} -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }} -p {{ template "postgresql.port" . }}
+
+{{ if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}
+Note: Since NetworkPolicy is enabled, only pods with label {{ template "common.names.fullname" . }}-client=true" will be able to connect to this PostgreSQL cluster.
+{{- end }}
+
+To connect to your database from outside the cluster execute the following commands:
+
+{{- if contains "NodePort" .Values.service.type }}
+
+    export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+    export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "common.names.fullname" . }})
+    {{ if (include "postgresql.password" . )  }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host $NODE_IP --port $NODE_PORT -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }}
+
+{{- else if contains "LoadBalancer" .Values.service.type }}
+
+  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.names.fullname" . }}'
+
+    export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.names.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+    {{ if (include "postgresql.password" . ) }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host $SERVICE_IP --port {{ template "postgresql.port" . }} -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }}
+
+{{- else if contains "ClusterIP" .Values.service.type }}
+
+    kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "common.names.fullname" . }} {{ template "postgresql.port" . }}:{{ template "postgresql.port" . }} &
+    {{ if (include "postgresql.password" . ) }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host 127.0.0.1 -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }} -p {{ template "postgresql.port" . }}
+
+{{- end }}
+
+{{- include "postgresql.validateValues" . -}}
+
+{{- include "common.warnings.rollingTag" .Values.image -}}
+
+{{- $passwordValidationErrors := include "common.validations.values.postgresql.passwords" (dict "secret" (include "common.names.fullname" .) "context" $) -}}
+
+{{- include "common.errors.upgrade.passwords.empty" (dict "validationErrors" (list $passwordValidationErrors) "context" $) -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/_helpers.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/_helpers.tpl
new file mode 100644
index 000000000..1f98efe78
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/_helpers.tpl
@@ -0,0 +1,337 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "postgresql.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "postgresql.primary.fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- $fullname := default (printf "%s-%s" .Release.Name $name) .Values.fullnameOverride -}}
+{{- if .Values.replication.enabled -}}
+{{- printf "%s-%s" $fullname "primary" | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s" $fullname | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper PostgreSQL image name
+*/}}
+{{- define "postgresql.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }}
+{{- end -}}
+
+{{/*
+Return the proper PostgreSQL metrics image name
+*/}}
+{{- define "postgresql.metrics.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.metrics.image "global" .Values.global) }}
+{{- end -}}
+
+{{/*
+Return the proper image name (for the init container volume-permissions image)
+*/}}
+{{- define "postgresql.volumePermissions.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.volumePermissions.image "global" .Values.global) }}
+{{- end -}}
+
+{{/*
+Return the proper Docker Image Registry Secret Names
+*/}}
+{{- define "postgresql.imagePullSecrets" -}}
+{{ include "common.images.pullSecrets" (dict "images" (list .Values.image .Values.metrics.image .Values.volumePermissions.image) "global" .Values.global) }}
+{{- end -}}
+
+{{/*
+Return PostgreSQL postgres user password
+*/}}
+{{- define "postgresql.postgres.password" -}}
+{{- if .Values.global.postgresql.postgresqlPostgresPassword }}
+    {{- .Values.global.postgresql.postgresqlPostgresPassword -}}
+{{- else if .Values.postgresqlPostgresPassword -}}
+    {{- .Values.postgresqlPostgresPassword -}}
+{{- else -}}
+    {{- randAlphaNum 10 -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL password
+*/}}
+{{- define "postgresql.password" -}}
+{{- if .Values.global.postgresql.postgresqlPassword }}
+    {{- .Values.global.postgresql.postgresqlPassword -}}
+{{- else if .Values.postgresqlPassword -}}
+    {{- .Values.postgresqlPassword -}}
+{{- else -}}
+    {{- randAlphaNum 10 -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL replication password
+*/}}
+{{- define "postgresql.replication.password" -}}
+{{- if .Values.global.postgresql.replicationPassword }}
+    {{- .Values.global.postgresql.replicationPassword -}}
+{{- else if .Values.replication.password -}}
+    {{- .Values.replication.password -}}
+{{- else -}}
+    {{- randAlphaNum 10 -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL username
+*/}}
+{{- define "postgresql.username" -}}
+{{- if .Values.global.postgresql.postgresqlUsername }}
+    {{- .Values.global.postgresql.postgresqlUsername -}}
+{{- else -}}
+    {{- .Values.postgresqlUsername -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL replication username
+*/}}
+{{- define "postgresql.replication.username" -}}
+{{- if .Values.global.postgresql.replicationUser }}
+    {{- .Values.global.postgresql.replicationUser -}}
+{{- else -}}
+    {{- .Values.replication.user -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL port
+*/}}
+{{- define "postgresql.port" -}}
+{{- if .Values.global.postgresql.servicePort }}
+    {{- .Values.global.postgresql.servicePort -}}
+{{- else -}}
+    {{- .Values.service.port -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL created database
+*/}}
+{{- define "postgresql.database" -}}
+{{- if .Values.global.postgresql.postgresqlDatabase }}
+    {{- .Values.global.postgresql.postgresqlDatabase -}}
+{{- else if .Values.postgresqlDatabase -}}
+    {{- .Values.postgresqlDatabase -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the password secret.
+*/}}
+{{- define "postgresql.secretName" -}}
+{{- if .Values.global.postgresql.existingSecret }}
+    {{- printf "%s" (tpl .Values.global.postgresql.existingSecret $) -}}
+{{- else if .Values.existingSecret -}}
+    {{- printf "%s" (tpl .Values.existingSecret $) -}}
+{{- else -}}
+    {{- printf "%s" (include "common.names.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return true if we should use an existingSecret.
+*/}}
+{{- define "postgresql.useExistingSecret" -}}
+{{- if or .Values.global.postgresql.existingSecret .Values.existingSecret -}}
+    {{- true -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return true if a secret object should be created
+*/}}
+{{- define "postgresql.createSecret" -}}
+{{- if not (include "postgresql.useExistingSecret" .) -}}
+    {{- true -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the configuration ConfigMap name.
+*/}}
+{{- define "postgresql.configurationCM" -}}
+{{- if .Values.configurationConfigMap -}}
+{{- printf "%s" (tpl .Values.configurationConfigMap $) -}}
+{{- else -}}
+{{- printf "%s-configuration" (include "common.names.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the extended configuration ConfigMap name.
+*/}}
+{{- define "postgresql.extendedConfigurationCM" -}}
+{{- if .Values.extendedConfConfigMap -}}
+{{- printf "%s" (tpl .Values.extendedConfConfigMap $) -}}
+{{- else -}}
+{{- printf "%s-extended-configuration" (include "common.names.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return true if a configmap should be mounted with PostgreSQL configuration
+*/}}
+{{- define "postgresql.mountConfigurationCM" -}}
+{{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }}
+    {{- true -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the initialization scripts ConfigMap name.
+*/}}
+{{- define "postgresql.initdbScriptsCM" -}}
+{{- if .Values.initdbScriptsConfigMap -}}
+{{- printf "%s" (tpl .Values.initdbScriptsConfigMap $) -}}
+{{- else -}}
+{{- printf "%s-init-scripts" (include "common.names.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the initialization scripts Secret name.
+*/}}
+{{- define "postgresql.initdbScriptsSecret" -}}
+{{- printf "%s" (tpl .Values.initdbScriptsSecret $) -}}
+{{- end -}}
+
+{{/*
+Get the metrics ConfigMap name.
+*/}}
+{{- define "postgresql.metricsCM" -}}
+{{- printf "%s-metrics" (include "common.names.fullname" .) -}}
+{{- end -}}
+
+{{/*
+Get the readiness probe command
+*/}}
+{{- define "postgresql.readinessProbeCommand" -}}
+- |
+{{- if (include "postgresql.database" .) }}
+  exec pg_isready -U {{ include "postgresql.username" . | quote }} -d "dbname={{ include "postgresql.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+{{- else }}
+  exec pg_isready -U {{ include "postgresql.username" . | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+{{- end }}
+{{- if contains "bitnami/" .Values.image.repository }}
+  [ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
+{{- end -}}
+{{- end -}}
+
+{{/*
+Compile all warnings into a single message, and call fail.
+*/}}
+{{- define "postgresql.validateValues" -}}
+{{- $messages := list -}}
+{{- $messages := append $messages (include "postgresql.validateValues.ldapConfigurationMethod" .) -}}
+{{- $messages := append $messages (include "postgresql.validateValues.psp" .) -}}
+{{- $messages := append $messages (include "postgresql.validateValues.tls" .) -}}
+{{- $messages := without $messages "" -}}
+{{- $message := join "\n" $messages -}}
+
+{{- if $message -}}
+{{- printf "\nVALUES VALIDATION:\n%s" $message | fail -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Validate values of Postgresql - If ldap.url is used then you don't need the other settings for ldap
+*/}}
+{{- define "postgresql.validateValues.ldapConfigurationMethod" -}}
+{{- if and .Values.ldap.enabled (and (not (empty .Values.ldap.url)) (not (empty .Values.ldap.server))) }}
+postgresql: ldap.url, ldap.server
+    You cannot set both `ldap.url` and `ldap.server` at the same time.
+    Please provide a unique way to configure LDAP.
+    More info at https://www.postgresql.org/docs/current/auth-ldap.html
+{{- end -}}
+{{- end -}}
+
+{{/*
+Validate values of Postgresql - If PSP is enabled RBAC should be enabled too
+*/}}
+{{- define "postgresql.validateValues.psp" -}}
+{{- if and .Values.psp.create (not .Values.rbac.create) }}
+postgresql: psp.create, rbac.create
+    RBAC should be enabled if PSP is enabled in order for PSP to work.
+    More info at https://kubernetes.io/docs/concepts/policy/pod-security-policy/#authorizing-policies
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for podsecuritypolicy.
+*/}}
+{{- define "podsecuritypolicy.apiVersion" -}}
+{{- if semverCompare "<1.10-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "extensions/v1beta1" -}}
+{{- else -}}
+{{- print "policy/v1beta1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for networkpolicy.
+*/}}
+{{- define "postgresql.networkPolicy.apiVersion" -}}
+{{- if semverCompare ">=1.4-0, <1.7-0" .Capabilities.KubeVersion.GitVersion -}}
+"extensions/v1beta1"
+{{- else if semverCompare "^1.7-0" .Capabilities.KubeVersion.GitVersion -}}
+"networking.k8s.io/v1"
+{{- end -}}
+{{- end -}}
+
+{{/*
+Validate values of Postgresql TLS - When TLS is enabled, so must be VolumePermissions
+*/}}
+{{- define "postgresql.validateValues.tls" -}}
+{{- if and .Values.tls.enabled (not .Values.volumePermissions.enabled) }}
+postgresql: tls.enabled, volumePermissions.enabled
+    When TLS is enabled you must enable volumePermissions as well to ensure certificates files have
+    the right permissions.
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the path to the cert file.
+*/}}
+{{- define "postgresql.tlsCert" -}}
+{{- required "Certificate filename is required when TLS in enabled" .Values.tls.certFilename | printf "/opt/bitnami/postgresql/certs/%s" -}}
+{{- end -}}
+
+{{/*
+Return the path to the cert key file.
+*/}}
+{{- define "postgresql.tlsCertKey" -}}
+{{- required "Certificate Key filename is required when TLS in enabled" .Values.tls.certKeyFilename | printf "/opt/bitnami/postgresql/certs/%s" -}}
+{{- end -}}
+
+{{/*
+Return the path to the CA cert file.
+*/}}
+{{- define "postgresql.tlsCACert" -}}
+{{- printf "/opt/bitnami/postgresql/certs/%s" .Values.tls.certCAFilename -}}
+{{- end -}}
+
+{{/*
+Return the path to the CRL file.
+*/}}
+{{- define "postgresql.tlsCRL" -}}
+{{- if .Values.tls.crlFilename -}}
+{{- printf "/opt/bitnami/postgresql/certs/%s" .Values.tls.crlFilename -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/configmap.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/configmap.yaml
new file mode 100644
index 000000000..3a5ea18ae
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/configmap.yaml
@@ -0,0 +1,31 @@
+{{ if and (or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration) (not .Values.configurationConfigMap) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "common.names.fullname" . }}-configuration
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+data:
+{{- if (.Files.Glob "files/postgresql.conf") }}
+{{ (.Files.Glob "files/postgresql.conf").AsConfig | indent 2 }}
+{{- else if .Values.postgresqlConfiguration }}
+  postgresql.conf: |
+{{- range $key, $value := default dict .Values.postgresqlConfiguration }}
+    {{- if kindIs "string" $value }}
+    {{ $key | snakecase }} = '{{ $value }}'
+    {{- else }}
+    {{ $key | snakecase }} = {{ $value }}
+    {{- end }}
+{{- end }}
+{{- end }}
+{{- if (.Files.Glob "files/pg_hba.conf") }}
+{{ (.Files.Glob "files/pg_hba.conf").AsConfig | indent 2 }}
+{{- else if .Values.pgHbaConfiguration }}
+  pg_hba.conf: |
+{{ .Values.pgHbaConfiguration | indent 4 }}
+{{- end }}
+{{ end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/extended-config-configmap.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/extended-config-configmap.yaml
new file mode 100644
index 000000000..b0dad253b
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/extended-config-configmap.yaml
@@ -0,0 +1,26 @@
+{{- if and (or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf) (not .Values.extendedConfConfigMap)}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "common.names.fullname" . }}-extended-configuration
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+data:
+{{- with .Files.Glob "files/conf.d/*.conf" }}
+{{ .AsConfig | indent 2 }}
+{{- end }}
+{{ with .Values.postgresqlExtendedConf }}
+  override.conf: |
+{{- range $key, $value := . }}
+    {{- if kindIs "string" $value }}
+    {{ $key | snakecase }} = '{{ $value }}'
+    {{- else }}
+    {{ $key | snakecase }} = {{ $value }}
+    {{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/extra-list.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/extra-list.yaml
new file mode 100644
index 000000000..9ac65f9e1
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/extra-list.yaml
@@ -0,0 +1,4 @@
+{{- range .Values.extraDeploy }}
+---
+{{ include "common.tplvalues.render" (dict "value" . "context" $) }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/initialization-configmap.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/initialization-configmap.yaml
new file mode 100644
index 000000000..7796c67a9
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/initialization-configmap.yaml
@@ -0,0 +1,25 @@
+{{- if and (or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScripts) (not .Values.initdbScriptsConfigMap) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "common.names.fullname" . }}-init-scripts
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+{{- with .Files.Glob "files/docker-entrypoint-initdb.d/*.sql.gz" }}
+binaryData:
+{{- range $path, $bytes := . }}
+  {{ base $path }}: {{ $.Files.Get $path | b64enc | quote }}
+{{- end }}
+{{- end }}
+data:
+{{- with .Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql}" }}
+{{ .AsConfig | indent 2 }}
+{{- end }}
+{{- with .Values.initdbScripts }}
+{{ toYaml . | indent 2 }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/metrics-configmap.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/metrics-configmap.yaml
new file mode 100644
index 000000000..fa539582b
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/metrics-configmap.yaml
@@ -0,0 +1,14 @@
+{{- if and .Values.metrics.enabled .Values.metrics.customMetrics }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "postgresql.metricsCM" . }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+data:
+  custom-metrics.yaml: {{ toYaml .Values.metrics.customMetrics | quote }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/metrics-svc.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/metrics-svc.yaml
new file mode 100644
index 000000000..af8b67e2f
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/metrics-svc.yaml
@@ -0,0 +1,26 @@
+{{- if .Values.metrics.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "common.names.fullname" . }}-metrics
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  annotations:
+  {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+    {{- toYaml .Values.metrics.service.annotations | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  type: {{ .Values.metrics.service.type }}
+  {{- if and (eq .Values.metrics.service.type "LoadBalancer") .Values.metrics.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.metrics.service.loadBalancerIP }}
+  {{- end }}
+  ports:
+    - name: http-metrics
+      port: 9187
+      targetPort: http-metrics
+  selector:
+  {{- include "common.labels.matchLabels" . | nindent 4 }}
+    role: primary
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/networkpolicy.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/networkpolicy.yaml
new file mode 100644
index 000000000..4f2740ea0
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/networkpolicy.yaml
@@ -0,0 +1,39 @@
+{{- if .Values.networkPolicy.enabled }}
+kind: NetworkPolicy
+apiVersion: {{ template "postgresql.networkPolicy.apiVersion" . }}
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  podSelector:
+    matchLabels:
+    {{- include "common.labels.matchLabels" . | nindent 6 }}
+  ingress:
+    # Allow inbound connections
+    - ports:
+        - port: {{ template "postgresql.port" . }}
+      {{- if not .Values.networkPolicy.allowExternal }}
+      from:
+        - podSelector:
+            matchLabels:
+              {{ template "common.names.fullname" . }}-client: "true"
+          {{- if .Values.networkPolicy.explicitNamespacesSelector }}
+          namespaceSelector:
+{{ toYaml .Values.networkPolicy.explicitNamespacesSelector | indent 12 }}
+          {{- end }}
+        - podSelector:
+            matchLabels:
+            {{- include "common.labels.matchLabels" . | nindent 14 }}
+              role: read
+      {{- end }}
+    {{- if .Values.metrics.enabled }}
+    # Allow prometheus scrapes
+    - ports:
+        - port: 9187
+    {{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/podsecuritypolicy.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/podsecuritypolicy.yaml
new file mode 100644
index 000000000..0c49694fa
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/podsecuritypolicy.yaml
@@ -0,0 +1,38 @@
+{{- if .Values.psp.create }}
+apiVersion: {{ include "podsecuritypolicy.apiVersion" . }}
+kind: PodSecurityPolicy
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  privileged: false
+  volumes:
+    - 'configMap'
+    - 'secret'
+    - 'persistentVolumeClaim'
+    - 'emptyDir'
+    - 'projected'
+  hostNetwork: false
+  hostIPC: false
+  hostPID: false
+  runAsUser:
+    rule: 'RunAsAny'
+  seLinux:
+    rule: 'RunAsAny'
+  supplementalGroups:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  fsGroup:
+    rule: 'MustRunAs'
+    ranges:
+      - min: 1
+        max: 65535
+  readOnlyRootFilesystem: false
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/prometheusrule.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/prometheusrule.yaml
new file mode 100644
index 000000000..d0f408c78
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/prometheusrule.yaml
@@ -0,0 +1,23 @@
+{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ template "common.names.fullname" . }}
+{{- with .Values.metrics.prometheusRule.namespace }}
+  namespace: {{ . }}
+{{- end }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- with .Values.metrics.prometheusRule.additionalLabels }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+spec:
+{{- with .Values.metrics.prometheusRule.rules }}
+  groups:
+    - name: {{ template "postgresql.name" $ }}
+      rules: {{ tpl (toYaml .) $ | nindent 8 }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/role.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/role.yaml
new file mode 100644
index 000000000..017a5716b
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/role.yaml
@@ -0,0 +1,20 @@
+{{- if .Values.rbac.create }}
+kind: Role
+apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+rules:
+  {{- if .Values.psp.create }}
+  - apiGroups: ["extensions"]
+    resources: ["podsecuritypolicies"]
+    verbs: ["use"]
+    resourceNames:
+      - {{ template "common.names.fullname" . }}
+  {{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/rolebinding.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/rolebinding.yaml
new file mode 100644
index 000000000..189775a15
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/rolebinding.yaml
@@ -0,0 +1,20 @@
+{{- if .Values.rbac.create }}
+kind: RoleBinding
+apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: Role
+  name: {{ template "common.names.fullname" . }}
+  apiGroup: rbac.authorization.k8s.io
+subjects:
+  - kind: ServiceAccount
+    name: {{ default (include "common.names.fullname" . ) .Values.serviceAccount.name }}
+    namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/secrets.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/secrets.yaml
new file mode 100644
index 000000000..d492cd593
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/secrets.yaml
@@ -0,0 +1,24 @@
+{{- if (include "postgresql.createSecret" .) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+type: Opaque
+data:
+  {{- if not (eq (include "postgresql.username" .) "postgres")  }}
+  postgresql-postgres-password: {{ include "postgresql.postgres.password" . | b64enc | quote }}
+  {{- end }}
+  postgresql-password: {{ include "postgresql.password" . | b64enc | quote }}
+  {{- if .Values.replication.enabled }}
+  postgresql-replication-password: {{ include "postgresql.replication.password" . | b64enc | quote }}
+  {{- end }}
+  {{- if (and .Values.ldap.enabled .Values.ldap.bind_password)}}
+  postgresql-ldap-password: {{ .Values.ldap.bind_password | b64enc | quote }}
+  {{- end }}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/serviceaccount.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/serviceaccount.yaml
new file mode 100644
index 000000000..03f0f50e7
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/serviceaccount.yaml
@@ -0,0 +1,12 @@
+{{- if and (.Values.serviceAccount.enabled) (not .Values.serviceAccount.name) }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  name: {{ template "common.names.fullname" . }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/servicemonitor.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/servicemonitor.yaml
new file mode 100644
index 000000000..587ce85b8
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/servicemonitor.yaml
@@ -0,0 +1,33 @@
+{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  {{- if .Values.metrics.serviceMonitor.namespace }}
+  namespace: {{ .Values.metrics.serviceMonitor.namespace }}
+  {{- end }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.metrics.serviceMonitor.additionalLabels }}
+    {{- toYaml .Values.metrics.serviceMonitor.additionalLabels | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+
+spec:
+  endpoints:
+    - port: http-metrics
+      {{- if .Values.metrics.serviceMonitor.interval }}
+      interval: {{ .Values.metrics.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
+      {{- end }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+    {{- include "common.labels.matchLabels" . | nindent 6 }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/statefulset-readreplicas.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/statefulset-readreplicas.yaml
new file mode 100644
index 000000000..b038299bf
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/statefulset-readreplicas.yaml
@@ -0,0 +1,411 @@
+{{- if .Values.replication.enabled }}
+{{- $readReplicasResources := coalesce .Values.readReplicas.resources .Values.resources -}}
+apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }}
+kind: StatefulSet
+metadata:
+  name: "{{ template "common.names.fullname" . }}-read"
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: read
+{{- with .Values.readReplicas.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+  annotations:
+  {{- if .Values.commonAnnotations }}
+  {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  {{- with .Values.readReplicas.annotations }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  serviceName: {{ template "common.names.fullname" . }}-headless
+  replicas: {{ .Values.replication.readReplicas }}
+  selector:
+    matchLabels:
+    {{- include "common.labels.matchLabels" . | nindent 6 }}
+      role: read
+  template:
+    metadata:
+      name: {{ template "common.names.fullname" . }}
+      labels:
+      {{- include "common.labels.standard" . | nindent 8 }}
+        app.kubernetes.io/component: read
+        role: read
+{{- with .Values.readReplicas.podLabels }}
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- with .Values.readReplicas.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }}
+    spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: "{{ .Values.schedulerName }}"
+      {{- end }}
+{{- include "postgresql.imagePullSecrets" . | indent 6 }}
+      {{- if .Values.readReplicas.affinity }}
+      affinity: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.affinity "context" $) | nindent 8 }}
+      {{- else }}
+      affinity:
+        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.readReplicas.podAffinityPreset "component" "read" "context" $) | nindent 10 }}
+        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.readReplicas.podAntiAffinityPreset "component" "read" "context" $) | nindent 10 }}
+        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.readReplicas.nodeAffinityPreset.type "key" .Values.readReplicas.nodeAffinityPreset.key "values" .Values.readReplicas.nodeAffinityPreset.values) | nindent 10 }}
+      {{- end }}
+      {{- if .Values.readReplicas.nodeSelector }}
+      nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.nodeSelector "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.readReplicas.tolerations }}
+      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.tolerations "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      {{- end }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext: {{- omit .Values.securityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if .Values.serviceAccount.enabled }}
+      serviceAccountName: {{ default (include "common.names.fullname" . ) .Values.serviceAccount.name}}
+      {{- end }}
+      {{- if or .Values.readReplicas.extraInitContainers (and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled))) }}
+      initContainers:
+      {{- if and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled) .Values.tls.enabled) }}
+        - name: init-chmod-data
+          image: {{ template "postgresql.volumePermissions.image" . }}
+          imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          command:
+            - /bin/sh
+            - -cx
+            - |
+              {{- if .Values.persistence.enabled }}
+              {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+              chown `id -u`:`id -G | cut -d " " -f2` {{ .Values.persistence.mountPath }}
+              {{- else }}
+              chown {{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} {{ .Values.persistence.mountPath }}
+              {{- end }}
+              mkdir -p {{ .Values.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.persistence.mountPath }}/conf {{- end }}
+              chmod 700 {{ .Values.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.persistence.mountPath }}/conf {{- end }}
+              find {{ .Values.persistence.mountPath }} -mindepth 1 -maxdepth 1 {{- if not (include "postgresql.mountConfigurationCM" .) }} -not -name "conf" {{- end }} -not -name ".snapshot" -not -name "lost+found" | \
+              {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+                xargs chown -R `id -u`:`id -G | cut -d " " -f2`
+              {{- else }}
+                xargs chown -R {{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }}
+              {{- end }}
+              {{- end }}
+              {{- if and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled }}
+              chmod -R 777 /dev/shm
+              {{- end }}
+              {{- if .Values.tls.enabled }}
+              cp /tmp/certs/* /opt/bitnami/postgresql/certs/
+              {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+              chown -R `id -u`:`id -G | cut -d " " -f2` /opt/bitnami/postgresql/certs/
+              {{- else }}
+              chown -R {{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} /opt/bitnami/postgresql/certs/
+              {{- end }}
+              chmod 600 {{ template "postgresql.tlsCertKey" . }}
+              {{- end }}
+          {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+          securityContext: {{- omit .Values.volumePermissions.securityContext "runAsUser" | toYaml | nindent 12 }}
+          {{- else }}
+          securityContext: {{- .Values.volumePermissions.securityContext | toYaml | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            {{ if .Values.persistence.enabled }}
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{- end }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+            {{- if .Values.tls.enabled }}
+            - name: raw-certificates
+              mountPath: /tmp/certs
+            - name: postgresql-certificates
+              mountPath: /opt/bitnami/postgresql/certs
+            {{- end }}
+      {{- end }}
+      {{- if .Values.readReplicas.extraInitContainers }}
+      {{- include "common.tplvalues.render" ( dict "value" .Values.readReplicas.extraInitContainers "context" $ ) | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.readReplicas.priorityClassName }}
+      priorityClassName: {{ .Values.readReplicas.priorityClassName }}
+      {{- end }}
+      containers:
+        - name: {{ template "common.names.fullname" . }}
+          image: {{ template "postgresql.image" . }}
+          imagePullPolicy: "{{ .Values.image.pullPolicy }}"
+          {{- if $readReplicasResources }}
+          resources: {{- toYaml $readReplicasResources | nindent 12 }}
+          {{- end }}
+          {{- if .Values.containerSecurityContext.enabled }}
+          securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}
+          {{- end }}
+          env:
+            - name: BITNAMI_DEBUG
+              value: {{ ternary "true" "false" .Values.image.debug | quote }}
+            - name: POSTGRESQL_VOLUME_DIR
+              value: "{{ .Values.persistence.mountPath }}"
+            - name: POSTGRESQL_PORT_NUMBER
+              value: "{{ template "postgresql.port" . }}"
+            {{- if .Values.persistence.mountPath }}
+            - name: PGDATA
+              value: {{ .Values.postgresqlDataDir | quote }}
+            {{- end }}
+            - name: POSTGRES_REPLICATION_MODE
+              value: "slave"
+            - name: POSTGRES_REPLICATION_USER
+              value: {{ include "postgresql.replication.username" . | quote }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_REPLICATION_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-replication-password"
+            {{- else }}
+            - name: POSTGRES_REPLICATION_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-replication-password
+            {{- end }}
+            - name: POSTGRES_CLUSTER_APP_NAME
+              value: {{ .Values.replication.applicationName }}
+            - name: POSTGRES_MASTER_HOST
+              value: {{ template "common.names.fullname" . }}
+            - name: POSTGRES_MASTER_PORT_NUMBER
+              value: {{ include "postgresql.port" . | quote }}
+            {{- if not (eq (include "postgresql.username" .) "postgres")  }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-postgres-password"
+            {{- else }}
+            - name: POSTGRES_POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-postgres-password
+            {{- end }}
+            {{- end }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-password"
+            {{- else }}
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-password
+            {{- end }}
+            - name: POSTGRESQL_ENABLE_TLS
+              value: {{ ternary "yes" "no" .Values.tls.enabled | quote }}
+            {{- if .Values.tls.enabled }}
+            - name: POSTGRESQL_TLS_PREFER_SERVER_CIPHERS
+              value: {{ ternary "yes" "no" .Values.tls.preferServerCiphers | quote }}
+            - name: POSTGRESQL_TLS_CERT_FILE
+              value: {{ template "postgresql.tlsCert" . }}
+            - name: POSTGRESQL_TLS_KEY_FILE
+              value: {{ template "postgresql.tlsCertKey" . }}
+            {{- if .Values.tls.certCAFilename }}
+            - name: POSTGRESQL_TLS_CA_FILE
+              value: {{ template "postgresql.tlsCACert" . }}
+            {{- end }}
+            {{- if .Values.tls.crlFilename }}
+            - name: POSTGRESQL_TLS_CRL_FILE
+              value: {{ template "postgresql.tlsCRL" . }}
+            {{- end }}
+            {{- end }}
+            - name: POSTGRESQL_LOG_HOSTNAME
+              value: {{ .Values.audit.logHostname | quote }}
+            - name: POSTGRESQL_LOG_CONNECTIONS
+              value: {{ .Values.audit.logConnections | quote }}
+            - name: POSTGRESQL_LOG_DISCONNECTIONS
+              value: {{ .Values.audit.logDisconnections | quote }}
+            {{- if .Values.audit.logLinePrefix }}
+            - name: POSTGRESQL_LOG_LINE_PREFIX
+              value: {{ .Values.audit.logLinePrefix | quote }}
+            {{- end }}
+            {{- if .Values.audit.logTimezone }}
+            - name: POSTGRESQL_LOG_TIMEZONE
+              value: {{ .Values.audit.logTimezone | quote }}
+            {{- end }}
+            {{- if .Values.audit.pgAuditLog }}
+            - name: POSTGRESQL_PGAUDIT_LOG
+              value: {{ .Values.audit.pgAuditLog | quote }}
+            {{- end }}
+            - name: POSTGRESQL_PGAUDIT_LOG_CATALOG
+              value: {{ .Values.audit.pgAuditLogCatalog | quote }}
+            - name: POSTGRESQL_CLIENT_MIN_MESSAGES
+              value: {{ .Values.audit.clientMinMessages | quote }}
+            - name: POSTGRESQL_SHARED_PRELOAD_LIBRARIES
+              value: {{ .Values.postgresqlSharedPreloadLibraries | quote }}
+            {{- if .Values.postgresqlMaxConnections }}
+            - name: POSTGRESQL_MAX_CONNECTIONS
+              value: {{ .Values.postgresqlMaxConnections | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlPostgresConnectionLimit }}
+            - name: POSTGRESQL_POSTGRES_CONNECTION_LIMIT
+              value: {{ .Values.postgresqlPostgresConnectionLimit | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlDbUserConnectionLimit }}
+            - name: POSTGRESQL_USERNAME_CONNECTION_LIMIT
+              value: {{ .Values.postgresqlDbUserConnectionLimit | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlTcpKeepalivesInterval }}
+            - name: POSTGRESQL_TCP_KEEPALIVES_INTERVAL
+              value: {{ .Values.postgresqlTcpKeepalivesInterval | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlTcpKeepalivesIdle }}
+            - name: POSTGRESQL_TCP_KEEPALIVES_IDLE
+              value: {{ .Values.postgresqlTcpKeepalivesIdle | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlStatementTimeout }}
+            - name: POSTGRESQL_STATEMENT_TIMEOUT
+              value: {{ .Values.postgresqlStatementTimeout | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlTcpKeepalivesCount }}
+            - name: POSTGRESQL_TCP_KEEPALIVES_COUNT
+              value: {{ .Values.postgresqlTcpKeepalivesCount | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlPghbaRemoveFilters }}
+            - name: POSTGRESQL_PGHBA_REMOVE_FILTERS
+              value: {{ .Values.postgresqlPghbaRemoveFilters | quote }}
+            {{- end }}
+          ports:
+            - name: tcp-postgresql
+              containerPort: {{ template "postgresql.port" . }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                {{- if (include "postgresql.database" .) }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} -d "dbname={{ include "postgresql.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- else }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- end }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- else if .Values.customLivenessProbe }}
+          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - -e
+                {{- include "postgresql.readinessProbeCommand" . | nindent 16 }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          {{- else if .Values.customReadinessProbe }}
+          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            {{- if .Values.usePasswordFile }}
+            - name: postgresql-password
+              mountPath: /opt/bitnami/postgresql/secrets/
+            {{- end }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+            {{- if .Values.persistence.enabled }}
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{ end }}
+            {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+            - name: postgresql-extended-config
+              mountPath: /bitnami/postgresql/conf/conf.d/
+            {{- end }}
+            {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }}
+            - name: postgresql-config
+              mountPath: /bitnami/postgresql/conf
+            {{- end }}
+            {{- if .Values.tls.enabled }}
+            - name: postgresql-certificates
+              mountPath: /opt/bitnami/postgresql/certs
+              readOnly: true
+            {{- end }}
+            {{- if .Values.readReplicas.extraVolumeMounts }}
+            {{- toYaml .Values.readReplicas.extraVolumeMounts | nindent 12 }}
+            {{- end }}
+{{- if .Values.readReplicas.sidecars }}
+{{- include "common.tplvalues.render" ( dict "value" .Values.readReplicas.sidecars "context" $ ) | nindent 8 }}
+{{- end }}
+      volumes:
+        {{- if .Values.usePasswordFile }}
+        - name: postgresql-password
+          secret:
+            secretName: {{ template "postgresql.secretName" . }}
+        {{- end }}
+        {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap}}
+        - name: postgresql-config
+          configMap:
+            name: {{ template "postgresql.configurationCM" . }}
+        {{- end }}
+        {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+        - name: postgresql-extended-config
+          configMap:
+            name: {{ template "postgresql.extendedConfigurationCM" . }}
+        {{- end }}
+        {{- if  .Values.tls.enabled }}
+        - name: raw-certificates
+          secret:
+            secretName: {{ required "A secret containing TLS certificates is required when TLS is enabled" .Values.tls.certificatesSecret }}
+        - name: postgresql-certificates
+          emptyDir: {}
+        {{- end }}
+        {{- if .Values.shmVolume.enabled }}
+        - name: dshm
+          emptyDir:
+            medium: Memory
+            sizeLimit: 1Gi
+        {{- end }}
+        {{- if or (not .Values.persistence.enabled) (not .Values.readReplicas.persistence.enabled) }}
+        - name: data
+          emptyDir: {}
+        {{- end }}
+        {{- if .Values.readReplicas.extraVolumes }}
+        {{- toYaml .Values.readReplicas.extraVolumes | nindent 8 }}
+        {{- end }}
+  updateStrategy:
+    type: {{ .Values.updateStrategy.type }}
+    {{- if (eq "Recreate" .Values.updateStrategy.type) }}
+    rollingUpdate: null
+    {{- end }}
+{{- if and .Values.persistence.enabled .Values.readReplicas.persistence.enabled }}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+      {{- with .Values.persistence.annotations }}
+        annotations:
+        {{- range $key, $value := . }}
+          {{ $key }}: {{ $value }}
+        {{- end }}
+      {{- end }}
+      spec:
+        accessModes:
+        {{- range .Values.persistence.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.persistence.size | quote }}
+        {{ include "common.storage.class" (dict "persistence" .Values.persistence "global" .Values.global) }}
+
+        {{- if .Values.persistence.selector }}
+        selector: {{- include "common.tplvalues.render" (dict "value" .Values.persistence.selector "context" $) | nindent 10 }}
+        {{- end -}}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/statefulset.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/statefulset.yaml
new file mode 100644
index 000000000..f8163fd99
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/statefulset.yaml
@@ -0,0 +1,609 @@
+apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }}
+kind: StatefulSet
+metadata:
+  name: {{ template "postgresql.primary.fullname" . }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: primary
+  {{- with .Values.primary.labels }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  annotations:
+  {{- if .Values.commonAnnotations }}
+  {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  {{- with .Values.primary.annotations }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  serviceName: {{ template "common.names.fullname" . }}-headless
+  replicas: 1
+  updateStrategy:
+    type: {{ .Values.updateStrategy.type }}
+    {{- if (eq "Recreate" .Values.updateStrategy.type) }}
+    rollingUpdate: null
+    {{- end }}
+  selector:
+    matchLabels:
+    {{- include "common.labels.matchLabels" . | nindent 6 }}
+      role: primary
+  template:
+    metadata:
+      name: {{ template "common.names.fullname" . }}
+      labels:
+      {{- include "common.labels.standard" . | nindent 8 }}
+        role: primary
+        app.kubernetes.io/component: primary
+      {{- with .Values.primary.podLabels }}
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.primary.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: "{{ .Values.schedulerName }}"
+      {{- end }}
+{{- include "postgresql.imagePullSecrets" . | indent 6 }}
+      {{- if .Values.primary.affinity }}
+      affinity: {{- include "common.tplvalues.render" (dict "value" .Values.primary.affinity "context" $) | nindent 8 }}
+      {{- else }}
+      affinity:
+        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.primary.podAffinityPreset "component" "primary" "context" $) | nindent 10 }}
+        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.primary.podAntiAffinityPreset "component" "primary" "context" $) | nindent 10 }}
+        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.primary.nodeAffinityPreset.type "key" .Values.primary.nodeAffinityPreset.key "values" .Values.primary.nodeAffinityPreset.values) | nindent 10 }}
+      {{- end }}
+      {{- if .Values.primary.nodeSelector }}
+      nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.primary.nodeSelector "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.primary.tolerations }}
+      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.primary.tolerations "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      {{- end }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext: {{- omit .Values.securityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if .Values.serviceAccount.enabled }}
+      serviceAccountName: {{ default (include "common.names.fullname" . ) .Values.serviceAccount.name }}
+      {{- end }}
+      {{- if or .Values.primary.extraInitContainers (and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled))) }}
+      initContainers:
+      {{- if and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled) .Values.tls.enabled) }}
+        - name: init-chmod-data
+          image: {{ template "postgresql.volumePermissions.image" . }}
+          imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          command:
+            - /bin/sh
+            - -cx
+            - |
+              {{- if .Values.persistence.enabled }}
+              {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+              chown `id -u`:`id -G | cut -d " " -f2` {{ .Values.persistence.mountPath }}
+              {{- else }}
+              chown {{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} {{ .Values.persistence.mountPath }}
+              {{- end }}
+              mkdir -p {{ .Values.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.persistence.mountPath }}/conf {{- end }}
+              chmod 700 {{ .Values.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.persistence.mountPath }}/conf {{- end }}
+              find {{ .Values.persistence.mountPath }} -mindepth 1 -maxdepth 1 {{- if not (include "postgresql.mountConfigurationCM" .) }} -not -name "conf" {{- end }} -not -name ".snapshot" -not -name "lost+found" | \
+              {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+                xargs chown -R `id -u`:`id -G | cut -d " " -f2`
+              {{- else }}
+                xargs chown -R {{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }}
+              {{- end }}
+              {{- end }}
+              {{- if and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled }}
+              chmod -R 777 /dev/shm
+              {{- end }}
+              {{- if .Values.tls.enabled }}
+              cp /tmp/certs/* /opt/bitnami/postgresql/certs/
+              {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+              chown -R `id -u`:`id -G | cut -d " " -f2` /opt/bitnami/postgresql/certs/
+              {{- else }}
+              chown -R {{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} /opt/bitnami/postgresql/certs/
+              {{- end }}
+              chmod 600 {{ template "postgresql.tlsCertKey" . }}
+              {{- end }}
+          {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+          securityContext: {{- omit .Values.volumePermissions.securityContext "runAsUser" | toYaml | nindent 12 }}
+          {{- else }}
+          securityContext: {{- .Values.volumePermissions.securityContext | toYaml | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            {{- if .Values.persistence.enabled }}
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{- end }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+            {{- if .Values.tls.enabled }}
+            - name: raw-certificates
+              mountPath: /tmp/certs
+            - name: postgresql-certificates
+              mountPath: /opt/bitnami/postgresql/certs
+            {{- end }}
+      {{- end }}
+      {{- if .Values.primary.extraInitContainers }}
+      {{- include "common.tplvalues.render" ( dict "value" .Values.primary.extraInitContainers "context" $ ) | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.primary.priorityClassName }}
+      priorityClassName: {{ .Values.primary.priorityClassName }}
+      {{- end }}
+      containers:
+        - name: {{ template "common.names.fullname" . }}
+          image: {{ template "postgresql.image" . }}
+          imagePullPolicy: "{{ .Values.image.pullPolicy }}"
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          {{- if .Values.containerSecurityContext.enabled }}
+          securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}
+          {{- end }}
+          env:
+            - name: BITNAMI_DEBUG
+              value: {{ ternary "true" "false" .Values.image.debug | quote }}
+            - name: POSTGRESQL_PORT_NUMBER
+              value: "{{ template "postgresql.port" . }}"
+            - name: POSTGRESQL_VOLUME_DIR
+              value: "{{ .Values.persistence.mountPath }}"
+            {{- if .Values.postgresqlInitdbArgs }}
+            - name: POSTGRES_INITDB_ARGS
+              value: {{ .Values.postgresqlInitdbArgs | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlInitdbWalDir }}
+            - name: POSTGRES_INITDB_WALDIR
+              value: {{ .Values.postgresqlInitdbWalDir | quote }}
+            {{- end }}
+            {{- if .Values.initdbUser }}
+            - name: POSTGRESQL_INITSCRIPTS_USERNAME
+              value: {{ .Values.initdbUser }}
+            {{- end }}
+            {{- if .Values.initdbPassword }}
+            - name: POSTGRESQL_INITSCRIPTS_PASSWORD
+              value: {{ .Values.initdbPassword }}
+            {{- end }}
+            {{- if .Values.persistence.mountPath }}
+            - name: PGDATA
+              value: {{ .Values.postgresqlDataDir | quote }}
+            {{- end }}
+            {{- if .Values.primaryAsStandBy.enabled }}
+            - name: POSTGRES_MASTER_HOST
+              value: {{ .Values.primaryAsStandBy.primaryHost }}
+            - name: POSTGRES_MASTER_PORT_NUMBER
+              value: {{ .Values.primaryAsStandBy.primaryPort | quote }}
+            {{- end }}
+            {{- if or .Values.replication.enabled .Values.primaryAsStandBy.enabled }}
+            - name: POSTGRES_REPLICATION_MODE
+            {{- if .Values.primaryAsStandBy.enabled }}
+              value: "slave"
+            {{- else }}
+              value: "master"
+            {{- end }}
+            - name: POSTGRES_REPLICATION_USER
+              value: {{ include "postgresql.replication.username" . | quote }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_REPLICATION_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-replication-password"
+            {{- else }}
+            - name: POSTGRES_REPLICATION_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-replication-password
+            {{- end }}
+            {{- if not (eq .Values.replication.synchronousCommit "off")}}
+            - name: POSTGRES_SYNCHRONOUS_COMMIT_MODE
+              value: {{ .Values.replication.synchronousCommit | quote }}
+            - name: POSTGRES_NUM_SYNCHRONOUS_REPLICAS
+              value: {{ .Values.replication.numSynchronousReplicas | quote }}
+            {{- end }}
+            - name: POSTGRES_CLUSTER_APP_NAME
+              value: {{ .Values.replication.applicationName }}
+            {{- end }}
+            {{- if not (eq (include "postgresql.username" .) "postgres")  }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-postgres-password"
+            {{- else }}
+            - name: POSTGRES_POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-postgres-password
+            {{- end }}
+            {{- end }}
+            - name: POSTGRES_USER
+              value: {{ include "postgresql.username" . | quote }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-password"
+            {{- else }}
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-password
+            {{- end }}
+            {{- if (include "postgresql.database" .) }}
+            - name: POSTGRES_DB
+              value: {{ (include "postgresql.database" .) | quote }}
+            {{- end }}
+            {{- if .Values.extraEnv }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.extraEnv "context" $) | nindent 12 }}
+            {{- end }}
+            - name: POSTGRESQL_ENABLE_LDAP
+              value: {{ ternary "yes" "no" .Values.ldap.enabled | quote }}
+            {{- if .Values.ldap.enabled }}
+            - name: POSTGRESQL_LDAP_SERVER
+              value: {{ .Values.ldap.server }}
+            - name: POSTGRESQL_LDAP_PORT
+              value: {{ .Values.ldap.port | quote }}
+            - name: POSTGRESQL_LDAP_SCHEME
+              value: {{ .Values.ldap.scheme }}
+            {{- if .Values.ldap.tls }}
+            - name: POSTGRESQL_LDAP_TLS
+              value: "1"
+            {{- end }}
+            - name: POSTGRESQL_LDAP_PREFIX
+              value: {{ .Values.ldap.prefix | quote }}
+            - name: POSTGRESQL_LDAP_SUFFIX
+              value: {{ .Values.ldap.suffix | quote }}
+            - name: POSTGRESQL_LDAP_BASE_DN
+              value: {{ .Values.ldap.baseDN }}
+            - name: POSTGRESQL_LDAP_BIND_DN
+              value: {{ .Values.ldap.bindDN }}
+            {{- if (not (empty .Values.ldap.bind_password)) }}
+            - name: POSTGRESQL_LDAP_BIND_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-ldap-password
+            {{- end}}
+            - name: POSTGRESQL_LDAP_SEARCH_ATTR
+              value: {{ .Values.ldap.search_attr }}
+            - name: POSTGRESQL_LDAP_SEARCH_FILTER
+              value: {{ .Values.ldap.search_filter }}
+            - name: POSTGRESQL_LDAP_URL
+              value: {{ .Values.ldap.url }}
+            {{- end}}
+            - name: POSTGRESQL_ENABLE_TLS
+              value: {{ ternary "yes" "no" .Values.tls.enabled | quote }}
+            {{- if .Values.tls.enabled }}
+            - name: POSTGRESQL_TLS_PREFER_SERVER_CIPHERS
+              value: {{ ternary "yes" "no" .Values.tls.preferServerCiphers | quote }}
+            - name: POSTGRESQL_TLS_CERT_FILE
+              value: {{ template "postgresql.tlsCert" . }}
+            - name: POSTGRESQL_TLS_KEY_FILE
+              value: {{ template "postgresql.tlsCertKey" . }}
+            {{- if .Values.tls.certCAFilename }}
+            - name: POSTGRESQL_TLS_CA_FILE
+              value: {{ template "postgresql.tlsCACert" . }}
+            {{- end }}
+            {{- if .Values.tls.crlFilename }}
+            - name: POSTGRESQL_TLS_CRL_FILE
+              value: {{ template "postgresql.tlsCRL" . }}
+            {{- end }}
+            {{- end }}
+            - name: POSTGRESQL_LOG_HOSTNAME
+              value: {{ .Values.audit.logHostname | quote }}
+            - name: POSTGRESQL_LOG_CONNECTIONS
+              value: {{ .Values.audit.logConnections | quote }}
+            - name: POSTGRESQL_LOG_DISCONNECTIONS
+              value: {{ .Values.audit.logDisconnections | quote }}
+            {{- if .Values.audit.logLinePrefix }}
+            - name: POSTGRESQL_LOG_LINE_PREFIX
+              value: {{ .Values.audit.logLinePrefix | quote }}
+            {{- end }}
+            {{- if .Values.audit.logTimezone }}
+            - name: POSTGRESQL_LOG_TIMEZONE
+              value: {{ .Values.audit.logTimezone | quote }}
+            {{- end }}
+            {{- if .Values.audit.pgAuditLog }}
+            - name: POSTGRESQL_PGAUDIT_LOG
+              value: {{ .Values.audit.pgAuditLog | quote }}
+            {{- end }}
+            - name: POSTGRESQL_PGAUDIT_LOG_CATALOG
+              value: {{ .Values.audit.pgAuditLogCatalog | quote }}
+            - name: POSTGRESQL_CLIENT_MIN_MESSAGES
+              value: {{ .Values.audit.clientMinMessages | quote }}
+            - name: POSTGRESQL_SHARED_PRELOAD_LIBRARIES
+              value: {{ .Values.postgresqlSharedPreloadLibraries | quote }}
+            {{- if .Values.postgresqlMaxConnections }}
+            - name: POSTGRESQL_MAX_CONNECTIONS
+              value: {{ .Values.postgresqlMaxConnections | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlPostgresConnectionLimit }}
+            - name: POSTGRESQL_POSTGRES_CONNECTION_LIMIT
+              value: {{ .Values.postgresqlPostgresConnectionLimit | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlDbUserConnectionLimit }}
+            - name: POSTGRESQL_USERNAME_CONNECTION_LIMIT
+              value: {{ .Values.postgresqlDbUserConnectionLimit | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlTcpKeepalivesInterval }}
+            - name: POSTGRESQL_TCP_KEEPALIVES_INTERVAL
+              value: {{ .Values.postgresqlTcpKeepalivesInterval | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlTcpKeepalivesIdle }}
+            - name: POSTGRESQL_TCP_KEEPALIVES_IDLE
+              value: {{ .Values.postgresqlTcpKeepalivesIdle | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlStatementTimeout }}
+            - name: POSTGRESQL_STATEMENT_TIMEOUT
+              value: {{ .Values.postgresqlStatementTimeout | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlTcpKeepalivesCount }}
+            - name: POSTGRESQL_TCP_KEEPALIVES_COUNT
+              value: {{ .Values.postgresqlTcpKeepalivesCount | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlPghbaRemoveFilters }}
+            - name: POSTGRESQL_PGHBA_REMOVE_FILTERS
+              value: {{ .Values.postgresqlPghbaRemoveFilters | quote }}
+            {{- end }}
+          {{- if .Values.extraEnvVarsCM }}
+          envFrom:
+            - configMapRef:
+                name: {{ tpl .Values.extraEnvVarsCM . }}
+          {{- end }}
+          ports:
+            - name: tcp-postgresql
+              containerPort: {{ template "postgresql.port" . }}
+          {{- if .Values.startupProbe.enabled }}
+          startupProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                {{- if (include "postgresql.database" .) }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} -d "dbname={{ include "postgresql.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- else }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- end }}
+            initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.startupProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.startupProbe.successThreshold }}
+            failureThreshold: {{ .Values.startupProbe.failureThreshold }}
+          {{- else if .Values.customStartupProbe }}
+          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customStartupProbe "context" $) | nindent 12 }}
+          {{- end }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                {{- if (include "postgresql.database" .) }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} -d "dbname={{ include "postgresql.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- else }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- end }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- else if .Values.customLivenessProbe }}
+          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - -e
+                {{- include "postgresql.readinessProbeCommand" . | nindent 16 }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          {{- else if .Values.customReadinessProbe }}
+          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }}
+            - name: custom-init-scripts
+              mountPath: /docker-entrypoint-initdb.d/
+            {{- end }}
+            {{- if .Values.initdbScriptsSecret }}
+            - name: custom-init-scripts-secret
+              mountPath: /docker-entrypoint-initdb.d/secret
+            {{- end }}
+            {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+            - name: postgresql-extended-config
+              mountPath: /bitnami/postgresql/conf/conf.d/
+            {{- end }}
+            {{- if .Values.usePasswordFile }}
+            - name: postgresql-password
+              mountPath: /opt/bitnami/postgresql/secrets/
+            {{- end }}
+            {{- if .Values.tls.enabled }}
+            - name: postgresql-certificates
+              mountPath: /opt/bitnami/postgresql/certs
+              readOnly: true
+            {{- end }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+            {{- if .Values.persistence.enabled }}
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{- end }}
+            {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }}
+            - name: postgresql-config
+              mountPath: /bitnami/postgresql/conf
+            {{- end }}
+            {{- if .Values.primary.extraVolumeMounts }}
+            {{- toYaml .Values.primary.extraVolumeMounts | nindent 12 }}
+            {{- end }}
+{{- if .Values.primary.sidecars }}
+{{- include "common.tplvalues.render" ( dict "value" .Values.primary.sidecars "context" $ ) | nindent 8 }}
+{{- end }}
+{{- if .Values.metrics.enabled }}
+        - name: metrics
+          image: {{ template "postgresql.metrics.image" . }}
+          imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
+         {{- if .Values.metrics.securityContext.enabled }}
+          securityContext: {{- omit .Values.metrics.securityContext "enabled" | toYaml | nindent 12 }}
+        {{- end }}
+          env:
+            {{- $database := required "In order to enable metrics you need to specify a database (.Values.postgresqlDatabase or .Values.global.postgresql.postgresqlDatabase)" (include "postgresql.database" .) }}
+            {{- $sslmode := ternary "require" "disable" .Values.tls.enabled }}
+            {{- if and .Values.tls.enabled .Values.tls.certCAFilename }}
+            - name: DATA_SOURCE_NAME
+              value: {{ printf "host=127.0.0.1 port=%d user=%s sslmode=%s sslcert=%s sslkey=%s" (int (include "postgresql.port" .)) (include "postgresql.username" .) $sslmode (include "postgresql.tlsCert" .) (include "postgresql.tlsCertKey" .) }}
+            {{- else }}
+            - name: DATA_SOURCE_URI
+              value: {{ printf "127.0.0.1:%d/%s?sslmode=%s" (int (include "postgresql.port" .)) $database $sslmode }}
+            {{- end }}
+            {{- if .Values.usePasswordFile }}
+            - name: DATA_SOURCE_PASS_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-password"
+            {{- else }}
+            - name: DATA_SOURCE_PASS
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-password
+            {{- end }}
+            - name: DATA_SOURCE_USER
+              value: {{ template "postgresql.username" . }}
+            {{- if .Values.metrics.extraEnvVars }}
+            {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http-metrics
+            initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metrics.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.metrics.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.metrics.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http-metrics
+            initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.metrics.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.metrics.readinessProbe.failureThreshold }}
+          {{- end }}
+          volumeMounts:
+            {{- if .Values.usePasswordFile }}
+            - name: postgresql-password
+              mountPath: /opt/bitnami/postgresql/secrets/
+            {{- end }}
+            {{- if .Values.tls.enabled }}
+            - name: postgresql-certificates
+              mountPath: /opt/bitnami/postgresql/certs
+              readOnly: true
+            {{- end }}
+            {{- if .Values.metrics.customMetrics }}
+            - name: custom-metrics
+              mountPath: /conf
+              readOnly: true
+          args: ["--extend.query-path", "/conf/custom-metrics.yaml"]
+            {{- end }}
+          ports:
+            - name: http-metrics
+              containerPort: 9187
+          {{- if .Values.metrics.resources }}
+          resources: {{- toYaml .Values.metrics.resources | nindent 12 }}
+          {{- end }}
+{{- end }}
+      volumes:
+        {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap}}
+        - name: postgresql-config
+          configMap:
+            name: {{ template "postgresql.configurationCM" . }}
+        {{- end }}
+        {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+        - name: postgresql-extended-config
+          configMap:
+            name: {{ template "postgresql.extendedConfigurationCM" . }}
+        {{- end }}
+        {{- if .Values.usePasswordFile }}
+        - name: postgresql-password
+          secret:
+            secretName: {{ template "postgresql.secretName" . }}
+        {{- end }}
+        {{- if  or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }}
+        - name: custom-init-scripts
+          configMap:
+            name: {{ template "postgresql.initdbScriptsCM" . }}
+        {{- end }}
+        {{- if .Values.initdbScriptsSecret }}
+        - name: custom-init-scripts-secret
+          secret:
+            secretName: {{ template "postgresql.initdbScriptsSecret" . }}
+        {{- end }}
+        {{- if  .Values.tls.enabled }}
+        - name: raw-certificates
+          secret:
+            secretName: {{ required "A secret containing TLS certificates is required when TLS is enabled" .Values.tls.certificatesSecret }}
+        - name: postgresql-certificates
+          emptyDir: {}
+        {{- end }}
+        {{- if .Values.primary.extraVolumes }}
+        {{- toYaml .Values.primary.extraVolumes | nindent 8 }}
+        {{- end }}
+        {{- if and .Values.metrics.enabled .Values.metrics.customMetrics }}
+        - name: custom-metrics
+          configMap:
+            name: {{ template "postgresql.metricsCM" . }}
+        {{- end }}
+        {{- if .Values.shmVolume.enabled }}
+        - name: dshm
+          emptyDir:
+            medium: Memory
+            sizeLimit: 1Gi
+        {{- end }}
+{{- if and .Values.persistence.enabled .Values.persistence.existingClaim }}
+        - name: data
+          persistentVolumeClaim:
+{{- with .Values.persistence.existingClaim }}
+            claimName: {{ tpl . $ }}
+{{- end }}
+{{- else if not .Values.persistence.enabled }}
+        - name: data
+          emptyDir: {}
+{{- else if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+      {{- with .Values.persistence.annotations }}
+        annotations:
+        {{- range $key, $value := . }}
+          {{ $key }}: {{ $value }}
+        {{- end }}
+      {{- end }}
+      spec:
+        accessModes:
+        {{- range .Values.persistence.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.persistence.size | quote }}
+        {{ include "common.storage.class" (dict "persistence" .Values.persistence "global" .Values.global) }}
+        {{- if .Values.persistence.selector }}
+        selector: {{- include "common.tplvalues.render" (dict "value" .Values.persistence.selector "context" $) | nindent 10 }}
+        {{- end -}}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/svc-headless.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/svc-headless.yaml
new file mode 100644
index 000000000..6f5f3b9ee
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/svc-headless.yaml
@@ -0,0 +1,28 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "common.names.fullname" . }}-headless
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+    # Use this annotation in addition to the actual publishNotReadyAddresses
+    # field below because the annotation will stop being respected soon but the
+    # field is broken in some versions of Kubernetes:
+    # https://github.com/kubernetes/kubernetes/issues/58662
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+  namespace: {{ .Release.Namespace }}
+spec:
+  type: ClusterIP
+  clusterIP: None
+  # We want all pods in the StatefulSet to have their addresses published for
+  # the sake of the other Postgresql pods even before they're ready, since they
+  # have to be able to talk to each other in order to become ready.
+  publishNotReadyAddresses: true
+  ports:
+    - name: tcp-postgresql
+      port: {{ template "postgresql.port" . }}
+      targetPort: tcp-postgresql
+  selector:
+  {{- include "common.labels.matchLabels" . | nindent 4 }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/svc-read.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/svc-read.yaml
new file mode 100644
index 000000000..56195ea1e
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/svc-read.yaml
@@ -0,0 +1,43 @@
+{{- if .Values.replication.enabled }}
+{{- $serviceAnnotations := coalesce .Values.readReplicas.service.annotations .Values.service.annotations -}}
+{{- $serviceType := coalesce .Values.readReplicas.service.type .Values.service.type -}}
+{{- $serviceLoadBalancerIP := coalesce .Values.readReplicas.service.loadBalancerIP .Values.service.loadBalancerIP -}}
+{{- $serviceLoadBalancerSourceRanges := coalesce .Values.readReplicas.service.loadBalancerSourceRanges .Values.service.loadBalancerSourceRanges -}}
+{{- $serviceClusterIP := coalesce .Values.readReplicas.service.clusterIP .Values.service.clusterIP -}}
+{{- $serviceNodePort := coalesce .Values.readReplicas.service.nodePort .Values.service.nodePort -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "common.names.fullname" . }}-read
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  annotations:
+  {{- if .Values.commonAnnotations }}
+  {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  {{- if $serviceAnnotations }}
+  {{- include "common.tplvalues.render" (dict "value" $serviceAnnotations "context" $) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  type: {{ $serviceType }}
+  {{- if and $serviceLoadBalancerIP (eq $serviceType "LoadBalancer") }}
+  loadBalancerIP: {{ $serviceLoadBalancerIP }}
+  {{- end }}
+  {{- if and (eq $serviceType "LoadBalancer") $serviceLoadBalancerSourceRanges }}
+  loadBalancerSourceRanges: {{- include "common.tplvalues.render" (dict "value" $serviceLoadBalancerSourceRanges "context" $) | nindent 4 }}
+  {{- end }}
+  {{- if and (eq $serviceType "ClusterIP") $serviceClusterIP }}
+  clusterIP: {{ $serviceClusterIP }}
+  {{- end }}
+  ports:
+    - name: tcp-postgresql
+      port:  {{ template "postgresql.port" . }}
+      targetPort: tcp-postgresql
+      {{- if $serviceNodePort }}
+      nodePort: {{ $serviceNodePort }}
+      {{- end }}
+  selector:
+  {{- include "common.labels.matchLabels" . | nindent 4 }}
+    role: read
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/svc.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/svc.yaml
new file mode 100644
index 000000000..a29431b6a
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/templates/svc.yaml
@@ -0,0 +1,41 @@
+{{- $serviceAnnotations := coalesce .Values.primary.service.annotations .Values.service.annotations -}}
+{{- $serviceType := coalesce .Values.primary.service.type .Values.service.type -}}
+{{- $serviceLoadBalancerIP := coalesce .Values.primary.service.loadBalancerIP .Values.service.loadBalancerIP -}}
+{{- $serviceLoadBalancerSourceRanges := coalesce .Values.primary.service.loadBalancerSourceRanges .Values.service.loadBalancerSourceRanges -}}
+{{- $serviceClusterIP := coalesce .Values.primary.service.clusterIP .Values.service.clusterIP -}}
+{{- $serviceNodePort := coalesce .Values.primary.service.nodePort .Values.service.nodePort -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels.standard" . | nindent 4 }}
+  annotations:
+  {{- if .Values.commonAnnotations }}
+  {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+  {{- if $serviceAnnotations }}
+  {{- include "common.tplvalues.render" (dict "value" $serviceAnnotations "context" $) | nindent 4 }}
+  {{- end }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  type: {{ $serviceType }}
+  {{- if and $serviceLoadBalancerIP (eq $serviceType "LoadBalancer") }}
+  loadBalancerIP: {{ $serviceLoadBalancerIP }}
+  {{- end }}
+  {{- if and (eq $serviceType "LoadBalancer") $serviceLoadBalancerSourceRanges }}
+  loadBalancerSourceRanges: {{- include "common.tplvalues.render" (dict "value" $serviceLoadBalancerSourceRanges "context" $) | nindent 4 }}
+  {{- end }}
+  {{- if and (eq $serviceType "ClusterIP") $serviceClusterIP }}
+  clusterIP: {{ $serviceClusterIP }}
+  {{- end }}
+  ports:
+    - name: tcp-postgresql
+      port: {{ template "postgresql.port" . }}
+      targetPort: tcp-postgresql
+      {{- if $serviceNodePort }}
+      nodePort: {{ $serviceNodePort }}
+      {{- end }}
+  selector:
+  {{- include "common.labels.matchLabels" . | nindent 4 }}
+    role: primary
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/values.schema.json b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/values.schema.json
new file mode 100644
index 000000000..66a2a9dd0
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/values.schema.json
@@ -0,0 +1,103 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "type": "object",
+  "properties": {
+    "postgresqlUsername": {
+      "type": "string",
+      "title": "Admin user",
+      "form": true
+    },
+    "postgresqlPassword": {
+      "type": "string",
+      "title": "Password",
+      "form": true
+    },
+    "persistence": {
+      "type": "object",
+      "properties": {
+        "size": {
+          "type": "string",
+          "title": "Persistent Volume Size",
+          "form": true,
+          "render": "slider",
+          "sliderMin": 1,
+          "sliderMax": 100,
+          "sliderUnit": "Gi"
+        }
+      }
+    },
+    "resources": {
+      "type": "object",
+      "title": "Required Resources",
+      "description": "Configure resource requests",
+      "form": true,
+      "properties": {
+        "requests": {
+          "type": "object",
+          "properties": {
+            "memory": {
+              "type": "string",
+              "form": true,
+              "render": "slider",
+              "title": "Memory Request",
+              "sliderMin": 10,
+              "sliderMax": 2048,
+              "sliderUnit": "Mi"
+            },
+            "cpu": {
+              "type": "string",
+              "form": true,
+              "render": "slider",
+              "title": "CPU Request",
+              "sliderMin": 10,
+              "sliderMax": 2000,
+              "sliderUnit": "m"
+            }
+          }
+        }
+      }
+    },
+    "replication": {
+      "type": "object",
+      "form": true,
+      "title": "Replication Details",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "title": "Enable Replication",
+          "form": true
+        },
+        "readReplicas": {
+          "type": "integer",
+          "title": "read Replicas",
+          "form": true,
+          "hidden": {
+            "value": false,
+            "path": "replication/enabled"
+          }
+        }
+      }
+    },
+    "volumePermissions": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "form": true,
+          "title": "Enable Init Containers",
+          "description": "Change the owner of the persist volume mountpoint to RunAsUser:fsGroup"
+        }
+      }
+    },
+    "metrics": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "title": "Configure metrics exporter",
+          "form": true
+        }
+      }
+    }
+  }
+}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/values.yaml
new file mode 100644
index 000000000..82ce09234
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/charts/postgresql/values.yaml
@@ -0,0 +1,824 @@
+## Global Docker image parameters
+## Please, note that this will override the image parameters, including dependencies, configured to use the global value
+## Current available global Docker image parameters: imageRegistry and imagePullSecrets
+##
+global:
+  postgresql: {}
+#   imageRegistry: myRegistryName
+#   imagePullSecrets:
+#     - myRegistryKeySecretName
+#   storageClass: myStorageClass
+
+## Bitnami PostgreSQL image version
+## ref: https://hub.docker.com/r/bitnami/postgresql/tags/
+##
+image:
+  registry: docker.io
+  repository: bitnami/postgresql
+  tag: 11.11.0-debian-10-r71
+  ## Specify a imagePullPolicy
+  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+  ##
+  pullPolicy: IfNotPresent
+  ## Optionally specify an array of imagePullSecrets.
+  ## Secrets must be manually created in the namespace.
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+  ##
+  # pullSecrets:
+  #   - myRegistryKeySecretName
+
+  ## Set to true if you would like to see extra information on logs
+  ## It turns BASH and/or NAMI debugging in the image
+  ##
+  debug: false
+
+## String to partially override common.names.fullname template (will maintain the release name)
+##
+# nameOverride:
+
+## String to fully override common.names.fullname template
+##
+# fullnameOverride:
+
+##
+## Init containers parameters:
+## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup
+##
+volumePermissions:
+  enabled: false
+  image:
+    registry: docker.io
+    repository: bitnami/bitnami-shell
+    tag: "10"
+    ## Specify a imagePullPolicy
+    ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+    ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+    ##
+    pullPolicy: Always
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+  ## Init container Security Context
+  ## Note: the chown of the data folder is done to securityContext.runAsUser
+  ## and not the below volumePermissions.securityContext.runAsUser
+  ## When runAsUser is set to special value "auto", init container will try to chwon the
+  ## data folder to autodetermined user&group, using commands: `id -u`:`id -G | cut -d" " -f2`
+  ## "auto" is especially useful for OpenShift which has scc with dynamic userids (and 0 is not allowed).
+  ## You may want to use this volumePermissions.securityContext.runAsUser="auto" in combination with
+  ## pod securityContext.enabled=false and shmVolume.chmod.enabled=false
+  ##
+  securityContext:
+    runAsUser: 0
+
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+##
+# schedulerName:
+
+## Pod Security Context
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+##
+securityContext:
+  enabled: true
+  fsGroup: 1001
+
+## Container Security Context
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+##
+containerSecurityContext:
+  enabled: true
+  runAsUser: 1001
+
+## Pod Service Account
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
+##
+serviceAccount:
+  enabled: false
+  ## Name of an already existing service account. Setting this value disables the automatic service account creation.
+  # name:
+
+## Pod Security Policy
+## ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/
+##
+psp:
+  create: false
+
+## Creates role for ServiceAccount
+## Required for PSP
+##
+rbac:
+  create: false
+
+replication:
+  enabled: false
+  user: repl_user
+  password: repl_password
+  readReplicas: 1
+  ## Set synchronous commit mode: on, off, remote_apply, remote_write and local
+  ## ref: https://www.postgresql.org/docs/9.6/runtime-config-wal.html#GUC-WAL-LEVEL
+  synchronousCommit: 'off'
+  ## From the number of `readReplicas` defined above, set the number of those that will have synchronous replication
+  ## NOTE: It cannot be > readReplicas
+  numSynchronousReplicas: 0
+  ## Replication Cluster application name. Useful for defining multiple replication policies
+  ##
+  applicationName: my_application
+
+## PostgreSQL admin password (used when `postgresqlUsername` is not `postgres`)
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-user-on-first-run (see note!)
+# postgresqlPostgresPassword:
+
+## PostgreSQL user (has superuser privileges if username is `postgres`)
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run
+##
+postgresqlUsername: postgres
+
+## PostgreSQL password
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run
+##
+# postgresqlPassword:
+
+## PostgreSQL password using existing secret
+## existingSecret: secret
+##
+
+## Mount PostgreSQL secret as a file instead of passing environment variable
+# usePasswordFile: false
+
+## Create a database
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-on-first-run
+##
+# postgresqlDatabase:
+
+## PostgreSQL data dir
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+postgresqlDataDir: /bitnami/postgresql/data
+
+## An array to add extra environment variables
+## For example:
+## extraEnv:
+##   - name: FOO
+##     value: "bar"
+##
+# extraEnv:
+extraEnv: []
+
+## Name of a ConfigMap containing extra env vars
+##
+# extraEnvVarsCM:
+
+## Specify extra initdb args
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+# postgresqlInitdbArgs:
+
+## Specify a custom location for the PostgreSQL transaction log
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+# postgresqlInitdbWalDir:
+
+## PostgreSQL configuration
+## Specify runtime configuration parameters as a dict, using camelCase, e.g.
+## {"sharedBuffers": "500MB"}
+## Alternatively, you can put your postgresql.conf under the files/ directory
+## ref: https://www.postgresql.org/docs/current/static/runtime-config.html
+##
+# postgresqlConfiguration:
+
+## PostgreSQL extended configuration
+## As above, but _appended_ to the main configuration
+## Alternatively, you can put your *.conf under the files/conf.d/ directory
+## https://github.com/bitnami/bitnami-docker-postgresql#allow-settings-to-be-loaded-from-files-other-than-the-default-postgresqlconf
+##
+# postgresqlExtendedConf:
+
+## Configure current cluster's primary server to be the standby server in other cluster.
+## This will allow cross cluster replication and provide cross cluster high availability.
+## You will need to configure pgHbaConfiguration if you want to enable this feature with local cluster replication enabled.
+##
+primaryAsStandBy:
+  enabled: false
+  #  primaryHost:
+  #  primaryPort:
+
+## PostgreSQL client authentication configuration
+## Specify content for pg_hba.conf
+## Default: do not create pg_hba.conf
+## Alternatively, you can put your pg_hba.conf under the files/ directory
+# pgHbaConfiguration: |-
+#   local all all trust
+#   host all all localhost trust
+#   host mydatabase mysuser 192.168.0.0/24 md5
+
+## ConfigMap with PostgreSQL configuration
+## NOTE: This will override postgresqlConfiguration and pgHbaConfiguration
+# configurationConfigMap:
+
+## ConfigMap with PostgreSQL extended configuration
+# extendedConfConfigMap:
+
+## initdb scripts
+## Specify dictionary of scripts to be run at first boot
+## Alternatively, you can put your scripts under the files/docker-entrypoint-initdb.d directory
+##
+# initdbScripts:
+#   my_init_script.sh: |
+#      #!/bin/sh
+#      echo "Do something."
+
+## ConfigMap with scripts to be run at first boot
+## NOTE: This will override initdbScripts
+# initdbScriptsConfigMap:
+
+## Secret with scripts to be run at first boot (in case it contains sensitive information)
+## NOTE: This can work along initdbScripts or initdbScriptsConfigMap
+# initdbScriptsSecret:
+
+## Specify the PostgreSQL username and password to execute the initdb scripts
+# initdbUser:
+# initdbPassword:
+
+## Audit settings
+## https://github.com/bitnami/bitnami-docker-postgresql#auditing
+##
+audit:
+  ## Log client hostnames
+  ##
+  logHostname: false
+  ## Log connections to the server
+  ##
+  logConnections: false
+  ## Log disconnections
+  ##
+  logDisconnections: false
+  ## Operation to audit using pgAudit (default if not set)
+  ##
+  pgAuditLog: ""
+  ## Log catalog using pgAudit
+  ##
+  pgAuditLogCatalog: "off"
+  ## Log level for clients
+  ##
+  clientMinMessages: error
+  ## Template for log line prefix (default if not set)
+  ##
+  logLinePrefix: ""
+  ## Log timezone
+  ##
+  logTimezone: ""
+
+## Shared preload libraries
+##
+postgresqlSharedPreloadLibraries: "pgaudit"
+
+## Maximum total connections
+##
+postgresqlMaxConnections:
+
+## Maximum connections for the postgres user
+##
+postgresqlPostgresConnectionLimit:
+
+## Maximum connections for the created user
+##
+postgresqlDbUserConnectionLimit:
+
+## TCP keepalives interval
+##
+postgresqlTcpKeepalivesInterval:
+
+## TCP keepalives idle
+##
+postgresqlTcpKeepalivesIdle:
+
+## TCP keepalives count
+##
+postgresqlTcpKeepalivesCount:
+
+## Statement timeout
+##
+postgresqlStatementTimeout:
+
+## Remove pg_hba.conf lines with the following comma-separated patterns
+## (cannot be used with custom pg_hba.conf)
+##
+postgresqlPghbaRemoveFilters:
+
+## Optional duration in seconds the pod needs to terminate gracefully.
+## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods
+##
+# terminationGracePeriodSeconds: 30
+
+## LDAP configuration
+##
+ldap:
+  enabled: false
+  url: ''
+  server: ''
+  port: ''
+  prefix: ''
+  suffix: ''
+  baseDN: ''
+  bindDN: ''
+  bind_password:
+  search_attr: ''
+  search_filter: ''
+  scheme: ''
+  tls: {}
+
+## PostgreSQL service configuration
+##
+service:
+  ## PosgresSQL service type
+  ##
+  type: ClusterIP
+  # clusterIP: None
+  port: 5432
+
+  ## Specify the nodePort value for the LoadBalancer and NodePort service types.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
+  ##
+  # nodePort:
+
+  ## Provide any additional annotations which may be required. Evaluated as a template.
+  ##
+  annotations: {}
+  ## Set the LoadBalancer service type to internal only.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
+  ##
+  # loadBalancerIP:
+  ## Load Balancer sources. Evaluated as a template.
+  ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service
+  ##
+  # loadBalancerSourceRanges:
+  # - 10.10.10.0/24
+
+## Start primary and read(s) pod(s) without limitations on shm memory.
+## By default docker and containerd (and possibly other container runtimes)
+## limit `/dev/shm` to `64M` (see e.g. the
+## [docker issue](https://github.com/docker-library/postgres/issues/416) and the
+## [containerd issue](https://github.com/containerd/containerd/issues/3654),
+## which could be not enough if PostgreSQL uses parallel workers heavily.
+##
+shmVolume:
+  ## Set `shmVolume.enabled` to `true` to mount a new tmpfs volume to remove
+  ## this limitation.
+  ##
+  enabled: true
+  ## Set to `true` to `chmod 777 /dev/shm` on a initContainer.
+  ## This option is ignored if `volumePermissions.enabled` is `false`
+  ##
+  chmod:
+    enabled: true
+
+## PostgreSQL data Persistent Volume Storage Class
+## If defined, storageClassName: <storageClass>
+## If set to "-", storageClassName: "", which disables dynamic provisioning
+## If undefined (the default) or set to null, no storageClassName spec is
+##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+##   GKE, AWS & OpenStack)
+##
+persistence:
+  enabled: true
+  ## A manually managed Persistent Volume and Claim
+  ## If defined, PVC must be created manually before volume will be bound
+  ## The value is evaluated as a template, so, for example, the name can depend on .Release or .Chart
+  ##
+  # existingClaim:
+
+  ## The path the volume will be mounted at, useful when using different
+  ## PostgreSQL images.
+  ##
+  mountPath: /bitnami/postgresql
+
+  ## The subdirectory of the volume to mount to, useful in dev environments
+  ## and one PV for multiple services.
+  ##
+  subPath: ''
+
+  # storageClass: "-"
+  accessModes:
+    - ReadWriteOnce
+  size: 8Gi
+  annotations: {}
+  ## selector can be used to match an existing PersistentVolume
+  ## selector:
+  ##   matchLabels:
+  ##     app: my-app
+  selector: {}
+
+## updateStrategy for PostgreSQL StatefulSet and its reads StatefulSets
+## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
+##
+updateStrategy:
+  type: RollingUpdate
+
+##
+## PostgreSQL Primary parameters
+##
+primary:
+  ## PostgreSQL Primary pod affinity preset
+  ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
+  ## Allowed values: soft, hard
+  ##
+  podAffinityPreset: ""
+
+  ## PostgreSQL Primary pod anti-affinity preset
+  ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
+  ## Allowed values: soft, hard
+  ##
+  podAntiAffinityPreset: soft
+
+  ## PostgreSQL Primary node affinity preset
+  ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity
+  ## Allowed values: soft, hard
+  ##
+  nodeAffinityPreset:
+    ## Node affinity type
+    ## Allowed values: soft, hard
+    type: ""
+    ## Node label key to match
+    ## E.g.
+    ## key: "kubernetes.io/e2e-az-name"
+    ##
+    key: ""
+    ## Node label values to match
+    ## E.g.
+    ## values:
+    ##   - e2e-az1
+    ##   - e2e-az2
+    ##
+    values: []
+
+  ## Affinity for PostgreSQL primary pods assignment
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ## Note: primary.podAffinityPreset, primary.podAntiAffinityPreset, and primary.nodeAffinityPreset will be ignored when it's set
+  ##
+  affinity: {}
+
+  ## Node labels for PostgreSQL primary pods assignment
+  ## ref: https://kubernetes.io/docs/user-guide/node-selection/
+  ##
+  nodeSelector: {}
+
+  ## Tolerations for PostgreSQL primary pods assignment
+  ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  ##
+  tolerations: []
+
+  labels: {}
+  annotations: {}
+  podLabels: {}
+  podAnnotations: {}
+  priorityClassName: ''
+  ## Extra init containers
+  ## Example
+  ##
+  ## extraInitContainers:
+  ##   - name: do-something
+  ##     image: busybox
+  ##     command: ['do', 'something']
+  ##
+  extraInitContainers: []
+
+  ## Additional PostgreSQL primary Volume mounts
+  ##
+  extraVolumeMounts: []
+  ## Additional PostgreSQL primary Volumes
+  ##
+  extraVolumes: []
+  ## Add sidecars to the pod
+  ##
+  ## For example:
+  ## sidecars:
+  ##   - name: your-image-name
+  ##     image: your-image
+  ##     imagePullPolicy: Always
+  ##     ports:
+  ##       - name: portname
+  ##         containerPort: 1234
+  ##
+  sidecars: []
+
+  ## Override the service configuration for primary
+  ##
+  service: {}
+  # type:
+  # nodePort:
+  # clusterIP:
+
+##
+## PostgreSQL read only replica parameters
+##
+readReplicas:
+  ## PostgreSQL read only pod affinity preset
+  ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
+  ## Allowed values: soft, hard
+  ##
+  podAffinityPreset: ""
+
+  ## PostgreSQL read only pod anti-affinity preset
+  ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
+  ## Allowed values: soft, hard
+  ##
+  podAntiAffinityPreset: soft
+
+  ## PostgreSQL read only node affinity preset
+  ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity
+  ## Allowed values: soft, hard
+  ##
+  nodeAffinityPreset:
+    ## Node affinity type
+    ## Allowed values: soft, hard
+    type: ""
+    ## Node label key to match
+    ## E.g.
+    ## key: "kubernetes.io/e2e-az-name"
+    ##
+    key: ""
+    ## Node label values to match
+    ## E.g.
+    ## values:
+    ##   - e2e-az1
+    ##   - e2e-az2
+    ##
+    values: []
+
+  ## Affinity for PostgreSQL read only pods assignment
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ## Note: readReplicas.podAffinityPreset, readReplicas.podAntiAffinityPreset, and readReplicas.nodeAffinityPreset will be ignored when it's set
+  ##
+  affinity: {}
+
+  ## Node labels for PostgreSQL read only  pods assignment
+  ## ref: https://kubernetes.io/docs/user-guide/node-selection/
+  ##
+  nodeSelector: {}
+
+  ## Tolerations for PostgreSQL read only  pods assignment
+  ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  ##
+  tolerations: []
+  labels: {}
+  annotations: {}
+  podLabels: {}
+  podAnnotations: {}
+  priorityClassName: ''
+
+  ## Extra init containers
+  ## Example
+  ##
+  ## extraInitContainers:
+  ##   - name: do-something
+  ##     image: busybox
+  ##     command: ['do', 'something']
+  ##
+  extraInitContainers: []
+
+  ## Additional PostgreSQL read replicas Volume mounts
+  ##
+  extraVolumeMounts: []
+
+  ## Additional PostgreSQL read replicas Volumes
+  ##
+  extraVolumes: []
+
+  ## Add sidecars to the pod
+  ##
+  ## For example:
+  ## sidecars:
+  ##   - name: your-image-name
+  ##     image: your-image
+  ##     imagePullPolicy: Always
+  ##     ports:
+  ##       - name: portname
+  ##         containerPort: 1234
+  ##
+  sidecars: []
+
+  ## Override the service configuration for read
+  ##
+  service: {}
+  # type:
+  # nodePort:
+  # clusterIP:
+
+  ## Whether to enable PostgreSQL read replicas data Persistent
+  ##
+  persistence:
+    enabled: true
+
+  # Override the resource configuration for read replicas
+  resources: {}
+  # requests:
+  #   memory: 256Mi
+  #   cpu: 250m
+
+## Configure resource requests and limits
+## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+##
+resources:
+  requests:
+    memory: 256Mi
+    cpu: 250m
+
+## Add annotations to all the deployed resources
+##
+commonAnnotations: {}
+
+networkPolicy:
+  ## Enable creation of NetworkPolicy resources. Only Ingress traffic is filtered for now.
+  ##
+  enabled: false
+
+  ## The Policy model to apply. When set to false, only pods with the correct
+  ## client label will have network access to the port PostgreSQL is listening
+  ## on. When true, PostgreSQL will accept connections from any source
+  ## (with the correct destination port).
+  ##
+  allowExternal: true
+
+  ## if explicitNamespacesSelector is missing or set to {}, only client Pods that are in the networkPolicy's namespace
+  ## and that match other criteria, the ones that have the good label, can reach the DB.
+  ## But sometimes, we want the DB to be accessible to clients from other namespaces, in this case, we can use this
+  ## LabelSelector to select these namespaces, note that the networkPolicy's namespace should also be explicitly added.
+  ##
+  ## Example:
+  ## explicitNamespacesSelector:
+  ##   matchLabels:
+  ##     role: frontend
+  ##   matchExpressions:
+  ##    - {key: role, operator: In, values: [frontend]}
+  ##
+  explicitNamespacesSelector: {}
+
+## Configure extra options for startup, liveness and readiness probes
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
+##
+startupProbe:
+  enabled: false
+  initialDelaySeconds: 30
+  periodSeconds: 15
+  timeoutSeconds: 5
+  failureThreshold: 10
+  successThreshold: 1
+
+livenessProbe:
+  enabled: true
+  initialDelaySeconds: 30
+  periodSeconds: 10
+  timeoutSeconds: 5
+  failureThreshold: 6
+  successThreshold: 1
+
+readinessProbe:
+  enabled: true
+  initialDelaySeconds: 5
+  periodSeconds: 10
+  timeoutSeconds: 5
+  failureThreshold: 6
+  successThreshold: 1
+
+## Custom Startup probe
+##
+customStartupProbe: {}
+
+## Custom Liveness probe
+##
+customLivenessProbe: {}
+
+## Custom Rediness probe
+##
+customReadinessProbe: {}
+
+##
+## TLS configuration
+##
+tls:
+  # Enable TLS traffic
+  enabled: false
+  #
+  # Whether to use the server's TLS cipher preferences rather than the client's.
+  preferServerCiphers: true
+  #
+  # Name of the Secret that contains the certificates
+  certificatesSecret: ''
+  #
+  # Certificate filename
+  certFilename: ''
+  #
+  # Certificate Key filename
+  certKeyFilename: ''
+  #
+  # CA Certificate filename
+  # If provided, PostgreSQL will authenticate TLS/SSL clients by requesting them a certificate
+  # ref: https://www.postgresql.org/docs/9.6/auth-methods.html
+  certCAFilename:
+  #
+  # File containing a Certificate Revocation List
+  crlFilename:
+
+## Configure metrics exporter
+##
+metrics:
+  enabled: false
+  # resources: {}
+  service:
+    type: ClusterIP
+    annotations:
+      prometheus.io/scrape: 'true'
+      prometheus.io/port: '9187'
+    loadBalancerIP:
+  serviceMonitor:
+    enabled: false
+    additionalLabels: {}
+    # namespace: monitoring
+    # interval: 30s
+    # scrapeTimeout: 10s
+  ## Custom PrometheusRule to be defined
+  ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
+  ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions
+  ##
+  prometheusRule:
+    enabled: false
+    additionalLabels: {}
+    namespace: ''
+    ## These are just examples rules, please adapt them to your needs.
+    ## Make sure to constraint the rules to the current postgresql service.
+    ## rules:
+    ##   - alert: HugeReplicationLag
+    ##     expr: pg_replication_lag{service="{{ template "common.names.fullname" . }}-metrics"} / 3600 > 1
+    ##     for: 1m
+    ##     labels:
+    ##       severity: critical
+    ##     annotations:
+    ##       description: replication for {{ template "common.names.fullname" . }} PostgreSQL is lagging by {{ "{{ $value }}" }} hour(s).
+    ##       summary: PostgreSQL replication is lagging by {{ "{{ $value }}" }} hour(s).
+    ##
+    rules: []
+
+  image:
+    registry: docker.io
+    repository: bitnami/postgres-exporter
+    tag: 0.9.0-debian-10-r43
+    pullPolicy: IfNotPresent
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+  ## Define additional custom metrics
+  ## ref: https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file
+  # customMetrics:
+  #   pg_database:
+  #     query: "SELECT d.datname AS name, CASE WHEN pg_catalog.has_database_privilege(d.datname, 'CONNECT') THEN pg_catalog.pg_database_size(d.datname) ELSE 0 END AS size_bytes FROM pg_catalog.pg_database d where datname not in ('template0', 'template1', 'postgres')"
+  #     metrics:
+  #       - name:
+  #           usage: "LABEL"
+  #           description: "Name of the database"
+  #       - size_bytes:
+  #           usage: "GAUGE"
+  #           description: "Size of the database in bytes"
+  #
+  ## An array to add extra env vars to configure postgres-exporter
+  ## see: https://github.com/wrouesnel/postgres_exporter#environment-variables
+  ## For example:
+  #  extraEnvVars:
+  #  - name: PG_EXPORTER_DISABLE_DEFAULT_METRICS
+  #    value: "true"
+  extraEnvVars: {}
+
+  ## Pod Security Context
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+  ##
+  securityContext:
+    enabled: false
+    runAsUser: 1001
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
+  ## Configure extra options for liveness and readiness probes
+  ##
+  livenessProbe:
+    enabled: true
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 6
+    successThreshold: 1
+
+  readinessProbe:
+    enabled: true
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 6
+    successThreshold: 1
+
+## Array with extra yaml to deploy with the chart. Evaluated as a template
+##
+extraDeploy: []
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/access-tls-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/access-tls-values.yaml
new file mode 100644
index 000000000..1a8c4698d
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/access-tls-values.yaml
@@ -0,0 +1,24 @@
+databaseUpgradeReady: true
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  persistence:
+    enabled: false
+  resources:
+    requests:
+      memory: "4Gi"
+      cpu: "2"
+    limits:
+      memory: "6Gi"
+      cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "4g"
+access:
+  accessConfig:
+    security:
+      tls: true
+  resetAccessCAKeys: true
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/default-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/default-values.yaml
new file mode 100644
index 000000000..fc3469399
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/default-values.yaml
@@ -0,0 +1,21 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+databaseUpgradeReady: true
+
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  persistence:
+    enabled: false
+  resources:
+    requests:
+      memory: "4Gi"
+      cpu: "2"
+    limits:
+      memory: "6Gi"
+      cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "4g"
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/derby-test-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/derby-test-values.yaml
new file mode 100644
index 000000000..82ff48545
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/derby-test-values.yaml
@@ -0,0 +1,19 @@
+databaseUpgradeReady: true
+
+postgresql:
+  enabled: false
+artifactory:
+  podSecurityContext:
+    fsGroupChangePolicy: "OnRootMismatch"
+  persistence:
+    enabled: false
+  resources:
+    requests:
+      memory: "4Gi"
+      cpu: "2"
+    limits:
+      memory: "6Gi"
+      cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "4g"
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/global-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/global-values.yaml
new file mode 100644
index 000000000..33bbf04a2
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/global-values.yaml
@@ -0,0 +1,247 @@
+databaseUpgradeReady: true
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  persistence:
+    enabled: false
+  resources:
+    requests:
+      memory: "4Gi"
+      cpu: "2"
+    limits:
+      memory: "6Gi"
+      cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "4g"
+  customInitContainersBegin: |
+   - name: "custom-init-begin-local"
+     image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     command:
+       - 'sh'
+       - '-c'
+       - echo "running in local"
+     volumeMounts:
+       - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+         name: artifactory-volume
+  customInitContainers: |
+   - name: "custom-init-local"
+     image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     command:
+       - 'sh'
+       - '-c'
+       - echo "running in local"
+     volumeMounts:
+       - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+         name: artifactory-volume
+  # Add custom volumes
+  customVolumes: |
+   - name: custom-script-local
+     emptyDir:
+       sizeLimit: 100Mi
+  # Add custom volumesMounts
+  customVolumeMounts: |
+   - name: custom-script-local
+     mountPath: "/scriptslocal"
+  # Add custom sidecar containers
+  customSidecarContainers: |
+   - name: "sidecar-list-local"
+     image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     securityContext:
+       allowPrivilegeEscalation: false
+       capabilities:
+         drop:
+           - NET_RAW
+     command: ["sh","-c","echo 'Sidecar is running in local' >> /scriptslocal/sidecarlocal.txt; cat /scriptslocal/sidecarlocal.txt; while true; do sleep 30; done"]
+     volumeMounts:
+       - mountPath: "/scriptslocal"
+         name: custom-script-local
+     resources:
+       requests:
+         memory: "32Mi"
+         cpu: "50m"
+       limits:
+         memory: "128Mi"
+         cpu: "100m"
+
+global:
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+  customInitContainersBegin: |
+   - name: "custom-init-begin-global"
+     image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     command:
+       - 'sh'
+       - '-c'
+       - echo "running in global"
+     volumeMounts:
+       - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+         name: artifactory-volume
+  customInitContainers: |
+   - name: "custom-init-global"
+     image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     command:
+       - 'sh'
+       - '-c'
+       - echo "running in global"
+     volumeMounts:
+       - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+         name: artifactory-volume
+  # Add custom volumes
+  customVolumes: |
+   - name: custom-script-global
+     emptyDir:
+       sizeLimit: 100Mi
+  # Add custom volumesMounts
+  customVolumeMounts: |
+   - name: custom-script-global
+     mountPath: "/scripts"
+  # Add custom sidecar containers
+  customSidecarContainers: |
+   - name: "sidecar-list-global"
+     image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     securityContext:
+       allowPrivilegeEscalation: false
+       capabilities:
+         drop:
+           - NET_RAW
+     command: ["sh","-c","echo 'Sidecar is running in global' >> /scripts/sidecarglobal.txt; cat /scripts/sidecarglobal.txt; while true; do sleep 30; done"]
+     volumeMounts:
+       - mountPath: "/scripts"
+         name: custom-script-global
+     resources:
+       requests:
+         memory: "32Mi"
+         cpu: "50m"
+       limits:
+         memory: "128Mi"
+         cpu: "100m"
+
+nginx:
+  customInitContainers: |
+   - name: "custom-init-begin-nginx"
+     image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     command:
+       - 'sh'
+       - '-c'
+       - echo "running in nginx"
+     volumeMounts:
+       - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+         name: custom-script-local
+  customSidecarContainers: |
+   - name: "sidecar-list-nginx"
+     image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+     securityContext:
+       allowPrivilegeEscalation: false
+       capabilities:
+         drop:
+           - NET_RAW
+     command: ["sh","-c","echo 'Sidecar is running in local' >> /scriptslocal/sidecarlocal.txt; cat /scriptslocal/sidecarlocal.txt; while true; do sleep 30; done"]
+     volumeMounts:
+       - mountPath: "/scriptslocal"
+         name: custom-script-local
+     resources:
+       requests:
+         memory: "32Mi"
+         cpu: "50m"
+       limits:
+         memory: "128Mi"
+         cpu: "100m"
+  # Add custom volumes
+  customVolumes: |
+   - name: custom-script-local
+     emptyDir:
+       sizeLimit: 100Mi
+
+  artifactoryConf: |
+    {{- if .Values.nginx.https.enabled }}
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+    ssl_certificate  {{ .Values.nginx.persistence.mountPath }}/ssl/tls.crt;
+    ssl_certificate_key  {{ .Values.nginx.persistence.mountPath }}/ssl/tls.key;
+    ssl_session_cache shared:SSL:1m;
+    ssl_prefer_server_ciphers   on;
+    {{- end }}
+    ## server configuration
+    server {
+      listen 8088;
+    {{- if .Values.nginx.internalPortHttps }}
+      listen {{ .Values.nginx.internalPortHttps }} ssl;
+    {{- else -}}
+      {{- if .Values.nginx.https.enabled }}
+      listen {{ .Values.nginx.https.internalPort }} ssl;
+      {{- end }}
+    {{- end }}
+    {{- if .Values.nginx.internalPortHttp }}
+      listen {{ .Values.nginx.internalPortHttp }};
+    {{- else -}}
+      {{- if .Values.nginx.http.enabled }}
+      listen {{ .Values.nginx.http.internalPort }};
+      {{- end }}
+    {{- end }}
+      server_name ~(?<repo>.+)\.{{ include "artifactory.fullname" . }} {{ include "artifactory.fullname" . }}
+      {{- range .Values.ingress.hosts -}}
+        {{- if contains "." . -}}
+          {{ "" | indent 0 }} ~(?<repo>.+)\.{{ . }}
+        {{- end -}}
+      {{- end -}};
+
+      if ($http_x_forwarded_proto = '') {
+        set $http_x_forwarded_proto  $scheme;
+      }
+      ## Application specific logs
+      ## access_log /var/log/nginx/artifactory-access.log timing;
+      ## error_log /var/log/nginx/artifactory-error.log;
+      rewrite ^/artifactory/?$ / redirect;
+      if ( $repo != "" ) {
+        rewrite ^/(v1|v2)/(.*) /artifactory/api/docker/$repo/$1/$2 break;
+      }
+      chunked_transfer_encoding on;
+      client_max_body_size 0;
+
+      location / {
+        proxy_read_timeout  900;
+        proxy_pass_header   Server;
+        proxy_cookie_path   ~*^/.* /;
+        proxy_pass          {{ include "artifactory.scheme" . }}://{{ include "artifactory.fullname" . }}:{{ .Values.artifactory.externalPort }}/;
+        {{- if .Values.nginx.service.ssloffload}}
+        proxy_set_header    X-JFrog-Override-Base-Url $http_x_forwarded_proto://$host;
+        {{- else }}
+        proxy_set_header    X-JFrog-Override-Base-Url $http_x_forwarded_proto://$host:$server_port;
+        proxy_set_header    X-Forwarded-Port  $server_port;
+        {{- end }}
+        proxy_set_header    X-Forwarded-Proto $http_x_forwarded_proto;
+        proxy_set_header    Host              $http_host;
+        proxy_set_header    X-Forwarded-For   $proxy_add_x_forwarded_for;
+        add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
+
+        location /artifactory/ {
+          if ( $request_uri ~ ^/artifactory/(.*)$ ) {
+            proxy_pass       {{ include "artifactory.scheme" . }}://{{ include "artifactory.fullname" . }}:{{ .Values.artifactory.externalArtifactoryPort }}/artifactory/$1;
+          }
+          proxy_pass         {{ include "artifactory.scheme" . }}://{{ include "artifactory.fullname" . }}:{{ .Values.artifactory.externalArtifactoryPort }}/artifactory/;
+        }
+      }
+    }
+
+  ## A list of custom ports to expose on the NGINX pod. Follows the conventional Kubernetes yaml syntax for container ports.
+  customPorts:
+  - containerPort: 8088
+    name: http2
+  service:
+    ## A list of custom ports to expose through the Ingress controller service. Follows the conventional Kubernetes yaml syntax for service ports.
+    customPorts:
+    - port: 8088
+      targetPort: 8088
+      protocol: TCP
+      name: http2
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/large-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/large-values.yaml
new file mode 100644
index 000000000..94a485d6f
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/large-values.yaml
@@ -0,0 +1,82 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+databaseUpgradeReady: true
+
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  persistence:
+    enabled: false
+  database:
+    maxOpenConnections: 150
+  tomcat:
+    connector:
+      maxThreads: 300
+  resources:
+    requests:
+      memory: "6Gi"
+      cpu: "2"
+    limits:
+      memory: "10Gi"
+      cpu: "8"
+  javaOpts:
+    xms: "8g"
+    xmx: "10g"
+access:
+  database:
+    maxOpenConnections: 150
+  tomcat:
+    connector:
+      maxThreads: 100
+router:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+frontend:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+metadata:
+  database:
+    maxOpenConnections: 150
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+event:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+jfconnect:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+observability:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/loggers-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/loggers-values.yaml
new file mode 100644
index 000000000..03c94be95
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/loggers-values.yaml
@@ -0,0 +1,43 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+databaseUpgradeReady: true
+
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  persistence:
+    enabled: false
+  resources:
+    requests:
+      memory: "4Gi"
+      cpu: "2"
+    limits:
+      memory: "6Gi"
+      cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "4g"
+
+  loggers:
+  - access-audit.log
+  - access-request.log
+  - access-security-audit.log
+  - access-service.log
+  - artifactory-access.log
+  - artifactory-event.log
+  - artifactory-import-export.log
+  - artifactory-request.log
+  - artifactory-service.log
+  - frontend-request.log
+  - frontend-service.log
+  - metadata-request.log
+  - metadata-service.log
+  - router-request.log
+  - router-service.log
+  - router-traefik.log
+
+  catalinaLoggers:
+  - tomcat-catalina.log
+  - tomcat-localhost.log
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/medium-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/medium-values.yaml
new file mode 100644
index 000000000..35044dc36
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/medium-values.yaml
@@ -0,0 +1,82 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+databaseUpgradeReady: true
+
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  persistence:
+    enabled: false
+  database:
+    maxOpenConnections: 100
+  tomcat:
+    connector:
+      maxThreads: 200
+  resources:
+    requests:
+      memory: "4Gi"
+      cpu: "2"
+    limits:
+      memory: "8Gi"
+      cpu: "6"
+  javaOpts:
+    xms: "6g"
+    xmx: "8g"
+access:
+  database:
+    maxOpenConnections: 100
+  tomcat:
+    connector:
+      maxThreads: 50
+router:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+frontend:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+metadata:
+  database:
+    maxOpenConnections: 100
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+event:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+jfconnect:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+observability:
+  resources:
+    requests:
+      memory: "200Mi"
+      cpu: "200m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/migration-disabled-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/migration-disabled-values.yaml
new file mode 100644
index 000000000..092756fb6
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/migration-disabled-values.yaml
@@ -0,0 +1,21 @@
+databaseUpgradeReady: true
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  migration:
+    enabled: false
+  persistence:
+    enabled: false
+  resources:
+    requests:
+      memory: "4Gi"
+      cpu: "2"
+    limits:
+      memory: "6Gi"
+      cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "4g"
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/nginx-autoreload-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/nginx-autoreload-values.yaml
new file mode 100644
index 000000000..09616c5bf
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/nginx-autoreload-values.yaml
@@ -0,0 +1,42 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+databaseUpgradeReady: true
+
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  persistence:
+    enabled: false
+  resources:
+    requests:
+      memory: "4Gi"
+      cpu: "2"
+    limits:
+      memory: "6Gi"
+      cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "4g"
+
+nginx:
+  customVolumes: |
+    - name: scripts
+      configMap:
+        name: {{ template "artifactory.fullname" . }}-nginx-scripts
+        defaultMode: 0550
+  customVolumeMounts: |
+    - name: scripts
+      mountPath: /var/opt/jfrog/nginx/scripts/
+  customCommand:
+    - /bin/sh
+    - -c
+    - |
+      # watch for configmap changes
+      /sbin/inotifyd /var/opt/jfrog/nginx/scripts/configreloader.sh {{ .Values.nginx.persistence.mountPath -}}/conf.d:n &
+      {{ if .Values.nginx.https.enabled -}}
+      # watch for tls secret changes
+      /sbin/inotifyd /var/opt/jfrog/nginx/scripts/configreloader.sh {{ .Values.nginx.persistence.mountPath -}}/ssl:n &
+      {{ end -}}
+      nginx -g 'daemon off;'
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/rtsplit-values-access-tls-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/rtsplit-values-access-tls-values.yaml
new file mode 100644
index 000000000..a38969a8f
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/rtsplit-values-access-tls-values.yaml
@@ -0,0 +1,96 @@
+databaseUpgradeReady: true
+artifactory:
+  joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  persistence:
+    enabled: false
+  resources:
+    requests:
+      memory: "4Gi"
+      cpu: "2"
+    limits:
+      memory: "6Gi"
+      cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "4g"
+
+access:
+  accessConfig:
+    security:
+      tls: true
+  resetAccessCAKeys: true
+
+postgresql:
+  postgresqlPassword: password
+  postgresqlExtendedConf:
+    maxConnections: 102
+  persistence:
+    enabled: false
+
+rbac:
+  create: true
+serviceAccount:
+  create: true
+  automountServiceAccountToken: true
+
+ingress:
+  enabled: true
+  className: "testclass"
+  hosts:
+    - demonow.xyz
+nginx:
+  enabled: false
+jfconnect:
+  enabled: true
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+mc:
+  enabled: true
+splitServicesToContainers: true
+
+router:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+frontend:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+metadata:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+event:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+observability:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/rtsplit-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/rtsplit-values.yaml
new file mode 100644
index 000000000..057ae9bf3
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/rtsplit-values.yaml
@@ -0,0 +1,151 @@
+databaseUpgradeReady: true
+artifactory:
+  replicaCount: 1
+  joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  persistence:
+    enabled: false
+  resources:
+    requests:
+      memory: "4Gi"
+      cpu: "2"
+    limits:
+      memory: "6Gi"
+      cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "4g"
+
+  # Add lifecycle hooks for artifactory container
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the artifactory postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the artifactory postStart handler >> /tmp/message"]
+
+postgresql:
+  postgresqlPassword: password
+  postgresqlExtendedConf:
+    maxConnections: 100
+  persistence:
+    enabled: false
+
+rbac:
+  create: true
+serviceAccount:
+  create: true
+  automountServiceAccountToken: true
+
+ingress:
+  enabled: true
+  className: "testclass"
+  hosts:
+    - demonow.xyz
+nginx:
+  enabled: false
+jfconnect:
+  enabled: true
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+  # Add lifecycle hooks for jfconect container
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the jfconnect postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the jfconnect postStart handler >> /tmp/message"]
+
+
+mc:
+  enabled: true
+splitServicesToContainers: true
+
+router:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+  # Add lifecycle hooks for router container
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the router postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the router postStart handler >> /tmp/message"]
+
+frontend:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+  # Add lifecycle hooks for frontend container
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the frontend postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the frontend postStart handler >> /tmp/message"]
+
+metadata:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the metadata postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the metadata postStart handler >> /tmp/message"]
+
+event:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the event postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the event postStart handler >> /tmp/message"]
+
+observability:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the observability postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the observability postStart handler >> /tmp/message"]
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/small-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/small-values.yaml
new file mode 100644
index 000000000..70d77790a
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/small-values.yaml
@@ -0,0 +1,82 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+databaseUpgradeReady: true
+
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  persistence:
+    enabled: false
+  database:
+    maxOpenConnections: 80
+  tomcat:
+    connector:
+      maxThreads: 200
+  resources:
+    requests:
+      memory: "4Gi"
+      cpu: "2"
+    limits:
+      memory: "6Gi"
+      cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "6g"
+access:
+  database:
+    maxOpenConnections: 80
+  tomcat:
+    connector:
+      maxThreads: 50
+router:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+frontend:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+metadata:
+  database:
+    maxOpenConnections: 80
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+event:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+jfconnect:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+observability:
+  resources:
+    requests:
+      memory: "100Mi"
+      cpu: "100m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/test-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/test-values.yaml
new file mode 100644
index 000000000..d2beb0eff
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/ci/test-values.yaml
@@ -0,0 +1,84 @@
+databaseUpgradeReady: true
+artifactory:
+  replicaCount: 3
+  joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+  masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  unifiedSecretInstallation: false
+  metrics:
+    enabled: true
+  persistence:
+    enabled: false
+  resources:
+    requests:
+      memory: "4Gi"
+      cpu: "2"
+    limits:
+      memory: "6Gi"
+      cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "4g"
+  statefulset:
+    annotations:
+      artifactory: test
+
+postgresql:
+  postgresqlPassword: password
+  postgresqlExtendedConf:
+    maxConnections: 100
+  persistence:
+    enabled: false
+
+rbac:
+  create: true
+serviceAccount:
+  create: true
+  automountServiceAccountToken: true
+
+ingress:
+  enabled: true
+  className: "testclass"
+  hosts:
+    - demonow.xyz
+nginx:
+  enabled: false
+
+jfconnect:
+  enabled: false
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 3
+  targetCPUUtilizationPercentage: 70
+
+## filebeat sidecar
+filebeat:
+  enabled: true
+  filebeatYml: |
+    logging.level: info
+    path.data: {{ .Values.artifactory.persistence.mountPath }}/log/filebeat
+    name: artifactory-filebeat
+    queue.spool:
+      file:
+        permissions: 0760
+    filebeat.inputs:
+    - type: log
+      enabled: true
+      close_eof: ${CLOSE:false}
+      paths:
+         - {{ .Values.artifactory.persistence.mountPath }}/log/*.log
+      fields:
+        service: "jfrt"
+        log_type: "artifactory"
+    output.file:
+      path: "/tmp/filebeat"
+      filename: filebeat
+  readinessProbe:
+    exec:
+      command:
+        - sh
+        - -c
+        - |
+          #!/usr/bin/env bash -e
+          curl --fail 127.0.0.1:5066
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/binarystore.xml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/binarystore.xml
new file mode 100644
index 000000000..8d71072e2
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/binarystore.xml
@@ -0,0 +1,429 @@
+{{- if eq .Values.artifactory.persistence.type "nfs" -}}
+<config version="2">
+    {{- if  (.Values.artifactory.persistence.maxCacheSize) }}
+    <chain> <!--template="file-system"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="file-system" type="file-system"/>
+        </provider>
+    </chain>
+    {{- else }}
+    <chain> <!--template="file-system"-->
+        <provider id="file-system" type="file-system"/>
+    </chain>
+    {{- end }}
+
+    {{- if .Values.artifactory.persistence.maxCacheSize }}
+    <provider id="cache-fs" type="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+    {{- end }}
+
+    <provider id="file-system" type="file-system">
+        <fileStoreDir>{{ .Values.artifactory.persistence.nfs.dataDir }}/filestore</fileStoreDir>
+    </provider>
+</config>
+{{- end }}
+{{- if eq .Values.artifactory.persistence.type "file-system" -}}
+<!-- File system filestore -->
+<config version="v1">
+    <chain> <!--template="file-system"-->
+        {{- if .Values.artifactory.persistence.fileSystem.cache.enabled }}
+        <provider id="cache-fs" type="cache-fs">
+        {{- end }}
+            <provider id="file-system" type="file-system"/>
+        {{- if .Values.artifactory.persistence.fileSystem.cache.enabled }}
+        </provider>
+        {{- end }}
+    </chain>
+
+    {{- if .Values.artifactory.persistence.fileSystem.cache.enabled }}
+    <provider id="cache-fs" type="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+    {{- end }}
+</config>
+{{- end }}
+{{- if eq .Values.artifactory.persistence.type "cluster-file-system" -}}
+<!-- Cluster File system filestore -->
+<config version="2">
+    <chain> <!--template="cluster-file-system"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="sharding-cluster" type="sharding-cluster">
+                <readBehavior>crossNetworkStrategy</readBehavior>
+                <writeBehavior>crossNetworkStrategy</writeBehavior>
+                <redundancy>{{ .Values.artifactory.persistence.redundancy }}</redundancy>
+                <lenientLimit>{{ .Values.artifactory.persistence.lenientLimit }}</lenientLimit>
+                <minSpareUploaderExecutor>2</minSpareUploaderExecutor>
+                <sub-provider id="state-aware" type="state-aware"/>
+                <dynamic-provider id="remote" type="remote"/>
+                <property name="zones" value="local,remote"/>
+            </provider>
+        </provider>
+    </chain>
+
+    <provider id="cache-fs" type="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+
+    <!-- Shards add local file-system provider configuration -->
+    <provider id="state-aware" type="state-aware">
+        <fileStoreDir>shard-fs-1</fileStoreDir>
+        <zone>local</zone>
+    </provider>
+
+    <!-- Shards dynamic remote provider configuration -->
+    <provider id="remote" type="remote">
+        <checkPeriod>30</checkPeriod>
+        <serviceId>tester-remote1</serviceId>
+        <timeout>10000</timeout>
+        <zone>remote</zone>
+        <property name="header.remote.block" value="true"/>
+    </provider>
+</config>
+{{- end }}
+{{- if or (eq .Values.artifactory.persistence.type "google-storage") (eq .Values.artifactory.persistence.type "google-storage-v2") (eq .Values.artifactory.persistence.type "cluster-google-storage-v2") (eq .Values.artifactory.persistence.type "google-storage-v2-direct")  }}
+<!-- Google storage -->
+<config version="2">
+    {{- if or (eq .Values.artifactory.persistence.type "google-storage") (eq .Values.artifactory.persistence.type "google-storage-v2") }}
+    <chain> <!--template="google-storage-v2"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="eventual" type="eventual">
+                <provider id="retry" type="retry">
+                    <provider id="google-storage-v2" type="google-storage-v2"/>
+                </provider>
+            </provider>
+        </provider>
+    </chain>
+    {{- else if eq .Values.artifactory.persistence.type "cluster-google-storage-v2" }}
+    <chain> <!--template="cluster-google-storage-v2"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="sharding-cluster" type="sharding-cluster">
+                <readBehavior>crossNetworkStrategy</readBehavior>
+                <writeBehavior>crossNetworkStrategy</writeBehavior>
+                <redundancy>{{ .Values.artifactory.persistence.redundancy }}</redundancy>
+                <lenientLimit>{{ .Values.artifactory.persistence.lenientLimit }}</lenientLimit>
+                <minSpareUploaderExecutor>2</minSpareUploaderExecutor>
+                <sub-provider id="eventual-cluster" type="eventual-cluster">
+                    <provider id="retry" type="retry">
+                        <provider id="google-storage-v2" type="google-storage-v2"/>
+                    </provider>
+                </sub-provider>
+                <dynamic-provider id="remote" type="remote"/>
+                <property name="zones" value="local,remote"/>
+            </provider>
+        </provider>
+    </chain>
+    {{- else if eq .Values.artifactory.persistence.type "google-storage-v2-direct" }}
+    <chain>  <!--template="google-storage-v2-direct"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="google-storage-v2" type="google-storage-v2"/>
+        </provider>
+    </chain>
+    {{- end }}
+
+    <!-- Set max cache-fs size -->
+    <provider id="cache-fs" type="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+
+    {{- if eq .Values.artifactory.persistence.type "cluster-google-storage-v2" }}
+    <provider id="eventual-cluster" type="eventual-cluster">
+        <zone>local</zone>
+    </provider>
+
+    <provider id="remote" type="remote">
+        <checkPeriod>30</checkPeriod>
+        <timeout>10000</timeout>
+        <zone>remote</zone>
+    </provider>
+    {{- end }}
+
+    <provider id="google-storage-v2" type="google-storage-v2">
+        {{- if .Values.artifactory.persistence.googleStorage.useInstanceCredentials }}
+        <useInstanceCredentials>true</useInstanceCredentials>
+        {{- else }}
+        <useInstanceCredentials>false</useInstanceCredentials>
+        {{- end }}
+        <enableSignedUrlRedirect>{{ .Values.artifactory.persistence.googleStorage.enableSignedUrlRedirect }}</enableSignedUrlRedirect>
+        <providerId>google-cloud-storage</providerId>
+        <endpoint>{{ .Values.artifactory.persistence.googleStorage.endpoint }}</endpoint>
+        <httpsOnly>{{ .Values.artifactory.persistence.googleStorage.httpsOnly }}</httpsOnly>
+        <bucketName>{{ .Values.artifactory.persistence.googleStorage.bucketName }}</bucketName>
+        <path>{{ .Values.artifactory.persistence.googleStorage.path }}</path>
+        <bucketExists>{{ .Values.artifactory.persistence.googleStorage.bucketExists }}</bucketExists>
+        {{- if .Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds }}
+        <signedUrlExpirySeconds>{{ .Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds | int64 }}</signedUrlExpirySeconds>
+        {{- end }}
+    </provider>
+</config>
+{{- end }}
+{{- if or (eq .Values.artifactory.persistence.type "aws-s3-v3") (eq .Values.artifactory.persistence.type "s3-storage-v3-direct") (eq .Values.artifactory.persistence.type "cluster-s3-storage-v3") (eq .Values.artifactory.persistence.type "s3-storage-v3-archive")  }}
+<!-- AWS S3 V3 -->
+<config version="2">
+    {{- if eq .Values.artifactory.persistence.type "aws-s3-v3" }}
+    <chain> <!--template="s3-storage-v3"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="eventual" type="eventual">
+                <provider id="retry" type="retry">
+                    <provider id="s3-storage-v3" type="s3-storage-v3"/>
+                </provider>
+            </provider>
+        </provider>
+    </chain>
+    {{- else if eq .Values.artifactory.persistence.type "s3-storage-v3-direct" }}
+    <chain> <!--template="s3-storage-v3-direct"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="s3-storage-v3" type="s3-storage-v3"/>
+        </provider>
+    </chain>
+    {{- else if eq .Values.artifactory.persistence.type "cluster-s3-storage-v3" }}
+    <chain> <!--template="cluster-s3-storage-v3"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="sharding-cluster-eventual-s3" type="sharding-cluster">
+                <sub-provider id="eventual-cluster-s3" type="eventual-cluster">
+                    <provider id="retry-s3" type="retry">
+                        <provider id="s3-storage-v3" type="s3-storage-v3"/>
+                    </provider>
+                </sub-provider>
+                <dynamic-provider id="remote-s3" type="remote"/>
+            </provider>
+        </provider>
+    </chain>
+    {{- else if eq .Values.artifactory.persistence.type "s3-storage-v3-archive" }}
+    <!-- s3-storage-v3 default chain based on AWS S3 client for archive purposes-->
+    <chain>   <!--template="s3-storage-v3-archive"-->
+        <provider id="s3-storage-v3-archive" type="s3-storage-v3-archive">
+            <provider id="s3-storage-v3" type="s3-storage-v3"/>
+        </provider>
+    </chain>
+    {{- end }}
+
+    {{- if or (eq .Values.artifactory.persistence.type "aws-s3-v3") (eq .Values.artifactory.persistence.type "s3-storage-v3-direct") (eq .Values.artifactory.persistence.type "cluster-s3-storage-v3") }}
+    <!-- Set max cache-fs size -->
+    <provider id="cache-fs" type="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64}}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+    {{- end }}
+
+    {{- if eq .Values.artifactory.persistence.type "cluster-s3-storage-v3" }}
+    <provider id="sharding-cluster-eventual-s3" type="sharding-cluster">
+        <readBehavior>crossNetworkStrategy</readBehavior>
+        <writeBehavior>crossNetworkStrategy</writeBehavior>
+        <redundancy>{{ .Values.artifactory.persistence.redundancy }}</redundancy>
+        <lenientLimit>{{ .Values.artifactory.persistence.lenientLimit }}</lenientLimit>
+        <property name="zones" value="local,remote"/>
+    </provider>
+
+    <provider id="remote-s3" type="remote">
+        <zone>remote</zone>
+    </provider>
+
+    <provider id="eventual-cluster-s3" type="eventual-cluster">
+        <zone>local</zone>
+    </provider>
+    {{- end }}
+
+    {{- with .Values.artifactory.persistence.awsS3V3 }}
+    <provider id="s3-storage-v3" type="s3-storage-v3">
+        <testConnection>{{ .testConnection }}</testConnection>
+        {{- if .identity }}
+        <identity>{{ .identity }}</identity>
+        {{- end }}
+        {{- if .credential }}
+        <credential>{{ .credential }}</credential>
+        {{- end }}
+        <region>{{ .region }}</region>
+        <bucketName>{{ .bucketName }}</bucketName>
+        <path>{{ .path }}</path>
+        <endpoint>{{ .endpoint }}</endpoint>
+        {{- with .port }}
+        <port>{{ . }}</port>
+        {{- end }}
+        {{- with .useHttp }}
+        <useHttp>{{ . }}</useHttp>
+        {{- end }}
+        {{- with .maxConnections }}
+        <maxConnections>{{ . }}</maxConnections>
+        {{- end }}
+        {{- with .connectionTimeout }}
+        <connectionTimeout>{{ . }}</connectionTimeout>
+        {{- end }}
+        {{- with .socketTimeout }}
+        <socketTimeout>{{ . }}</socketTimeout>
+        {{- end }}
+        {{- with .kmsServerSideEncryptionKeyId }}
+        <kmsServerSideEncryptionKeyId>{{ . }}</kmsServerSideEncryptionKeyId>
+        {{- end }}
+        {{- with .kmsKeyRegion }}
+        <kmsKeyRegion>{{ . }}</kmsKeyRegion>
+        {{- end }}
+        {{- with .kmsCryptoMode }}
+        <kmsCryptoMode>{{ . }}</kmsCryptoMode>
+        {{- end }}
+        {{- if .useInstanceCredentials }}
+        <useInstanceCredentials>true</useInstanceCredentials>
+        {{- else }}
+        <useInstanceCredentials>false</useInstanceCredentials>
+        {{- end }}
+        <usePresigning>{{ .usePresigning }}</usePresigning>
+        <signatureExpirySeconds>{{ .signatureExpirySeconds }}</signatureExpirySeconds>
+        <signedUrlExpirySeconds>{{ .signedUrlExpirySeconds }}</signedUrlExpirySeconds>
+        {{- with .cloudFrontDomainName }}
+        <cloudFrontDomainName>{{ . }}</cloudFrontDomainName>
+        {{- end }}
+        {{- with .cloudFrontKeyPairId }}
+        <cloudFrontKeyPairId>{{ . }}</cloudFrontKeyPairId>
+        {{- end }}
+        {{- with .cloudFrontPrivateKey }}
+        <cloudFrontPrivateKey>{{ . }}</cloudFrontPrivateKey>
+        {{- end }}
+        {{- with .enableSignedUrlRedirect }}
+        <enableSignedUrlRedirect>{{ . }}</enableSignedUrlRedirect>
+        {{- end }}
+        {{- with .enablePathStyleAccess }}
+        <enablePathStyleAccess>{{ . }}</enablePathStyleAccess>
+        {{- end }}
+        {{- with .multiPartLimit }}
+        <multiPartLimit>{{ . | int64 }}</multiPartLimit>
+        {{- end }}
+        {{- with .multipartElementSize }}
+        <multipartElementSize>{{ . | int64 }}</multipartElementSize>
+        {{- end }}
+    </provider>
+    {{- end }}
+</config>
+{{- end }}
+
+{{- if or (eq .Values.artifactory.persistence.type "azure-blob") (eq .Values.artifactory.persistence.type "azure-blob-storage-direct") (eq .Values.artifactory.persistence.type "cluster-azure-blob-storage") }}
+<!-- Azure Blob Storage -->
+<config version="2">
+    {{- if or (eq .Values.artifactory.persistence.type "azure-blob") }}
+    <chain> <!--template="azure-blob-storage"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="eventual" type="eventual">
+                <provider id="retry-azure-blob-storage" type="retry">
+                    <provider id="azure-blob-storage" type="azure-blob-storage"/>
+                </provider>
+            </provider>
+        </provider>
+    </chain>
+    {{- else if eq .Values.artifactory.persistence.type "azure-blob-storage-direct" }}
+    <chain> <!--template="azure-blob-storage-direct"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="azure-blob-storage" type="azure-blob-storage"/>
+        </provider>
+    </chain>
+    {{- else if eq .Values.artifactory.persistence.type "cluster-azure-blob-storage" }}
+    <chain> <!--template="cluster-azure-blob-storage"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="sharding-cluster" type="sharding-cluster">
+                <sub-provider id="eventual-cluster" type="eventual-cluster">
+                    <provider id="retry-azure-blob-storage" type="retry">
+                        <provider id="azure-blob-storage" type="azure-blob-storage"/>
+                    </provider>
+                </sub-provider>
+                <dynamic-provider id="remote" type="remote"/>
+            </provider>
+        </provider>
+    </chain>
+    {{- end }}
+
+    <!-- Set max cache-fs size -->
+    <provider id="cache-fs" type="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+
+    {{- if eq .Values.artifactory.persistence.type "cluster-azure-blob-storage" }}
+    <!-- cluster eventual Azure Blob Storage Service default chain -->
+    <provider id="sharding-cluster" type="sharding-cluster">
+        <readBehavior>crossNetworkStrategy</readBehavior>
+        <writeBehavior>crossNetworkStrategy</writeBehavior>
+        <redundancy>{{ .Values.artifactory.persistence.redundancy }}</redundancy>
+        <lenientLimit>{{ .Values.artifactory.persistence.lenientLimit }}</lenientLimit>
+        <property name="zones" value="local,remote"/>
+    </provider>
+    <provider id="remote" type="remote">
+        <zone>remote</zone>
+    </provider>
+    <provider id="eventual-cluster" type="eventual-cluster">
+        <zone>local</zone>
+    </provider>
+    {{- end }}
+
+    <provider id="azure-blob-storage" type="azure-blob-storage">
+        <accountName>{{ .Values.artifactory.persistence.azureBlob.accountName }}</accountName>
+        <accountKey>{{ .Values.artifactory.persistence.azureBlob.accountKey }}</accountKey>
+        <endpoint>{{ .Values.artifactory.persistence.azureBlob.endpoint }}</endpoint>
+        <containerName>{{ .Values.artifactory.persistence.azureBlob.containerName }}</containerName>
+        <multiPartLimit>{{ .Values.artifactory.persistence.azureBlob.multiPartLimit | int64 }}</multiPartLimit>
+        <multipartElementSize>{{ .Values.artifactory.persistence.azureBlob.multipartElementSize | int64 }}</multipartElementSize>
+        <testConnection>{{ .Values.artifactory.persistence.azureBlob.testConnection }}</testConnection>
+    </provider>
+</config>
+{{- end }}
+{{- if eq .Values.artifactory.persistence.type "azure-blob-storage-v2-direct" -}}
+<config version="3">
+    <chain template="azure-blob-storage-v2-direct"/>
+    <provider type="cache-fs" id="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+        {{- if .Values.artifactory.persistence.maxFileSizeLimit }}
+        <maxFileSizeLimit>{{.Values.artifactory.persistence.maxFileSizeLimit | int64}}</maxFileSizeLimit>
+        {{- end }}
+        {{- if .Values.artifactory.persistence.skipDuringUpload }}
+        <skipDuringUpload>{{.Values.artifactory.persistence.skipDuringUpload}}</skipDuringUpload>
+        {{- end }}
+    </provider>
+    <provider id="azure-blob-storage-v2" type="azure-blob-storage-v2">
+        <accountName>{{ .Values.artifactory.persistence.azureBlob.accountName }}</accountName>
+        <accountKey>{{ .Values.artifactory.persistence.azureBlob.accountKey }}</accountKey>
+        <endpoint>{{ .Values.artifactory.persistence.azureBlob.endpoint }}</endpoint>
+        <container>{{ .Values.artifactory.persistence.azureBlob.containerName }}</container> 
+        <multiPartLimit>{{ .Values.artifactory.persistence.azureBlob.multiPartLimit | int64 }}</multiPartLimit>
+        <multipartElementSize>{{ .Values.artifactory.persistence.azureBlob.multipartElementSize | int64 }}</multipartElementSize>
+        <testConnection>{{ .Values.artifactory.persistence.azureBlob.testConnection }}</testConnection>
+    </provider>   
+</config>
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/installer-info.json b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/installer-info.json
new file mode 100644
index 000000000..79f42ed16
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/installer-info.json
@@ -0,0 +1,32 @@
+{
+    "productId": "Helm_artifactory/{{ .Chart.Version }}",
+    "features": [
+      {
+        "featureId": "Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"
+      },
+      {
+        "featureId": "Database/{{ .Values.database.type }}"
+      },
+      {
+        "featureId": "PostgreSQL_Enabled/{{ .Values.postgresql.enabled }}"
+      },
+      {
+        "featureId": "Nginx_Enabled/{{ .Values.nginx.enabled }}"
+      },
+      {
+        "featureId": "ArtifactoryPersistence_Type/{{ .Values.artifactory.persistence.type }}"
+      },
+      {
+        "featureId": "SplitServicesToContainers_Enabled/{{ .Values.splitServicesToContainers }}"
+      },
+      {
+        "featureId": "UnifiedSecretInstallation_Enabled/{{ .Values.artifactory.unifiedSecretInstallation }}"
+      },
+      {
+        "featureId": "Filebeat_Enabled/{{ .Values.filebeat.enabled }}"
+      },
+      {
+        "featureId": "ReplicaCount/{{ .Values.artifactory.replicaCount }}"
+      }
+    ]
+}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/migrate.sh b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/migrate.sh
new file mode 100644
index 000000000..ba44160f4
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/migrate.sh
@@ -0,0 +1,4311 @@
+#!/bin/bash
+
+# Flags
+FLAG_Y="y"
+FLAG_N="n"
+FLAGS_Y_N="$FLAG_Y $FLAG_N"
+FLAG_NOT_APPLICABLE="_NA_"
+
+CURRENT_VERSION=$1
+
+WRAPPER_SCRIPT_TYPE_RPMDEB="RPMDEB"
+WRAPPER_SCRIPT_TYPE_DOCKER_COMPOSE="DOCKERCOMPOSE"
+
+SENSITIVE_KEY_VALUE="__sensitive_key_hidden___"
+
+# Shared system keys
+SYS_KEY_SHARED_JFROGURL="shared.jfrogUrl"
+SYS_KEY_SHARED_SECURITY_JOINKEY="shared.security.joinKey"
+SYS_KEY_SHARED_SECURITY_MASTERKEY="shared.security.masterKey"
+
+SYS_KEY_SHARED_NODE_ID="shared.node.id"
+SYS_KEY_SHARED_JAVAHOME="shared.javaHome"
+
+SYS_KEY_SHARED_DATABASE_TYPE="shared.database.type"
+SYS_KEY_SHARED_DATABASE_TYPE_VALUE_POSTGRES="postgresql"
+SYS_KEY_SHARED_DATABASE_DRIVER="shared.database.driver"
+SYS_KEY_SHARED_DATABASE_URL="shared.database.url"
+SYS_KEY_SHARED_DATABASE_USERNAME="shared.database.username"
+SYS_KEY_SHARED_DATABASE_PASSWORD="shared.database.password"
+
+SYS_KEY_SHARED_ELASTICSEARCH_URL="shared.elasticsearch.url"
+SYS_KEY_SHARED_ELASTICSEARCH_USERNAME="shared.elasticsearch.username"
+SYS_KEY_SHARED_ELASTICSEARCH_PASSWORD="shared.elasticsearch.password"
+SYS_KEY_SHARED_ELASTICSEARCH_CLUSTERSETUP="shared.elasticsearch.clusterSetup"
+SYS_KEY_SHARED_ELASTICSEARCH_UNICASTFILE="shared.elasticsearch.unicastFile"
+SYS_KEY_SHARED_ELASTICSEARCH_CLUSTERSETUP_VALUE="YES"
+
+# Define this in product specific script. Should contain the path to unitcast file
+# File used by insight server to write cluster active nodes info. This will be read by elasticsearch
+#SYS_KEY_SHARED_ELASTICSEARCH_UNICASTFILE_VALUE=""
+
+SYS_KEY_RABBITMQ_ACTIVE_NODE_NAME="shared.rabbitMq.active.node.name"
+SYS_KEY_RABBITMQ_ACTIVE_NODE_IP="shared.rabbitMq.active.node.ip"
+
+# Filenames
+FILE_NAME_SYSTEM_YAML="system.yaml"
+FILE_NAME_JOIN_KEY="join.key"
+FILE_NAME_MASTER_KEY="master.key"
+FILE_NAME_INSTALLER_YAML="installer.yaml"
+
+# Global constants used in business logic
+NODE_TYPE_STANDALONE="standalone"
+NODE_TYPE_CLUSTER_NODE="node"
+NODE_TYPE_DATABASE="database"
+
+# External(isable) databases 
+DATABASE_POSTGRES="POSTGRES"
+DATABASE_ELASTICSEARCH="ELASTICSEARCH"
+DATABASE_RABBITMQ="RABBITMQ"
+
+POSTGRES_LABEL="PostgreSQL"
+ELASTICSEARCH_LABEL="Elasticsearch"
+RABBITMQ_LABEL="Rabbitmq"
+
+ARTIFACTORY_LABEL="Artifactory"
+JFMC_LABEL="Mission Control"
+DISTRIBUTION_LABEL="Distribution"
+XRAY_LABEL="Xray"
+
+POSTGRES_CONTAINER="postgres"
+ELASTICSEARCH_CONTAINER="elasticsearch"
+RABBITMQ_CONTAINER="rabbitmq"
+REDIS_CONTAINER="redis"
+
+#Adding a small timeout before a read ensures it is positioned correctly in the screen
+read_timeout=0.5
+
+# Options related to data directory location
+PROMPT_DATA_DIR_LOCATION="Installation Directory"
+KEY_DATA_DIR_LOCATION="installer.data_dir"
+
+SYS_KEY_SHARED_NODE_HAENABLED="shared.node.haEnabled"
+PROMPT_ADD_TO_CLUSTER="Are you adding an additional node to an existing product cluster?"
+KEY_ADD_TO_CLUSTER="installer.ha"
+VALID_VALUES_ADD_TO_CLUSTER="$FLAGS_Y_N"
+
+MESSAGE_POSTGRES_INSTALL="The installer can install a $POSTGRES_LABEL database, or you can connect to an existing compatible $POSTGRES_LABEL database\n(compatible databases: https://www.jfrog.com/confluence/display/JFROG/System+Requirements#SystemRequirements-RequirementsMatrix)"
+PROMPT_POSTGRES_INSTALL="Do you want to install $POSTGRES_LABEL?"
+KEY_POSTGRES_INSTALL="installer.install_postgresql"
+VALID_VALUES_POSTGRES_INSTALL="$FLAGS_Y_N"
+
+# Postgres connection details
+RPM_DEB_POSTGRES_HOME_DEFAULT="/var/opt/jfrog/postgres"
+RPM_DEB_MESSAGE_STANDALONE_POSTGRES_DATA="$POSTGRES_LABEL home will have data and its configuration"
+RPM_DEB_PROMPT_STANDALONE_POSTGRES_DATA="Type desired $POSTGRES_LABEL home location"
+RPM_DEB_KEY_STANDALONE_POSTGRES_DATA="installer.postgresql.home"
+
+MESSAGE_DATABASE_URL="Provide the database connection details"
+PROMPT_DATABASE_URL(){
+    local databaseURlExample=
+    case "$PRODUCT_NAME" in
+            $ARTIFACTORY_LABEL)
+                databaseURlExample="jdbc:postgresql://<IP_ADDRESS>:<PORT>/artifactory"
+            ;;
+            $JFMC_LABEL)
+                databaseURlExample="postgresql://<IP_ADDRESS>:<PORT>/mission_control?sslmode=disable"
+            ;;
+            $DISTRIBUTION_LABEL)
+                databaseURlExample="jdbc:postgresql://<IP_ADDRESS>:<PORT>/distribution?sslmode=disable"
+            ;;
+            $XRAY_LABEL)
+                databaseURlExample="postgres://<IP_ADDRESS>:<PORT>/xraydb?sslmode=disable"
+            ;;
+        esac
+    if [ -z "$databaseURlExample" ]; then
+        echo -n "$POSTGRES_LABEL URL" # For consistency with username and password
+        return
+    fi
+    echo -n "$POSTGRES_LABEL url. Example: [$databaseURlExample]"
+}
+REGEX_DATABASE_URL(){
+    local databaseURlExample=
+    case "$PRODUCT_NAME" in
+            $ARTIFACTORY_LABEL)
+                databaseURlExample="jdbc:postgresql://.*/artifactory.*"
+            ;;
+            $JFMC_LABEL)
+                databaseURlExample="postgresql://.*/mission_control.*"
+            ;;
+            $DISTRIBUTION_LABEL)
+                databaseURlExample="jdbc:postgresql://.*/distribution.*"
+            ;;
+            $XRAY_LABEL)
+                databaseURlExample="postgres://.*/xraydb.*"
+            ;;
+        esac
+    echo -n "^$databaseURlExample\$"
+}
+ERROR_MESSAGE_DATABASE_URL="Invalid $POSTGRES_LABEL URL"
+KEY_DATABASE_URL="$SYS_KEY_SHARED_DATABASE_URL"
+#NOTE: It is important to display the label. Since the message may be hidden if URL is known
+PROMPT_DATABASE_USERNAME="$POSTGRES_LABEL username"
+KEY_DATABASE_USERNAME="$SYS_KEY_SHARED_DATABASE_USERNAME"
+#NOTE: It is important to display the label. Since the message may be hidden if URL is known
+PROMPT_DATABASE_PASSWORD="$POSTGRES_LABEL password"
+KEY_DATABASE_PASSWORD="$SYS_KEY_SHARED_DATABASE_PASSWORD"
+IS_SENSITIVE_DATABASE_PASSWORD="$FLAG_Y"
+
+MESSAGE_STANDALONE_ELASTICSEARCH_INSTALL="The installer can install a $ELASTICSEARCH_LABEL database or you can connect to an existing compatible $ELASTICSEARCH_LABEL database"
+PROMPT_STANDALONE_ELASTICSEARCH_INSTALL="Do you want to install $ELASTICSEARCH_LABEL?"
+KEY_STANDALONE_ELASTICSEARCH_INSTALL="installer.install_elasticsearch"
+VALID_VALUES_STANDALONE_ELASTICSEARCH_INSTALL="$FLAGS_Y_N"
+
+# Elasticsearch connection details
+MESSAGE_ELASTICSEARCH_DETAILS="Provide the $ELASTICSEARCH_LABEL connection details"
+PROMPT_ELASTICSEARCH_URL="$ELASTICSEARCH_LABEL URL"
+KEY_ELASTICSEARCH_URL="$SYS_KEY_SHARED_ELASTICSEARCH_URL"
+
+PROMPT_ELASTICSEARCH_USERNAME="$ELASTICSEARCH_LABEL username"
+KEY_ELASTICSEARCH_USERNAME="$SYS_KEY_SHARED_ELASTICSEARCH_USERNAME"
+
+PROMPT_ELASTICSEARCH_PASSWORD="$ELASTICSEARCH_LABEL password"
+KEY_ELASTICSEARCH_PASSWORD="$SYS_KEY_SHARED_ELASTICSEARCH_PASSWORD"
+IS_SENSITIVE_ELASTICSEARCH_PASSWORD="$FLAG_Y"
+
+# Cluster related questions
+MESSAGE_CLUSTER_MASTER_KEY="Provide the cluster's master key. It can be found in the data directory of the first node under /etc/security/master.key"
+PROMPT_CLUSTER_MASTER_KEY="Master Key"
+KEY_CLUSTER_MASTER_KEY="$SYS_KEY_SHARED_SECURITY_MASTERKEY"
+IS_SENSITIVE_CLUSTER_MASTER_KEY="$FLAG_Y"
+
+MESSAGE_JOIN_KEY="The Join key is the secret key used to establish trust between services in the JFrog Platform.\n(You can copy the Join Key from Admin > User Management > Settings)"
+PROMPT_JOIN_KEY="Join Key"
+KEY_JOIN_KEY="$SYS_KEY_SHARED_SECURITY_JOINKEY"
+IS_SENSITIVE_JOIN_KEY="$FLAG_Y"
+REGEX_JOIN_KEY="^[a-zA-Z0-9]{16,}\$"
+ERROR_MESSAGE_JOIN_KEY="Invalid Join Key"
+
+# Rabbitmq related cluster information
+MESSAGE_RABBITMQ_ACTIVE_NODE_NAME="Provide an active ${RABBITMQ_LABEL} node name. Run the command [ hostname -s ] on any of the existing nodes in the product cluster to get this"
+PROMPT_RABBITMQ_ACTIVE_NODE_NAME="${RABBITMQ_LABEL} active node name"
+KEY_RABBITMQ_ACTIVE_NODE_NAME="$SYS_KEY_RABBITMQ_ACTIVE_NODE_NAME"
+
+# Rabbitmq related cluster information (necessary only for docker-compose)
+PROMPT_RABBITMQ_ACTIVE_NODE_IP="${RABBITMQ_LABEL} active node ip"
+KEY_RABBITMQ_ACTIVE_NODE_IP="$SYS_KEY_RABBITMQ_ACTIVE_NODE_IP"
+
+MESSAGE_JFROGURL(){
+    echo -e "The JFrog URL allows ${PRODUCT_NAME} to connect to a JFrog Platform Instance.\n(You can copy the JFrog URL from Administration > User Management > Settings > Connection details)"
+}
+PROMPT_JFROGURL="JFrog URL"
+KEY_JFROGURL="$SYS_KEY_SHARED_JFROGURL"
+REGEX_JFROGURL="^https?://.*:{0,}[0-9]{0,4}\$"
+ERROR_MESSAGE_JFROGURL="Invalid JFrog URL"
+
+
+# Set this to FLAG_Y on upgrade
+IS_UPGRADE="${FLAG_N}"
+
+# This belongs in JFMC but is the ONLY one that needs it so keeping it here for now. Can be made into a method and overridden if necessary
+MESSAGE_MULTIPLE_PG_SCHEME="Please setup $POSTGRES_LABEL with schema as described in https://www.jfrog.com/confluence/display/JFROG/Installing+Mission+Control"
+
+_getMethodOutputOrVariableValue() {
+    unset EFFECTIVE_MESSAGE
+    local keyToSearch=$1
+    local effectiveMessage=
+    local result="0"
+    # logSilly "Searching for method: [$keyToSearch]"
+    LC_ALL=C type "$keyToSearch" > /dev/null 2>&1 || result="$?"
+    if [[ "$result" == "0" ]]; then
+        # logSilly "Found method for [$keyToSearch]"
+        EFFECTIVE_MESSAGE="$($keyToSearch)"
+        return
+    fi
+    eval EFFECTIVE_MESSAGE=\${$keyToSearch}
+    if [ ! -z "$EFFECTIVE_MESSAGE" ]; then
+        return
+    fi
+    # logSilly "Didn't find method or variable for [$keyToSearch]"
+}
+
+
+# REF https://misc.flogisoft.com/bash/tip_colors_and_formatting
+cClear="\e[0m"
+cBlue="\e[38;5;69m"
+cRedDull="\e[1;31m"
+cYellow="\e[1;33m"
+cRedBright="\e[38;5;197m"
+cBold="\e[1m"
+
+
+_loggerGetModeRaw() {
+    local MODE="$1"
+    case $MODE in
+    INFO)
+        printf ""
+    ;;
+    DEBUG)
+        printf "%s" "[${MODE}] "
+    ;;
+    WARN)
+        printf "${cRedDull}%s%s${cClear}" "[" "${MODE}" "] "
+    ;;
+    ERROR)
+        printf "${cRedBright}%s%s${cClear}" "[" "${MODE}" "] "
+    ;;
+    esac
+}
+
+
+_loggerGetMode() {
+    local MODE="$1"
+    case $MODE in
+    INFO)
+        printf "${cBlue}%s%-5s%s${cClear}" "[" "${MODE}" "]"
+    ;;
+    DEBUG)
+        printf "%-7s" "[${MODE}]"
+    ;;
+    WARN)
+        printf "${cRedDull}%s%-5s%s${cClear}" "[" "${MODE}" "]"
+    ;;
+    ERROR)
+        printf "${cRedBright}%s%-5s%s${cClear}" "[" "${MODE}" "]"
+    ;;
+    esac
+}
+
+# Capitalises the first letter of the message
+_loggerGetMessage() {
+    local originalMessage="$*"
+    local firstChar=$(echo "${originalMessage:0:1}" | awk '{ print toupper($0) }')
+    local resetOfMessage="${originalMessage:1}"
+    echo "$firstChar$resetOfMessage"
+}
+
+# The spec also says content should be left-trimmed but this is not necessary in our case. We don't reach the limit.
+_loggerGetStackTrace() {
+    printf "%s%-30s%s" "[" "$1:$2" "]"
+}
+
+_loggerGetThread() {
+    printf "%s" "[main]"
+}
+
+_loggerGetServiceType() {
+    printf "%s%-5s%s" "[" "shell" "]"
+}
+
+#Trace ID is not applicable to scripts
+_loggerGetTraceID() {
+    printf "%s" "[]"
+}
+
+logRaw() {
+    echo ""
+    printf "$1"
+    echo ""
+}
+
+logBold(){
+    echo ""
+    printf "${cBold}$1${cClear}"
+    echo ""
+}
+
+# The date binary works differently based on whether it is GNU/BSD
+is_date_supported=0
+date --version > /dev/null 2>&1 || is_date_supported=1
+IS_GNU=$(echo $is_date_supported)
+
+_loggerGetTimestamp() {
+    if [ "${IS_GNU}" == "0" ]; then
+        echo -n $(date -u +%FT%T.%3NZ)
+    else
+        echo -n $(date -u +%FT%T.000Z)
+    fi
+}
+
+# https://www.shellscript.sh/tips/spinner/
+_spin()
+{
+    spinner="/|\\-/|\\-"
+    while :
+    do
+    for i in `seq 0 7`
+    do
+        echo -n "${spinner:$i:1}"
+        echo -en "\010"
+        sleep 1
+    done
+    done
+}
+
+showSpinner() {
+    # Start the Spinner:
+    _spin &
+    # Make a note of its Process ID (PID):
+    SPIN_PID=$!
+    # Kill the spinner on any signal, including our own exit.
+    trap "kill -9 $SPIN_PID" `seq 0 15` &> /dev/null || return 0
+}
+
+stopSpinner() {
+    local occurrences=$(ps -ef | grep -wc "${SPIN_PID}")
+    let "occurrences+=0"
+    # validate that it is present (2 since this search itself will show up in the results)
+    if [ $occurrences -gt 1 ]; then
+        kill -9 $SPIN_PID &>/dev/null || return 0
+        wait $SPIN_ID &>/dev/null
+    fi
+}
+
+_getEffectiveMessage(){
+    local MESSAGE="$1"
+    local MODE=${2-"INFO"}
+
+    if [ -z "$CONTEXT" ]; then
+        CONTEXT=$(caller)
+    fi
+
+    _EFFECTIVE_MESSAGE=
+    if [ -z "$LOG_BEHAVIOR_ADD_META" ]; then
+        _EFFECTIVE_MESSAGE="$(_loggerGetModeRaw $MODE)$(_loggerGetMessage $MESSAGE)"
+    else
+        local SERVICE_TYPE="script"
+        local TRACE_ID=""
+        local THREAD="main"
+        
+        local CONTEXT_LINE=$(echo "$CONTEXT" | awk '{print $1}')
+        local CONTEXT_FILE=$(echo "$CONTEXT" | awk -F"/" '{print $NF}')
+        
+        _EFFECTIVE_MESSAGE="$(_loggerGetTimestamp) $(_loggerGetServiceType) $(_loggerGetMode $MODE) $(_loggerGetTraceID) $(_loggerGetStackTrace $CONTEXT_FILE $CONTEXT_LINE) $(_loggerGetThread) - $(_loggerGetMessage $MESSAGE)"
+    fi
+    CONTEXT=
+}
+
+# Important - don't call any log method from this method. Will become an infinite loop. Use echo to debug
+_logToFile() {
+    local MODE=${1-"INFO"}
+    local targetFile="$LOG_BEHAVIOR_ADD_REDIRECTION"
+    # IF the file isn't passed, abort
+    if [ -z "$targetFile" ]; then
+        return
+    fi
+    # IF this is not being run in verbose mode and mode is debug or lower, abort
+    if [ "${VERBOSE_MODE}" != "$FLAG_Y" ] && [ "${VERBOSE_MODE}" != "true" ] && [ "${VERBOSE_MODE}" != "debug" ]; then
+        if [ "$MODE" == "DEBUG" ] || [ "$MODE" == "SILLY" ]; then
+            return
+        fi
+    fi
+
+    # Create the file if it doesn't exist
+    if [ ! -f "${targetFile}" ]; then
+        return
+        # touch $targetFile > /dev/null 2>&1 || true
+    fi
+    # # Make it readable
+    # chmod 640 $targetFile > /dev/null 2>&1 || true
+
+    # Log contents
+    printf "%s\n" "$_EFFECTIVE_MESSAGE" >> "$targetFile" || true
+}
+
+logger() {
+    if [ "$LOG_BEHAVIOR_ADD_NEW_LINE" == "$FLAG_Y" ]; then
+        echo ""
+    fi
+    _getEffectiveMessage "$@"
+    local MODE=${2-"INFO"}
+    printf "%s\n" "$_EFFECTIVE_MESSAGE"
+    _logToFile "$MODE"
+}
+
+logDebug(){
+    VERBOSE_MODE=${VERBOSE_MODE-"false"}
+    CONTEXT=$(caller)
+    if [ "${VERBOSE_MODE}" == "$FLAG_Y" ] || [ "${VERBOSE_MODE}" == "true" ] || [ "${VERBOSE_MODE}" == "debug" ];then
+        logger "$1" "DEBUG"
+    else
+        logger "$1" "DEBUG" >&6
+    fi
+    CONTEXT=
+}
+
+logSilly(){
+    VERBOSE_MODE=${VERBOSE_MODE-"false"}
+    CONTEXT=$(caller)
+    if [ "${VERBOSE_MODE}" == "silly" ];then
+        logger "$1" "DEBUG"
+    else
+        logger "$1" "DEBUG" >&6
+    fi
+    CONTEXT=
+}
+
+logError() {
+    CONTEXT=$(caller)
+    logger "$1" "ERROR"
+    CONTEXT=
+}
+
+errorExit () {
+    CONTEXT=$(caller)
+    logger "$1" "ERROR"
+    CONTEXT=
+    exit 1
+}
+
+warn () {
+    CONTEXT=$(caller)
+    logger "$1" "WARN"
+    CONTEXT=
+}
+
+note () {
+    CONTEXT=$(caller)
+    logger "$1" "NOTE"
+    CONTEXT=
+}
+
+bannerStart() {
+    title=$1
+    echo
+    echo -e "\033[1m${title}\033[0m"
+    echo
+}
+
+bannerSection() {
+    title=$1
+    echo
+    echo -e "******************************** ${title} ********************************"
+    echo
+}
+
+bannerSubSection() {
+    title=$1
+    echo
+    echo -e "************** ${title} *******************"
+    echo
+}
+
+bannerMessge() {
+    title=$1
+    echo
+    echo -e "********************************"
+    echo -e "${title}"
+    echo -e "********************************"
+    echo
+}
+
+setRed () {
+    local input="$1"
+    echo -e \\033[31m${input}\\033[0m
+}
+setGreen () {
+    local input="$1"
+    echo -e \\033[32m${input}\\033[0m
+}
+setYellow () {
+    local input="$1"
+    echo -e \\033[33m${input}\\033[0m
+}
+
+logger_addLinebreak () {
+    echo -e "---\n"
+}
+
+bannerImportant() {
+    title=$1
+    local bold="\033[1m"
+    local noColour="\033[0m"
+    echo
+    echo -e "${bold}######################################## IMPORTANT ########################################${noColour}"
+    echo -e "${bold}${title}${noColour}"
+    echo -e "${bold}###########################################################################################${noColour}"
+    echo
+}
+
+bannerEnd() {
+    #TODO pass a title and calculate length dynamically so that start and end look alike
+    echo
+    echo "*****************************************************************************"
+    echo
+}
+
+banner() {
+    title=$1
+    content=$2
+    bannerStart "${title}"
+    echo -e "$content"
+}
+
+# The logic below helps us redirect content we'd normally hide to the log file. 
+    #
+    # We have several commands which clutter the console with output and so use 
+    # `cmd > /dev/null` - this redirects the command's output to null.
+    # 
+    # However, the information we just hid maybe useful for support. Using the code pattern
+    # `cmd >&6` (instead of `cmd> >/dev/null` ), the command's output is hidden from the console 
+    # but redirected to the installation log file
+    # 
+
+#Default value of 6 is just null
+exec 6>>/dev/null
+redirectLogsToFile() {
+    echo ""
+    # local file=$1
+
+    # [ ! -z "${file}" ] || return 0
+
+    # local logDir=$(dirname "$file")
+
+    # if [ ! -f "${file}" ]; then
+    #     [ -d "${logDir}" ] || mkdir -p ${logDir} || \
+    #     ( echo "WARNING : Could not create parent directory (${logDir}) to redirect console log : ${file}" ; return 0 )
+    # fi
+
+    # #6 now points to the log file
+    # exec 6>>${file}
+    # #reference https://unix.stackexchange.com/questions/145651/using-exec-and-tee-to-redirect-logs-to-stdout-and-a-log-file-in-the-same-time
+    # exec 2>&1 > >(tee -a "${file}")
+}
+
+# Check if a give key contains any sensitive string as part of it
+# Based on the result, the caller can decide its value can be displayed or not
+#   Sample usage : isKeySensitive "${key}" && displayValue="******" || displayValue=${value}
+isKeySensitive(){
+    local key=$1
+    local sensitiveKeys="password|secret|key|token"
+    
+    if [ -z "${key}" ]; then
+        return 1
+    else
+        local lowercaseKey=$(echo "${key}" | tr '[:upper:]' '[:lower:]' 2>/dev/null)
+        [[ "${lowercaseKey}" =~ ${sensitiveKeys} ]] && return 0 || return 1
+    fi
+}
+
+getPrintableValueOfKey(){
+    local displayValue=
+    local key="$1"
+    if [ -z "$key" ]; then
+        # This is actually an incorrect usage of this method but any logging will cause unexpected content in the caller
+        echo -n ""
+        return
+    fi
+
+    local value="$2"
+    isKeySensitive "${key}" && displayValue="$SENSITIVE_KEY_VALUE" || displayValue="${value}"
+    echo -n $displayValue
+}
+
+_createConsoleLog(){
+    if [ -z "${JF_PRODUCT_HOME}" ]; then
+        return
+    fi
+    local targetFile="${JF_PRODUCT_HOME}/var/log/console.log"
+    mkdir -p "${JF_PRODUCT_HOME}/var/log" || true
+    if [ ! -f ${targetFile} ]; then
+        touch $targetFile > /dev/null 2>&1 || true
+    fi
+    chmod 640 $targetFile > /dev/null 2>&1 || true
+}
+
+# Output from application's logs are piped to this method. It checks a configuration variable to determine if content should be logged to 
+# the common console.log file
+redirectServiceLogsToFile() {
+
+    local result="0"
+    # check if the function getSystemValue exists
+    LC_ALL=C type getSystemValue > /dev/null 2>&1 || result="$?"
+    if [[ "$result" != "0" ]]; then
+        warn "Couldn't find the systemYamlHelper. Skipping log redirection"
+        return 0
+    fi
+
+    getSystemValue "shared.consoleLog" "NOT_SET"
+    if [[ "${YAML_VALUE}" == "false" ]]; then
+        logger "Redirection is set to false. Skipping log redirection"
+        return 0;
+    fi
+
+    if [ -z "${JF_PRODUCT_HOME}" ] || [ "${JF_PRODUCT_HOME}" == "" ]; then
+        warn "JF_PRODUCT_HOME is unavailable. Skipping log redirection"
+        return 0
+    fi
+
+    local targetFile="${JF_PRODUCT_HOME}/var/log/console.log"
+    
+    _createConsoleLog
+
+    while read -r line; do
+        printf '%s\n' "${line}" >> $targetFile || return 0 # Don't want to log anything - might clutter the screen
+    done
+}
+
+## Display environment variables starting with JF_ along with its value
+## Value of sensitive keys will be displayed as "******"
+##
+## Sample Display :
+##
+## ========================
+## JF Environment variables
+## ========================
+##
+## JF_SHARED_NODE_ID                   : locahost
+## JF_SHARED_JOINKEY                   : ******
+##
+##
+displayEnv() {
+    local JFEnv=$(printenv | grep ^JF_ 2>/dev/null)
+    local key=
+    local value=
+
+    if [ -z "${JFEnv}" ]; then
+        return
+    fi
+
+    cat << ENV_START_MESSAGE
+
+========================
+JF Environment variables
+========================
+ENV_START_MESSAGE
+
+    for entry in ${JFEnv}; do
+        key=$(echo "${entry}" | awk -F'=' '{print $1}')
+        value=$(echo "${entry}" | awk -F'=' '{print $2}')
+
+        isKeySensitive "${key}" && value="******" || value=${value}
+        
+        printf "\n%-35s%s" "${key}" " : ${value}"
+    done
+    echo;
+}
+
+_addLogRotateConfiguration() {
+    logDebug "Method ${FUNCNAME[0]}"
+    # mandatory inputs
+    local confFile="$1"
+    local logFile="$2"
+
+    # Method available in _ioOperations.sh
+    LC_ALL=C type io_setYQPath > /dev/null 2>&1 || return 1
+
+    io_setYQPath
+
+    # Method available in _systemYamlHelper.sh
+    LC_ALL=C type getSystemValue > /dev/null 2>&1 || return 1
+
+    local frequency="daily"
+    local archiveFolder="archived"
+
+    local compressLogFiles=
+    getSystemValue "shared.logging.rotation.compress" "true"
+    if [[ "${YAML_VALUE}" == "true" ]]; then
+        compressLogFiles="compress"
+    fi
+
+    getSystemValue "shared.logging.rotation.maxFiles" "10"
+    local noOfBackupFiles="${YAML_VALUE}"
+
+    getSystemValue "shared.logging.rotation.maxSizeMb" "25"
+    local sizeOfFile="${YAML_VALUE}M"
+
+    logDebug "Adding logrotate configuration for [$logFile] to [$confFile]"
+
+    # Add configuration to file
+    local confContent=$(cat << LOGROTATECONF
+$logFile {
+    $frequency
+    missingok
+    rotate $noOfBackupFiles
+    $compressLogFiles
+    notifempty
+    olddir $archiveFolder
+    dateext
+    extension .log
+    dateformat -%Y-%m-%d
+    size ${sizeOfFile}
+}
+LOGROTATECONF
+) 
+    echo "${confContent}" > ${confFile} || return 1
+}
+
+_operationIsBySameUser() {
+    local targetUser="$1"
+    local currentUserID=$(id -u)
+    local currentUserName=$(id -un)
+
+    if [ $currentUserID == $targetUser ] || [ $currentUserName == $targetUser ]; then
+        echo -n "yes"
+    else   
+        echo -n "no"
+    fi
+}
+
+_addCronJobForLogrotate() {
+    logDebug "Method ${FUNCNAME[0]}"
+    
+    # Abort if logrotate is not available
+    [ "$(io_commandExists 'crontab')" != "yes" ] && warn "cron is not available" && return 1
+
+    # mandatory inputs
+    local productHome="$1"
+    local confFile="$2"
+    local cronJobOwner="$3"
+
+    # We want to use our binary if possible. It may be more recent than the one in the OS
+    local logrotateBinary="$productHome/app/third-party/logrotate/logrotate"
+
+    if [ ! -f "$logrotateBinary" ]; then
+        logrotateBinary="logrotate"
+        [ "$(io_commandExists 'logrotate')" != "yes" ] && warn "logrotate is not available" && return 1
+    fi
+    local cmd="$logrotateBinary ${confFile} --state $productHome/var/etc/logrotate/logrotate-state" #--verbose
+
+    id -u $cronJobOwner > /dev/null 2>&1 || { warn "User $cronJobOwner does not exist. Aborting logrotate configuration" && return 1; }
+    
+    # Remove the existing line
+    removeLogRotation "$productHome" "$cronJobOwner" || true
+
+    # Run logrotate daily at 23:55 hours
+    local cronInterval="55 23 * * * $cmd"
+
+    local standaloneMode=$(_operationIsBySameUser "$cronJobOwner")
+
+    # If this is standalone mode, we cannot use -u - the user running this process may not have the necessary privileges
+    if [ "$standaloneMode" == "no" ]; then
+        (crontab -l -u $cronJobOwner 2>/dev/null; echo "$cronInterval") | crontab -u $cronJobOwner -
+    else
+        (crontab -l 2>/dev/null; echo "$cronInterval") | crontab -
+    fi
+}
+
+## Configure logrotate for a product
+## Failure conditions:
+## If logrotation could not be setup for some reason
+## Parameters:
+## $1: The product name
+## $2: The product home
+## Depends on global: none
+## Updates global: none
+## Returns: NA
+
+configureLogRotation() {
+    logDebug "Method ${FUNCNAME[0]}"
+
+    # mandatory inputs
+    local productName="$1"
+    if [ -z $productName ]; then
+        warn "Incorrect usage. A product name is necessary for configuring log rotation" && return 1
+    fi
+    
+    local productHome="$2"
+    if [ -z $productHome ]; then
+        warn "Incorrect usage. A product home folder is necessary for configuring log rotation" && return 1
+    fi
+
+    local logFile="${productHome}/var/log/console.log"
+    if [[ $(uname) == "Darwin" ]]; then
+        logger "Log rotation for [$logFile] has not been configured. Please setup manually"
+        return 0
+    fi
+    
+    local userID="$3"
+    if [ -z $userID ]; then
+        warn "Incorrect usage. A userID is necessary for configuring log rotation" && return 1
+    fi
+
+    local groupID=${4:-$userID}
+    local logConfigOwner=${5:-$userID}
+
+    logDebug "Configuring log rotation as user [$userID], group [$groupID], effective cron User [$logConfigOwner]"
+    
+    local errorMessage="Could not configure logrotate. Please configure log rotation of the file: [$logFile] manually"
+
+    local confFile="${productHome}/var/etc/logrotate/logrotate.conf"
+
+    # TODO move to recursive method
+    createDir "${productHome}" "$userID" "$groupID" || { warn "${errorMessage}" && return 1; }
+    createDir "${productHome}/var" "$userID" "$groupID" || { warn "${errorMessage}" && return 1; }
+    createDir "${productHome}/var/log" "$userID" "$groupID" || { warn "${errorMessage}" && return 1; }
+    createDir "${productHome}/var/log/archived" "$userID" "$groupID" || { warn "${errorMessage}" && return 1; }
+    
+    # TODO move to recursive method
+    createDir "${productHome}/var/etc"  "$userID" "$groupID" || { warn "${errorMessage}" && return 1; }
+    createDir "${productHome}/var/etc/logrotate" "$logConfigOwner" || { warn "${errorMessage}" && return 1; }
+
+    # conf file should be owned by the user running the script
+    createFile "${confFile}" "${logConfigOwner}" || { warn "Could not create configuration file [$confFile]" return 1; }
+
+    _addLogRotateConfiguration "${confFile}" "${logFile}" "$userID" "$groupID" || { warn "${errorMessage}" && return 1; }
+    _addCronJobForLogrotate "${productHome}" "${confFile}" "${logConfigOwner}" || { warn "${errorMessage}" && return 1; }
+}
+
+_pauseExecution() {
+    if [ "${VERBOSE_MODE}" == "debug" ]; then
+        
+        local breakPoint="$1"
+        if [ ! -z "$breakPoint" ]; then
+            printf "${cBlue}Breakpoint${cClear} [$breakPoint] "
+            echo ""
+        fi
+        printf "${cBlue}Press enter once you are ready to continue${cClear}"
+        read -s choice
+        echo ""
+    fi
+}
+
+# removeLogRotation "$productHome" "$cronJobOwner" || true
+removeLogRotation() {
+    logDebug "Method ${FUNCNAME[0]}"
+    if [[ $(uname) == "Darwin" ]]; then
+        logDebug "Not implemented for Darwin."
+        return 0
+    fi
+    local productHome="$1"
+    local cronJobOwner="$2"
+    local standaloneMode=$(_operationIsBySameUser "$cronJobOwner")
+
+    local confFile="${productHome}/var/etc/logrotate/logrotate.conf"
+    
+    if [ "$standaloneMode" == "no" ]; then
+        crontab -l -u $cronJobOwner 2>/dev/null | grep -v "$confFile" | crontab -u $cronJobOwner -
+    else
+        crontab -l 2>/dev/null | grep -v "$confFile" | crontab -
+    fi
+}
+
+# NOTE: This method does not check the configuration to see if redirection is necessary.
+# This is intentional. If we don't redirect, tomcat logs might get redirected to a folder/file
+# that does not exist, causing the service itself to not start
+setupTomcatRedirection() {
+    logDebug "Method ${FUNCNAME[0]}"
+    local consoleLog="${JF_PRODUCT_HOME}/var/log/console.log"
+    _createConsoleLog
+    export CATALINA_OUT="${consoleLog}"
+}
+
+setupScriptLogsRedirection() {
+    logDebug "Method ${FUNCNAME[0]}"
+    if [ -z "${JF_PRODUCT_HOME}" ]; then
+        logDebug "No JF_PRODUCT_HOME. Returning"
+        return
+    fi
+    # Create the console.log file if it is not already present
+    # _createConsoleLog || true
+    # # Ensure any logs (logger/logError/warn) also get redirected to the console.log
+    # # Using installer.log as a temparory fix. Please change this to console.log once INST-291 is fixed
+    export LOG_BEHAVIOR_ADD_REDIRECTION="${JF_PRODUCT_HOME}/var/log/console.log"
+    export LOG_BEHAVIOR_ADD_META="$FLAG_Y"
+}
+
+# Returns Y if this method is run inside a container
+isRunningInsideAContainer() {
+    local check1=$(grep -sq 'docker\|kubepods' /proc/1/cgroup; echo $?)
+    local check2=$(grep -sq 'containers' /proc/self/mountinfo; echo $?)
+    if [[ $check1 == 0 || $check2 == 0 || -f "/.dockerenv" ]]; then
+        echo -n "$FLAG_Y"
+    else
+        echo -n "$FLAG_N"
+    fi 
+}
+
+POSTGRES_USER=999
+NGINX_USER=104
+NGINX_GROUP=107
+ES_USER=1000
+REDIS_USER=999
+MONGO_USER=999
+RABBITMQ_USER=999
+LOG_FILE_PERMISSION=640
+PID_FILE_PERMISSION=644
+
+# Copy file
+copyFile(){
+    local source=$1
+    local target=$2
+    local mode=${3:-overwrite}
+    local enableVerbose=${4:-"${FLAG_N}"}
+    local verboseFlag=""
+
+    if [ ! -z "${enableVerbose}" ] && [ "${enableVerbose}" == "${FLAG_Y}" ]; then
+        verboseFlag="-v"
+    fi
+
+    if [[ ! ( $source && $target ) ]]; then
+        warn "Source and target is mandatory to copy file"
+        return 1
+    fi
+
+    if [[ -f "${target}" ]]; then
+        [[ "$mode" = "overwrite" ]] && ( cp ${verboseFlag} -f "$source" "$target" || errorExit "Unable to copy file, command : cp -f ${source} ${target}") || true
+    else
+        cp ${verboseFlag} -f "$source" "$target" || errorExit "Unable to copy file, command : cp -f ${source} ${target}"
+    fi
+}
+
+# Copy files recursively from given source directory to destination directory
+# This method wil copy but will NOT overwrite
+# Destination will be created if its not available
+copyFilesNoOverwrite(){
+    local src=$1
+    local dest=$2
+    local enableVerboseCopy="${3:-${FLAG_Y}}"
+
+    if [[ -z "${src}" || -z "${dest}" ]]; then
+        return
+    fi
+
+    if [ -d "${src}" ] && [ "$(ls -A ${src})" ]; then
+        local relativeFilePath=""
+        local targetFilePath=""
+
+        for file in $(find ${src} -type f 2>/dev/null) ; do
+            # Derive relative path and attach it to destination 
+            # Example : 
+            #       src=/extra_config
+            #       dest=/var/opt/jfrog/artifactory/etc
+            #       file=/extra_config/config.xml
+            #       relativeFilePath=config.xml
+            #       targetFilePath=/var/opt/jfrog/artifactory/etc/config.xml
+            relativeFilePath=${file/${src}/}
+            targetFilePath=${dest}${relativeFilePath}
+
+            createDir "$(dirname "$targetFilePath")"
+            copyFile "${file}" "${targetFilePath}" "no_overwrite" "${enableVerboseCopy}"
+        done
+    fi    
+}
+
+#    TODO : WINDOWS ?
+#  Check the max open files and open processes set on the system
+checkULimits () {
+    local minMaxOpenFiles=${1:-32000}
+    local minMaxOpenProcesses=${2:-1024}
+    local setValue=${3:-true}
+    local warningMsgForFiles=${4}
+    local warningMsgForProcesses=${5}
+
+    logger "Checking open files and processes limits"
+
+    local currentMaxOpenFiles=$(ulimit -n)
+    logger "Current max open files is $currentMaxOpenFiles"
+    if [ ${currentMaxOpenFiles} != "unlimited" ] && [ "$currentMaxOpenFiles" -lt "$minMaxOpenFiles" ]; then
+        if [ "${setValue}" ]; then
+            ulimit -n "${minMaxOpenFiles}" >/dev/null 2>&1 || warn "Max number of open files $currentMaxOpenFiles is low!"
+            [ -z "${warningMsgForFiles}" ] || warn "${warningMsgForFiles}"
+        else
+            errorExit "Max number of open files $currentMaxOpenFiles, is too low. Cannot run the application!"
+        fi
+    fi
+
+    local currentMaxOpenProcesses=$(ulimit -u)
+    logger "Current max open processes is $currentMaxOpenProcesses"
+    if [ "$currentMaxOpenProcesses" != "unlimited" ] && [ "$currentMaxOpenProcesses" -lt "$minMaxOpenProcesses" ]; then
+        if [ "${setValue}" ]; then
+            ulimit -u "${minMaxOpenProcesses}" >/dev/null 2>&1 || warn "Max number of open files $currentMaxOpenFiles is low!"
+            [ -z "${warningMsgForProcesses}" ] || warn "${warningMsgForProcesses}"
+        else
+            errorExit "Max number of open files $currentMaxOpenProcesses, is too low. Cannot run the application!"
+        fi
+    fi
+}
+
+createDirs() {
+    local appDataDir=$1
+    local serviceName=$2
+    local folders="backup bootstrap data etc logs work"
+
+    [ -z "${appDataDir}" ]  && errorExit "An application directory is mandatory to create its data structure"  || true
+    [ -z "${serviceName}" ] && errorExit "A service name is mandatory to create service data structure"         || true
+
+    for folder in ${folders}
+    do
+        folder=${appDataDir}/${folder}/${serviceName}
+        if [ ! -d "${folder}" ]; then
+            logger "Creating folder : ${folder}"
+            mkdir -p "${folder}" || errorExit "Failed to create ${folder}"
+        fi
+    done
+}
+
+
+testReadWritePermissions () {
+    local dir_to_check=$1
+    local error=false
+
+    [ -d ${dir_to_check} ] || errorExit "'${dir_to_check}' is not a directory"
+
+    local test_file=${dir_to_check}/test-permissions
+
+    # Write file
+    if echo test > ${test_file} 1> /dev/null 2>&1; then
+        # Write succeeded. Testing read...
+        if cat ${test_file} > /dev/null; then
+            rm -f ${test_file}
+        else
+            error=true
+        fi
+    else
+        error=true
+    fi
+
+    if [ ${error} == true ]; then
+        return 1
+    else
+        return 0
+    fi
+}
+
+# Test directory has read/write permissions for current user
+testDirectoryPermissions () {
+    local dir_to_check=$1
+    local error=false
+
+    [ -d ${dir_to_check}  ] || errorExit "'${dir_to_check}' is not a directory"
+
+    local u_id=$(id -u)
+    local id_str="id ${u_id}"
+
+    logger "Testing directory ${dir_to_check} has read/write permissions for user ${id_str}"
+
+    if ! testReadWritePermissions ${dir_to_check}; then
+        error=true
+    fi
+
+    if [ "${error}" == true ]; then
+        local stat_data=$(stat -Lc "Directory: %n, permissions: %a, owner: %U, group: %G" ${dir_to_check})
+        logger "###########################################################"
+        logger "${dir_to_check} DOES NOT have proper permissions for user ${id_str}"
+        logger "${stat_data}"
+        logger "Mounted directory must have read/write permissions for user ${id_str}"
+        logger "###########################################################"
+        errorExit "Directory ${dir_to_check} has bad permissions for user ${id_str}"
+    fi
+    logger "Permissions for ${dir_to_check} are good"
+}
+
+# Utility method to create a directory path recursively with chown feature as
+# Failure conditions:
+## Exits if unable to create a directory
+# Parameters:
+## $1: Root directory from where the path can be created
+## $2: List of recursive child directories separated by space
+## $3: user who should own the directory. Optional
+## $4: group who should own the directory. Optional
+# Depends on global: none
+# Updates global: none
+# Returns: NA
+#
+# Usage:
+# createRecursiveDir "/opt/jfrog/product/var" "bootstrap tomcat lib" "user_name" "group_name"
+createRecursiveDir(){
+    local rootDir=$1
+    local pathDirs=$2
+    local user=$3
+    local group=${4:-${user}}
+    local fullPath=
+
+    [ ! -z "${rootDir}" ] || return 0
+
+    createDir "${rootDir}" "${user}" "${group}"
+
+    [ ! -z "${pathDirs}" ] || return 0
+
+    fullPath=${rootDir}
+
+    for dir in ${pathDirs}; do
+        fullPath=${fullPath}/${dir}
+        createDir "${fullPath}" "${user}" "${group}"
+    done
+}
+
+# Utility method to create a directory
+# Failure conditions:
+## Exits if unable to create a directory
+# Parameters:
+## $1: directory to create
+## $2: user who should own the directory. Optional
+## $3: group who should own the directory. Optional
+# Depends on global: none
+# Updates global: none
+# Returns: NA
+
+createDir(){
+    local dirName="$1"
+    local printMessage=no
+    logSilly "Method ${FUNCNAME[0]} invoked with [$dirName]"
+    [ -z "${dirName}" ] && return
+    
+    logDebug "Attempting to create ${dirName}"
+    mkdir -p "${dirName}" || errorExit "Unable to create directory: [${dirName}]"
+    local userID="$2"
+    local groupID=${3:-$userID}
+
+    # If UID/GID is passed, chown the folder
+    if [ ! -z "$userID" ] && [ ! -z "$groupID" ]; then
+        # Earlier, this line would have returned 1 if it failed. Now it just warns. 
+        # This is intentional. Earlier, this line would NOT be reached if the folder already existed. 
+        # Since it will always come to this line and the script may be running as a non-root user, this method will just warn if
+        # setting permissions fails (so as to not affect any existing flows)
+        io_setOwnershipNonRecursive "$dirName" "$userID" "$groupID" || warn "Could not set owner of [$dirName] to [$userID:$groupID]"
+    fi
+    # logging message to print created dir with user and group
+    local logMessage=${4:-$printMessage}
+    if [[ "${logMessage}" == "yes" ]]; then
+        logger "Successfully created directory [${dirName}].  Owner: [${userID}:${groupID}]"
+    fi
+}
+
+removeSoftLinkAndCreateDir () {
+    local dirName="$1"
+    local userID="$2"
+    local groupID="$3"
+    local logMessage="$4"
+    removeSoftLink "${dirName}"
+    createDir "${dirName}" "${userID}" "${groupID}" "${logMessage}"
+}
+
+# Utility method to remove a soft link
+removeSoftLink () {
+    local dirName="$1"
+    if [[ -L "${dirName}" ]]; then
+        targetLink=$(readlink -f "${dirName}")
+        logger "Removing the symlink [${dirName}] pointing to [${targetLink}]"
+        rm -f "${dirName}"
+    fi
+}
+
+# Check Directory exist in the path
+checkDirExists () {
+    local directoryPath="$1"
+
+    [[ -d "${directoryPath}" ]] && echo -n "true" || echo -n "false"
+}
+
+
+# Utility method to create a file
+# Failure conditions:
+# Parameters:
+## $1: file to create
+# Depends on global: none
+# Updates global: none
+# Returns: NA
+
+createFile(){
+    local fileName="$1"
+    logSilly "Method ${FUNCNAME[0]} [$fileName]"
+    [ -f "${fileName}" ] && return 0
+    touch "${fileName}" || return 1
+
+    local userID="$2"
+    local groupID=${3:-$userID}
+
+    # If UID/GID is passed, chown the folder
+    if [ ! -z "$userID" ] && [ ! -z "$groupID" ]; then
+        io_setOwnership "$fileName" "$userID" "$groupID" || return 1
+    fi
+}
+
+# Check File exist in the filePath
+# IMPORTANT- DON'T ADD LOGGING to this method
+checkFileExists () {
+    local filePath="$1"
+
+    [[ -f "${filePath}" ]] && echo -n "true" || echo -n "false"
+}
+
+# Check for directories contains any (files or sub directories)
+# IMPORTANT- DON'T ADD LOGGING to this method
+checkDirContents () {
+    local directoryPath="$1"
+    if [[ "$(ls -1 "${directoryPath}" | wc -l)" -gt 0 ]]; then
+        echo -n "true"
+    else
+        echo -n "false"
+    fi
+}
+
+# Check contents exist in directory
+# IMPORTANT- DON'T ADD LOGGING to this method
+checkContentExists () {
+    local source="$1"
+
+    if [[ "$(checkDirContents "${source}")" != "true" ]]; then
+        echo -n "false"
+    else
+        echo -n "true"
+    fi
+}
+
+# Resolve the variable
+# IMPORTANT- DON'T ADD LOGGING to this method
+evalVariable () {
+    local output="$1"
+    local input="$2"
+
+    eval "${output}"=\${"${input}"}
+    eval echo \${"${output}"}
+}
+
+# Usage: if [ "$(io_commandExists 'curl')" == "yes" ]
+# IMPORTANT- DON'T ADD LOGGING to this method
+io_commandExists() {
+    local commandToExecute="$1"
+    hash "${commandToExecute}" 2>/dev/null
+    local rt=$?
+    if [ "$rt" == 0 ]; then echo -n "yes"; else echo -n "no"; fi
+}
+
+# Usage: if [ "$(io_curlExists)" != "yes" ]
+# IMPORTANT- DON'T ADD LOGGING to this method
+io_curlExists() {
+    io_commandExists "curl"
+}
+
+
+io_hasMatch() {
+    logSilly "Method ${FUNCNAME[0]}"
+    local result=0
+    logDebug "Executing [echo \"$1\" | grep \"$2\" >/dev/null 2>&1]"
+    echo "$1" | grep "$2" >/dev/null 2>&1 || result=1
+    return $result
+}
+
+# Utility method to check if the string passed (usually a connection url) corresponds to this machine itself
+# Failure conditions: None
+# Parameters:
+## $1: string to check against
+# Depends on global: none
+# Updates global: IS_LOCALHOST with value "yes/no"
+# Returns: NA
+
+io_getIsLocalhost() {
+    logSilly "Method ${FUNCNAME[0]}"
+    IS_LOCALHOST="$FLAG_N"
+    local inputString="$1"
+    logDebug "Parsing [$inputString] to check if we are dealing with this machine itself"
+
+    io_hasMatch "$inputString" "localhost" && {
+        logDebug "Found localhost. Returning [$FLAG_Y]"
+        IS_LOCALHOST="$FLAG_Y" && return;
+    } || logDebug "Did not find match for localhost"
+    
+    local hostIP=$(io_getPublicHostIP)
+    io_hasMatch "$inputString" "$hostIP" && {
+        logDebug "Found $hostIP. Returning [$FLAG_Y]"
+        IS_LOCALHOST="$FLAG_Y" && return;
+    } || logDebug "Did not find match for $hostIP"
+    
+    local hostID=$(io_getPublicHostID)
+    io_hasMatch "$inputString" "$hostID" && {
+        logDebug "Found $hostID. Returning [$FLAG_Y]"
+        IS_LOCALHOST="$FLAG_Y" && return;
+    } || logDebug "Did not find match for $hostID"
+    
+    local hostName=$(io_getPublicHostName)
+    io_hasMatch  "$inputString" "$hostName" && {
+        logDebug "Found $hostName. Returning [$FLAG_Y]"
+        IS_LOCALHOST="$FLAG_Y" && return;
+    } || logDebug "Did not find match for $hostName"
+    
+}
+
+# Usage: if [ "$(io_tarExists)" != "yes" ]
+# IMPORTANT- DON'T ADD LOGGING to this method
+io_tarExists() {
+    io_commandExists "tar"
+}
+
+# IMPORTANT- DON'T ADD LOGGING to this method
+io_getPublicHostIP() {
+    local OS_TYPE=$(uname)
+    local publicHostIP=
+    if [ "${OS_TYPE}" == "Darwin" ]; then
+        ipStatus=$(ifconfig en0 | grep "status" | awk '{print$2}')
+        if [ "${ipStatus}" == "active" ]; then
+            publicHostIP=$(ifconfig en0 | grep inet | grep -v inet6 | awk '{print $2}')
+        else
+            errorExit "Host IP could not be resolved!"
+        fi
+    elif [ "${OS_TYPE}" == "Linux" ]; then
+        publicHostIP=$(hostname -i 2>/dev/null || echo "127.0.0.1")
+    fi
+    publicHostIP=$(echo "${publicHostIP}" | awk '{print $1}')
+    echo -n "${publicHostIP}"
+}
+
+# Will return the short host name (up to the first dot)
+# IMPORTANT- DON'T ADD LOGGING to this method
+io_getPublicHostName() {
+    echo -n "$(hostname -s)"
+}
+
+# Will return the full host name (use this as much as possible)
+# IMPORTANT- DON'T ADD LOGGING to this method
+io_getPublicHostID() {
+    echo -n "$(hostname)"
+}
+
+# Utility method to backup a file
+# Failure conditions: NA
+# Parameters: filePath
+# Depends on global: none,
+# Updates global: none
+# Returns: NA
+io_backupFile() {
+    logSilly "Method ${FUNCNAME[0]}"
+    fileName="$1"
+    if [ ! -f "${filePath}" ]; then
+        logDebug "No file: [${filePath}] to backup"
+        return
+    fi
+    dateTime=$(date +"%Y-%m-%d-%H-%M-%S")
+    targetFileName="${fileName}.backup.${dateTime}"
+    yes | \cp -f "$fileName" "${targetFileName}"
+    logger "File [${fileName}] backedup as [${targetFileName}]"
+}
+
+# Reference https://stackoverflow.com/questions/4023830/how-to-compare-two-strings-in-dot-separated-version-format-in-bash/4025065#4025065
+is_number() {
+    case "$BASH_VERSION" in
+        3.1.*)
+            PATTERN='\^\[0-9\]+\$'
+            ;;
+        *)
+            PATTERN='^[0-9]+$'
+            ;;
+    esac
+
+    [[ "$1" =~ $PATTERN ]]
+}
+
+io_compareVersions() {
+    if [[ $# != 2 ]]
+    then
+        echo "Usage: min_version current minimum"
+        return
+    fi
+
+    A="${1%%.*}"
+    B="${2%%.*}"
+
+    if [[ "$A" != "$1" && "$B" != "$2" && "$A" == "$B" ]]
+    then
+        io_compareVersions "${1#*.}" "${2#*.}"
+    else
+        if is_number "$A" && is_number "$B"
+        then
+            if [[ "$A" -eq "$B" ]]; then
+                echo "0"
+            elif [[ "$A" -gt "$B" ]]; then
+                echo "1"
+            elif [[ "$A" -lt "$B" ]]; then
+                echo "-1"
+            fi
+        fi
+    fi
+}
+
+# Reference https://stackoverflow.com/questions/369758/how-to-trim-whitespace-from-a-bash-variable
+# Strip all leading and trailing spaces
+# IMPORTANT- DON'T ADD LOGGING to this method
+io_trim() {
+    local var="$1"
+    # remove leading whitespace characters
+    var="${var#"${var%%[![:space:]]*}"}"
+    # remove trailing whitespace characters
+    var="${var%"${var##*[![:space:]]}"}"
+    echo -n "$var"
+}
+
+# temporary function will be removing it ASAP
+# search for string and replace text in file
+replaceText_migration_hook () {
+    local regexString="$1"
+    local replaceText="$2"
+    local file="$3"
+
+    if [[ "$(checkFileExists "${file}")" != "true" ]]; then
+        return
+    fi
+    if [[ $(uname) == "Darwin" ]]; then
+        sed -i '' -e "s/${regexString}/${replaceText}/" "${file}" || warn "Failed to replace the text in ${file}"
+    else
+        sed -i -e "s/${regexString}/${replaceText}/" "${file}" || warn "Failed to replace the text in ${file}"
+    fi
+}
+
+# search for string and replace text in file
+replaceText () {
+    local regexString="$1"
+    local replaceText="$2"
+    local file="$3"
+
+    if [[ "$(checkFileExists "${file}")" != "true" ]]; then
+        return
+    fi
+    if [[ $(uname) == "Darwin" ]]; then
+        sed -i '' -e "s#${regexString}#${replaceText}#" "${file}" || warn "Failed to replace the text in ${file}"
+    else
+        sed -i -e "s#${regexString}#${replaceText}#" "${file}" || warn "Failed to replace the text in ${file}"
+        logDebug "Replaced [$regexString] with [$replaceText] in [$file]"
+    fi
+}
+
+# search for string and prepend text in file
+prependText () {
+    local regexString="$1"
+    local text="$2"
+    local file="$3"
+
+    if [[ "$(checkFileExists "${file}")" != "true" ]]; then
+        return
+    fi
+    if [[ $(uname) == "Darwin" ]]; then
+        sed -i '' -e '/'"${regexString}"'/i\'$'\n\\'"${text}"''$'\n' "${file}" || warn "Failed to prepend the text in ${file}"
+    else
+        sed -i -e '/'"${regexString}"'/i\'$'\n\\'"${text}"''$'\n' "${file}" || warn "Failed to prepend the text in ${file}"
+    fi
+}
+
+# add text to beginning of the file
+addText () {
+    local text="$1"
+    local file="$2"
+
+    if [[ "$(checkFileExists "${file}")" != "true" ]]; then
+        return
+    fi
+    if [[ $(uname) == "Darwin" ]]; then
+        sed -i '' -e '1s/^/'"${text}"'\'$'\n/' "${file}" || warn "Failed to add the text in ${file}"
+    else
+        sed -i -e '1s/^/'"${text}"'\'$'\n/' "${file}" || warn "Failed to add the text in ${file}"
+    fi
+}
+
+io_replaceString () {
+    local value="$1"
+    local firstString="$2"
+    local secondString="$3"
+    local separator=${4:-"/"}
+    local updateValue=
+    if [[ $(uname) == "Darwin" ]]; then
+        updateValue=$(echo "${value}" | sed "s${separator}${firstString}${separator}${secondString}${separator}")
+    else
+        updateValue=$(echo "${value}" | sed "s${separator}${firstString}${separator}${secondString}${separator}")
+    fi
+    echo -n "${updateValue}"
+}
+
+_findYQ() {
+    # logSilly "Method ${FUNCNAME[0]}" (Intentionally not logging. Does not add value)
+    local parentDir="$1"
+    if [ -z "$parentDir" ]; then
+        return
+    fi
+    logDebug "Executing command [find "${parentDir}" -name third-party -type d]"
+    local yq=$(find "${parentDir}" -name third-party -type d)
+    if [ -d "${yq}/yq" ]; then
+        export YQ_PATH="${yq}/yq"
+    fi
+}
+
+
+io_setYQPath() {
+    # logSilly "Method ${FUNCNAME[0]}" (Intentionally not logging. Does not add value)
+    if [ "$(io_commandExists 'yq')" == "yes" ]; then
+        return
+    fi
+    
+    if [ ! -z "${JF_PRODUCT_HOME}" ] && [ -d "${JF_PRODUCT_HOME}" ]; then
+        _findYQ "${JF_PRODUCT_HOME}"
+    fi
+    
+    if [ -z "${YQ_PATH}" ] && [ ! -z "${COMPOSE_HOME}" ] && [ -d "${COMPOSE_HOME}" ]; then
+        _findYQ "${COMPOSE_HOME}"
+    fi
+    # TODO We can remove this block after all the code is restructured.
+    if [ -z "${YQ_PATH}" ] && [ ! -z "${SCRIPT_HOME}" ] && [ -d "${SCRIPT_HOME}" ]; then
+        _findYQ "${SCRIPT_HOME}"
+    fi
+    
+}
+
+io_getLinuxDistribution() {
+    LINUX_DISTRIBUTION=
+
+    # Make sure running on Linux
+    [ $(uname -s) != "Linux" ] && return
+
+    # Find out what Linux distribution we are on
+
+    cat /etc/*-release | grep -i Red >/dev/null 2>&1 && LINUX_DISTRIBUTION=RedHat || true
+
+    # OS 6.x
+    cat /etc/issue.net | grep Red >/dev/null 2>&1 && LINUX_DISTRIBUTION=RedHat || true
+
+    # OS 7.x
+    cat /etc/*-release | grep -i centos >/dev/null 2>&1 && LINUX_DISTRIBUTION=CentOS && LINUX_DISTRIBUTION_VER="7" || true
+
+    # OS 8.x
+    grep -q -i "release 8" /etc/redhat-release >/dev/null 2>&1 && LINUX_DISTRIBUTION_VER="8" || true
+
+    # OS 7.x
+    grep -q -i "release 7" /etc/redhat-release >/dev/null 2>&1 && LINUX_DISTRIBUTION_VER="7" || true
+
+    # OS 6.x
+    grep -q -i "release 6" /etc/redhat-release >/dev/null 2>&1 && LINUX_DISTRIBUTION_VER="6" || true
+
+    cat /etc/*-release | grep -i Red | grep -i 'VERSION=7' >/dev/null 2>&1 && LINUX_DISTRIBUTION=RedHat && LINUX_DISTRIBUTION_VER="7" || true
+
+    cat /etc/*-release | grep -i debian >/dev/null 2>&1 && LINUX_DISTRIBUTION=Debian || true
+
+    cat /etc/*-release | grep -i ubuntu >/dev/null 2>&1 && LINUX_DISTRIBUTION=Ubuntu || true
+}
+
+## Utility method to check ownership of folders/files
+## Failure conditions:
+    ## If invoked with incorrect inputs - FATAL
+    ## If file is not owned by the user & group
+## Parameters:
+    ## user
+    ## group
+    ## folder to chown    
+## Globals: none
+## Returns: none
+## NOTE: The method does NOTHING if the OS is Mac
+io_checkOwner () {
+    logSilly "Method ${FUNCNAME[0]}"
+    local osType=$(uname)
+    
+    if [ "${osType}" != "Linux" ]; then
+        logDebug "Unsupported OS. Skipping check"
+        return 0
+    fi
+
+    local file_to_check=$1
+    local user_id_to_check=$2
+    
+
+    if [ -z "$user_id_to_check" ] || [ -z "$file_to_check" ]; then
+        errorExit "Invalid invocation of method. Missing mandatory inputs"
+    fi
+
+    local group_id_to_check=${3:-$user_id_to_check}
+    local check_user_name=${4:-"no"}
+
+    logDebug "Checking permissions on [$file_to_check] for user [$user_id_to_check] & group [$group_id_to_check]"
+
+    local stat=
+
+    if [ "${check_user_name}" == "yes" ]; then
+        stat=( $(stat -Lc "%U %G" ${file_to_check}) )
+    else
+        stat=( $(stat -Lc "%u %g" ${file_to_check}) )
+    fi
+
+    local user_id=${stat[0]}
+    local group_id=${stat[1]}
+
+    if [[ "${user_id}" != "${user_id_to_check}" ]] || [[ "${group_id}" != "${group_id_to_check}" ]] ; then
+        logDebug "Ownership mismatch. [${file_to_check}] is not owned by [${user_id_to_check}:${group_id_to_check}]"
+        return 1
+    else
+        return 0
+    fi
+}
+
+## Utility method to change ownership of a file/folder - NON recursive
+## Failure conditions:
+    ## If invoked with incorrect inputs - FATAL
+    ## If chown operation fails - returns 1
+## Parameters: 
+    ## user
+    ## group
+    ## file to chown    
+## Globals: none
+## Returns: none
+## NOTE: The method does NOTHING if the OS is Mac
+
+io_setOwnershipNonRecursive() {
+    
+    local osType=$(uname)
+    if [ "${osType}" != "Linux" ]; then
+        return
+    fi
+
+    local targetFile=$1
+    local user=$2
+
+    if [ -z "$user" ] || [ -z "$targetFile" ]; then
+        errorExit "Invalid invocation of method. Missing mandatory inputs"
+    fi
+
+    local group=${3:-$user}
+    logDebug "Method ${FUNCNAME[0]}. Executing [chown ${user}:${group} ${targetFile}]"
+    chown ${user}:${group} ${targetFile} || return 1
+}
+
+## Utility method to change ownership of a file. 
+## IMPORTANT 
+## If being called on a folder, should ONLY be called for fresh folders or may cause performance issues
+## Failure conditions:
+    ## If invoked with incorrect inputs - FATAL
+    ## If chown operation fails - returns 1
+## Parameters: 
+    ## user
+    ## group
+    ## file to chown    
+## Globals: none
+## Returns: none
+## NOTE: The method does NOTHING if the OS is Mac
+
+io_setOwnership() {
+    
+    local osType=$(uname)
+    if [ "${osType}" != "Linux" ]; then
+        return
+    fi
+
+    local targetFile=$1
+    local user=$2
+
+    if [ -z "$user" ] || [ -z "$targetFile" ]; then
+        errorExit "Invalid invocation of method. Missing mandatory inputs"
+    fi
+
+    local group=${3:-$user}
+    logDebug "Method ${FUNCNAME[0]}. Executing [chown -R ${user}:${group} ${targetFile}]"
+    chown -R ${user}:${group} ${targetFile} || return 1
+}
+
+## Utility method to create third party folder structure necessary for Postgres
+## Failure conditions:
+## If creation of directory or assigning permissions fails
+## Parameters: none
+## Globals:
+## POSTGRESQL_DATA_ROOT
+## Returns: none
+## NOTE: The method does NOTHING if the folder already exists
+io_createPostgresDir() {
+    logDebug "Method ${FUNCNAME[0]}"
+    [ -z "${POSTGRESQL_DATA_ROOT}" ] && return 0
+
+    logDebug "Property [${POSTGRESQL_DATA_ROOT}] exists. Proceeding"
+
+    createDir "${POSTGRESQL_DATA_ROOT}/data"
+    io_setOwnership  "${POSTGRESQL_DATA_ROOT}" "${POSTGRES_USER}" "${POSTGRES_USER}" || errorExit "Setting ownership of [${POSTGRESQL_DATA_ROOT}] to [${POSTGRES_USER}:${POSTGRES_USER}] failed"
+}
+
+## Utility method to create third party folder structure necessary for Nginx
+## Failure conditions:
+## If creation of directory or assigning permissions fails
+## Parameters: none
+## Globals:
+## NGINX_DATA_ROOT
+## Returns: none
+## NOTE: The method does NOTHING if the folder already exists
+io_createNginxDir() {
+    logDebug "Method ${FUNCNAME[0]}"
+    [ -z "${NGINX_DATA_ROOT}" ] && return 0
+
+    logDebug "Property [${NGINX_DATA_ROOT}] exists. Proceeding"
+
+    createDir "${NGINX_DATA_ROOT}"
+    io_setOwnership  "${NGINX_DATA_ROOT}" "${NGINX_USER}" "${NGINX_GROUP}" || errorExit "Setting ownership of [${NGINX_DATA_ROOT}] to [${NGINX_USER}:${NGINX_GROUP}] failed"
+}
+
+## Utility method to create third party folder structure necessary for ElasticSearch
+## Failure conditions:
+## If creation of directory or assigning permissions fails
+## Parameters: none
+## Globals:
+## ELASTIC_DATA_ROOT
+## Returns: none
+## NOTE: The method does NOTHING if the folder already exists
+io_createElasticSearchDir() {
+    logDebug "Method ${FUNCNAME[0]}"
+    [ -z "${ELASTIC_DATA_ROOT}" ] && return 0
+
+    logDebug "Property [${ELASTIC_DATA_ROOT}] exists. Proceeding"
+
+    createDir "${ELASTIC_DATA_ROOT}/data"
+    io_setOwnership  "${ELASTIC_DATA_ROOT}" "${ES_USER}" "${ES_USER}" || errorExit "Setting ownership of [${ELASTIC_DATA_ROOT}] to [${ES_USER}:${ES_USER}] failed"
+}
+
+## Utility method to create third party folder structure necessary for Redis
+## Failure conditions:
+## If creation of directory or assigning permissions fails
+## Parameters: none
+## Globals:
+## REDIS_DATA_ROOT
+## Returns: none
+## NOTE: The method does NOTHING if the folder already exists
+io_createRedisDir() {
+    logDebug "Method ${FUNCNAME[0]}"
+    [ -z "${REDIS_DATA_ROOT}" ] && return 0
+
+    logDebug "Property [${REDIS_DATA_ROOT}] exists. Proceeding"
+
+    createDir "${REDIS_DATA_ROOT}"
+    io_setOwnership  "${REDIS_DATA_ROOT}" "${REDIS_USER}" "${REDIS_USER}" || errorExit "Setting ownership of [${REDIS_DATA_ROOT}] to [${REDIS_USER}:${REDIS_USER}] failed"
+}
+
+## Utility method to create third party folder structure necessary for Mongo
+## Failure conditions:
+## If creation of directory or assigning permissions fails
+## Parameters: none
+## Globals:
+## MONGODB_DATA_ROOT
+## Returns: none
+## NOTE: The method does NOTHING if the folder already exists
+io_createMongoDir() {
+    logDebug "Method ${FUNCNAME[0]}"
+    [ -z "${MONGODB_DATA_ROOT}" ] && return 0
+
+    logDebug "Property [${MONGODB_DATA_ROOT}] exists. Proceeding"
+
+    createDir "${MONGODB_DATA_ROOT}/logs"
+    createDir "${MONGODB_DATA_ROOT}/configdb"
+    createDir "${MONGODB_DATA_ROOT}/db"
+    io_setOwnership  "${MONGODB_DATA_ROOT}" "${MONGO_USER}" "${MONGO_USER}" || errorExit "Setting ownership of [${MONGODB_DATA_ROOT}] to [${MONGO_USER}:${MONGO_USER}] failed"
+}
+
+## Utility method to create third party folder structure necessary for RabbitMQ
+## Failure conditions:
+## If creation of directory or assigning permissions fails
+## Parameters: none
+## Globals:
+## RABBITMQ_DATA_ROOT
+## Returns: none
+## NOTE: The method does NOTHING if the folder already exists
+io_createRabbitMQDir() {
+    logDebug "Method ${FUNCNAME[0]}"
+    [ -z "${RABBITMQ_DATA_ROOT}" ] && return 0
+
+    logDebug "Property [${RABBITMQ_DATA_ROOT}] exists. Proceeding"
+
+    createDir "${RABBITMQ_DATA_ROOT}"
+    io_setOwnership  "${RABBITMQ_DATA_ROOT}" "${RABBITMQ_USER}" "${RABBITMQ_USER}" || errorExit "Setting ownership of [${RABBITMQ_DATA_ROOT}] to [${RABBITMQ_USER}:${RABBITMQ_USER}] failed"
+}
+
+# Add or replace a property in provided properties file
+addOrReplaceProperty() {
+    local propertyName=$1
+    local propertyValue=$2
+    local propertiesPath=$3
+    local delimiter=${4:-"="}
+
+    # Return if any of the inputs are empty
+    [[ -z "$propertyName"   || "$propertyName"   == "" ]] && return
+    [[ -z "$propertyValue"  || "$propertyValue"  == "" ]] && return
+    [[ -z "$propertiesPath" || "$propertiesPath" == "" ]] && return
+
+    grep "^${propertyName}\s*${delimiter}.*$" ${propertiesPath} > /dev/null 2>&1
+    [ $? -ne 0 ] && echo -e "\n${propertyName}${delimiter}${propertyValue}" >> ${propertiesPath}
+    sed -i -e "s|^${propertyName}\s*${delimiter}.*$|${propertyName}${delimiter}${propertyValue}|g;" ${propertiesPath}
+}
+
+# Set property only if its not set
+io_setPropertyNoOverride(){
+    local propertyName=$1
+    local propertyValue=$2
+    local propertiesPath=$3
+
+    # Return if any of the inputs are empty
+    [[ -z "$propertyName"   || "$propertyName"   == "" ]] && return
+    [[ -z "$propertyValue"  || "$propertyValue"  == "" ]] && return
+    [[ -z "$propertiesPath" || "$propertiesPath" == "" ]] && return
+
+    grep "^${propertyName}:" ${propertiesPath} > /dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        echo -e "${propertyName}: ${propertyValue}" >> ${propertiesPath} || warn "Setting property ${propertyName}: ${propertyValue} in [ ${propertiesPath} ] failed"
+    else
+        logger "Skipping update of property : ${propertyName}" >&6
+    fi
+}
+
+# Add a line to a file if it doesn't already exist
+addLine() {
+    local line_to_add=$1
+    local target_file=$2
+    logger "Trying to add line $1 to $2" >&6 2>&1
+    cat "$target_file" | grep -F "$line_to_add" -wq >&6 2>&1
+    if [ $? != 0  ]; then
+        logger "Line does not exist and will be added" >&6 2>&1
+        echo $line_to_add >> $target_file || errorExit "Could not update $target_file"
+    fi    
+}
+
+# Utility method to check if a value (first parameter) exists in an array (2nd parameter)
+# 1st parameter "value to find"
+# 2nd parameter "The array to search in. Please pass a string with each value separated by space"
+# Example: containsElement "y" "y Y n N"
+containsElement () {
+    local searchElement=$1
+    local searchArray=($2)
+    local found=1
+    for elementInIndex in "${searchArray[@]}";do
+    if [[ $elementInIndex == $searchElement ]]; then
+        found=0
+    fi
+    done
+    return $found
+}
+
+# Utility method to get user's choice
+# 1st parameter "what to ask the user"
+# 2nd parameter "what choices to accept, separated by spaces"
+# 3rd parameter "what is the default choice (to use if the user simply presses Enter)"
+# Example 'getUserChoice "Are you feeling lucky? Punk!" "y n Y N" "y"'
+getUserChoice(){
+    configureLogOutput
+    read_timeout=${read_timeout:-0.5}
+    local choice="na"
+    local text_to_display=$1
+    local choices=$2
+    local default_choice=$3
+    users_choice=
+
+    until containsElement "$choice" "$choices"; do
+        echo "";echo "";
+        sleep $read_timeout #This ensures correct placement of the question.
+        read -p  "$text_to_display :" choice
+        : ${choice:=$default_choice}
+    done
+    users_choice=$choice
+    echo -e "\n$text_to_display: $users_choice" >&6
+    sleep $read_timeout #This ensures correct logging
+}
+
+setFilePermission () {
+    local permission=$1
+    local file=$2
+    chmod "${permission}" "${file}" || warn "Setting permission ${permission} to file [ ${file} ] failed"
+}
+
+
+#setting required paths
+setAppDir (){
+    SCRIPT_DIR=$(dirname $0)
+    SCRIPT_HOME="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    APP_DIR="`cd "${SCRIPT_HOME}";pwd`"
+}
+
+ZIP_TYPE="zip"
+COMPOSE_TYPE="compose"
+HELM_TYPE="helm"
+RPM_TYPE="rpm"
+DEB_TYPE="debian"
+
+sourceScript () {
+    local file="$1"
+
+    [ ! -z "${file}" ] || errorExit "target file is not passed to source a file"
+
+    if [ ! -f "${file}" ]; then
+        errorExit "${file} file is not found"
+    else
+        source "${file}" || errorExit "Unable to source ${file}, please check if the user ${USER} has permissions to perform this action"
+    fi
+}
+# Source required helpers
+initHelpers () {
+    local systemYamlHelper="${APP_DIR}/systemYamlHelper.sh"
+    local thirdPartyDir=$(find ${APP_DIR}/.. -name third-party -type d)
+    export YQ_PATH="${thirdPartyDir}/yq"
+    LIBXML2_PATH="${thirdPartyDir}/libxml2/bin/xmllint"
+    export LD_LIBRARY_PATH="${thirdPartyDir}/libxml2/lib"
+    sourceScript "${systemYamlHelper}"
+}
+# Check migration info yaml file available in the path
+checkMigrationInfoYaml () {
+
+    if [[ -f "${APP_DIR}/migrationHelmInfo.yaml" ]]; then
+        MIGRATION_SYSTEM_YAML_INFO="${APP_DIR}/migrationHelmInfo.yaml"
+        INSTALLER="${HELM_TYPE}"
+    elif [[ -f "${APP_DIR}/migrationZipInfo.yaml" ]]; then
+        MIGRATION_SYSTEM_YAML_INFO="${APP_DIR}/migrationZipInfo.yaml"
+        INSTALLER="${ZIP_TYPE}"
+    elif [[ -f "${APP_DIR}/migrationRpmInfo.yaml" ]]; then
+        MIGRATION_SYSTEM_YAML_INFO="${APP_DIR}/migrationRpmInfo.yaml"
+        INSTALLER="${RPM_TYPE}"
+    elif [[ -f "${APP_DIR}/migrationDebInfo.yaml" ]]; then
+        MIGRATION_SYSTEM_YAML_INFO="${APP_DIR}/migrationDebInfo.yaml"
+        INSTALLER="${DEB_TYPE}"
+    elif [[ -f "${APP_DIR}/migrationComposeInfo.yaml" ]]; then
+        MIGRATION_SYSTEM_YAML_INFO="${APP_DIR}/migrationComposeInfo.yaml"
+        INSTALLER="${COMPOSE_TYPE}"
+    else
+        errorExit "File migration Info yaml does not exist in [${APP_DIR}]"
+    fi
+}
+
+retrieveYamlValue () {
+    local yamlPath="$1"
+    local value="$2"
+    local output="$3"
+    local message="$4"
+
+    [[ -z "${yamlPath}" ]] && errorExit "yamlPath is mandatory to get value from ${MIGRATION_SYSTEM_YAML_INFO}"
+
+    getYamlValue "${yamlPath}" "${MIGRATION_SYSTEM_YAML_INFO}" "false"
+    value="${YAML_VALUE}"
+    if [[ -z "${value}" ]]; then
+        if [[ "${output}" == "Warning" ]]; then
+            warn "Empty value for ${yamlPath} in [${MIGRATION_SYSTEM_YAML_INFO}]"
+        elif [[ "${output}" == "Skip" ]]; then
+            return
+        else
+            errorExit "${message}"
+        fi
+    fi
+}
+
+checkEnv () {
+    
+    if [[ "${INSTALLER}" == "${ZIP_TYPE}" ]]; then
+        # check Environment JF_PRODUCT_HOME is set before migration
+        NEW_DATA_DIR="$(evalVariable "NEW_DATA_DIR" "JF_PRODUCT_HOME")"
+        if [[ -z "${NEW_DATA_DIR}" ]]; then
+            errorExit "Environment variable JF_PRODUCT_HOME is not set, this is required to perform Migration"
+        fi
+        # appending var directory to $JF_PRODUCT_HOME
+        NEW_DATA_DIR="${NEW_DATA_DIR}/var"
+    elif [[ "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        getCustomDataDir_hook
+        NEW_DATA_DIR="${OLD_DATA_DIR}"
+        if [[ -z "${NEW_DATA_DIR}" ]] && [[  -z "${OLD_DATA_DIR}" ]]; then
+            errorExit "Could not find ${PROMPT_DATA_DIR_LOCATION} to perform Migration"
+        fi
+    else
+        # check Environment JF_ROOT_DATA_DIR is set before migration
+        OLD_DATA_DIR="$(evalVariable "OLD_DATA_DIR" "JF_ROOT_DATA_DIR")"
+        # check Environment JF_ROOT_DATA_DIR is set before migration
+        NEW_DATA_DIR="$(evalVariable "NEW_DATA_DIR" "JF_ROOT_DATA_DIR")"
+        if [[ -z "${NEW_DATA_DIR}" ]] && [[  -z "${OLD_DATA_DIR}" ]]; then
+            errorExit "Could not find ${PROMPT_DATA_DIR_LOCATION} to perform Migration"
+        fi
+            # appending var directory to $JF_PRODUCT_HOME
+            NEW_DATA_DIR="${NEW_DATA_DIR}/var"
+    fi
+    
+}
+
+getDataDir () {
+
+    if [[ "${INSTALLER}" == "${ZIP_TYPE}" || "${INSTALLER}" == "${COMPOSE_TYPE}"|| "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        checkEnv
+    else
+        getCustomDataDir_hook
+        NEW_DATA_DIR="`cd "${APP_DIR}"/../../;pwd`"
+        NEW_DATA_DIR="${NEW_DATA_DIR}/var"
+    fi
+}
+
+# Retrieve Product name from MIGRATION_SYSTEM_YAML_INFO
+getProduct () {
+    retrieveYamlValue "migration.product" "${YAML_VALUE}" "Fail" "Empty value under ${yamlPath} in [${MIGRATION_SYSTEM_YAML_INFO}]"
+    PRODUCT="${YAML_VALUE}"
+    PRODUCT=$(echo "${PRODUCT}" | tr '[:upper:]' '[:lower:]' 2>/dev/null)
+    if [[ "${PRODUCT}" != "artifactory" && "${PRODUCT}" != "distribution" && "${PRODUCT}" != "xray" ]]; then
+        errorExit "migration.product in [${MIGRATION_SYSTEM_YAML_INFO}] is not correct, please set based on product as ARTIFACTORY or DISTRIBUTION"
+    fi
+    if [[ "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        JF_USER="${PRODUCT}"
+    fi
+}
+# Compare product version with minProductVersion and maxProductVersion
+migrateCheckVersion () {
+    local productVersion="$1"
+    local minProductVersion="$2"
+    local maxProductVersion="$3"
+    local productVersion618="6.18.0"
+    local unSupportedProductVersions7=("7.2.0 7.2.1")
+
+    if [[ "$(io_compareVersions "${productVersion}" "${maxProductVersion}")" -eq 0 || "$(io_compareVersions "${productVersion}" "${maxProductVersion}")" -eq 1 ]]; then
+        logger "Migration not necessary. ${PRODUCT} is already ${productVersion}"
+        exit 11
+    elif [[ "$(io_compareVersions "${productVersion}" "${minProductVersion}")" -eq 0 || "$(io_compareVersions "${productVersion}" "${minProductVersion}")" -eq 1 ]]; then
+        if [[ ("$(io_compareVersions "${productVersion}" "${productVersion618}")" -eq 0 || "$(io_compareVersions "${productVersion}" "${productVersion618}")" -eq 1) && " ${unSupportedProductVersions7[@]} " =~ " ${CURRENT_VERSION} " ]]; then
+            touch /tmp/error;
+            errorExit "Current ${PRODUCT} version (${productVersion}) does not support migration to ${CURRENT_VERSION}"
+        else
+            bannerStart "Detected ${PRODUCT} ${productVersion}, initiating migration"
+        fi
+    else
+        logger "Current ${PRODUCT} ${productVersion} version is not supported for migration"
+        exit 1
+    fi
+}
+
+getProductVersion () {
+    local minProductVersion="$1"
+    local maxProductVersion="$2"
+    local newfilePath="$3"
+    local oldfilePath="$4"
+    local propertyInDocker="$5"
+    local property="$6"
+    local productVersion=
+    local status=
+
+    if [[ "$INSTALLER" == "${COMPOSE_TYPE}" ]]; then
+        if [[ -f "${oldfilePath}" ]]; then
+            if [[ "${PRODUCT}" == "artifactory" ]]; then
+                productVersion="$(readKey "${property}" "${oldfilePath}")"
+            else
+                productVersion="$(cat "${oldfilePath}")"
+            fi
+            status="success"
+        elif [[ -f "${newfilePath}" ]]; then
+            productVersion="$(readKey "${propertyInDocker}" "${newfilePath}")"
+            status="fail"
+        else
+            logger "File [${oldfilePath}] or [${newfilePath}] not found to get current version."
+            exit 0
+        fi
+    elif [[ "$INSTALLER" == "${HELM_TYPE}" ]]; then
+        if [[ -f "${oldfilePath}" ]]; then
+            if [[ "${PRODUCT}" == "artifactory" ]]; then
+                productVersion="$(readKey "${property}" "${oldfilePath}")"
+            else
+                productVersion="$(cat "${oldfilePath}")"
+            fi
+            status="success"
+        else
+            productVersion="${CURRENT_VERSION}"
+            [[ -z "${productVersion}" || "${productVersion}" == "" ]] && logger "${PRODUCT} CURRENT_VERSION is not set" && exit 0
+        fi
+    else
+        if [[ -f "${newfilePath}" ]]; then
+            productVersion="$(readKey "${property}" "${newfilePath}")"
+            status="fail"
+        elif [[ -f "${oldfilePath}" ]]; then
+            productVersion="$(readKey "${property}" "${oldfilePath}")"
+            status="success"
+        else
+            if [[ "${INSTALLER}" == "${ZIP_TYPE}" ]]; then
+                logger "File [${newfilePath}] not found to get current version."
+            else
+                logger "File [${oldfilePath}] or [${newfilePath}] not found to get current version."
+            fi
+            exit 0
+        fi
+    fi
+    if [[ -z "${productVersion}" || "${productVersion}" == "" ]]; then
+        [[ "${status}" == "success" ]] && logger "No version found in file [${oldfilePath}]."
+        [[ "${status}" == "fail" ]] && logger "No version found in file [${newfilePath}]."
+        exit 0
+    fi
+
+    migrateCheckVersion "${productVersion}" "${minProductVersion}" "${maxProductVersion}"
+}
+
+readKey () {
+    local property="$1"
+    local file="$2"
+    local version=
+
+    while IFS='=' read -r key value || [ -n "${key}" ];
+    do
+        [[ ! "${key}" =~ \#.* && ! -z "${key}" && ! -z "${value}" ]]
+        key="$(io_trim "${key}")"
+        if [[ "${key}" == "${property}" ]]; then
+            version="${value}" && check=true && break
+        else
+            check=false
+        fi
+    done < "${file}"
+    if [[ "${check}" == "false" ]]; then
+        return
+    fi
+    echo "${version}"
+}
+
+# create Log directory
+createLogDir () {
+    if [[ "${INSTALLER}" == "${DEB_TYPE}" || "${INSTALLER}" == "${RPM_TYPE}" ]]; then
+        getUserAndGroupFromFile
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/log" "${USER_TO_CHECK}" "${GROUP_TO_CHECK}"
+    fi
+}
+
+# Creating migration log file
+creationMigrateLog () {
+    local LOG_FILE_NAME="migration.log"
+    createLogDir
+    local MIGRATION_LOG_FILE="${NEW_DATA_DIR}/log/${LOG_FILE_NAME}"
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        MIGRATION_LOG_FILE="${SCRIPT_HOME}/${LOG_FILE_NAME}"
+    fi
+    touch "${MIGRATION_LOG_FILE}"
+    setFilePermission "${LOG_FILE_PERMISSION}" "${MIGRATION_LOG_FILE}"
+    exec &> >(tee -a "${MIGRATION_LOG_FILE}")   
+}
+# Set path where system.yaml should create
+setSystemYamlPath () {
+    SYSTEM_YAML_PATH="${NEW_DATA_DIR}/etc/system.yaml"
+    if [[ "${INSTALLER}" != "${HELM_TYPE}" ]]; then
+        logger "system.yaml will be created in path [${SYSTEM_YAML_PATH}]"
+    fi
+}
+# Create directory
+createDirectory () {
+    local directory="$1"
+    local output="$2"
+    local check=false
+    local message="Could not create directory ${directory}, please check if the user ${USER} has permissions to perform this action"
+    removeSoftLink "${directory}"
+    mkdir -p "${directory}" && check=true || check=false
+    if [[ "${check}" == "false" ]]; then
+        if [[ "${output}" == "Warning" ]]; then
+            warn "${message}"
+        else
+            errorExit "${message}"
+        fi
+    fi
+    setOwnershipBasedOnInstaller "${directory}"
+}
+
+setOwnershipBasedOnInstaller () {
+    local directory="$1"
+    if [[ "${INSTALLER}" == "${DEB_TYPE}" || "${INSTALLER}" == "${RPM_TYPE}" ]]; then
+        getUserAndGroupFromFile
+        chown -R ${USER_TO_CHECK}:${GROUP_TO_CHECK} "${directory}" || warn "Setting ownership on $directory failed"
+    elif [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        io_setOwnership "${directory}" "${JF_USER}" "${JF_USER}"
+    fi
+}
+
+getUserAndGroup () {
+    local file="$1"
+    read uid gid <<<$(stat -c '%U %G' ${file})
+    USER_TO_CHECK="${uid}"
+    GROUP_TO_CHECK="${gid}"
+}
+    
+# set ownership
+getUserAndGroupFromFile () {
+    case $PRODUCT in
+        artifactory)
+            getUserAndGroup "/etc/opt/jfrog/artifactory/artifactory.properties"
+        ;;
+        distribution)
+            getUserAndGroup "${OLD_DATA_DIR}/etc/versions.properties"
+        ;;
+        xray)
+            getUserAndGroup "${OLD_DATA_DIR}/security/master.key"
+        ;;
+        esac
+} 
+
+# creating required directories
+createRequiredDirs () {
+    bannerSubSection "CREATING REQUIRED DIRECTORIES"
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}"  ]]; then
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/etc/security" "${JF_USER}" "${JF_USER}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/data" "${JF_USER}" "${JF_USER}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/log/archived" "${JF_USER}" "${JF_USER}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/work" "${JF_USER}" "${JF_USER}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/backup" "${JF_USER}" "${JF_USER}" "yes"
+        io_setOwnership "${NEW_DATA_DIR}" "${JF_USER}" "${JF_USER}"
+        if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" ]]; then
+            removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/data/postgres" "${POSTGRES_USER}" "${POSTGRES_USER}" "yes"
+        fi
+    elif [[ "${INSTALLER}" == "${DEB_TYPE}" || "${INSTALLER}" == "${RPM_TYPE}" ]]; then
+        getUserAndGroupFromFile
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/etc" "${USER_TO_CHECK}" "${GROUP_TO_CHECK}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/etc/security" "${USER_TO_CHECK}" "${GROUP_TO_CHECK}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/data" "${USER_TO_CHECK}" "${GROUP_TO_CHECK}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/log/archived" "${USER_TO_CHECK}" "${GROUP_TO_CHECK}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/work" "${USER_TO_CHECK}" "${GROUP_TO_CHECK}" "yes"
+        removeSoftLinkAndCreateDir "${NEW_DATA_DIR}/backup" "${USER_TO_CHECK}" "${GROUP_TO_CHECK}" "yes"
+    fi
+}
+
+# Check entry in map is format
+checkMapEntry () {
+    local entry="$1"
+
+    [[ "${entry}" != *"="* ]] && echo -n "false" || echo -n "true"
+}
+# Check value Empty and warn
+warnIfEmpty () {
+    local filePath="$1"
+    local yamlPath="$2"
+    local check=
+
+    if [[ -z "${filePath}" ]]; then
+        warn "Empty value in yamlpath [${yamlPath} in [${MIGRATION_SYSTEM_YAML_INFO}]"
+        check=false
+    else
+        check=true
+    fi
+    echo "${check}"
+}
+
+logCopyStatus () {
+    local status="$1"
+    local logMessage="$2"
+    local warnMessage="$3"
+
+    [[ "${status}" == "success"  ]] && logger "${logMessage}"
+    [[ "${status}" == "fail" ]] && warn "${warnMessage}"
+}
+# copy contents from source to destination
+copyCmd () {
+    local source="$1"
+    local target="$2"
+    local mode="$3"
+    local status=
+    
+    case $mode in
+        unique)
+            cp -up "${source}"/* "${target}"/ && status="success" || status="fail"
+            logCopyStatus "${status}" "Successfully copied directory contents from [${source}] to [${target}]" "Failed to copy directory contents from [${source}] to [${target}]"
+        ;;
+        specific)
+            cp -pf "${source}" "${target}"/ && status="success" || status="fail"
+            logCopyStatus "${status}" "Successfully copied file [${source}] to [${target}]" "Failed to copy file [${source}] to [${target}]"
+        ;;
+        patternFiles)
+            cp -pf "${source}"* "${target}"/ && status="success" || status="fail"
+            logCopyStatus "${status}" "Successfully copied files matching [${source}*] to [${target}]" "Failed to copy files matching [${source}*] to [${target}]"
+        ;;
+        full)
+            cp -prf "${source}"/* "${target}"/ && status="success" || status="fail"
+            logCopyStatus "${status}" "Successfully copied directory contents from [${source}] to [${target}]" "Failed to copy directory contents from [${source}] to [${target}]"
+        ;;
+    esac
+}
+# Check contents exist in source before copying
+copyOnContentExist () {
+    local source="$1"
+    local target="$2"
+    local mode="$3"
+
+    if [[ "$(checkContentExists "${source}")" == "true" ]]; then
+        copyCmd "${source}" "${target}" "${mode}"
+    else
+        logger "No contents to copy from [${source}]"
+    fi
+}
+
+# move source to destination
+moveCmd () {
+    local source="$1"
+    local target="$2"
+    local status=
+    
+    mv -f "${source}" "${target}" && status="success" || status="fail"
+    [[ "${status}" == "success" ]] && logger "Successfully moved directory [${source}] to [${target}]"
+    [[ "${status}" == "fail" ]] && warn "Failed to move directory [${source}] to [${target}]"
+}
+
+# symlink target to source
+symlinkCmd () {
+    local source="$1"
+    local target="$2"
+    local symlinkSubDir="$3"
+    local check=false
+    
+    if [[ "${symlinkSubDir}" == "subDir" ]]; then
+        ln -sf "${source}"/* "${target}" && check=true || check=false
+    else
+        ln -sf "${source}" "${target}"   && check=true || check=false
+    fi
+    
+    [[ "${check}" == "true"  ]] && logger "Successfully symlinked directory [${target}] to old [${source}]"
+    [[ "${check}" == "false" ]] && warn "Symlink operation failed"
+}
+# Check contents exist in source before symlinking
+symlinkOnExist () {
+    local source="$1"
+    local target="$2"
+    local symlinkSubDir="$3"
+
+    if [[ "$(checkContentExists "${source}")" == "true" ]]; then
+        if [[ "${symlinkSubDir}" == "subDir" ]]; then
+            symlinkCmd "${source}" "${target}" "subDir"
+        else
+            symlinkCmd "${source}" "${target}"
+        fi
+    else
+        logger "No contents to symlink from [${source}]"
+    fi
+}
+
+prependDir () {
+    local absolutePath="$1"
+    local fullPath="$2"
+    local sourcePath=
+
+    if [[ "${absolutePath}" = \/* ]]; then
+        sourcePath="${absolutePath}"
+    else
+        sourcePath="${fullPath}"
+    fi
+    echo "${sourcePath}"
+}
+
+getFirstEntry (){
+    local entry="$1"
+
+    [[ -z "${entry}" ]] && return
+    echo "${entry}" | awk -F"=" '{print $1}'
+}
+
+getSecondEntry () {
+    local entry="$1"
+
+    [[ -z "${entry}" ]] && return
+    echo "${entry}" | awk -F"=" '{print $2}'
+}
+# To get absolutePath
+pathResolver () {
+    local directoryPath="$1"
+    local dataDir=
+
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" ||  "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        retrieveYamlValue "migration.oldDataDir" "oldDataDir" "Warning"
+        dataDir="${YAML_VALUE}"
+        cd "${dataDir}"
+    else
+        cd "${OLD_DATA_DIR}"
+    fi
+    absoluteDir="`cd "${directoryPath}";pwd`"
+    echo "${absoluteDir}"
+}
+
+checkPathResolver () {
+    local value="$1"
+
+    if [[ "${value}" == \/* ]]; then
+        value="${value}"
+    else
+        value="$(pathResolver "${value}")"
+    fi
+    echo "${value}"
+}
+
+propertyMigrate () {
+    local entry="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local check=false
+
+    local yamlPath="$(getFirstEntry "${entry}")"
+    local property="$(getSecondEntry "${entry}")"
+    if [[ -z "${property}" ]]; then
+        warn "Property is empty in map [${entry}] in the file [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    if [[ -z "${yamlPath}" ]]; then
+        warn "yamlPath is empty for [${property}] in [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    local keyValues=$(cat "${NEW_DATA_DIR}/${filePath}/${fileName}" | grep "^[^#]" | grep "[*=*]")
+    for i in ${keyValues}; do
+        key=$(echo "${i}" | awk -F"=" '{print $1}')
+        value=$(echo "${i}" | cut -f 2- -d '=')
+        [ -z "${key}" ] && continue
+        [ -z "${value}" ] && continue
+        if [[ "${key}" == "${property}" ]]; then
+            if [[ "${PRODUCT}" == "artifactory" ]]; then
+                value="$(migrateResolveDerbyPath "${key}" "${value}")"
+                value="$(migrateResolveHaDirPath "${key}" "${value}")"
+                if [[ "${INSTALLER}" != "${DOCKER_TYPE}" ]]; then 
+                    value="$(updatePostgresUrlString_Hook "${yamlPath}" "${value}")"
+                fi
+            fi
+            if [[ "${key}" == "context.url" ]]; then
+                local ip=$(echo "${value}" | awk -F/ '{print $3}' | sed 's/:.*//')
+                setSystemValue "shared.node.ip" "${ip}" "${SYSTEM_YAML_PATH}"
+                logger "Setting [shared.node.ip] with [${ip}] in system.yaml"
+            fi
+            setSystemValue "${yamlPath}" "${value}" "${SYSTEM_YAML_PATH}" && logger "Setting [${yamlPath}] with value of the property [${property}] in system.yaml" && check=true && break || check=false
+        fi
+    done
+    [[ "${check}" == "false" ]] && logger "Property [${property}] not found in file [${fileName}]"
+}
+
+setHaEnabled_hook () {
+    echo ""
+}
+
+migratePropertiesFiles () {
+    local fileList=
+    local filePath=
+    local fileName=
+    local map=
+    
+    retrieveYamlValue "migration.propertyFiles.files" "fileList" "Skip"
+    fileList="${YAML_VALUE}"
+    if [[ -z "${fileList}" ]]; then
+        return
+    fi
+    bannerSection "PROCESSING MIGRATION OF PROPERTY FILES"
+    for file in ${fileList};
+    do
+        bannerSubSection "Processing Migration of $file"
+        retrieveYamlValue "migration.propertyFiles.$file.filePath" "filePath" "Warning"
+        filePath="${YAML_VALUE}"
+        retrieveYamlValue "migration.propertyFiles.$file.fileName" "fileName" "Warning"
+        fileName="${YAML_VALUE}"
+        [[ -z "${filePath}" && -z "${fileName}" ]] && continue
+        if [[ "$(checkFileExists "${NEW_DATA_DIR}/${filePath}/${fileName}")" == "true" ]]; then
+            logger "File [${fileName}] found in path [${NEW_DATA_DIR}/${filePath}]"
+            # setting haEnabled with true only if ha-node.properties is present
+            setHaEnabled_hook "${filePath}"
+            retrieveYamlValue "migration.propertyFiles.$file.map" "map" "Warning"
+            map="${YAML_VALUE}"
+            [[ -z "${map}" ]] && continue
+            for entry in $map;
+            do
+                if [[ "$(checkMapEntry "${entry}")" == "true" ]]; then
+                    propertyMigrate "${entry}" "${filePath}" "${fileName}"
+                else
+                    warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e yamlPath=property"
+                fi
+            done
+        else
+            logger "File [${fileName}] was not found in path [${NEW_DATA_DIR}/${filePath}] to migrate"
+        fi
+    done
+}
+
+createTargetDir () {
+    local mountDir="$1"
+    local target="$2"
+
+    logger "Target directory not found [${mountDir}/${target}], creating it"
+    createDirectoryRecursive "${mountDir}" "${target}" "Warning"
+}
+
+createDirectoryRecursive () {
+    local mountDir="$1"
+    local target="$2"
+    local output="$3"
+    local check=false
+    local message="Could not create directory ${directory}, please check if the user ${USER} has permissions to perform this action"
+    removeSoftLink "${mountDir}/${target}"
+    local directory=$(echo "${target}" | tr '/' ' ' )
+    local targetDir="${mountDir}"
+    for dir in ${directory}; 
+    do
+        targetDir="${targetDir}/${dir}"
+        mkdir -p "${targetDir}" && check=true || check=false
+        setOwnershipBasedOnInstaller "${targetDir}"
+    done
+    if [[ "${check}" == "false" ]]; then
+        if [[ "${output}" == "Warning" ]]; then
+            warn "${message}"
+        else
+            errorExit "${message}"
+        fi
+    fi
+}
+
+copyOperation () {
+    local source="$1"
+    local target="$2"
+    local mode="$3"
+    local check=false
+    local targetDataDir=
+    local targetLink=
+    local date=
+
+    # prepend OLD_DATA_DIR only if source is relative path
+    source="$(prependDir "${source}" "${OLD_DATA_DIR}/${source}")"
+    if [[ "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        targetDataDir="${NEW_DATA_DIR}"
+    else
+        targetDataDir="`cd "${NEW_DATA_DIR}"/../;pwd`"
+    fi
+    copyLogMessage "${mode}"
+    #remove source if it is a symlink
+    if [[ -L "${source}" ]]; then
+        targetLink=$(readlink -f "${source}")
+        logger "Removing the symlink [${source}] pointing to [${targetLink}]"
+        rm -f "${source}"
+        source=${targetLink}
+    fi
+    if [[ "$(checkDirExists "${source}")" != "true" ]]; then
+        logger "Source [${source}] directory not found in path"
+        return
+    fi
+    if [[ "$(checkDirContents "${source}")" != "true" ]]; then
+        logger "No contents to copy from [${source}]"
+        return
+    fi
+    if [[ "$(checkDirExists "${targetDataDir}/${target}")" != "true" ]]; then
+        createTargetDir "${targetDataDir}" "${target}"
+    fi
+    copyOnContentExist "${source}" "${targetDataDir}/${target}" "${mode}"
+}
+
+copySpecificFiles () {
+    local source="$1"
+    local target="$2"
+    local mode="$3"
+    
+    # prepend OLD_DATA_DIR only if source is relative path
+    source="$(prependDir "${source}" "${OLD_DATA_DIR}/${source}")"
+    if [[ "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        targetDataDir="${NEW_DATA_DIR}"
+    else
+        targetDataDir="`cd "${NEW_DATA_DIR}"/../;pwd`"
+    fi
+    copyLogMessage "${mode}"
+    if [[ "$(checkFileExists "${source}")" != "true" ]]; then
+        logger "Source file [${source}] does not exist in path"
+        return
+    fi
+    if [[ "$(checkDirExists "${targetDataDir}/${target}")" != "true" ]]; then
+        createTargetDir "${targetDataDir}" "${target}"
+    fi
+    copyCmd "${source}" "${targetDataDir}/${target}" "${mode}"
+}
+
+copyPatternMatchingFiles () {
+    local source="$1"
+    local target="$2"
+    local mode="$3"
+    local sourcePath="${4}"
+
+    # prepend OLD_DATA_DIR only if source is relative path
+    sourcePath="$(prependDir "${sourcePath}" "${OLD_DATA_DIR}/${sourcePath}")"
+    if [[ "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        targetDataDir="${NEW_DATA_DIR}"
+    else
+        targetDataDir="`cd "${NEW_DATA_DIR}"/../;pwd`"
+    fi
+    copyLogMessage "${mode}"
+    if [[ "$(checkDirExists "${sourcePath}")" != "true" ]]; then
+        logger "Source [${sourcePath}] directory not found in path"
+        return
+    fi
+    if ls "${sourcePath}/${source}"* 1> /dev/null 2>&1; then
+        if [[ "$(checkDirExists "${targetDataDir}/${target}")" != "true" ]]; then
+            createTargetDir "${targetDataDir}" "${target}"
+        fi
+        copyCmd "${sourcePath}/${source}" "${targetDataDir}/${target}" "${mode}"
+    else
+        logger "Source file [${sourcePath}/${source}*] does not exist in path"
+    fi
+}
+
+copyLogMessage () {
+    local mode="$1"
+    case $mode in
+        specific)
+            logger "Copy file [${source}] to target [${targetDataDir}/${target}]"
+        ;;
+        patternFiles)
+            logger "Copy files matching [${sourcePath}/${source}*] to target [${targetDataDir}/${target}]"
+        ;;
+        full)
+            logger "Copy directory contents from source [${source}] to target [${targetDataDir}/${target}]"
+        ;;
+        unique)
+            logger "Copy directory contents from source [${source}] to target [${targetDataDir}/${target}]"
+        ;;
+    esac
+}
+
+copyBannerMessages () {
+    local mode="$1"
+    local textMode="$2"
+    case $mode in
+        specific)
+            bannerSection "COPY ${textMode} FILES"
+        ;;
+        patternFiles)
+            bannerSection "COPY MATCHING ${textMode}"
+        ;;
+        full)
+            bannerSection "COPY ${textMode} DIRECTORIES CONTENTS"
+        ;;
+        unique)
+            bannerSection "COPY ${textMode} DIRECTORIES CONTENTS"
+        ;;
+    esac
+}
+
+invokeCopyFunctions () {
+    local mode="$1"
+    local source="$2"
+    local target="$3"
+
+    case $mode in
+        specific)
+            copySpecificFiles "${source}" "${target}" "${mode}"
+        ;;
+        patternFiles)
+            retrieveYamlValue "migration.${copyFormat}.sourcePath" "map" "Warning"
+            local sourcePath="${YAML_VALUE}"
+            copyPatternMatchingFiles "${source}" "${target}" "${mode}" "${sourcePath}"
+        ;;
+        full)
+            copyOperation "${source}" "${target}" "${mode}"
+        ;;
+        unique)
+            copyOperation "${source}" "${target}" "${mode}"
+        ;;
+    esac
+}
+# Copies contents from source directory and target directory
+copyDataDirectories () {
+    local copyFormat="$1"
+    local mode="$2"
+    local map=
+    local source=
+    local target=
+    local textMode=
+    local targetDataDir=
+    local copyFormatValue=
+
+    retrieveYamlValue "migration.${copyFormat}" "${copyFormat}" "Skip"
+    copyFormatValue="${YAML_VALUE}"
+    if [[ -z "${copyFormatValue}" ]]; then
+        return
+    fi
+    textMode=$(echo "${mode}" | tr '[:lower:]' '[:upper:]' 2>/dev/null)
+    copyBannerMessages "${mode}" "${textMode}"
+    retrieveYamlValue "migration.${copyFormat}.map" "map" "Warning"
+    map="${YAML_VALUE}"
+    if [[ "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        targetDataDir="${NEW_DATA_DIR}"
+    else
+        targetDataDir="`cd "${NEW_DATA_DIR}"/../;pwd`"
+    fi
+    for entry in $map;
+    do
+        if [[ "$(checkMapEntry "${entry}")" == "true" ]]; then
+            source="$(getSecondEntry "${entry}")"
+            target="$(getFirstEntry "${entry}")"
+            [[ -z "${source}" ]] && warn "source value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+            [[ -z "${target}" ]] && warn "target value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+            invokeCopyFunctions "${mode}" "${source}" "${target}"
+        else
+            warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e target=source"
+        fi
+        echo "";
+    done
+}
+
+invokeMoveFunctions () {
+    local source="$1"
+    local target="$2"
+    local sourceDataDir=
+    local targetBasename=
+    # prepend OLD_DATA_DIR only if source is relative path
+    sourceDataDir=$(prependDir "${source}" "${OLD_DATA_DIR}/${source}")
+    targetBasename=$(dirname "${target}")
+    logger "Moving directory source [${sourceDataDir}] to target [${NEW_DATA_DIR}/${target}]"
+    if [[ "$(checkDirExists "${sourceDataDir}")" != "true" ]]; then
+        logger "Directory [${sourceDataDir}] not found in path to move"
+        return
+    fi
+    if [[ "$(checkDirExists "${NEW_DATA_DIR}/${targetBasename}")" != "true" ]]; then
+        createTargetDir "${NEW_DATA_DIR}" "${targetBasename}"
+        moveCmd "${sourceDataDir}" "${NEW_DATA_DIR}/${target}"
+    else
+        moveCmd "${sourceDataDir}" "${NEW_DATA_DIR}/tempDir"
+        moveCmd "${NEW_DATA_DIR}/tempDir" "${NEW_DATA_DIR}/${target}"
+    fi
+}
+
+# Move source directory and target directory
+moveDirectories () {
+    local moveDataDirectories=
+    local map=
+    local source=
+    local target=
+
+    retrieveYamlValue "migration.moveDirectories" "moveDirectories" "Skip"
+    moveDirectories="${YAML_VALUE}"
+    if [[ -z "${moveDirectories}" ]]; then
+        return
+    fi
+    bannerSection "MOVE DIRECTORIES"
+    retrieveYamlValue "migration.moveDirectories.map" "map" "Warning"
+    map="${YAML_VALUE}"
+    for entry in $map;
+    do
+        if [[ "$(checkMapEntry "${entry}")" == "true" ]]; then
+            source="$(getSecondEntry "${entry}")"
+            target="$(getFirstEntry "${entry}")"
+            [[ -z "${source}" ]] && warn "source value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+            [[ -z "${target}" ]] && warn "target value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+            invokeMoveFunctions "${source}" "${target}"
+        else
+            warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e target=source"
+        fi
+    echo "";
+    done
+}
+
+# Trim masterKey if its generated using hex 32 
+trimMasterKey () {
+    local masterKeyDir=/opt/jfrog/artifactory/var/etc/security
+    local oldMasterKey=$(<${masterKeyDir}/master.key)
+    local oldMasterKey_Length=$(echo ${#oldMasterKey})
+    local newMasterKey=
+    if [[ ${oldMasterKey_Length} -gt 32 ]]; then
+        bannerSection "TRIM MASTERKEY"
+        newMasterKey=$(echo ${oldMasterKey:0:32})
+        cp ${masterKeyDir}/master.key ${masterKeyDir}/backup_master.key
+        logger "Original masterKey is backed up : ${masterKeyDir}/backup_master.key"
+        rm -rf ${masterKeyDir}/master.key
+        echo ${newMasterKey} > ${masterKeyDir}/master.key
+        logger "masterKey is trimmed : ${masterKeyDir}/master.key"
+    fi
+}
+
+copyDirectories () {
+
+    copyDataDirectories "copyFiles" "full"
+    copyDataDirectories "copyUniqueFiles" "unique"
+    copyDataDirectories "copySpecificFiles" "specific"
+    copyDataDirectories "copyPatternMatchingFiles" "patternFiles"
+}
+
+symlinkDir () {
+    local source="$1"
+    local target="$2"
+    local targetDir=
+    local basename=
+    local targetParentDir=
+    
+    targetDir="$(dirname "${target}")"
+    if [[ "${targetDir}" == "${source}" ]]; then
+        # symlink the sub directories
+        createDirectory "${NEW_DATA_DIR}/${target}" "Warning"
+        if [[ "$(checkDirExists "${NEW_DATA_DIR}/${target}")" == "true" ]]; then
+            symlinkOnExist "${OLD_DATA_DIR}/${source}" "${NEW_DATA_DIR}/${target}" "subDir"
+            basename="$(basename "${target}")"
+            cd "${NEW_DATA_DIR}/${target}" && rm -f "${basename}"
+        fi
+    else
+        targetParentDir="$(dirname "${NEW_DATA_DIR}/${target}")"
+        createDirectory "${targetParentDir}" "Warning"
+        if [[ "$(checkDirExists "${targetParentDir}")" == "true" ]]; then
+            symlinkOnExist "${OLD_DATA_DIR}/${source}" "${NEW_DATA_DIR}/${target}"
+        fi
+    fi
+}
+
+symlinkOperation () {
+    local source="$1"
+    local target="$2"
+    local check=false
+    local targetLink=
+    local date=
+    
+    #   Check if source is a link and do symlink
+    if [[ -L "${OLD_DATA_DIR}/${source}" ]]; then
+        targetLink=$(readlink -f "${OLD_DATA_DIR}/${source}")
+        symlinkOnExist "${targetLink}" "${NEW_DATA_DIR}/${target}"
+    else
+        #  check if source is directory and do symlink
+        if [[ "$(checkDirExists "${OLD_DATA_DIR}/${source}")" != "true" ]]; then
+            logger "Source [${source}] directory not found in path to symlink"
+            return
+        fi
+        if [[ "$(checkDirContents "${OLD_DATA_DIR}/${source}")" != "true" ]]; then
+            logger "No contents found in [${OLD_DATA_DIR}/${source}] to symlink"
+            return
+        fi
+        if [[ "$(checkDirExists "${NEW_DATA_DIR}/${target}")" != "true" ]]; then
+            logger "Target directory [${NEW_DATA_DIR}/${target}] does not exist to create symlink, creating it"
+            symlinkDir "${source}" "${target}"
+        else
+            rm -rf "${NEW_DATA_DIR}/${target}" && check=true || check=false
+            [[ "${check}" == "false" ]] && warn "Failed to remove contents in [${NEW_DATA_DIR}/${target}/]"
+            symlinkDir "${source}" "${target}"
+        fi
+    fi
+}
+# Creates a symlink path - Source directory to which the symbolic link should point.
+symlinkDirectories () {
+    local linkFiles=
+    local map=
+    local source=
+    local target=
+
+    retrieveYamlValue "migration.linkFiles" "linkFiles" "Skip"
+    linkFiles="${YAML_VALUE}"
+    if [[ -z "${linkFiles}" ]]; then
+        return
+    fi
+    bannerSection "SYMLINK DIRECTORIES"
+    retrieveYamlValue "migration.linkFiles.map" "map" "Warning"
+    map="${YAML_VALUE}"
+    for entry in $map;
+    do
+        if [[ "$(checkMapEntry "${entry}")" == "true" ]]; then
+            source="$(getSecondEntry "${entry}")"
+            target="$(getFirstEntry "${entry}")"
+            logger "Symlink directory [${NEW_DATA_DIR}/${target}] to old [${OLD_DATA_DIR}/${source}]"
+            [[ -z "${source}" ]] && warn "source value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+            [[ -z "${target}" ]] && warn "target value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+            symlinkOperation "${source}" "${target}"
+        else
+            warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e target=source"
+        fi
+        echo "";
+    done
+}
+
+updateConnectionString () {
+    local yamlPath="$1"
+    local value="$2"
+    local mongoPath="shared.mongo.url"
+    local rabbitmqPath="shared.rabbitMq.url"
+    local postgresPath="shared.database.url"
+    local redisPath="shared.redis.connectionString"
+    local mongoConnectionString="mongo.connectionString"
+    local sourceKey=
+    local hostIp=$(io_getPublicHostIP)
+    local hostKey=
+    
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" ]]; then 
+    # Replace @postgres:,@mongodb:,@rabbitmq:,@redis: to @{hostIp}: (Compose Installer)
+        hostKey="@${hostIp}:"
+        case $yamlPath in
+            ${postgresPath})
+                sourceKey="@postgres:"
+                value=$(io_replaceString "${value}" "${sourceKey}" "${hostKey}")
+            ;;
+            ${mongoPath})
+                sourceKey="@mongodb:"
+                value=$(io_replaceString "${value}" "${sourceKey}" "${hostKey}")
+            ;;
+            ${rabbitmqPath})
+                sourceKey="@rabbitmq:"
+                value=$(io_replaceString "${value}" "${sourceKey}" "${hostKey}")
+            ;;
+            ${redisPath})
+                sourceKey="@redis:"
+                value=$(io_replaceString "${value}" "${sourceKey}" "${hostKey}")
+            ;;
+            ${mongoConnectionString})
+                sourceKey="@mongodb:"
+                value=$(io_replaceString "${value}" "${sourceKey}" "${hostKey}")
+            ;;
+        esac
+    fi
+    echo -n "${value}"
+}
+
+yamlMigrate () {
+    local entry="$1"
+    local sourceFile="$2"
+    local value=
+    local yamlPath=
+    local key=
+    yamlPath="$(getFirstEntry "${entry}")"
+    key="$(getSecondEntry "${entry}")"
+    if [[ -z "${key}" ]]; then
+        warn "key is empty in map [${entry}] in the file [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    if [[ -z "${yamlPath}" ]]; then
+        warn "yamlPath is empty for [${key}] in [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    getYamlValue "${key}" "${sourceFile}" "false"
+    value="${YAML_VALUE}"
+    if [[ ! -z "${value}" ]]; then
+        value=$(updateConnectionString "${yamlPath}" "${value}")
+    fi
+    if [[ -z "${value}" ]]; then
+        logger "No value for [${key}] in [${sourceFile}]"
+    else
+        setSystemValue "${yamlPath}" "${value}" "${SYSTEM_YAML_PATH}"
+        logger "Setting [${yamlPath}] with value of the key [${key}] in system.yaml"
+    fi
+}
+
+migrateYamlFile () {
+    local files=
+    local filePath=
+    local fileName=
+    local sourceFile=
+    local map=
+    retrieveYamlValue "migration.yaml.files" "files" "Skip"
+    files="${YAML_VALUE}"
+    if [[ -z "${files}" ]]; then
+        return
+    fi
+    bannerSection "MIGRATION OF YAML FILES"
+    for file in $files;
+    do
+        bannerSubSection "Processing Migration of $file"
+        retrieveYamlValue "migration.yaml.$file.filePath" "filePath" "Warning"
+        filePath="${YAML_VALUE}"
+        retrieveYamlValue "migration.yaml.$file.fileName" "fileName" "Warning"
+        fileName="${YAML_VALUE}"
+        [[ -z "${filePath}" && -z "${fileName}" ]] && continue
+        sourceFile="${NEW_DATA_DIR}/${filePath}/${fileName}"
+        if [[ "$(checkFileExists "${sourceFile}")" == "true" ]]; then
+            logger "File [${fileName}] found in path [${NEW_DATA_DIR}/${filePath}]"
+            retrieveYamlValue "migration.yaml.$file.map" "map" "Warning"
+            map="${YAML_VALUE}"
+            [[ -z "${map}" ]] && continue
+            for entry in $map;
+            do
+                if [[ "$(checkMapEntry "${entry}")" == "true" ]]; then
+                    yamlMigrate "${entry}" "${sourceFile}"
+                else
+                    warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e yamlPath=key"
+                fi
+            done
+        else
+            logger "File [${fileName}] is not found in path [${NEW_DATA_DIR}/${filePath}] to migrate"
+        fi
+    done
+}
+# updates the key and value in system.yaml
+updateYamlKeyValue () {
+    local entry="$1"
+    local value=
+    local yamlPath=
+    local key=
+
+    yamlPath="$(getFirstEntry "${entry}")"
+    value="$(getSecondEntry "${entry}")"
+    if [[ -z "${value}" ]]; then
+        warn "value is empty in map [${entry}] in the file [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    if [[ -z "${yamlPath}" ]]; then
+        warn "yamlPath is empty for [${key}] in [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    setSystemValue "${yamlPath}" "${value}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${yamlPath}] with value [${value}] in system.yaml"
+}
+
+updateSystemYamlFile () {
+    local updateYaml=
+    local map=
+
+    retrieveYamlValue "migration.updateSystemYaml" "updateYaml" "Skip"
+    updateSystemYaml="${YAML_VALUE}"
+    if [[ -z "${updateSystemYaml}" ]]; then
+        return
+    fi
+    bannerSection "UPDATE SYSTEM YAML FILE WITH KEY AND VALUES"
+    retrieveYamlValue "migration.updateSystemYaml.map" "map" "Warning"
+    map="${YAML_VALUE}"
+    if [[ -z "${map}" ]]; then
+        return
+    fi
+    for entry in $map;
+    do
+        if [[ "$(checkMapEntry "${entry}")" == "true" ]]; then
+            updateYamlKeyValue "${entry}"
+        else
+            warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e yamlPath=key"
+        fi
+    done
+}
+
+backupFiles_hook () {
+    logSilly "Method ${FUNCNAME[0]}"
+}
+
+backupDirectory () {
+    local backupDir="$1"
+    local dir="$2"
+    local targetDir="$3"
+    local effectiveUser=
+    local effectiveGroup=
+
+    if [[ "${dir}" = \/* ]]; then
+        dir=$(echo "${dir/\//}")
+    fi
+            
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" ]]; then 
+        effectiveUser="${JF_USER}"
+        effectiveGroup="${JF_USER}"
+    elif [[ "${INSTALLER}" == "${DEB_TYPE}" || "${INSTALLER}" == "${RPM_TYPE}" ]]; then
+        effectiveUser="${USER_TO_CHECK}" 
+        effectiveGroup="${GROUP_TO_CHECK}"
+    fi
+    
+    removeSoftLinkAndCreateDir "${backupDir}" "${effectiveUser}" "${effectiveGroup}" "yes"
+    local backupDirectory="${backupDir}/${PRODUCT}"
+    removeSoftLinkAndCreateDir "${backupDirectory}" "${effectiveUser}" "${effectiveGroup}" "yes"
+    removeSoftLinkAndCreateDir "${backupDirectory}/${dir}" "${effectiveUser}" "${effectiveGroup}" "yes"
+    local outputCheckDirExists="$(checkDirExists "${backupDirectory}/${dir}")"
+    if [[ "${outputCheckDirExists}" == "true" ]]; then
+        copyOnContentExist "${targetDir}" "${backupDirectory}/${dir}" "full"
+    fi
+}
+
+removeOldDirectory () {
+    local backupDir="$1"
+    local entry="$2"
+    local check=false
+    
+    # prepend OLD_DATA_DIR only if entry is relative path
+    local targetDir="$(prependDir "${entry}" "${OLD_DATA_DIR}/${entry}")"
+    local outputCheckDirExists="$(checkDirExists "${targetDir}")"
+    if [[ "${outputCheckDirExists}" != "true" ]]; then
+        logger "No [${targetDir}] directory found to delete"
+        echo "";
+        return
+    fi
+    backupDirectory "${backupDir}" "${entry}" "${targetDir}"
+    rm -rf  "${targetDir}" && check=true || check=false
+    [[ "${check}" == "true"  ]] && logger "Successfully removed directory [${targetDir}]"
+    [[ "${check}" == "false" ]] && warn "Failed to remove directory [${targetDir}]"
+    echo "";
+}
+
+cleanUpOldDataDirectories () {
+    local cleanUpOldDataDir=
+    local map=
+    local entry=
+
+    retrieveYamlValue "migration.cleanUpOldDataDir" "cleanUpOldDataDir" "Skip"
+    cleanUpOldDataDir="${YAML_VALUE}"
+    if [[ -z "${cleanUpOldDataDir}" ]]; then
+        return
+    fi
+    bannerSection "CLEAN UP OLD DATA DIRECTORIES"
+    retrieveYamlValue "migration.cleanUpOldDataDir.map" "map" "Warning"
+    map="${YAML_VALUE}"
+    [[ -z "${map}" ]] && continue
+    date="$(date +%Y%m%d%H%M)"
+    backupDir="${NEW_DATA_DIR}/backup/backup-${date}"
+    bannerImportant "****** Old data configurations are backedup in [${backupDir}] directory ******"
+    backupFiles_hook "${backupDir}/${PRODUCT}"
+    for entry in $map;
+    do
+        removeOldDirectory "${backupDir}" "${entry}"
+    done
+}
+
+backupFiles () {
+    local backupDir="$1"
+    local dir="$2"
+    local targetDir="$3"
+    local fileName="$4"
+    local effectiveUser=
+    local effectiveGroup=
+
+    if [[ "${dir}" = \/* ]]; then
+        dir=$(echo "${dir/\//}")
+    fi
+            
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" ]]; then 
+        effectiveUser="${JF_USER}"
+        effectiveGroup="${JF_USER}"
+    elif [[ "${INSTALLER}" == "${DEB_TYPE}" || "${INSTALLER}" == "${RPM_TYPE}" ]]; then
+        effectiveUser="${USER_TO_CHECK}" 
+        effectiveGroup="${GROUP_TO_CHECK}"
+    fi
+
+    removeSoftLinkAndCreateDir "${backupDir}" "${effectiveUser}" "${effectiveGroup}" "yes"
+    local backupDirectory="${backupDir}/${PRODUCT}"
+    removeSoftLinkAndCreateDir "${backupDirectory}" "${effectiveUser}" "${effectiveGroup}" "yes"
+    removeSoftLinkAndCreateDir "${backupDirectory}/${dir}" "${effectiveUser}" "${effectiveGroup}" "yes"
+    local outputCheckDirExists="$(checkDirExists "${backupDirectory}/${dir}")"
+    if [[ "${outputCheckDirExists}" == "true" ]]; then
+        copyCmd "${targetDir}/${fileName}" "${backupDirectory}/${dir}" "specific"
+    fi
+}
+
+removeOldFiles () {
+    local backupDir="$1"
+    local directoryName="$2"
+    local fileName="$3"
+    local check=false
+    
+    # prepend OLD_DATA_DIR only if entry is relative path
+    local targetDir="$(prependDir "${directoryName}" "${OLD_DATA_DIR}/${directoryName}")"
+    local outputCheckFileExists="$(checkFileExists "${targetDir}/${fileName}")"
+    if [[ "${outputCheckFileExists}" != "true" ]]; then
+        logger "No [${targetDir}/${fileName}] file found to delete"
+        return
+    fi
+    backupFiles "${backupDir}" "${directoryName}" "${targetDir}" "${fileName}"
+    rm -f  "${targetDir}/${fileName}" && check=true || check=false
+    [[ "${check}" == "true"  ]] && logger "Successfully removed file [${targetDir}/${fileName}]"
+    [[ "${check}" == "false" ]] && warn "Failed to remove file [${targetDir}/${fileName}]"
+    echo "";
+}
+
+cleanUpOldFiles () {
+    local cleanUpFiles=
+    local map=
+    local entry=
+
+    retrieveYamlValue "migration.cleanUpOldFiles" "cleanUpOldFiles" "Skip"
+    cleanUpOldFiles="${YAML_VALUE}"
+    if [[ -z "${cleanUpOldFiles}" ]]; then
+        return
+    fi
+    bannerSection "CLEAN UP OLD FILES"
+    retrieveYamlValue "migration.cleanUpOldFiles.map" "map" "Warning"
+    map="${YAML_VALUE}"
+    [[ -z "${map}" ]] && continue
+    date="$(date +%Y%m%d%H%M)"
+    backupDir="${NEW_DATA_DIR}/backup/backup-${date}"
+    bannerImportant "****** Old files are backedup in [${backupDir}] directory ******"
+    for entry in $map;
+    do  
+        local outputCheckMapEntry="$(checkMapEntry "${entry}")"
+        if [[ "${outputCheckMapEntry}" != "true" ]]; then
+            warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e directoryName=fileName"
+        fi
+        local fileName="$(getSecondEntry "${entry}")"
+        local directoryName="$(getFirstEntry "${entry}")"
+        [[ -z "${fileName}" ]] && warn "File name value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+        [[ -z "${directoryName}" ]] && warn "Directory name value is empty for [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}]" && continue
+        removeOldFiles "${backupDir}" "${directoryName}" "${fileName}"
+        echo "";
+    done 
+}
+
+startMigration () {
+    bannerSection "STARTING MIGRATION"
+}
+
+endMigration () {
+    bannerSection "MIGRATION COMPLETED SUCCESSFULLY"
+}
+
+initialize () {
+    setAppDir
+    _pauseExecution "setAppDir"
+    initHelpers
+    _pauseExecution "initHelpers"
+    checkMigrationInfoYaml
+    _pauseExecution "checkMigrationInfoYaml"
+    getProduct
+    _pauseExecution "getProduct"
+    getDataDir
+    _pauseExecution "getDataDir"
+}
+
+main () {
+    case $PRODUCT in
+        artifactory)
+            migrateArtifactory
+        ;;
+        distribution)
+            migrateDistribution
+        ;;
+        xray)
+            migrationXray
+        ;;
+    esac
+    exit 0
+}
+
+# Ensures meta data is logged
+LOG_BEHAVIOR_ADD_META="$FLAG_Y"
+
+
+migrateResolveDerbyPath () {
+    local key="$1"
+    local value="$2"
+
+    if [[ "${key}" == "url" && "${value}" == *"db.home"* ]]; then
+        if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" ]]; then
+            derbyPath="/opt/jfrog/artifactory/var/data/artifactory/derby"
+            value=$(echo "${value}" | sed "s|{db.home}|$derbyPath|")
+        else
+            derbyPath="${NEW_DATA_DIR}/data/artifactory/derby"
+            value=$(echo "${value}" | sed "s|{db.home}|$derbyPath|")
+        fi
+    fi
+    echo "${value}"
+}
+
+migrateResolveHaDirPath () {
+    local key="$1"
+    local value="$2"
+
+    if [[ "${INSTALLER}" == "${RPM_TYPE}" || "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" || "${INSTALLER}" == "${DEB_TYPE}" ]]; then
+        if [[ "${key}" == "artifactory.ha.data.dir" || "${key}" == "artifactory.ha.backup.dir" ]]; then
+            value=$(checkPathResolver "${value}")
+        fi
+    fi
+    echo "${value}"
+}
+updatePostgresUrlString_Hook () {
+    local yamlPath="$1"
+    local value="$2"
+    local hostIp=$(io_getPublicHostIP)
+    local sourceKey="//postgresql:"
+    if [[ "${yamlPath}" == "shared.database.url" ]]; then
+        value=$(io_replaceString "${value}" "${sourceKey}" "//${hostIp}:" "#")
+    fi
+    echo "${value}"
+}
+# Check Artifactory product version
+checkArtifactoryVersion () {
+    local minProductVersion="6.0.0"
+    local maxProductVersion="7.0.0"
+    local propertyInDocker="ARTIFACTORY_VERSION"
+    local property="artifactory.version"
+    
+    if [[ "${INSTALLER}" ==  "${COMPOSE_TYPE}" ]]; then
+        local newfilePath="${APP_DIR}/../.env"
+        local oldfilePath="${OLD_DATA_DIR}/etc/artifactory.properties"
+    elif [[ "${INSTALLER}" ==  "${HELM_TYPE}" ]]; then
+        local oldfilePath="${OLD_DATA_DIR}/etc/artifactory.properties"
+    elif [[ "${INSTALLER}" ==  "${ZIP_TYPE}" ]]; then
+        local newfilePath="${NEW_DATA_DIR}/etc/artifactory/artifactory.properties"
+        local oldfilePath="${OLD_DATA_DIR}/etc/artifactory.properties"
+    else
+        local newfilePath="${NEW_DATA_DIR}/etc/artifactory/artifactory.properties"
+        local oldfilePath="/etc/opt/jfrog/artifactory/artifactory.properties"
+    fi
+
+    getProductVersion "${minProductVersion}" "${maxProductVersion}" "${newfilePath}" "${oldfilePath}" "${propertyInDocker}" "${property}"
+}
+
+getCustomDataDir_hook () {
+    retrieveYamlValue "migration.oldDataDir" "oldDataDir" "Fail"
+    OLD_DATA_DIR="${YAML_VALUE}"
+}
+
+# Get protocol value of connector
+getXmlConnectorProtocol () {
+    local i="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local protocolValue=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@protocol' ${filePath}/${fileName} 2>/dev/null |awk -F"=" '{print $2}' | tr -d '"')
+    echo -e "${protocolValue}"
+}
+
+# Get all attributes of connector
+getXmlConnectorAttributes () {
+    local i="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local connectorAttributes=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@*' ${filePath}/${fileName} 2>/dev/null)
+    # strip leading and trailing spaces
+    connectorAttributes=$(io_trim "${connectorAttributes}")
+    echo "${connectorAttributes}"
+}
+
+# Get port value of connector
+getXmlConnectorPort () {
+    local i="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local portValue=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@port' ${filePath}/${fileName} 2>/dev/null | awk -F"=" '{print $2}' | tr -d '"')
+    echo -e "${portValue}"
+}
+
+# Get maxThreads value of connector
+getXmlConnectorMaxThreads () {
+    local i="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local maxThreadValue=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@maxThreads' ${filePath}/${fileName} 2>/dev/null | awk -F"=" '{print $2}' | tr -d '"')
+    echo -e "${maxThreadValue}"
+}
+# Get sendReasonPhrase value of connector
+getXmlConnectorSendReasonPhrase () {
+    local i="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local sendReasonPhraseValue=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@sendReasonPhrase' ${filePath}/${fileName} 2>/dev/null | awk -F"=" '{print $2}' | tr -d '"')
+    echo -e "${sendReasonPhraseValue}"
+}
+# Get relaxedPathChars value of connector
+getXmlConnectorRelaxedPathChars () {
+    local i="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local relaxedPathCharsValue=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@relaxedPathChars' ${filePath}/${fileName} 2>/dev/null | awk -F"=" '{print $2}' | tr -d '"')
+    # strip leading and trailing spaces
+    relaxedPathCharsValue=$(io_trim "${relaxedPathCharsValue}")
+    echo -e "${relaxedPathCharsValue}"
+}
+# Get relaxedQueryChars value of connector
+getXmlConnectorRelaxedQueryChars () {
+    local i="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local relaxedQueryCharsValue=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@relaxedQueryChars' ${filePath}/${fileName} 2>/dev/null | awk -F"=" '{print $2}' | tr -d '"')
+    # strip leading and trailing spaces
+    relaxedQueryCharsValue=$(io_trim "${relaxedQueryCharsValue}")
+    echo -e "${relaxedQueryCharsValue}"
+}
+
+# Updating system.yaml with Connector port 
+setConnectorPort () {
+    local yamlPath="$1"
+    local valuePort="$2"
+    local portYamlPath=
+    if [[ -z "${yamlPath}" ]]; then
+        return
+    fi
+    if [[ -z "${valuePort}" ]]; then
+        warn "port value is empty, could not migrate to system.yaml"
+        return
+    fi
+    ## Getting port yaml path from migration info yaml
+    retrieveYamlValue "${yamlPath}" portYamlPath "Warning"
+    portYamlPath="${YAML_VALUE}"
+    if [[ -z "${portYamlPath}" ]]; then
+        return
+    fi
+    setSystemValue "${portYamlPath}" "${valuePort}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${portYamlPath}] with value [${valuePort}] in system.yaml"
+}
+
+# Updating system.yaml with Connector maxThreads
+setConnectorMaxThread () {
+    local yamlPath="$1"
+    local threadValue="$2"
+    local maxThreadYamlPath=
+    if [[ -z "${yamlPath}" ]]; then
+        return
+    fi
+    if [[ -z  "${threadValue}" ]]; then
+        return
+    fi
+    ## Getting max Threads yaml path from migration info yaml
+    retrieveYamlValue "${yamlPath}" maxThreadYamlPath "Warning"
+    maxThreadYamlPath="${YAML_VALUE}"
+    if [[ -z "${maxThreadYamlPath}" ]]; then
+        return
+    fi
+    setSystemValue "${maxThreadYamlPath}" "${threadValue}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${maxThreadYamlPath}] with value [${threadValue}] in system.yaml"
+}
+
+# Updating system.yaml with Connector sendReasonPhrase
+setConnectorSendReasonPhrase () {
+    local yamlPath="$1"
+    local sendReasonPhraseValue="$2"
+    local sendReasonPhraseYamlPath=
+    if [[ -z "${yamlPath}" ]]; then
+        return
+    fi
+    if [[ -z  "${sendReasonPhraseValue}" ]]; then
+        return
+    fi
+    ## Getting sendReasonPhrase yaml path from migration info yaml
+    retrieveYamlValue "${yamlPath}" sendReasonPhraseYamlPath "Warning"
+    sendReasonPhraseYamlPath="${YAML_VALUE}"
+    if [[ -z "${sendReasonPhraseYamlPath}" ]]; then
+        return
+    fi
+    setSystemValue "${sendReasonPhraseYamlPath}" "${sendReasonPhraseValue}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${sendReasonPhraseYamlPath}] with value [${sendReasonPhraseValue}] in system.yaml"
+}
+
+# Updating system.yaml with Connector relaxedPathChars
+setConnectorRelaxedPathChars () {
+    local yamlPath="$1"
+    local relaxedPathCharsValue="$2"
+    local relaxedPathCharsYamlPath=
+    if [[ -z "${yamlPath}" ]]; then
+        return
+    fi
+    if [[ -z  "${relaxedPathCharsValue}" ]]; then
+        return
+    fi
+    ## Getting relaxedPathChars yaml path from migration info yaml
+    retrieveYamlValue "${yamlPath}" relaxedPathCharsYamlPath "Warning"
+    relaxedPathCharsYamlPath="${YAML_VALUE}"
+    if [[ -z "${relaxedPathCharsYamlPath}" ]]; then
+        return
+    fi
+    setSystemValue "${relaxedPathCharsYamlPath}" "${relaxedPathCharsValue}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${relaxedPathCharsYamlPath}] with value [${relaxedPathCharsValue}] in system.yaml"
+}
+
+# Updating system.yaml with Connector relaxedQueryChars
+setConnectorRelaxedQueryChars () {
+    local yamlPath="$1"
+    local relaxedQueryCharsValue="$2"
+    local relaxedQueryCharsYamlPath=
+    if [[ -z "${yamlPath}" ]]; then
+        return
+    fi
+    if [[ -z  "${relaxedQueryCharsValue}" ]]; then
+        return
+    fi
+    ## Getting relaxedQueryChars yaml path from migration info yaml
+    retrieveYamlValue "${yamlPath}" relaxedQueryCharsYamlPath "Warning"
+    relaxedQueryCharsYamlPath="${YAML_VALUE}"
+    if [[ -z "${relaxedQueryCharsYamlPath}" ]]; then
+        return
+    fi
+    setSystemValue "${relaxedQueryCharsYamlPath}" "${relaxedQueryCharsValue}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${relaxedQueryCharsYamlPath}] with value [${relaxedQueryCharsValue}] in system.yaml"
+}
+
+# Updating system.yaml with Connectors configurations
+setConnectorExtraConfig () {
+    local yamlPath="$1"
+    local connectorAttributes="$2"
+    local extraConfigPath=
+    if [[ -z "${yamlPath}" ]]; then
+        return
+    fi
+    if [[ -z "${connectorAttributes}" ]]; then
+        return
+    fi
+    ## Getting extraConfig yaml path from migration info yaml
+    retrieveYamlValue "${yamlPath}" extraConfig "Warning"
+    extraConfigPath="${YAML_VALUE}"
+    if [[ -z "${extraConfigPath}" ]]; then
+        return
+    fi
+    # strip leading and trailing spaces
+    connectorAttributes=$(io_trim "${connectorAttributes}")
+    setSystemValue "${extraConfigPath}" "${connectorAttributes}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${extraConfigPath}] with connector attributes in system.yaml"
+}
+
+# Updating system.yaml with extra Connectors
+setExtraConnector () {
+    local yamlPath="$1"
+    local extraConnector="$2"
+    local extraConnectorYamlPath=
+    if [[ -z "${yamlPath}" ]]; then
+        return
+    fi
+    if [[ -z "${extraConnector}" ]]; then
+        return
+    fi
+    ## Getting extraConnecotr yaml path from migration info yaml
+    retrieveYamlValue "${yamlPath}" extraConnectorYamlPath "Warning"
+    extraConnectorYamlPath="${YAML_VALUE}"
+    if [[ -z "${extraConnectorYamlPath}" ]]; then
+        return
+    fi
+    getYamlValue  "${extraConnectorYamlPath}"  "${SYSTEM_YAML_PATH}"  "false"
+    local connectorExtra="${YAML_VALUE}"
+    if [[ -z "${connectorExtra}" ]]; then
+        setSystemValue "${extraConnectorYamlPath}" "${extraConnector}" "${SYSTEM_YAML_PATH}"
+        logger "Setting [${extraConnectorYamlPath}] with extra connectors in system.yaml"
+    else    
+        setSystemValue "${extraConnectorYamlPath}" "\"${connectorExtra} ${extraConnector}\"" "${SYSTEM_YAML_PATH}"
+        logger "Setting [${extraConnectorYamlPath}] with extra connectors in system.yaml"
+    fi
+}
+
+# Migrate extra connectors to system.yaml
+migrateExtraConnectors () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    local excludeDefaultPort="$4"
+    local i="$5"
+    local extraConfig= 
+    local extraConnector=
+    if [[ "${excludeDefaultPort}" == "yes" ]]; then
+        for ((i = 1 ; i <= "${connectorCount}" ; i++));
+        do  
+            local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+            [[ "${portValue}" != "${DEFAULT_ACCESS_PORT}" && "${portValue}" != "${DEFAULT_RT_PORT}" ]] || continue
+            extraConnector=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']' ${filePath}/${fileName} 2>/dev/null)
+            setExtraConnector "${EXTRA_CONFIG_YAMLPATH}" "${extraConnector}" 
+        done
+    else
+        extraConnector=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']' ${filePath}/${fileName} 2>/dev/null)
+        setExtraConnector "${EXTRA_CONFIG_YAMLPATH}" "${extraConnector}"
+    fi
+}
+
+# Migrate connector configurations
+migrateConnectorConfig () {
+    local i="$1"
+    local protocolType="$2"
+    local portValue="$3"
+    local connectorPortYamlPath="$4"
+    local connectorMaxThreadYamlPath="$5"
+    local connectorAttributesYamlPath="$6"
+    local filePath="$7"
+    local fileName="$8"
+    local connectorSendReasonPhraseYamlPath="$9"
+    local connectorRelaxedPathCharsYamlPath="${10}"
+    local connectorRelaxedQueryCharsYamlPath="${11}"
+    
+    # migrate port
+    setConnectorPort "${connectorPortYamlPath}" "${portValue}"
+    
+    # migrate maxThreads
+    local maxThreadValue=$(getXmlConnectorMaxThreads "$i" "${filePath}" "${fileName}")
+    setConnectorMaxThread "${connectorMaxThreadYamlPath}" "${maxThreadValue}"
+
+    # migrate sendReasonPhrase
+    local sendReasonPhraseValue=$(getXmlConnectorSendReasonPhrase "$i" "${filePath}" "${fileName}")
+    setConnectorSendReasonPhrase "${connectorSendReasonPhraseYamlPath}" "${sendReasonPhraseValue}"
+    
+    # migrate relaxedPathChars
+    local relaxedPathCharsValue=$(getXmlConnectorRelaxedPathChars "$i" "${filePath}" "${fileName}")
+    setConnectorRelaxedPathChars "${connectorRelaxedPathCharsYamlPath}" "\"${relaxedPathCharsValue}\""
+    # migrate relaxedQueryChars
+    local relaxedQueryCharsValue=$(getXmlConnectorRelaxedQueryChars "$i" "${filePath}" "${fileName}")
+    setConnectorRelaxedQueryChars "${connectorRelaxedQueryCharsYamlPath}" "\"${relaxedQueryCharsValue}\""
+
+    # migrate all attributes to extra config except port , maxThread , sendReasonPhrase ,relaxedPathChars and relaxedQueryChars
+    local connectorAttributes=$(getXmlConnectorAttributes "$i" "${filePath}" "${fileName}")
+    connectorAttributes=$(echo "${connectorAttributes}" | sed 's/port="'${portValue}'"//g' | sed 's/maxThreads="'${maxThreadValue}'"//g' | sed 's/sendReasonPhrase="'${sendReasonPhraseValue}'"//g' | sed 's/relaxedPathChars="\'${relaxedPathCharsValue}'\"//g' | sed 's/relaxedQueryChars="\'${relaxedQueryCharsValue}'\"//g')
+    # strip leading and trailing spaces
+    connectorAttributes=$(io_trim "${connectorAttributes}")
+    setConnectorExtraConfig "${connectorAttributesYamlPath}" "${connectorAttributes}"
+}
+
+# Check for default port 8040 and 8081 in connectors and migrate
+migrateConnectorPort () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    local defaultPort="$4"
+    local connectorPortYamlPath="$5"
+    local connectorMaxThreadYamlPath="$6"
+    local connectorAttributesYamlPath="$7"
+    local connectorSendReasonPhraseYamlPath="$8"
+    local connectorRelaxedPathCharsYamlPath="$9"
+    local connectorRelaxedQueryCharsYamlPath="${10}"
+    local portYamlPath=
+    local maxThreadYamlPath=
+    local status=
+    for ((i = 1 ; i <= "${connectorCount}" ; i++));
+    do  
+        local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+        local protocolType=$(getXmlConnectorProtocol "$i" "${filePath}" "${fileName}")
+        [[ "${protocolType}" == *AJP* ]] && continue
+        [[ "${portValue}" != "${defaultPort}" ]] && continue
+        if [[ "${portValue}" == "${DEFAULT_RT_PORT}" ]]; then
+            RT_DEFAULTPORT_STATUS=success
+        else
+            AC_DEFAULTPORT_STATUS=success
+        fi
+        migrateConnectorConfig "${i}" "${protocolType}" "${portValue}" "${connectorPortYamlPath}" "${connectorMaxThreadYamlPath}" "${connectorAttributesYamlPath}" "${filePath}" "${fileName}" "${connectorSendReasonPhraseYamlPath}" "${connectorRelaxedPathCharsYamlPath}" "${connectorRelaxedQueryCharsYamlPath}"
+    done
+}
+
+# migrate to extra, connector having default port and protocol is AJP
+migrateDefaultPortIfAjp () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    local defaultPort="$4"
+    
+    for ((i = 1 ; i <= "${connectorCount}" ; i++));
+    do  
+        local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+        local protocolType=$(getXmlConnectorProtocol "$i" "${filePath}" "${fileName}")
+        [[ "${protocolType}" != *AJP* ]] && continue
+        [[ "${portValue}" != "${defaultPort}" ]] && continue
+        migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "no" "${i}"
+    done
+
+}
+
+# Comparing max threads in connectors
+compareMaxThreads () {
+    local firstConnectorMaxThread="$1"
+    local firstConnectorNode="$2"
+    local secondConnectorMaxThread="$3"
+    local secondConnectorNode="$4"
+    local filePath="$5"
+    local fileName="$6"
+
+    # choose higher maxThreads connector as Artifactory.
+    if [[ "${firstConnectorMaxThread}" -gt ${secondConnectorMaxThread} || "${firstConnectorMaxThread}" -eq ${secondConnectorMaxThread} ]]; then
+        # maxThread is higher in firstConnector,
+        # Taking firstConnector as Artifactory and SecondConnector as Access
+        # maxThread is equal in both connector,considering firstConnector as Artifactory and SecondConnector as Access
+        local rtPortValue=$(getXmlConnectorPort "${firstConnectorNode}" "${filePath}" "${fileName}")
+        migrateConnectorConfig "${firstConnectorNode}" "${protocolType}" "${rtPortValue}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+        local acPortValue=$(getXmlConnectorPort "${secondConnectorNode}" "${filePath}" "${fileName}")
+        migrateConnectorConfig "${secondConnectorNode}" "${protocolType}" "${acPortValue}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+    else
+        # maxThread is higher in SecondConnector, 
+        # Taking SecondConnector as Artifactory and firstConnector as Access
+        local rtPortValue=$(getXmlConnectorPort "${secondConnectorNode}" "${filePath}" "${fileName}")
+        migrateConnectorConfig "${secondConnectorNode}" "${protocolType}" "${rtPortValue}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+        local acPortValue=$(getXmlConnectorPort "${firstConnectorNode}" "${filePath}" "${fileName}")
+        migrateConnectorConfig "${firstConnectorNode}" "${protocolType}" "${acPortValue}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+    fi
+}
+
+# Check max threads exist to compare
+maxThreadsExistToCompare () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    local firstConnectorMaxThread=
+    local secondConnectorMaxThread=
+    local firstConnectorNode=
+    local secondConnectorNode=
+    local status=success
+    local firstnode=fail
+
+    for ((i = 1 ; i <= "${connectorCount}" ; i++));
+        do 
+        local protocolType=$(getXmlConnectorProtocol "$i" "${filePath}" "${fileName}")
+        if [[ ${protocolType} == *AJP* ]]; then
+            # Migrate Connectors
+            migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "no" "${i}"
+            continue
+        fi
+        # store maxthreads value of each connector
+        if [[ ${firstnode} == "fail" ]]; then
+            firstConnectorMaxThread=$(getXmlConnectorMaxThreads "${i}" "${filePath}" "${fileName}")
+            firstConnectorNode="${i}"
+            firstnode=success
+        else
+            secondConnectorMaxThread=$(getXmlConnectorMaxThreads "${i}" "${filePath}" "${fileName}")
+            secondConnectorNode="${i}"
+        fi
+    done
+    [[ -z "${firstConnectorMaxThread}" ]] && status=fail
+    [[ -z "${secondConnectorMaxThread}" ]] && status=fail
+    # maxThreads is set, now compare MaxThreads
+    if [[ "${status}" == "success" ]]; then
+        compareMaxThreads "${firstConnectorMaxThread}" "${firstConnectorNode}" "${secondConnectorMaxThread}" "${secondConnectorNode}" "${filePath}" "${fileName}"
+    else 
+        # Assume first connector is RT, maxThreads is not set in both connectors
+        local rtPortValue=$(getXmlConnectorPort "${firstConnectorNode}" "${filePath}" "${fileName}")
+        migrateConnectorConfig "${firstConnectorNode}" "${protocolType}" "${rtPortValue}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+        local acPortValue=$(getXmlConnectorPort "${secondConnectorNode}" "${filePath}" "${fileName}")
+        migrateConnectorConfig "${secondConnectorNode}" "${protocolType}" "${acPortValue}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+    fi
+}
+
+migrateExtraBasedOnNonAjpCount () {
+    local nonAjpCount="$1"
+    local filePath="$2"
+    local fileName="$3"
+    local connectorCount="$4"
+    local i="$5"
+
+    local protocolType=$(getXmlConnectorProtocol "$i" "${filePath}" "${fileName}")
+    if [[ "${protocolType}" == *AJP* ]]; then
+        if [[ "${nonAjpCount}" -eq 1  ]]; then
+            # migrateExtraConnectors
+            migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "no" "${i}"
+            continue
+        else
+            # migrateExtraConnectors
+            migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "yes"
+            continue
+        fi
+    fi
+}
+
+# find RT and AC Connector
+findRtAndAcConnector () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    local initialAjpCount=0
+    local nonAjpCount=0
+
+    # get the count of non AJP
+    for ((i = 1 ; i <= "${connectorCount}" ; i++));
+    do  
+        local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+        local protocolType=$(getXmlConnectorProtocol "$i" "${filePath}" "${fileName}")
+        [[ "${protocolType}" != *AJP* ]]  || continue
+        nonAjpCount=$((initialAjpCount+1))
+        initialAjpCount="${nonAjpCount}"
+    done
+    if [[ "${nonAjpCount}" -eq 1 ]]; then  
+        # Add the connector found as access and artifactory connectors
+        # Mark port as 8040 for access
+        for ((i = 1 ; i <= "${connectorCount}" ; i++))
+        do  
+            migrateExtraBasedOnNonAjpCount "${nonAjpCount}" "${filePath}" "${fileName}" "${connectorCount}"  "$i"
+            local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+            migrateConnectorConfig "$i" "${protocolType}" "${portValue}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+            migrateConnectorConfig "$i" "${protocolType}" "${portValue}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+            setConnectorPort "${AC_PORT_YAMLPATH}" "${DEFAULT_ACCESS_PORT}"
+        done
+    elif [[ "${nonAjpCount}" -eq 2 ]]; then
+        # compare maxThreads in both connectors
+        maxThreadsExistToCompare "${filePath}" "${fileName}" "${connectorCount}"
+    elif [[ "${nonAjpCount}" -gt 2 ]]; then
+        # migrateExtraConnectors
+        migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "yes"
+    elif [[ "${nonAjpCount}" -eq 0 ]]; then
+        # setting with default port in system.yaml
+        setConnectorPort "${RT_PORT_YAMLPATH}" "${DEFAULT_RT_PORT}"
+        setConnectorPort "${AC_PORT_YAMLPATH}" "${DEFAULT_ACCESS_PORT}"
+        # migrateExtraConnectors
+        migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "yes"
+    fi
+}
+
+# get the count of non AJP
+getCountOfNonAjp () {
+    local port="$1"
+    local connectorCount="$2"
+    local filePath=$3
+    local fileName=$4
+    local initialNonAjpCount=0
+
+    for ((i = 1 ; i <= "${connectorCount}" ; i++));
+    do  
+        local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+        local protocolType=$(getXmlConnectorProtocol "$i" "${filePath}" "${fileName}")
+        [[ "${portValue}" != "${port}" ]] || continue
+        [[ "${protocolType}" != *AJP* ]]  || continue
+        local nonAjpCount=$((initialNonAjpCount+1))
+        initialNonAjpCount="${nonAjpCount}"
+    done
+    echo -e "${nonAjpCount}"
+}
+
+# Find for access connector
+findAcConnector () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    
+    # get the count of non AJP 
+    local nonAjpCount=$(getCountOfNonAjp "${DEFAULT_RT_PORT}" "${connectorCount}" "${filePath}" "${fileName}")
+    if [[ "${nonAjpCount}" -eq 1 ]]; then
+        # Add the connector found as access connector and mark port as that of connector
+        for ((i = 1 ; i <= "${connectorCount}" ; i++))
+        do  
+            migrateExtraBasedOnNonAjpCount "${nonAjpCount}" "${filePath}" "${fileName}" "${connectorCount}" "$i"
+            local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+            if [[ "${portValue}" != "${DEFAULT_RT_PORT}" ]]; then
+                migrateConnectorConfig "$i" "${protocolType}" "${portValue}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+            fi   
+        done
+    elif [[ "${nonAjpCount}" -gt 1 ]]; then
+        # Take RT properties into access with 8040
+        for ((i = 1 ; i <= "${connectorCount}" ; i++))
+        do  
+            migrateExtraBasedOnNonAjpCount "${nonAjpCount}" "${filePath}" "${fileName}" "${connectorCount}" "$i"
+            local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+            if [[ "${portValue}" == "${DEFAULT_RT_PORT}" ]]; then
+                migrateConnectorConfig "$i" "${protocolType}" "${portValue}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+                setConnectorPort "${AC_PORT_YAMLPATH}" "${DEFAULT_ACCESS_PORT}"
+            fi
+        done
+    elif [[ "${nonAjpCount}" -eq 0 ]]; then 
+        # Add RT connector details as access connector and mark port as 8040  
+        migrateConnectorPort "${filePath}" "${fileName}" "${connectorCount}" "${DEFAULT_RT_PORT}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+        setConnectorPort "${AC_PORT_YAMLPATH}" "${DEFAULT_ACCESS_PORT}"
+        # migrateExtraConnectors
+        migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "yes"
+    fi
+}
+
+# Find for artifactory connector
+findRtConnector () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    
+    # get the count of non AJP 
+    local nonAjpCount=$(getCountOfNonAjp "${DEFAULT_ACCESS_PORT}" "${connectorCount}" "${filePath}" "${fileName}")
+    if [[ "${nonAjpCount}" -eq 1 ]]; then
+        # Add the connector found as RT connector
+        for ((i = 1 ; i <= "${connectorCount}" ; i++))
+        do  
+            migrateExtraBasedOnNonAjpCount "${nonAjpCount}" "${filePath}" "${fileName}" "${connectorCount}" "$i"
+            local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+            if [[ "${portValue}" != "${DEFAULT_ACCESS_PORT}" ]]; then
+                migrateConnectorConfig "$i" "${protocolType}" "${portValue}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+            fi
+        done
+    elif [[ "${nonAjpCount}" -gt 1 ]]; then
+        # Take access properties into artifactory with 8081
+        for ((i = 1 ; i <= "${connectorCount}" ; i++))
+        do  
+            migrateExtraBasedOnNonAjpCount "${nonAjpCount}" "${filePath}" "${fileName}" "${connectorCount}" "$i"
+            local portValue=$(getXmlConnectorPort "$i" "${filePath}" "${fileName}")
+            if [[ "${portValue}" == "${DEFAULT_ACCESS_PORT}" ]]; then
+                migrateConnectorConfig "$i" "${protocolType}" "${portValue}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${filePath}" "${fileName}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+                setConnectorPort "${RT_PORT_YAMLPATH}" "${DEFAULT_RT_PORT}"
+            fi
+        done
+    elif [[ "${nonAjpCount}" -eq 0 ]]; then   
+        # Add access connector details as RT connector and mark as ${DEFAULT_RT_PORT}
+        migrateConnectorPort "${filePath}" "${fileName}" "${connectorCount}" "${DEFAULT_ACCESS_PORT}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+        setConnectorPort "${RT_PORT_YAMLPATH}" "${DEFAULT_RT_PORT}"
+        # migrateExtraConnectors
+        migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "yes"
+    fi
+}
+
+checkForTlsConnector () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    for ((i = 1 ; i <= "${connectorCount}" ; i++))
+    do
+        local sslProtocolValue=$($LIBXML2_PATH --xpath '//Server/Service/Connector['$i']/@sslProtocol' ${filePath}/${fileName} 2>/dev/null | awk -F"=" '{print $2}' | tr -d '"')
+        if [[ "${sslProtocolValue}" == "TLS" ]]; then
+            bannerImportant "NOTE: Ignoring TLS connector during migration, modify the system yaml to enable TLS. Original server.xml is saved in path [${filePath}/${fileName}]"
+            TLS_CONNECTOR_EXISTS=${FLAG_Y}
+            continue
+        fi
+    done
+}
+
+# set custom tomcat server Listeners to system.yaml
+setListenerConnector () {
+    local filePath="$1"
+    local fileName="$2"
+    local listenerCount="$3"
+    for ((i = 1 ; i <= "${listenerCount}" ; i++))
+    do 
+        local listenerConnector=$($LIBXML2_PATH --xpath '//Server/Listener['$i']' ${filePath}/${fileName} 2>/dev/null)
+        local listenerClassName=$($LIBXML2_PATH --xpath '//Server/Listener['$i']/@className' ${filePath}/${fileName} 2>/dev/null | awk -F"=" '{print $2}' | tr -d '"')
+        if [[ "${listenerClassName}" == *Apr* ]]; then
+            setExtraConnector "${EXTRA_LISTENER_CONFIG_YAMLPATH}" "${listenerConnector}"
+        fi
+    done
+}
+# add custom tomcat server Listeners
+addTomcatServerListeners () {
+    local filePath="$1"
+    local fileName="$2"
+    local listenerCount="$3"
+    if [[ "${listenerCount}" == "0" ]]; then
+        logger "No listener connectors found in the [${filePath}/${fileName}],skipping migration of listener connectors"
+    else
+        setListenerConnector "${filePath}" "${fileName}" "${listenerCount}"
+        setSystemValue "${RT_TOMCAT_HTTPSCONNECTOR_ENABLED}" "true" "${SYSTEM_YAML_PATH}"
+        logger "Setting [${RT_TOMCAT_HTTPSCONNECTOR_ENABLED}] with value [true] in system.yaml"
+    fi
+}
+
+# server.xml migration operations
+xmlMigrateOperation () {
+    local filePath="$1"
+    local fileName="$2"
+    local connectorCount="$3"
+    local listenerCount="$4"
+    RT_DEFAULTPORT_STATUS=fail
+    AC_DEFAULTPORT_STATUS=fail
+    TLS_CONNECTOR_EXISTS=${FLAG_N}
+
+    # Check for connector with TLS , if found ignore migrating it
+    checkForTlsConnector "${filePath}" "${fileName}" "${connectorCount}"
+    if [[ "${TLS_CONNECTOR_EXISTS}" == "${FLAG_Y}" ]]; then
+        return
+    fi
+    addTomcatServerListeners "${filePath}" "${fileName}" "${listenerCount}"
+    # Migrate RT default port from connectors 
+    migrateConnectorPort "${filePath}" "${fileName}" "${connectorCount}" "${DEFAULT_RT_PORT}" "${RT_PORT_YAMLPATH}" "${RT_MAXTHREADS_YAMLPATH}" "${RT_EXTRACONFIG_YAMLPATH}" "${RT_SENDREASONPHRASE_YAMLPATH}" "${RT_RELAXEDPATHCHARS_YAMLPATH}" "${RT_RELAXEDQUERYCHARS_YAMLPATH}"
+    # Migrate to extra if RT default ports are AJP
+    migrateDefaultPortIfAjp "${filePath}" "${fileName}" "${connectorCount}" "${DEFAULT_RT_PORT}"
+    # Migrate AC default port from connectors
+    migrateConnectorPort "${filePath}" "${fileName}" "${connectorCount}" "${DEFAULT_ACCESS_PORT}" "${AC_PORT_YAMLPATH}" "${AC_MAXTHREADS_YAMLPATH}" "${AC_EXTRACONFIG_YAMLPATH}" "${AC_SENDREASONPHRASE_YAMLPATH}"
+    # Migrate to extra if access default ports are AJP
+    migrateDefaultPortIfAjp "${filePath}" "${fileName}" "${connectorCount}" "${DEFAULT_ACCESS_PORT}"
+
+    if [[ "${AC_DEFAULTPORT_STATUS}" == "success" && "${RT_DEFAULTPORT_STATUS}" == "success" ]]; then
+        # RT and AC default port found
+        logger "Artifactory 8081 and Access 8040 default port are found"
+        migrateExtraConnectors "${filePath}" "${fileName}" "${connectorCount}" "yes"
+    elif [[ "${AC_DEFAULTPORT_STATUS}" == "success" && "${RT_DEFAULTPORT_STATUS}" == "fail" ]]; then
+        # Only AC default port found,find RT connector
+        logger "Found Access default 8040 port"
+        findRtConnector "${filePath}" "${fileName}" "${connectorCount}"
+    elif [[ "${AC_DEFAULTPORT_STATUS}" == "fail" && "${RT_DEFAULTPORT_STATUS}" == "success" ]]; then
+        # Only RT default port found,find AC connector
+        logger "Found Artifactory default 8081 port"
+        findAcConnector "${filePath}" "${fileName}" "${connectorCount}"
+    elif [[ "${AC_DEFAULTPORT_STATUS}" == "fail" && "${RT_DEFAULTPORT_STATUS}" == "fail" ]]; then    
+        # RT and AC default port not found, find connector
+        logger "Artifactory 8081 and Access 8040 default port are not found"
+        findRtAndAcConnector "${filePath}" "${fileName}" "${connectorCount}"
+    fi
+}
+
+# get count of connectors
+getXmlConnectorCount () {
+    local filePath="$1"
+    local fileName="$2"
+    local count=$($LIBXML2_PATH --xpath 'count(/Server/Service/Connector)' ${filePath}/${fileName})
+    echo -e "${count}"
+}
+
+# get count of listener connectors
+getTomcatServerListenersCount () {
+    local filePath="$1"
+    local fileName="$2"
+    local count=$($LIBXML2_PATH --xpath 'count(/Server/Listener)' ${filePath}/${fileName})
+    echo -e "${count}"
+}
+
+# Migrate server.xml configuration to system.yaml
+migrateXmlFile () {
+    local xmlFiles=
+    local fileName=
+    local filePath=
+    local sourceFilePath=
+    DEFAULT_ACCESS_PORT="8040"
+    DEFAULT_RT_PORT="8081"
+    AC_PORT_YAMLPATH="migration.xmlFiles.serverXml.access.port"
+    AC_MAXTHREADS_YAMLPATH="migration.xmlFiles.serverXml.access.maxThreads"
+    AC_SENDREASONPHRASE_YAMLPATH="migration.xmlFiles.serverXml.access.sendReasonPhrase"
+    AC_EXTRACONFIG_YAMLPATH="migration.xmlFiles.serverXml.access.extraConfig"
+    RT_PORT_YAMLPATH="migration.xmlFiles.serverXml.artifactory.port"
+    RT_MAXTHREADS_YAMLPATH="migration.xmlFiles.serverXml.artifactory.maxThreads"
+    RT_SENDREASONPHRASE_YAMLPATH='migration.xmlFiles.serverXml.artifactory.sendReasonPhrase'
+    RT_RELAXEDPATHCHARS_YAMLPATH='migration.xmlFiles.serverXml.artifactory.relaxedPathChars'
+    RT_RELAXEDQUERYCHARS_YAMLPATH='migration.xmlFiles.serverXml.artifactory.relaxedQueryChars'
+    RT_EXTRACONFIG_YAMLPATH="migration.xmlFiles.serverXml.artifactory.extraConfig"
+    ROUTER_PORT_YAMLPATH="migration.xmlFiles.serverXml.router.port"
+    EXTRA_CONFIG_YAMLPATH="migration.xmlFiles.serverXml.extra.config"
+    EXTRA_LISTENER_CONFIG_YAMLPATH="migration.xmlFiles.serverXml.extra.listener"
+    RT_TOMCAT_HTTPSCONNECTOR_ENABLED="artifactory.tomcat.httpsConnector.enabled"
+
+    retrieveYamlValue "migration.xmlFiles" "xmlFiles" "Skip"
+    xmlFiles="${YAML_VALUE}"
+    if [[ -z "${xmlFiles}" ]]; then
+        return
+    fi
+    bannerSection "PROCESSING MIGRATION OF XML FILES"
+    retrieveYamlValue "migration.xmlFiles.serverXml.fileName" "fileName" "Warning"
+    fileName="${YAML_VALUE}"
+    if [[ -z "${fileName}" ]]; then
+        return
+    fi
+    bannerSubSection "Processing Migration of $fileName"
+    retrieveYamlValue "migration.xmlFiles.serverXml.filePath" "filePath" "Warning"
+    filePath="${YAML_VALUE}"
+    if [[ -z "${filePath}" ]]; then
+        return
+    fi
+    # prepend NEW_DATA_DIR only if filePath is relative path
+    sourceFilePath=$(prependDir "${filePath}" "${NEW_DATA_DIR}/${filePath}")
+    if [[ "$(checkFileExists "${sourceFilePath}/${fileName}")" == "true" ]]; then
+        logger "File [${fileName}] is found in path [${sourceFilePath}]"
+        local connectorCount=$(getXmlConnectorCount "${sourceFilePath}" "${fileName}")
+        if [[ "${connectorCount}" == "0" ]]; then
+            logger "No connectors found in the [${filePath}/${fileName}],skipping migration of xml configuration"
+            return
+        fi
+        local listenerCount=$(getTomcatServerListenersCount "${sourceFilePath}" "${fileName}")
+        xmlMigrateOperation "${sourceFilePath}" "${fileName}" "${connectorCount}" "${listenerCount}"
+    else
+        logger "File [${fileName}] is not found in path [${sourceFilePath}] to migrate"
+    fi   
+}
+
+compareArtifactoryUser () {
+    local property="$1"
+    local oldPropertyValue="$2"
+    local newPropertyValue="$3"
+    local yamlPath="$4"
+    local sourceFile="$5"
+
+    if [[ "${oldPropertyValue}" != "${newPropertyValue}" ]]; then
+        setSystemValue "${yamlPath}" "${oldPropertyValue}" "${SYSTEM_YAML_PATH}"
+        logger "Setting [${yamlPath}] with value of the property [${property}] in system.yaml"
+    else
+        logger "No change in property [${property}] value in [${sourceFile}] to migrate"
+    fi
+}
+
+migrateReplicator () {
+    local property="$1"
+    local oldPropertyValue="$2"
+    local yamlPath="$3"
+
+    setSystemValue "${yamlPath}" "${oldPropertyValue}" "${SYSTEM_YAML_PATH}"
+    logger "Setting [${yamlPath}] with value of the property [${property}] in system.yaml"
+}
+
+compareJavaOptions () {
+    local property="$1"
+    local oldPropertyValue="$2"
+    local newPropertyValue="$3"
+    local yamlPath="$4"
+    local sourceFile="$5"
+    local oldJavaOption=
+    local newJavaOption=
+    local extraJavaOption=
+    local check=false
+    local success=true
+    local status=true
+
+    oldJavaOption=$(echo "${oldPropertyValue}" | awk 'BEGIN{FS=OFS="\""}{for(i=2;i<NF;i+=2)gsub(/ /,"@",$i)}1')
+    newJavaOption=$(echo "${newPropertyValue}" | awk 'BEGIN{FS=OFS="\""}{for(i=2;i<NF;i+=2)gsub(/ /,"@",$i)}1')
+    for oldJavaOption in $oldPropertyValue;
+    do
+        for newJavaOption in $newPropertyValue;
+        do
+            if [[ "${oldJavaOption}" == "${newJavaOption}" ]]; then
+                check=true
+                break
+            else
+                check=false
+            fi
+        done
+        if [[ "${check}" == "false" ]]; then
+            oldJavaOption=$(echo "${oldJavaOption}" | tr -s "@" " ")
+            getYamlValue "${yamlPath}" "${SYSTEM_YAML_PATH}" "false"
+            extraJavaOption="${YAML_VALUE}"
+            success=false
+            if [[ -z "${extraJavaOption}" ]]; then
+                setSystemValue "${yamlPath}" "\"${oldJavaOption}\"" "${SYSTEM_YAML_PATH}" && status=false
+            else
+                [[ "${extraJavaOption}" != *"${oldJavaOption}"* ]] && setSystemValue "${yamlPath}" "\"${extraJavaOption} ${oldJavaOption}\"" "${SYSTEM_YAML_PATH}" || status=false
+            fi
+        fi
+    done
+    if [[ "${status}" == "false" ]]; then
+        getYamlValue "${yamlPath}" "${SYSTEM_YAML_PATH}" "false"
+        local extraOpts="${YAML_VALUE}"
+        logger "Setting [${yamlPath}] with value of the property [${property}] in system.yaml"
+    fi
+    [[ "${success}" == "true" && "${check}" == "true" ]] && logger "No change in property [JAVA_OPTIONS] value in [${sourceFile}] to migrate"
+}
+
+defaultPropertyMigrate () {
+    local entry="$1"
+    local sourceFile="$2"
+    local targetFile="$3"
+    local yamlPath=
+    local property=
+    local oldPropertyValue=
+    local newPropertyValue=
+    local check=false
+    
+    local targetDataDir=
+
+    local yamlPath=$(getFirstEntry "${entry}")
+    local property=$(getSecondEntry "${entry}")
+    if [[ -z "${property}" ]]; then
+        warn "Property is empty in map [${entry}] in the file [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    if [[ -z "${yamlPath}" ]]; then
+        warn "yamlPath is empty for [${property}] in [${MIGRATION_SYSTEM_YAML_INFO}]"
+        return
+    fi
+    unset ${property}
+    source ${sourceFile}
+    oldPropertyValue=$(evalVariable "oldPropertyValue" "${property}")
+
+    unset ${property}
+    source ${targetFile}
+    if [[ "${property}" == "JAVA_OPTIONS" ]]; then
+        property="DEFAULT_JAVA_OPTIONS"
+    fi
+    newPropertyValue="$(evalVariable "newPropertyValue" "${property}")"
+
+    [[ -z "${oldPropertyValue}" ]] && logger "Property [${property}] not found in [${sourceFile}] to migrate" || check=true
+    if [[ "${check}" == "true" ]]; then
+        # migrate ARTIFACTORY_USER
+        [[ "${property}" == "ARTIFACTORY_USER" ]] && compareArtifactoryUser "${property}" "${oldPropertyValue}" "${newPropertyValue}" "${yamlPath}" "${sourceFile}"
+        # migrate JAVA_OPTIONS
+        [[ "${property}" == *"JAVA_OPTIONS"* ]] && compareJavaOptions "${property}" "${oldPropertyValue}" "${newPropertyValue}" "${yamlPath}" "${sourceFile}"
+        # migrate START_LOCAL_REPLICATOR
+        [[ "${property}" == "START_LOCAL_REPLICATOR" ]] && migrateReplicator "${property}" "${oldPropertyValue}" "${yamlPath}"
+    fi
+}
+
+migrateDefaultFile () {
+    local oldDefaultFilePath=
+    local newDefaultFilePath=
+    local oldfileName=
+    local newFileName=
+    local map=
+    local defaultFile=
+    local sourceFilePath=
+    local targetFilePath=
+    local sourceFile=
+    local targetFile=
+    
+    retrieveYamlValue "migration.defaultFile" "defaultFile" "Skip"
+    defaultFile="${YAML_VALUE}"
+    if [[ -z "${defaultFile}" ]]; then
+        return
+    fi
+    bannerSection "PROCESSING MIGRATION OF DEFAULTFILE"
+    retrieveYamlValue "migration.defaultFile.oldFile.defaultFilePath" "oldDefaultFilePath" "Warning"
+    oldDefaultFilePath="${YAML_VALUE}"
+    retrieveYamlValue "migration.defaultFile.oldFile.fileName" "oldFileName" "Warning"
+    oldFileName="${YAML_VALUE}"
+    if [[ "$(warnIfEmpty "${oldDefaultFilePath}" "migration.defaultFile.oldFile.defaultFilePath")" != "true" ]]; then
+        return
+    fi
+    if [[ "$(warnIfEmpty "${oldFileName}" "migration.defaultFile.oldFile.fileName")" != "true" ]]; then
+        return
+    fi
+    retrieveYamlValue "migration.defaultFile.newFile.defaultFilePath" "newDefaultFilePath" "Warning"
+    newDefaultFilePath="${YAML_VALUE}"
+    retrieveYamlValue "migration.defaultFile.newFile.fileName" "newfileName" "Warning"
+    newFileName="${YAML_VALUE}"
+    if [[ "$(warnIfEmpty "${newDefaultFilePath}" "migration.defaultFile.newFile.defaultFilePath")" != "true" ]]; then
+        return
+    fi
+    if [[ "$(warnIfEmpty "${newFileName}" "migration.defaultFile.newFile.fileName")" != "true" ]]; then
+        return
+    fi
+    # prepend NEW_DATA_DIR only if oldDefaultFilePath is relative path
+    sourceFilePath=$(prependDir "${oldDefaultFilePath}" ${NEW_DATA_DIR}/${oldDefaultFilePath})
+    sourceFile="${sourceFilePath}/${oldFileName}"
+    if [[ "$(checkFileExists "${sourceFile}")" != "true" ]]; then
+        logger "OldDefaultFile [${oldFileName}] not found in the path [${sourceFilePath}]"
+        return
+    fi
+    # path newDefaultFilePath will change based installer
+    if [[ "${INSTALLER}" == "${ZIP_TYPE}" ]]; then
+        targetFilePath="${APP_DIR}/../${newDefaultFilePath}"
+    else
+        targetDataDir="`cd "${NEW_DATA_DIR}"/../;pwd`"
+        targetFilePath="${targetDataDir}/${newDefaultFilePath}"
+    fi
+    targetFile="${targetFilePath}/${newFileName}"
+    if [[ "$(checkFileExists "${targetFile}")" != "true" ]]; then
+        logger "NewDefaultFile [${newFileName}] not found in the path [${sourceFilePath}]"
+        return
+    fi
+    logger "OldDefaultFile [${oldFileName}] found in the path [${sourceFilePath}]"
+    logger "NewDefaultFile [${newFileName}] found in the path [${targetFilePath}]"
+    retrieveYamlValue "migration.defaultFile.map" "map" "Warning"
+    map="${YAML_VALUE}"
+    [[ -z "${map}" ]] && continue
+    for entry in $map;
+    do
+        if [[ "$(checkMapEntry "${entry}")" == "true" ]]; then
+            defaultPropertyMigrate "${entry}" "${sourceFile}" "${targetFile}"
+        else
+            warn "map entry [${entry}] in [${MIGRATION_SYSTEM_YAML_INFO}] is not in correct format, correct format i.e yamlPath=property"
+        fi
+    done
+}
+
+# comment node.id in system.yaml
+# Add a commented Line above the node.id in system.yaml
+commentNodeId () {
+    local filePath=
+    local fileName=
+    local idKey=
+
+    retrieveYamlValue "migration.propertyFiles.haNodeProperty.filePath" "filePath" "Skip"
+    filePath="${YAML_VALUE}"
+    if [[ -z "${filePath}" ]]; then
+        return
+    fi
+    retrieveYamlValue "migration.propertyFiles.haNodeProperty.fileName" "fileName" "Skip"
+    fileName="${YAML_VALUE}"
+    if [[ -z "${fileName}" ]]; then
+        return
+    fi
+    if [[ "$(checkFileExists "${NEW_DATA_DIR}/${filePath}/${fileName}")" == "true" ]]; then
+        getYamlValue "shared.node" "${SYSTEM_YAML_PATH}" "false"
+        idKey=$(echo "${YAML_VALUE}" | grep "^id:")
+        local regexString="${idKey}"
+        local replaceText="#&"
+        replaceText_migration_hook "${regexString}" "${replaceText}" "${SYSTEM_YAML_PATH}"
+        local text="# NOTE: node.id can be automatically determined based on the current hostname or be set using the SHARED_NODE_ID environment variable. There is no need to explicitly specify it here."
+        prependText "${regexString}" "${text}" "${SYSTEM_YAML_PATH}"
+    fi
+}
+
+artifactoryInfoMessage () {
+
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        addText "# yamlFile was generated from db.properties and ha-node.properties config files." "${SYSTEM_YAML_PATH}"
+    else
+        addText "# yamlFile was generated from default file,db.properties and ha-node.properties config files." "${SYSTEM_YAML_PATH}"
+    fi
+
+}
+
+setHaEnabled_hook () {
+    local filePath="$1"
+    if [[ "$(checkFileExists "${NEW_DATA_DIR}/${filePath}/ha-node.properties")" == "true" ]]; then
+        setSystemValue "shared.node.haEnabled" "true" "${SYSTEM_YAML_PATH}"
+        logger "Setting [shared.node.haEnabled] with [true] in system.yaml"
+    fi
+}
+
+removeFileOperation () {
+    local backupDir="$1"
+    local file="$2"
+    if [[ "$(checkFileExists "${file}")" == "true" ]]; then
+        cp -pf "${file}" "${backupDir}" || warn "Failed to copy file [${file}] to ${backupDir}"
+        rm -f "${file}" || warn "Failed to remove file [${file}]"
+    else
+        logger "Source file [${file}] does not exist in path to backup and remove"
+    fi
+}
+
+_createBackupOfLogBackDir () {
+    local backupDir="$1"
+    local accessLogbackFile="${NEW_DATA_DIR}/etc/access/logback.xml"
+    local artiLogbackFile="${NEW_DATA_DIR}/etc/artifactory/logback.xml"
+    local effectiveUser=
+    local effectiveGroup=
+    if [[ "${INSTALLER}" == "${COMPOSE_TYPE}" || "${INSTALLER}" == "${HELM_TYPE}" ]]; then
+        effectiveUser="${JF_USER}"
+        effectiveGroup="${JF_USER}"
+    elif [[ "${INSTALLER}" == "${DEB_TYPE}" || "${INSTALLER}" == "${RPM_TYPE}" ]]; then
+        effectiveUser="${USER_TO_CHECK}" 
+        effectiveGroup="${GROUP_TO_CHECK}"
+    fi
+    removeSoftLinkAndCreateDir "${backupDir}/logbackXmlFiles" "${effectiveUser}" "${effectiveGroup}" "yes"
+    removeSoftLinkAndCreateDir "${backupDir}/logbackXmlFiles/access" "${effectiveUser}" "${effectiveGroup}" "yes" 
+    removeSoftLinkAndCreateDir "${backupDir}/logbackXmlFiles/artifactory" "${effectiveUser}" "${effectiveGroup}" "yes"
+    removeFileOperation "${backupDir}/logbackXmlFiles/access" "${accessLogbackFile}"
+    removeFileOperation "${backupDir}/logbackXmlFiles/artifactory" "${artiLogbackFile}"
+}
+
+backupFiles_hook () {
+    local backupDirectory="$1" 
+    _createBackupOfLogBackDir "${backupDirectory}"
+}
+
+migrateArtifactory () {
+    creationMigrateLog
+    _pauseExecution "creationMigrateLog"
+    checkArtifactoryVersion
+    _pauseExecution "checkArtifactoryVersion"
+    startMigration
+    _pauseExecution "startMigration"
+    setSystemYamlPath
+    _pauseExecution "setSystemYamlPath"
+    createRequiredDirs
+    _pauseExecution "createRequiredDirs"
+    symlinkDirectories
+    _pauseExecution "symlinkDirectories"
+    copyDirectories
+    _pauseExecution "copyDirectories"
+    moveDirectories
+    _pauseExecution "moveDirectories"
+    trimMasterKey
+    _pauseExecution "trimMasterKey"
+    migratePropertiesFiles
+    _pauseExecution "migratePropertiesFiles"
+    migrateXmlFile
+    _pauseExecution "migrateXmlFile"
+    migrateDefaultFile
+    _pauseExecution "migrateDefaultFile"
+    migrateYamlFile
+    _pauseExecution "migrateYamlFile"
+    updateSystemYamlFile
+    _pauseExecution "updateSystemYamlFile"
+    cleanUpOldDataDirectories
+    _pauseExecution "cleanUpOldDataDirectories"
+    cleanUpOldFiles
+    _pauseExecution "cleanUpOldFiles"
+    commentNodeId
+    _pauseExecution "commentNodeId"
+    artifactoryInfoMessage
+    _pauseExecution "artifactoryInfoMessage"
+    endMigration
+    _pauseExecution "endMigration"
+}
+
+initialize
+main
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/migrationHelmInfo.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/migrationHelmInfo.yaml
new file mode 100644
index 000000000..016bea02d
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/migrationHelmInfo.yaml
@@ -0,0 +1,27 @@
+migration:
+  product: ARTIFACTORY
+  oldDataDir: /var/opt/jfrog/artifactory
+  moveDirectories:
+    map:
+    # Note : $JF_ROOT_DATA_DIR will be prepended to the sourceDirectoryPath value only if relative path and $JF_ROOT_DATA_DIR/var will be prepended to the targetDirectoryPath value
+    # map should be in format example: targetDirectoryPath=sourceDirectoryPath
+      backup/access=access/backup
+      etc/access=access/etc
+      data/access=access/data
+      work/access=access/tmp
+      log/archived/access=access/logs
+      log/archived/artifactory=logs
+  linkFiles:
+    map:
+    # Note : $JF_ROOT_DATA_DIR will be prepended to the sourceDirectoryPath value only if relative path and $JF_ROOT_DATA_DIR will be prepended to the targetDirectoryPath value
+    # map should be in format example: targetDirectoryPath=sourceDirectoryPath
+      etc/artifactory=etc
+      backup/artifactory=backup
+      data/artifactory=data
+      support/artifactory=support
+  cleanUpOldDataDir:
+    # Note $JF_ROOT_DATA_DIR will be prepended to the map entry
+    map:
+      access
+      metadata
+      logs
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/migrationStatus.sh b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/migrationStatus.sh
new file mode 100644
index 000000000..2ad7c9d31
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/migrationStatus.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+statusCheck(){
+local retries=0
+# Max Timeout in seconds  default ~3600
+local maxTimeOutInSeconds=$1
+MaxRetries=$(( maxTimeOutInSeconds/10 ))
+# Wait for DB to start 
+sleep 30
+until [ "`curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1:8082/router/api/v1/system/health`" == "200" ];
+do
+  echo Waiting for Artifactory to start --- sleeping for 10 seconds
+  if [[ ${retries} -eq ${MaxRetries} ]]
+  then 
+    echo Failed to start.
+    exit 1
+  fi
+  retries=$(( retries+1 ))
+  sleep 10
+done
+
+sleep 20
+echo "Artifactory started successfully...in Init Container"
+echo "Stopping artifactory in Init Container..."
+${scriptsPath}/artifactory.sh stop
+echo "Exiting Init Container..."
+
+}
+
+scriptsPath="/opt/jfrog/artifactory/app/bin"
+maxTimeOut=$2
+bash ${scriptsPath}/migrate.sh $1
+status=$?
+if [[ ${status} -eq 1 && -f /tmp/error ]]; then
+  echo "Migration is not supported ...Exiting Init Container"
+  exit 1
+elif [[ ${status} -eq 0 ]]; then
+  echo "Waiting for Artifactory to start in Init Container"
+  /entrypoint-artifactory.sh &
+  statusCheck ${maxTimeOut}
+else
+  echo "Migration not necessary...Exiting Init Container"
+  exit 0
+fi
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/nginx-artifactory-conf.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/nginx-artifactory-conf.yaml
new file mode 100644
index 000000000..1ddd6c33a
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/nginx-artifactory-conf.yaml
@@ -0,0 +1,108 @@
+{{- if .Values.nginx.https.enabled }}
+ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+ssl_certificate  {{ .Values.nginx.persistence.mountPath }}/ssl/tls.crt;
+ssl_certificate_key  {{ .Values.nginx.persistence.mountPath }}/ssl/tls.key;
+ssl_session_cache shared:SSL:1m;
+ssl_prefer_server_ciphers   on;
+{{- end }}
+## server configuration
+server {
+{{- if .Values.nginx.internalPortHttps }}
+{{- if .Values.nginx.singleStackIPv6Cluster }}
+listen [::]:{{ .Values.nginx.internalPortHttps }} ssl;
+{{- else -}}
+listen {{ .Values.nginx.internalPortHttps }} ssl;
+{{- end }}
+{{- else -}}
+{{- if .Values.nginx.https.enabled }}
+{{- if .Values.nginx.singleStackIPv6Cluster }}
+listen [::]:{{ .Values.nginx.https.internalPort }} ssl;
+{{- else -}}
+listen {{ .Values.nginx.https.internalPort }} ssl;
+{{- end }}
+{{- end }}
+{{- end }}
+{{- if .Values.nginx.internalPortHttp }}
+{{- if .Values.nginx.singleStackIPv6Cluster }}
+listen [::]:{{ .Values.nginx.internalPortHttp }};
+{{- else -}}
+listen {{ .Values.nginx.internalPortHttp }};
+{{- end }}
+{{- else -}}
+{{- if .Values.nginx.http.enabled }}
+{{- if .Values.nginx.singleStackIPv6Cluster }}
+listen [::]:{{ .Values.nginx.http.internalPort }};
+{{- else -}}
+listen {{ .Values.nginx.http.internalPort }};
+{{- end }}
+{{- end }}
+{{- end }}
+server_name ~(?<repo>.+)\.{{ include "artifactory.fullname" . }} {{ include "artifactory.fullname" . }}
+{{ tpl (include "artifactory.nginx.hosts" .) . }};
+
+if ($http_x_forwarded_proto = '') {
+  set $http_x_forwarded_proto  $scheme;
+}
+set $host_port {{ .Values.nginx.https.externalPort }};
+if ( $scheme = "http" ) {
+  set $host_port {{ .Values.nginx.http.externalPort }};
+}
+## Application specific logs
+## access_log /var/log/nginx/artifactory-access.log timing;
+## error_log /var/log/nginx/artifactory-error.log;
+rewrite ^/artifactory/?$ / redirect;
+if ( $repo != "" ) {
+  rewrite ^/(v1|v2)/(.*) /artifactory/api/docker/$repo/$1/$2 break;
+}
+chunked_transfer_encoding on;
+client_max_body_size 0;
+
+location / {
+  proxy_read_timeout  900;
+  proxy_pass_header   Server;
+  proxy_cookie_path   ~*^/.* /;
+  proxy_pass          {{ include "artifactory.scheme" . }}://{{ include "artifactory.fullname" . }}:{{ .Values.artifactory.externalPort }}/;
+  {{- if .Values.nginx.service.ssloffload}}
+  {{- if .Values.nginx.service.ssloffloadForceHttps}}
+  proxy_set_header    X-JFrog-Override-Base-Url https://$host;
+  proxy_set_header    X-Forwarded-Proto https;
+  {{- else }}
+  proxy_set_header    X-JFrog-Override-Base-Url $http_x_forwarded_proto://$host;
+  proxy_set_header    X-Forwarded-Proto $http_x_forwarded_proto;
+  {{- end }}
+  {{- else if or (eq (int .Values.nginx.https.internalPort) 80) (eq (int .Values.nginx.https.externalPort) 443)}}
+  proxy_set_header    X-JFrog-Override-Base-Url $http_x_forwarded_proto://$host;
+  proxy_set_header    X-Forwarded-Port  $server_port;
+  proxy_set_header    X-Forwarded-Proto $http_x_forwarded_proto;
+  {{- else }}
+  proxy_set_header    X-JFrog-Override-Base-Url $http_x_forwarded_proto://$host:$host_port;
+  proxy_set_header    X-Forwarded-Port  $server_port;
+  proxy_set_header    X-Forwarded-Proto $http_x_forwarded_proto;
+  {{- end }}
+  proxy_set_header    Host              $http_host;
+  proxy_set_header    X-Forwarded-For   $proxy_add_x_forwarded_for;
+  {{- if .Values.nginx.disableProxyBuffering}}
+  proxy_http_version 1.1;
+  proxy_request_buffering off;
+  proxy_buffering off;
+  {{- end }}
+  add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
+  location /artifactory/ {
+    if ( $request_uri ~ ^/artifactory/(.*)$ ) {
+      proxy_pass       http://{{ include "artifactory.fullname" . }}:{{ .Values.artifactory.externalArtifactoryPort }}/artifactory/$1;
+    }
+    proxy_pass         http://{{ include "artifactory.fullname" . }}:{{ .Values.artifactory.externalArtifactoryPort }}/artifactory/;
+  }
+  location /pipelines/ {
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header Host $http_host;
+    {{- if .Values.router.tlsEnabled }}
+    proxy_pass  https://{{ include "artifactory.fullname" . }}:{{ .Values.router.internalPort }};
+    {{- else }}
+    proxy_pass  http://{{ include "artifactory.fullname" . }}:{{ .Values.router.internalPort }};
+    {{- end }}
+  }
+}
+}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/nginx-main-conf.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/nginx-main-conf.yaml
new file mode 100644
index 000000000..6ee7f98f9
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/nginx-main-conf.yaml
@@ -0,0 +1,83 @@
+# Main Nginx configuration file
+worker_processes  4;
+
+{{- if .Values.nginx.logs.stderr }}
+error_log  stderr {{ .Values.nginx.logs.level }};
+{{- else -}}
+error_log  {{ .Values.nginx.persistence.mountPath }}/logs/error.log {{ .Values.nginx.logs.level }};
+{{- end }}
+pid        /var/run/nginx.pid;
+
+{{- if .Values.artifactory.ssh.enabled }}
+## SSH Server Configuration
+stream {
+  server {
+    {{- if .Values.nginx.singleStackIPv6Cluster }}
+    listen [::]:{{ .Values.nginx.ssh.internalPort }};
+    {{- else -}}
+    listen {{ .Values.nginx.ssh.internalPort }};
+    {{- end }}
+    proxy_pass {{ include "artifactory.fullname" . }}:{{ .Values.artifactory.ssh.externalPort }};
+  }
+}
+{{- end }}
+
+events {
+  worker_connections  1024;
+}
+
+http {
+  include       /etc/nginx/mime.types;
+  default_type  application/octet-stream;
+
+  variables_hash_max_size 1024;
+  variables_hash_bucket_size 64;
+  server_names_hash_max_size 4096;
+  server_names_hash_bucket_size 128;
+  types_hash_max_size 2048;
+  types_hash_bucket_size 64;
+  proxy_read_timeout 2400s;
+  client_header_timeout 2400s;
+  client_body_timeout 2400s;
+  proxy_connect_timeout 75s;
+  proxy_send_timeout 2400s;
+  proxy_buffer_size 128k;
+  proxy_buffers 40 128k;
+  proxy_busy_buffers_size 128k;
+  proxy_temp_file_write_size 250m;
+  proxy_http_version 1.1;
+  client_body_buffer_size 128k;
+
+  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+  '$status $body_bytes_sent "$http_referer" '
+  '"$http_user_agent" "$http_x_forwarded_for"';
+
+  log_format timing 'ip = $remote_addr '
+  'user = \"$remote_user\" '
+  'local_time = \"$time_local\" '
+  'host = $host '
+  'request = \"$request\" '
+  'status = $status '
+  'bytes = $body_bytes_sent '
+  'upstream = \"$upstream_addr\" '
+  'upstream_time = $upstream_response_time '
+  'request_time = $request_time '
+  'referer = \"$http_referer\" '
+  'UA = \"$http_user_agent\"';
+
+  {{- if .Values.nginx.logs.stdout }}
+  access_log /dev/stdout timing;
+  {{- else -}}
+  access_log {{ .Values.nginx.persistence.mountPath }}/logs/access.log timing;
+  {{- end }}
+
+  sendfile        on;
+  #tcp_nopush     on;
+
+  keepalive_timeout  65;
+
+  #gzip  on;
+
+  include /etc/nginx/conf.d/*.conf;
+
+}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/system.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/system.yaml
new file mode 100644
index 000000000..fecc70714
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/files/system.yaml
@@ -0,0 +1,167 @@
+router:
+  serviceRegistry:
+    insecure: {{ .Values.router.serviceRegistry.insecure }}
+shared:
+{{- if .Values.artifactory.coldStorage.enabled }}
+  jfrogColdStorage:
+    coldInstanceEnabled: true
+{{- end }}
+{{- if .Values.artifactory.worker.enabled }}
+  featureToggler:
+    worker: true
+{{- end }}
+{{ tpl (include "artifactory.metrics" .) . }}
+  logging:
+    consoleLog:
+      enabled: {{ .Values.artifactory.consoleLog }}
+  extraJavaOpts: >
+    -Dartifactory.graceful.shutdown.max.request.duration.millis={{ mul .Values.artifactory.terminationGracePeriodSeconds 1000 }}
+    -Dartifactory.access.client.max.connections={{ .Values.access.tomcat.connector.maxThreads }}
+{{- if .Values.artifactory.worker.enabled }}
+    -Dartifactory.workers.addon.support=true
+{{- end }}
+  {{- with .Values.artifactory.javaOpts }}
+    {{- if .corePoolSize }}
+    -Dartifactory.async.corePoolSize={{ .corePoolSize }}
+    {{- end }}
+  {{- if .xms }}
+    -Xms{{ .xms }}
+  {{- end }}
+  {{- if .xmx }}
+    -Xmx{{ .xmx }}
+  {{- end }}
+  {{- if .jmx.enabled }}
+    -Dcom.sun.management.jmxremote
+    -Dcom.sun.management.jmxremote.port={{ .jmx.port }}
+    -Dcom.sun.management.jmxremote.rmi.port={{ .jmx.port }}
+    -Dcom.sun.management.jmxremote.ssl={{ .jmx.ssl }}
+  {{- if .jmx.host }}
+    -Djava.rmi.server.hostname={{ tpl .jmx.host $ }}
+  {{- else }}
+    -Djava.rmi.server.hostname={{ template "artifactory.fullname" $ }}
+  {{- end }}
+  {{- if .jmx.authenticate }}
+    -Dcom.sun.management.jmxremote.authenticate=true
+    -Dcom.sun.management.jmxremote.access.file={{ .jmx.accessFile }}
+    -Dcom.sun.management.jmxremote.password.file={{ .jmx.passwordFile }}
+  {{- else }}
+    -Dcom.sun.management.jmxremote.authenticate=false
+  {{- end }}
+  {{- end }}
+  {{- if .other }}
+    {{ .other }}
+  {{- end }}
+  {{- end }}
+  {{- if or .Values.database.type .Values.postgresql.enabled }}
+  database:
+    allowNonPostgresql: {{ .Values.database.allowNonPostgresql }}
+    {{- if .Values.postgresql.enabled }}
+    type: postgresql
+    url: "jdbc:postgresql://{{ .Release.Name }}-postgresql:{{ .Values.postgresql.service.port }}/{{ .Values.postgresql.postgresqlDatabase }}"
+    driver: org.postgresql.Driver
+    username: "{{ .Values.postgresql.postgresqlUsername }}"
+    {{- else }}
+    type: "{{ .Values.database.type }}"
+    driver: "{{ .Values.database.driver }}"
+    {{- end }}
+  {{- end }}
+artifactory:
+{{- if or .Values.artifactory.haDataDir.enabled .Values.artifactory.haBackupDir.enabled }}
+  node:
+  {{- if .Values.artifactory.haDataDir.path }}
+    haDataDir: {{ .Values.artifactory.haDataDir.path }}
+  {{- end }}
+  {{- if .Values.artifactory.haBackupDir.path }}
+    haBackupDir: {{ .Values.artifactory.haBackupDir.path }}
+  {{- end }}
+{{- end }}
+  database:
+    maxOpenConnections: {{ .Values.artifactory.database.maxOpenConnections }}
+  tomcat:
+    maintenanceConnector:
+      port: {{ .Values.artifactory.tomcat.maintenanceConnector.port }}
+    connector:
+      maxThreads: {{ .Values.artifactory.tomcat.connector.maxThreads }}
+      sendReasonPhrase: {{ .Values.artifactory.tomcat.connector.sendReasonPhrase }}
+      extraConfig: {{ .Values.artifactory.tomcat.connector.extraConfig }}
+frontend:
+  session:
+    timeMinutes: {{ .Values.frontend.session.timeoutMinutes | quote }}
+access:
+  runOnArtifactoryTomcat: {{ .Values.access.runOnArtifactoryTomcat | default false }}
+  database:
+    maxOpenConnections: {{ .Values.access.database.maxOpenConnections }}
+  {{- if not (.Values.access.runOnArtifactoryTomcat | default false) }}
+  extraJavaOpts: >
+  {{- if .Values.splitServicesToContainers }}
+    -XX:InitialRAMPercentage=20
+    -XX:MaxRAMPercentage=70
+  {{- end }}
+  {{- with .Values.access.javaOpts }}
+  {{- if .other }}
+    {{ .other }}
+  {{- end }}
+  {{- end }}
+  {{- end }}
+  tomcat:
+    connector:
+      maxThreads: {{ .Values.access.tomcat.connector.maxThreads }}
+      sendReasonPhrase: {{ .Values.access.tomcat.connector.sendReasonPhrase }}
+      extraConfig: {{ .Values.access.tomcat.connector.extraConfig }}
+{{- if .Values.artifactory.worker.enabled }}
+  worker:
+    enabled: true
+{{- end }}
+{{- if .Values.mc.enabled }}
+mc:
+  enabled: true
+  database:
+    maxOpenConnections: {{ .Values.mc.database.maxOpenConnections }}
+  idgenerator:
+    maxOpenConnections: {{ .Values.mc.idgenerator.maxOpenConnections }}
+  tomcat:
+    connector:
+      maxThreads: {{ .Values.mc.tomcat.connector.maxThreads }}
+      sendReasonPhrase: {{ .Values.mc.tomcat.connector.sendReasonPhrase }}
+      extraConfig: {{ .Values.mc.tomcat.connector.extraConfig }}
+{{- end }}
+metadata:
+  database:
+    maxOpenConnections: {{ .Values.metadata.database.maxOpenConnections }}
+{{- if and .Values.jfconnect.enabled  (not (regexMatch "^.*(oss|cpp-ce|jcr).*$" .Values.artifactory.image.repository)) }}
+jfconnect:
+  enabled: true
+{{- else }}
+jfconnect:
+  enabled: false
+jfconnect_service:
+  enabled: false
+{{- end }}
+{{- if and .Values.federation.enabled  (not (regexMatch "^.*(oss|cpp-ce|jcr).*$" .Values.artifactory.image.repository)) }}
+federation:
+  enabled: true
+  embedded: {{ .Values.federation.embedded }}
+  extraJavaOpts: {{ .Values.federation.extraJavaOpts }}
+  port: {{ .Values.federation.internalPort }}
+rtfs:
+  database:
+    driver: org.postgresql.Driver
+    type: postgresql
+    username: {{ .Values.federation.database.username }}
+    password: {{ .Values.federation.database.password }}
+    url: jdbc:postgresql://{{ .Values.federation.database.host }}:{{ .Values.federation.database.port }}/{{ .Values.federation.database.name }}
+{{- else }}
+federation:
+  enabled: false
+{{- end }}
+{{- if .Values.event.webhooks }}
+event:
+  webhooks: {{ toYaml .Values.event.webhooks | nindent 6 }}
+{{- end }}
+{{- if .Values.evidence.enabled }}
+evidence:
+  enabled: true
+{{- else }}
+evidence:
+  enabled: false
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/logo/artifactory-logo.png b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/logo/artifactory-logo.png
new file mode 100644
index 000000000..fe6c23c5a
Binary files /dev/null and b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/logo/artifactory-logo.png differ
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-2xlarge.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-2xlarge.yaml
new file mode 100644
index 000000000..e3f9a3442
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-2xlarge.yaml
@@ -0,0 +1,158 @@
+##############################################################################################
+# The 2xlarge sizing
+# This size is intended for very large organizations. It can be increased with adding replicas
+# [WARNING] Some of the the configuration mentioned in this file are taken inside system.yaml
+# hence this configuration will be overridden when enabling systemYamlOverride
+##############################################################################################
+splitServicesToContainers: true
+artifactory:
+  # Enterprise and above licenses are required for setting replicaCount greater than 1.
+  # Count should be equal or above the total number of licenses available for artifactory.
+  replicaCount: 6
+
+  # Require multiple Artifactory pods to run on separate nodes
+  podAntiAffinity:
+    type: "hard"
+
+  resources:
+    requests:
+      cpu: "4"
+      memory: 20Gi
+    limits:
+      # cpu: "20"
+      memory: 24Gi
+
+  extraEnvironmentVariables:
+    - name: MALLOC_ARENA_MAX
+      value: "16"
+    - name: SKIP_WAIT_FOR_EXTERNAL_DB
+      value: "true"
+
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=40
+      -XX:MaxRAMPercentage=70
+      -Dartifactory.async.corePoolSize=200
+      -Dartifactory.async.poolMaxQueueSize=100000
+      -Dartifactory.http.client.max.total.connections=150
+      -Dartifactory.http.client.max.connections.per.route=150
+      -Dartifactory.access.client.max.connections=200
+      -Dartifactory.metadata.event.operator.threads=5
+      -XX:MaxMetaspaceSize=512m
+      -Djdk.nio.maxCachedBufferSize=1048576
+      -XX:MaxDirectMemorySize=1024m
+  tomcat:
+    connector:
+      maxThreads: 800
+      extraConfig: 'acceptCount="1200" acceptorThreadCount="2" compression="off" connectionLinger="-1" connectionTimeout="120000" enableLookups="false"'
+
+  database:
+    maxOpenConnections: 200
+
+access:
+  tomcat:
+    connector:
+      maxThreads: 200
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=20
+      -XX:MaxRAMPercentage=60
+  database:
+    maxOpenConnections: 200
+  resources:
+    requests:
+      cpu: 1
+      memory: 2Gi
+    limits:
+      # cpu: 2
+      memory: 4Gi
+
+router:
+  resources:
+    requests:
+      cpu: "2"
+      memory: 2Gi
+    limits:
+      # cpu: "12"
+      memory: 4Gi
+
+frontend:
+  resources:
+    requests:
+      cpu: "1"
+      memory: 500Mi
+    limits:
+      # cpu: "5"
+      memory: 1Gi
+
+metadata:
+  database:
+    maxOpenConnections: 200
+  resources:
+    requests:
+      cpu: "1"
+      memory: 500Mi
+    limits:
+      # cpu: "5"
+      memory: 2Gi
+
+event:
+  resources:
+    requests:
+      cpu: 200m
+      memory: 100Mi
+    limits:
+      # cpu: "1"
+      memory: 500Mi
+
+observability:
+  resources:
+    requests:
+      cpu: 200m
+      memory: 100Mi
+    limits:
+      # cpu: "1"
+      memory: 500Mi
+
+jfconnect:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 100Mi
+    limits:
+      # cpu: "1"
+      memory: 250Mi
+
+nginx:
+  replicaCount: 3
+  disableProxyBuffering: true
+  resources:
+    requests:
+      cpu: "4"
+      memory: "6Gi"
+    limits:
+      # cpu: "14"
+      memory: "8Gi"
+
+postgresql:
+  postgresqlExtendedConf:
+    maxConnections: "5000"
+  primary:
+    affinity:
+      # Require PostgreSQL pod to run on a different node than Artifactory pods
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                    - artifactory
+            topologyKey: kubernetes.io/hostname
+  resources:
+    requests:
+      memory: 256Gi
+      cpu: "64"
+    limits:
+      memory: 256Gi
+      # cpu: "128"
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-large.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-large.yaml
new file mode 100644
index 000000000..ec52b6077
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-large.yaml
@@ -0,0 +1,158 @@
+##############################################################################################
+# The large sizing
+# This size is intended for large organizations. It can be increased with adding replicas or moving to the xlarge sizing
+# [WARNING] Some of the the configuration mentioned in this file are taken inside system.yaml
+# hence this configuration will be overridden when enabling systemYamlOverride
+##############################################################################################
+splitServicesToContainers: true
+artifactory:
+  # Enterprise and above licenses are required for setting replicaCount greater than 1.
+  # Count should be equal or above the total number of licenses available for artifactory.
+  replicaCount: 3
+
+  # Require multiple Artifactory pods to run on separate nodes
+  podAntiAffinity:
+    type: "hard"
+
+  resources:
+    requests:
+      cpu: "2"
+      memory: 10Gi
+    limits:
+      # cpu: "14"
+      memory: 12Gi
+
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=40
+      -XX:MaxRAMPercentage=65
+      -Dartifactory.async.corePoolSize=80
+      -Dartifactory.async.poolMaxQueueSize=20000
+      -Dartifactory.http.client.max.total.connections=100
+      -Dartifactory.http.client.max.connections.per.route=100
+      -Dartifactory.access.client.max.connections=125
+      -Dartifactory.metadata.event.operator.threads=4
+      -XX:MaxMetaspaceSize=512m
+      -Djdk.nio.maxCachedBufferSize=524288
+      -XX:MaxDirectMemorySize=512m
+  tomcat:
+    connector:
+      maxThreads: 500
+      extraConfig: 'acceptCount="800" acceptorThreadCount="2" compression="off" connectionLinger="-1" connectionTimeout="120000" enableLookups="false"'
+
+  database:
+    maxOpenConnections: 100
+
+  extraEnvironmentVariables:
+    - name: MALLOC_ARENA_MAX
+      value: "8"
+    - name: SKIP_WAIT_FOR_EXTERNAL_DB
+      value: "true"
+
+access:
+  tomcat:
+    connector:
+      maxThreads: 125
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=20
+      -XX:MaxRAMPercentage=60
+  database:
+    maxOpenConnections: 100
+  resources:
+    requests:
+      cpu: 1
+      memory: 1.5Gi
+    limits:
+      # cpu: 1
+      memory: 2Gi
+
+router:
+  resources:
+    requests:
+      cpu: 400m
+      memory: 800Mi
+    limits:
+      # cpu: "8"
+      memory: 2Gi
+
+frontend:
+  resources:
+    requests:
+      cpu: 200m
+      memory: 300Mi
+    limits:
+      # cpu: "3"
+      memory: 1Gi
+
+metadata:
+  database:
+    maxOpenConnections: 100
+  resources:
+    requests:
+      cpu: 200m
+      memory: 200Mi
+    limits:
+      # cpu: "4"
+      memory: 1Gi
+
+event:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+observability:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+jfconnect:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 100Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+nginx:
+  replicaCount: 2
+  disableProxyBuffering: true
+  resources:
+    requests:
+      cpu: "1"
+      memory: "500Mi"
+    limits:
+      # cpu: "4"
+      memory: "1Gi"
+
+postgresql:
+  postgresqlExtendedConf:
+    maxConnections: "600"
+  primary:
+    affinity:
+      # Require PostgreSQL pod to run on a different node than Artifactory pods
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                    - artifactory
+            topologyKey: kubernetes.io/hostname
+  resources:
+    requests:
+      memory: 64Gi
+      cpu: "16"
+    limits:
+      memory: 64Gi
+      # cpu: "32"
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-medium.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-medium.yaml
new file mode 100644
index 000000000..16045600d
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-medium.yaml
@@ -0,0 +1,158 @@
+##############################################################################################
+# The medium sizing
+# This size is just 2 replicas of the small size. Vertical sizing of all services is not changed
+# [WARNING] Some of the the configuration mentioned in this file are taken inside system.yaml
+# hence this configuration will be overridden when enabling systemYamlOverride
+##############################################################################################
+splitServicesToContainers: true
+artifactory:
+  # Enterprise and above licenses are required for setting replicaCount greater than 1.
+  # Count should be equal or above the total number of licenses available for artifactory.
+  replicaCount: 2
+
+  # Require multiple Artifactory pods to run on separate nodes
+  podAntiAffinity:
+    type: "hard"
+
+  resources:
+    requests:
+      cpu: "1"
+      memory: 4Gi
+    limits:
+      # cpu: "10"
+      memory: 5Gi
+
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=40
+      -XX:MaxRAMPercentage=70
+      -Dartifactory.async.corePoolSize=40
+      -Dartifactory.async.poolMaxQueueSize=10000
+      -Dartifactory.http.client.max.total.connections=50
+      -Dartifactory.http.client.max.connections.per.route=50
+      -Dartifactory.access.client.max.connections=75
+      -Dartifactory.metadata.event.operator.threads=3
+      -XX:MaxMetaspaceSize=512m
+      -Djdk.nio.maxCachedBufferSize=262144
+      -XX:MaxDirectMemorySize=256m
+  tomcat:
+    connector:
+      maxThreads: 300
+      extraConfig: 'acceptCount="600" acceptorThreadCount="2" compression="off" connectionLinger="-1" connectionTimeout="120000" enableLookups="false"'
+
+  database:
+    maxOpenConnections: 50
+
+  extraEnvironmentVariables:
+    - name: MALLOC_ARENA_MAX
+      value: "2"
+    - name: SKIP_WAIT_FOR_EXTERNAL_DB
+      value: "true"
+
+access:
+  tomcat:
+    connector:
+      maxThreads: 75
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=20
+      -XX:MaxRAMPercentage=60
+  database:
+    maxOpenConnections: 50
+  resources:
+    requests:
+      cpu: 500m
+      memory: 1.5Gi
+    limits:
+      # cpu: 1
+      memory: 2Gi
+
+router:
+  resources:
+    requests:
+      cpu: 200m
+      memory: 500Mi
+    limits:
+      # cpu: "2"
+      memory: 1Gi
+
+frontend:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 150Mi
+    limits:
+      # cpu: "2"
+      memory: 250Mi
+
+metadata:
+  database:
+    maxOpenConnections: 50
+  resources:
+    requests:
+      cpu: 100m
+      memory: 200Mi
+    limits:
+      # cpu: "2"
+      memory: 1Gi
+
+event:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+observability:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+jfconnect:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+nginx:
+  replicaCount: 2
+  disableProxyBuffering: true
+  resources:
+    requests:
+      cpu: "100m"
+      memory: "100Mi"
+    limits:
+      # cpu: "2"
+      memory: "500Mi"
+
+postgresql:
+  postgresqlExtendedConf:
+    maxConnections: "200"
+  primary:
+    affinity:
+      # Require PostgreSQL pod to run on a different node than Artifactory pods
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                    - artifactory
+            topologyKey: kubernetes.io/hostname
+  resources:
+    requests:
+      memory: 32Gi
+      cpu: "8"
+    limits:
+      memory: 32Gi
+      # cpu: "16"
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-small.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-small.yaml
new file mode 100644
index 000000000..9593936e9
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-small.yaml
@@ -0,0 +1,158 @@
+##############################################################################################
+# The small sizing
+# This is the size recommended for running Artifactory for small teams
+# [WARNING] Some of the the configuration mentioned in this file are taken inside system.yaml
+# hence this configuration will be overridden when enabling systemYamlOverride
+##############################################################################################
+splitServicesToContainers: true
+artifactory:
+  # Enterprise and above licenses are required for setting replicaCount greater than 1.
+  # Count should be equal or above the total number of licenses available for artifactory.
+  replicaCount: 1
+
+  # Require multiple Artifactory pods to run on separate nodes
+  podAntiAffinity:
+    type: "hard"
+
+  resources:
+    requests:
+      cpu: "1"
+      memory: 4Gi
+    limits:
+      # cpu: "10"
+      memory: 5Gi
+
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=40
+      -XX:MaxRAMPercentage=70
+      -Dartifactory.async.corePoolSize=40
+      -Dartifactory.async.poolMaxQueueSize=10000
+      -Dartifactory.http.client.max.total.connections=50
+      -Dartifactory.http.client.max.connections.per.route=50
+      -Dartifactory.access.client.max.connections=75
+      -Dartifactory.metadata.event.operator.threads=3
+      -XX:MaxMetaspaceSize=512m
+      -Djdk.nio.maxCachedBufferSize=262144
+      -XX:MaxDirectMemorySize=256m
+  tomcat:
+    connector:
+      maxThreads: 300
+      extraConfig: 'acceptCount="600" acceptorThreadCount="2" compression="off" connectionLinger="-1" connectionTimeout="120000" enableLookups="false"'
+
+  database:
+    maxOpenConnections: 50
+
+  extraEnvironmentVariables:
+    - name: MALLOC_ARENA_MAX
+      value: "2"
+    - name: SKIP_WAIT_FOR_EXTERNAL_DB
+      value: "true"
+
+access:
+  tomcat:
+    connector:
+      maxThreads: 75
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=20
+      -XX:MaxRAMPercentage=60
+  database:
+    maxOpenConnections: 50
+  resources:
+    requests:
+      cpu: 500m
+      memory: 1.5Gi
+    limits:
+      # cpu: 1
+      memory: 2Gi
+
+router:
+  resources:
+    requests:
+      cpu: 200m
+      memory: 500Mi
+    limits:
+      # cpu: "2"
+      memory: 1Gi
+
+frontend:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 150Mi
+    limits:
+      # cpu: "2"
+      memory: 250Mi
+
+metadata:
+  database:
+    maxOpenConnections: 50
+  resources:
+    requests:
+      cpu: 100m
+      memory: 200Mi
+    limits:
+      # cpu: "2"
+      memory: 1Gi
+
+event:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+observability:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+jfconnect:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+nginx:
+  replicaCount: 1
+  disableProxyBuffering: true
+  resources:
+    requests:
+      cpu: "100m"
+      memory: "100Mi"
+    limits:
+      # cpu: "2"
+      memory: "500Mi"
+
+postgresql:
+  postgresqlExtendedConf:
+    maxConnections: "100"
+  primary:
+    affinity:
+      # Require PostgreSQL pod to run on a different node than Artifactory pods
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                    - artifactory
+            topologyKey: kubernetes.io/hostname
+  resources:
+    requests:
+      memory: 16Gi
+      cpu: "4"
+    limits:
+      memory: 16Gi
+      # cpu: "10"
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-xlarge.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-xlarge.yaml
new file mode 100644
index 000000000..92f9f317b
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-xlarge.yaml
@@ -0,0 +1,158 @@
+##############################################################################################
+# The xlarge sizing
+# This size is intended for very large organizations. It can be increased with adding replicas
+# [WARNING] Some of the the configuration mentioned in this file are taken inside system.yaml
+# hence this configuration will be overridden when enabling systemYamlOverride
+##############################################################################################
+splitServicesToContainers: true
+artifactory:
+  # Enterprise and above licenses are required for setting replicaCount greater than 1.
+  # Count should be equal or above the total number of licenses available for artifactory.
+  replicaCount: 4
+
+  # Require multiple Artifactory pods to run on separate nodes
+  podAntiAffinity:
+    type: "hard"
+
+  resources:
+    requests:
+      cpu: "2"
+      memory: 14Gi
+    limits:
+      # cpu: "14"
+      memory: 16Gi
+
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=40
+      -XX:MaxRAMPercentage=65
+      -Dartifactory.async.corePoolSize=160
+      -Dartifactory.async.poolMaxQueueSize=50000
+      -Dartifactory.http.client.max.total.connections=150
+      -Dartifactory.http.client.max.connections.per.route=150
+      -Dartifactory.access.client.max.connections=150
+      -Dartifactory.metadata.event.operator.threads=5
+      -XX:MaxMetaspaceSize=512m
+      -Djdk.nio.maxCachedBufferSize=1048576
+      -XX:MaxDirectMemorySize=1024m
+  tomcat:
+    connector:
+      maxThreads: 600
+      extraConfig: 'acceptCount="1200" acceptorThreadCount="2" compression="off" connectionLinger="-1" connectionTimeout="120000" enableLookups="false"'
+
+  database:
+    maxOpenConnections: 150
+
+  extraEnvironmentVariables:
+    - name: MALLOC_ARENA_MAX
+      value: "16"
+    - name: SKIP_WAIT_FOR_EXTERNAL_DB
+      value: "true"
+
+access:
+  tomcat:
+    connector:
+      maxThreads: 150
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=20
+      -XX:MaxRAMPercentage=60
+  database:
+    maxOpenConnections: 150
+  resources:
+    requests:
+      cpu: 500m
+      memory: 2Gi
+    limits:
+      # cpu: 1
+      memory: 3Gi
+
+router:
+  resources:
+    requests:
+      cpu: 400m
+      memory: 1Gi
+    limits:
+      # cpu: "8"
+      memory: 2Gi
+
+frontend:
+  resources:
+    requests:
+      cpu: 200m
+      memory: 300Mi
+    limits:
+      # cpu: "3"
+      memory: 1Gi
+
+metadata:
+  database:
+    maxOpenConnections: 150
+  resources:
+    requests:
+      cpu: 200m
+      memory: 200Mi
+    limits:
+      # cpu: "4"
+      memory: 1Gi
+
+event:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+observability:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+jfconnect:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 100Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+nginx:
+  replicaCount: 2
+  disableProxyBuffering: true
+  resources:
+    requests:
+      cpu: "4"
+      memory: "4Gi"
+    limits:
+      # cpu: "12"
+      memory: "8Gi"
+
+postgresql:
+  postgresqlExtendedConf:
+    maxConnections: "2000"
+  primary:
+    affinity:
+      # Require PostgreSQL pod to run on a different node than Artifactory pods
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                    - artifactory
+            topologyKey: kubernetes.io/hostname
+  resources:
+    requests:
+      memory: 128Gi
+      cpu: "32"
+    limits:
+      memory: 128Gi
+      # cpu: "64"
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-xsmall.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-xsmall.yaml
new file mode 100644
index 000000000..cc61f12e8
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/sizing/artifactory-xsmall.yaml
@@ -0,0 +1,160 @@
+##############################################################################################
+# The xsmall sizing
+# This is the minimum size recommended for running Artifactory
+# [WARNING] Some of the the configuration mentioned in this file are taken inside system.yaml
+# hence this configuration will be overridden when enabling systemYamlOverride
+##############################################################################################
+splitServicesToContainers: true
+artifactory:
+  # Enterprise and above licenses are required for setting replicaCount greater than 1.
+  # Count should be equal or above the total number of licenses available for artifactory.
+  replicaCount: 1
+
+  # Require multiple Artifactory pods to run on separate nodes
+  podAntiAffinity:
+    type: "hard"
+
+  resources:
+    requests:
+      cpu: "1"
+      memory: 3Gi
+    limits:
+      # cpu: "10"
+      memory: 4Gi
+
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=40
+      -XX:MaxRAMPercentage=70
+      -Dartifactory.async.corePoolSize=10
+      -Dartifactory.async.poolMaxQueueSize=2000
+      -Dartifactory.http.client.max.total.connections=20
+      -Dartifactory.http.client.max.connections.per.route=20
+      -Dartifactory.access.client.max.connections=15
+      -Dartifactory.metadata.event.operator.threads=2
+      -XX:MaxMetaspaceSize=400m
+      -XX:CompressedClassSpaceSize=96m
+      -Djdk.nio.maxCachedBufferSize=131072
+      -XX:MaxDirectMemorySize=128m
+  tomcat:
+    connector:
+      maxThreads: 50
+      extraConfig: 'acceptCount="200" acceptorThreadCount="2" compression="off" connectionLinger="-1" connectionTimeout="120000" enableLookups="false"'
+
+  database:
+    maxOpenConnections: 15
+
+  extraEnvironmentVariables:
+    - name: MALLOC_ARENA_MAX
+      value: "2"
+    - name: SKIP_WAIT_FOR_EXTERNAL_DB
+      value: "true"
+
+access:
+  tomcat:
+    connector:
+      maxThreads: 15
+  javaOpts:
+    other: >
+      -XX:InitialRAMPercentage=20
+      -XX:MaxRAMPercentage=60
+  database:
+    maxOpenConnections: 15
+  resources:
+    requests:
+      cpu: 500m
+      memory: 1.5Gi
+    limits:
+      # cpu: 1
+      memory: 2Gi
+
+router:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 200Mi
+    limits:
+      # cpu: "2"
+      memory: 1Gi
+
+frontend:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 150Mi
+    limits:
+      # cpu: "2"
+      memory: 250Mi
+
+metadata:
+  database:
+    maxOpenConnections: 15
+  resources:
+    requests:
+      cpu: 50m
+      memory: 100Mi
+    limits:
+      # cpu: "2"
+      memory: 1Gi
+
+event:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+observability:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+jfconnect:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 50Mi
+    limits:
+      # cpu: 500m
+      memory: 250Mi
+
+nginx:
+  replicaCount: 1
+  disableProxyBuffering: true
+  resources:
+    requests:
+      cpu: "50m"
+      memory: "50Mi"
+    limits:
+      # cpu: "1"
+      memory: "250Mi"
+
+postgresql:
+  postgresqlExtendedConf:
+    maxConnections: "50"
+  primary:
+    affinity:
+      # Require PostgreSQL pod to run on a different node than Artifactory pods
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                    - artifactory
+            topologyKey: kubernetes.io/hostname
+  resources:
+    requests:
+      memory: 8Gi
+      cpu: "2"
+    limits:
+      memory: 8Gi
+      # cpu: "8"
+
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/NOTES.txt b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/NOTES.txt
new file mode 100644
index 000000000..76652ac98
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/NOTES.txt
@@ -0,0 +1,106 @@
+Congratulations. You have just deployed JFrog Artifactory!
+{{- if .Values.artifactory.masterKey }}
+{{- if and (not .Values.artifactory.masterKeySecretName) (eq .Values.artifactory.masterKey "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF") }}
+
+
+***************************************** WARNING ******************************************
+* Your Artifactory master key is still set to the provided example:                        *
+* artifactory.masterKey=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF   *
+*                                                                                          *
+* You should change this to your own generated key:                                        *
+* $ export MASTER_KEY=$(openssl rand -hex 32)                                              *
+* $ echo ${MASTER_KEY}                                                                     *
+*                                                                                          *
+* Pass the created master key to helm with '--set artifactory.masterKey=${MASTER_KEY}'     *
+*                                                                                          *
+* Alternatively, you can use a pre-existing secret with a key called master-key with       *
+* '--set artifactory.masterKeySecretName=${SECRET_NAME}'                                   *
+********************************************************************************************
+{{- end }}
+{{- end }}
+
+{{- if .Values.artifactory.joinKey }}
+{{- if eq .Values.artifactory.joinKey "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE" }}
+
+
+***************************************** WARNING ******************************************
+* Your Artifactory join key is still set to the provided example:                          *
+* artifactory.joinKey=EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE                                     *
+*                                                                                          *
+* You should change this to your own generated key:                                        *
+* $ export JOIN_KEY=$(openssl rand -hex 32)                                                *
+* $ echo ${JOIN_KEY}                                                                       *
+*                                                                                          *
+* Pass the created master key to helm with '--set artifactory.joinKey=${JOIN_KEY}'         *
+*                                                                                          *
+********************************************************************************************
+{{- end }}
+{{- end }}
+
+{{- if .Values.artifactory.setSecurityContext }}
+****************************************** WARNING **********************************************
+* From chart version 107.84.x, `setSecurityContext` has been renamed to `podSecurityContext`,   *
+  please change your values.yaml before upgrade , For more Info , refer to 107.84.x changelog   *
+*************************************************************************************************
+{{- end }}
+
+{{- if and (or (or (or (or (or ( or ( or ( or (or (or ( or (or .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName) .Values.systemYamlOverride.existingSecret) (or .Values.artifactory.customCertificates.enabled .Values.global.customCertificates.enabled)) .Values.aws.licenseConfigSecretName) .Values.artifactory.persistence.customBinarystoreXmlSecret) .Values.access.customCertificatesSecretName) .Values.systemYamlOverride.existingSecret) .Values.artifactory.license.secret) .Values.artifactory.userPluginSecrets) (and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey)) (and .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName)) (or .Values.artifactory.joinKeySecretName .Values.global.joinKeySecretName)) .Values.artifactory.unifiedSecretInstallation }}
+****************************************** WARNING **************************************************************************************************
+* The unifiedSecretInstallation flag is currently enabled, which creates the unified secret. The existing secrets will continue as separate secrets.*
+* Update the values.yaml with the existing secrets to add them to the unified secret.                                                               *
+*****************************************************************************************************************************************************
+{{- end }}
+
+1. Get the Artifactory URL by running these commands:
+
+   {{- if .Values.ingress.enabled }}
+   {{- range .Values.ingress.hosts }}
+     http://{{ . }}
+   {{- end }}
+
+   {{- else if contains "NodePort" .Values.nginx.service.type }}
+   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "artifactory.nginx.fullname" . }})
+   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+   echo http://$NODE_IP:$NODE_PORT/
+
+   {{- else if contains "LoadBalancer"  .Values.nginx.service.type }}
+
+   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+         You can watch the status of the service by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "artifactory.nginx.fullname" . }}'
+   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "artifactory.nginx.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+   echo http://$SERVICE_IP/
+
+   {{- else if contains "ClusterIP" .Values.nginx.service.type }}
+   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "component={{ .Values.nginx.name }}" -o jsonpath="{.items[0].metadata.name}")
+   echo http://127.0.0.1:{{ .Values.nginx.externalPortHttp }}
+   kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME {{ .Values.nginx.externalPortHttp }}:{{ .Values.nginx.internalPortHttp }}
+
+   {{- end }}
+
+2. Open Artifactory in your browser
+   Default credential for Artifactory:
+   user: admin
+   password: password
+
+{{ if .Values.artifactory.javaOpts.jmx.enabled }}
+JMX configuration:
+{{- if not (contains "LoadBalancer"  .Values.artifactory.service.type) }}
+If you want to access JMX from you computer with jconsole, you should set ".Values.artifactory.service.type=LoadBalancer" !!!
+{{ end }}
+
+1. Get the Artifactory service IP:
+export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "artifactory.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+
+2. Map the service name to the service IP in /etc/hosts:
+sudo sh -c "echo \"${SERVICE_IP}    {{ template "artifactory.fullname" . }}\" >> /etc/hosts"
+
+3. Launch jconsole:
+jconsole {{ template "artifactory.fullname" . }}:{{ .Values.artifactory.javaOpts.jmx.port }}
+{{- end }}
+
+{{- if and .Values.nginx.enabled .Values.ingress.hosts }}
+***************************************** WARNING *****************************************************************************
+* when nginx is enabled , .Values.ingress.hosts will be deprecated in upcoming releases                                              *
+* It is recommended to use nginx.hosts instead ingress.hosts 
+*******************************************************************************************************************************
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/_helpers.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/_helpers.tpl
new file mode 100644
index 000000000..8e517e000
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/_helpers.tpl
@@ -0,0 +1,544 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "artifactory.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Expand the name nginx service.
+*/}}
+{{- define "artifactory.nginx.name" -}}
+{{- default .Chart.Name .Values.nginx.name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "artifactory.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified nginx name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "artifactory.nginx.fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s-%s" .Release.Name $name .Values.nginx.name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "artifactory.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+{{ default (include "artifactory.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+{{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "artifactory.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Generate SSL certificates
+*/}}
+{{- define "artifactory.gen-certs" -}}
+{{- $altNames := list ( printf "%s.%s" (include "artifactory.fullname" .) .Release.Namespace ) ( printf "%s.%s.svc" (include "artifactory.fullname" .) .Release.Namespace ) -}}
+{{- $ca := genCA "artifactory-ca" 365 -}}
+{{- $cert := genSignedCert ( include "artifactory.fullname" . ) nil $altNames 365 $ca -}}
+tls.crt: {{ $cert.Cert | b64enc }}
+tls.key: {{ $cert.Key | b64enc }}
+{{- end -}}
+
+{{/*
+Scheme (http/https) based on Access or Router TLS enabled/disabled
+*/}}
+{{- define "artifactory.scheme" -}}
+{{- if or .Values.access.accessConfig.security.tls .Values.router.tlsEnabled -}}
+{{- printf "%s" "https" -}}
+{{- else -}}
+{{- printf "%s" "http" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve joinKey value
+*/}}
+{{- define "artifactory.joinKey" -}}
+{{- if .Values.global.joinKey -}}
+{{- .Values.global.joinKey -}}
+{{- else if .Values.artifactory.joinKey -}}
+{{- .Values.artifactory.joinKey -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve jfConnectToken value
+*/}}
+{{- define "artifactory.jfConnectToken" -}}
+{{- .Values.artifactory.jfConnectToken -}}
+{{- end -}}
+
+{{/*
+Resolve masterKey value
+*/}}
+{{- define "artifactory.masterKey" -}}
+{{- if .Values.global.masterKey -}}
+{{- .Values.global.masterKey -}}
+{{- else if .Values.artifactory.masterKey -}}
+{{- .Values.artifactory.masterKey -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve joinKeySecretName value
+*/}}
+{{- define "artifactory.joinKeySecretName" -}}
+{{- if .Values.global.joinKeySecretName -}}
+{{- .Values.global.joinKeySecretName -}}
+{{- else if .Values.artifactory.joinKeySecretName -}}
+{{- .Values.artifactory.joinKeySecretName -}}
+{{- else -}}
+{{ include "artifactory.fullname" . }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve jfConnectTokenSecretName value
+*/}}
+{{- define "artifactory.jfConnectTokenSecretName" -}}
+{{- if .Values.artifactory.jfConnectTokenSecretName -}}
+{{- .Values.artifactory.jfConnectTokenSecretName -}}
+{{- else -}}
+{{ include "artifactory.fullname" . }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve masterKeySecretName value
+*/}}
+{{- define "artifactory.masterKeySecretName" -}}
+{{- if .Values.global.masterKeySecretName -}}
+{{- .Values.global.masterKeySecretName -}}
+{{- else if .Values.artifactory.masterKeySecretName -}}
+{{- .Values.artifactory.masterKeySecretName -}}
+{{- else -}}
+{{ include "artifactory.fullname" . }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve imagePullSecrets value
+*/}}
+{{- define "artifactory.imagePullSecrets" -}}
+{{- if .Values.global.imagePullSecrets }}
+imagePullSecrets:
+{{- range .Values.global.imagePullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- else if .Values.imagePullSecrets }}
+imagePullSecrets:
+{{- range .Values.imagePullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customInitContainersBegin value
+*/}}
+{{- define "artifactory.customInitContainersBegin" -}}
+{{- if .Values.global.customInitContainersBegin -}}
+{{- .Values.global.customInitContainersBegin -}}
+{{- end -}}
+{{- if .Values.artifactory.customInitContainersBegin -}}
+{{- .Values.artifactory.customInitContainersBegin -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customInitContainers value
+*/}}
+{{- define "artifactory.customInitContainers" -}}
+{{- if .Values.global.customInitContainers -}}
+{{- .Values.global.customInitContainers -}}
+{{- end -}}
+{{- if .Values.artifactory.customInitContainers -}}
+{{- .Values.artifactory.customInitContainers -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customVolumes value
+*/}}
+{{- define "artifactory.customVolumes" -}}
+{{- if .Values.global.customVolumes -}}
+{{- .Values.global.customVolumes -}}
+{{- end -}}
+{{- if .Values.artifactory.customVolumes -}}
+{{- .Values.artifactory.customVolumes -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customVolumeMounts value
+*/}}
+{{- define "artifactory.customVolumeMounts" -}}
+{{- if .Values.global.customVolumeMounts -}}
+{{- .Values.global.customVolumeMounts -}}
+{{- end -}}
+{{- if .Values.artifactory.customVolumeMounts -}}
+{{- .Values.artifactory.customVolumeMounts -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customSidecarContainers value
+*/}}
+{{- define "artifactory.customSidecarContainers" -}}
+{{- if .Values.global.customSidecarContainers -}}
+{{- .Values.global.customSidecarContainers -}}
+{{- end -}}
+{{- if .Values.artifactory.customSidecarContainers -}}
+{{- .Values.artifactory.customSidecarContainers -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper artifactory chart image names
+*/}}
+{{- define "artifactory.getImageInfoByValue" -}}
+{{- $dot := index . 0 }}
+{{- $indexReference := index . 1 }}
+{{- $registryName := index $dot.Values $indexReference "image" "registry" -}}
+{{- $repositoryName := index $dot.Values $indexReference "image" "repository" -}}
+{{- $tag := default $dot.Chart.AppVersion (index $dot.Values $indexReference "image" "tag") | toString -}}
+{{- if $dot.Values.global }}
+    {{- if and $dot.Values.splitServicesToContainers $dot.Values.global.versions.router (eq $indexReference "router") }}
+    {{- $tag = $dot.Values.global.versions.router | toString -}}
+    {{- end -}}
+    {{- if and $dot.Values.global.versions.initContainers (eq $indexReference "initContainers") }}
+    {{- $tag = $dot.Values.global.versions.initContainers | toString -}}
+    {{- end -}}
+    {{- if and $dot.Values.global.versions.artifactory (or (eq $indexReference "artifactory") (eq $indexReference "nginx") ) }}
+    {{- $tag = $dot.Values.global.versions.artifactory | toString -}}
+    {{- end -}}
+    {{- if $dot.Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" $dot.Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper artifactory app version
+*/}}
+{{- define "artifactory.app.version" -}}
+{{- $tag := (splitList ":" ((include "artifactory.getImageInfoByValue" (list . "artifactory" )))) | last | toString -}}
+{{- printf "%s" $tag -}}
+{{- end -}}
+
+{{/*
+Custom certificate copy command
+*/}}
+{{- define "artifactory.copyCustomCerts" -}}
+echo "Copy custom certificates to {{ .Values.artifactory.persistence.mountPath }}/etc/security/keys/trusted";
+mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/security/keys/trusted;
+for file in $(ls -1 /tmp/certs/* | grep -v .key | grep -v ":" | grep -v grep); do if [ -f "${file}" ]; then cp -v ${file} {{ .Values.artifactory.persistence.mountPath }}/etc/security/keys/trusted; fi done;
+if [ -f {{ .Values.artifactory.persistence.mountPath }}/etc/security/keys/trusted/tls.crt ]; then mv -v {{ .Values.artifactory.persistence.mountPath }}/etc/security/keys/trusted/tls.crt {{ .Values.artifactory.persistence.mountPath }}/etc/security/keys/trusted/ca.crt; fi;
+{{- end -}}
+
+{{/*
+Circle of trust certificates copy command
+*/}}
+{{- define "artifactory.copyCircleOfTrustCertsCerts" -}}
+echo "Copy circle of trust certificates to {{ .Values.artifactory.persistence.mountPath }}/etc/access/keys/trusted";
+mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/access/keys/trusted;
+for file in $(ls -1 /tmp/circleoftrustcerts/* | grep -v .key | grep -v ":" | grep -v grep); do if [ -f "${file}" ]; then cp -v ${file} {{ .Values.artifactory.persistence.mountPath }}/etc/access/keys/trusted; fi done;
+{{- end -}}
+
+{{/*
+Resolve requiredServiceTypes value
+*/}}
+{{- define "artifactory.router.requiredServiceTypes" -}}
+{{- $requiredTypes := "jfrt,jfac" -}}
+{{- if not .Values.access.enabled -}}
+  {{- $requiredTypes = "jfrt" -}}
+{{- end -}}
+{{- if .Values.observability.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfob" -}}
+{{- end -}}
+{{- if .Values.metadata.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfmd" -}}
+{{- end -}}
+{{- if .Values.event.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfevt" -}}
+{{- end -}}
+{{- if .Values.frontend.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jffe" -}}
+{{- end -}}
+{{- if .Values.jfconnect.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfcon" -}}
+{{- end -}}
+{{- if .Values.evidence.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfevd" -}}
+{{- end -}}
+{{- if .Values.mc.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfmc" -}}
+{{- end -}}
+{{- $requiredTypes -}}
+{{- end -}}
+
+{{/*
+Check if the image is artifactory pro or not
+*/}}
+{{- define "artifactory.isImageProType" -}}
+{{- if not (regexMatch "^.*(oss|cpp-ce|jcr).*$" .Values.artifactory.image.repository) -}}
+{{ true }}
+{{- else -}}
+{{ false }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Check if the artifactory is using derby database
+*/}}
+{{- define "artifactory.isUsingDerby" -}}
+{{- if and (eq (default "derby" .Values.database.type) "derby") (not .Values.postgresql.enabled) -}}
+{{ true }}
+{{- else -}}
+{{ false }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+nginx scheme (http/https)
+*/}}
+{{- define "nginx.scheme" -}}
+{{- if .Values.nginx.http.enabled -}}
+{{- printf "%s" "http" -}}
+{{- else -}}
+{{- printf "%s" "https" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+nginx command
+*/}}
+{{- define "nginx.command" -}}
+{{- if .Values.nginx.customCommand }}
+{{  toYaml .Values.nginx.customCommand }}
+{{- end }}
+{{- end -}}
+
+{{/*
+nginx port (8080/8443) based on http/https enabled
+*/}}
+{{- define "nginx.port" -}}
+{{- if .Values.nginx.http.enabled -}}
+{{- .Values.nginx.http.internalPort -}}
+{{- else -}}
+{{- .Values.nginx.https.internalPort -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customInitContainers value
+*/}}
+{{- define "artifactory.nginx.customInitContainers" -}}
+{{- if .Values.nginx.customInitContainers -}}
+{{- .Values.nginx.customInitContainers -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve customVolumes value
+*/}}
+{{- define "artifactory.nginx.customVolumes" -}}
+{{- if .Values.nginx.customVolumes -}}
+{{- .Values.nginx.customVolumes -}}
+{{- end -}}
+{{- end -}}
+
+
+{{/*
+Resolve customVolumeMounts nginx value
+*/}}
+{{- define "artifactory.nginx.customVolumeMounts" -}}
+{{- if .Values.nginx.customVolumeMounts -}}
+{{- .Values.nginx.customVolumeMounts -}}
+{{- end -}}
+{{- end -}}
+
+
+{{/*
+Resolve customSidecarContainers value
+*/}}
+{{- define "artifactory.nginx.customSidecarContainers" -}}
+{{- if .Values.nginx.customSidecarContainers -}}
+{{- .Values.nginx.customSidecarContainers -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve Artifactory pod node selector value
+*/}}
+{{- define "artifactory.nodeSelector" -}}
+nodeSelector:
+{{- if .Values.global.nodeSelector }}
+{{ toYaml .Values.global.nodeSelector | indent 2 }}
+{{- else if .Values.artifactory.nodeSelector }}
+{{ toYaml .Values.artifactory.nodeSelector | indent 2 }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve Nginx pods node selector value
+*/}}
+{{- define "nginx.nodeSelector" -}}
+nodeSelector:
+{{- if .Values.global.nodeSelector }}
+{{ toYaml .Values.global.nodeSelector | indent 2 }}
+{{- else if .Values.nginx.nodeSelector }}
+{{ toYaml .Values.nginx.nodeSelector | indent 2 }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve unifiedCustomSecretVolumeName value
+*/}}
+{{- define "artifactory.unifiedCustomSecretVolumeName" -}}
+{{- printf "%s-%s" (include "artifactory.name" .) ("unified-secret-volume") | trunc 63 -}}
+{{- end -}}
+
+{{/*
+Check the Duplication of volume names for secrets. If unifiedSecretInstallation is enabled then the method is checking for volume names,
+if the volume exists in customVolume then an extra volume with the same name will not be getting added in unifiedSecretInstallation case.
+*/}}
+{{- define "artifactory.checkDuplicateUnifiedCustomVolume" -}}
+{{- if or .Values.global.customVolumes .Values.artifactory.customVolumes -}}
+{{- $val := (tpl (include "artifactory.customVolumes" .) .) | toJson -}}
+{{- contains (include "artifactory.unifiedCustomSecretVolumeName" .) $val | toString -}}
+{{- else -}}
+{{- printf "%s" "false" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Calculate the systemYaml from structured and unstructured text input
+*/}}
+{{- define "artifactory.finalSystemYaml" -}}
+{{ tpl (mergeOverwrite (include "artifactory.systemYaml" . | fromYaml) .Values.artifactory.extraSystemYaml | toYaml) . }}
+{{- end -}}
+
+{{/*
+Calculate the systemYaml from the unstructured text input
+*/}}
+{{- define "artifactory.systemYaml" -}}
+{{ include (print $.Template.BasePath "/_system-yaml-render.tpl") . }}
+{{- end -}}
+
+{{/*
+Metrics enabled
+*/}}
+{{- define "metrics.enabled" -}}
+shared:
+  metrics:
+    enabled: true
+{{- end }}
+
+{{/*
+Resolve unified secret prepend release name
+*/}}
+{{- define "artifactory.unifiedSecretPrependReleaseName" -}}
+{{- if .Values.artifactory.unifiedSecretPrependReleaseName }}
+{{- printf "%s" (include "artifactory.fullname" .) -}}
+{{- else }}
+{{- printf "%s" (include "artifactory.name" .) -}}
+{{- end }}
+{{- end }}
+
+{{/*
+Resolve artifactory metrics
+*/}}
+{{- define "artifactory.metrics" -}}
+{{- if .Values.artifactory.openMetrics -}} 
+{{- if .Values.artifactory.openMetrics.enabled -}}
+{{ include "metrics.enabled" . }}
+{{- if .Values.artifactory.openMetrics.filebeat }}
+{{- if .Values.artifactory.openMetrics.filebeat.enabled }}
+{{ include "metrics.enabled" . }}
+    filebeat:
+{{ tpl (.Values.artifactory.openMetrics.filebeat | toYaml) . | indent 6 }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- else if .Values.artifactory.metrics -}}
+{{- if .Values.artifactory.metrics.enabled -}}
+{{ include "metrics.enabled" . }}
+{{- if .Values.artifactory.metrics.filebeat }}
+{{- if .Values.artifactory.metrics.filebeat.enabled }}
+{{ include "metrics.enabled" . }}
+    filebeat:
+{{ tpl (.Values.artifactory.metrics.filebeat | toYaml) . | indent 6 }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Resolve nginx hosts value
+*/}}
+{{- define "artifactory.nginx.hosts" -}}
+{{- if .Values.ingress.hosts }}
+{{- range .Values.ingress.hosts -}}
+  {{- if contains "." . -}}
+    {{ "" | indent 0 }} ~(?<repo>.+)\.{{ . }}
+  {{- end -}}
+{{- end -}}
+{{- else if .Values.nginx.hosts }}
+{{- range .Values.nginx.hosts -}}
+  {{- if contains "." . -}}
+    {{ "" | indent 0 }} ~(?<repo>.+)\.{{ . }}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified grpc ingress name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "artifactory.ingressGrpc.fullname" -}}
+{{- printf "%s-%s" (include "artifactory.fullname" .) .Values.ingressGrpc.name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified grpc service name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "artifactory.serviceGrpc.fullname" -}}
+{{- printf "%s-%s" (include "artifactory.fullname" .) .Values.artifactory.serviceGrpc.name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/_system-yaml-render.tpl b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/_system-yaml-render.tpl
new file mode 100644
index 000000000..deaa773ea
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/_system-yaml-render.tpl
@@ -0,0 +1,5 @@
+{{- if .Values.artifactory.systemYaml -}}
+{{- tpl .Values.artifactory.systemYaml . -}}
+{{- else -}}
+{{ (tpl ( $.Files.Get "files/system.yaml" ) .) }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/additional-resources.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/additional-resources.yaml
new file mode 100644
index 000000000..c4d06f08a
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/additional-resources.yaml
@@ -0,0 +1,3 @@
+{{ if .Values.additionalResources }}
+{{ tpl .Values.additionalResources . }}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/admin-bootstrap-creds.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/admin-bootstrap-creds.yaml
new file mode 100644
index 000000000..eb2d613c6
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/admin-bootstrap-creds.yaml
@@ -0,0 +1,15 @@
+{{- if not (and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey) }}
+{{- if and .Values.artifactory.admin.password (not .Values.artifactory.unifiedSecretInstallation) }}
+kind: Secret
+apiVersion: v1
+metadata:
+  name: {{ template "artifactory.fullname" . }}-bootstrap-creds
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  bootstrap.creds: {{ (printf "%s@%s=%s" .Values.artifactory.admin.username .Values.artifactory.admin.ip .Values.artifactory.admin.password) | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-access-config.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-access-config.yaml
new file mode 100644
index 000000000..4fcf85d94
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-access-config.yaml
@@ -0,0 +1,15 @@
+{{- if and .Values.access.accessConfig (not .Values.artifactory.unifiedSecretInstallation) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "artifactory.fullname" . }}-access-config
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+type: Opaque
+stringData:
+  access.config.patch.yml: |
+{{ tpl (toYaml .Values.access.accessConfig) . | indent 4 }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-binarystore-secret.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-binarystore-secret.yaml
new file mode 100644
index 000000000..6b721dd4c
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-binarystore-secret.yaml
@@ -0,0 +1,18 @@
+{{- if and (not .Values.artifactory.persistence.customBinarystoreXmlSecret) (not .Values.artifactory.unifiedSecretInstallation) }}
+kind: Secret
+apiVersion: v1
+metadata:
+  name: {{ template "artifactory.fullname" . }}-binarystore
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+stringData:
+  binarystore.xml: |-
+{{- if .Values.artifactory.persistence.binarystoreXml }} 
+{{ tpl .Values.artifactory.persistence.binarystoreXml . | indent 4 }}
+{{- else }}
+{{ tpl ( .Files.Get "files/binarystore.xml" ) . | indent 4 }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-configmaps.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-configmaps.yaml
new file mode 100644
index 000000000..359fa07d2
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-configmaps.yaml
@@ -0,0 +1,13 @@
+{{ if .Values.artifactory.configMaps }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "artifactory.fullname" . }}-configmaps
+  labels:
+    app: {{ template "artifactory.fullname" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+{{ tpl .Values.artifactory.configMaps . | indent 2 }}
+{{ end -}}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-custom-secrets.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-custom-secrets.yaml
new file mode 100644
index 000000000..4b73e79fc
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-custom-secrets.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.artifactory.customSecrets (not .Values.artifactory.unifiedSecretInstallation) }}
+{{- range .Values.artifactory.customSecrets }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "artifactory.fullname" $ }}-{{ .name }}
+  labels:
+    app: "{{ template "artifactory.name" $ }}"
+    chart: "{{ template "artifactory.chart" $ }}"
+    component: "{{ $.Values.artifactory.name }}"
+    heritage: {{ $.Release.Service | quote }}
+    release: {{ $.Release.Name | quote }}
+type: Opaque
+stringData:
+  {{ .key }}: |
+{{ .data | indent 4 -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-database-secrets.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-database-secrets.yaml
new file mode 100644
index 000000000..f98d422e9
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-database-secrets.yaml
@@ -0,0 +1,24 @@
+{{- if and  (not .Values.database.secrets) (not .Values.postgresql.enabled) (not .Values.artifactory.unifiedSecretInstallation) }}
+{{- if or .Values.database.url .Values.database.user .Values.database.password }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "artifactory.fullname" . }}-database-creds
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+type: Opaque
+data:
+  {{- with .Values.database.url }}
+  db-url: {{ tpl . $ | b64enc | quote }}
+  {{- end }}
+  {{- with .Values.database.user }}
+  db-user: {{ tpl . $ | b64enc | quote }}
+  {{- end }}
+  {{- with .Values.database.password }}
+  db-password: {{ tpl . $ | b64enc | quote }}
+  {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-gcp-credentials-secret.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-gcp-credentials-secret.yaml
new file mode 100644
index 000000000..72dee6bb8
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-gcp-credentials-secret.yaml
@@ -0,0 +1,16 @@
+{{- if not .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+{{- if and (.Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled) (not .Values.artifactory.unifiedSecretInstallation) }}
+kind: Secret
+apiVersion: v1
+metadata:
+  name: {{ template "artifactory.fullname" . }}-gcpcreds
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+stringData:
+  gcp.credentials.json: |-
+{{ tpl .Values.artifactory.persistence.googleStorage.gcpServiceAccount.config . | indent 4 }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-hpa.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-hpa.yaml
new file mode 100644
index 000000000..01f8a9fb7
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-hpa.yaml
@@ -0,0 +1,29 @@
+{{- if .Values.autoscaling.enabled }}
+  {{- if semverCompare ">=v1.23.0-0" .Capabilities.KubeVersion.Version }}
+apiVersion: autoscaling/v2
+  {{- else }}
+apiVersion: autoscaling/v2beta2
+  {{- end }}
+kind: HorizontalPodAutoscaler
+metadata:
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: {{ template "artifactory.fullname" . }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: StatefulSet
+    name: {{ template "artifactory.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-installer-info.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-installer-info.yaml
new file mode 100644
index 000000000..cfb95b67d
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-installer-info.yaml
@@ -0,0 +1,16 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ template "artifactory.fullname" . }}-installer-info
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  installer-info.json: |
+{{- if .Values.installerInfo -}}
+{{- tpl .Values.installerInfo . | nindent 4 -}}
+{{- else -}}
+{{ (tpl ( .Files.Get "files/installer-info.json" | nindent 4 ) .) }}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-license-secret.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-license-secret.yaml
new file mode 100644
index 000000000..dda734033
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-license-secret.yaml
@@ -0,0 +1,16 @@
+{{ if and (not .Values.artifactory.unifiedSecretInstallation) (not .Values.artifactory.license.secret) }}
+{{- with .Values.artifactory.license.licenseKey }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "artifactory.fullname" $ }}-license
+  labels:
+    app: {{ template "artifactory.name" $ }}
+    chart: {{ template "artifactory.chart" $ }}
+    heritage: {{ $.Release.Service }}
+    release: {{ $.Release.Name }}
+type: Opaque
+data:
+  artifactory.lic: {{ . | b64enc | quote }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-migration-scripts.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-migration-scripts.yaml
new file mode 100644
index 000000000..4b1ba4027
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-migration-scripts.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.artifactory.migration.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "artifactory.fullname" . }}-migration-scripts
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  migrate.sh: |
+{{ .Files.Get "files/migrate.sh" | indent 4 }}
+  migrationHelmInfo.yaml: |
+{{ .Files.Get "files/migrationHelmInfo.yaml" | indent 4 }}
+  migrationStatus.sh: |
+{{ .Files.Get "files/migrationStatus.sh" | indent 4 }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-networkpolicy.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-networkpolicy.yaml
new file mode 100644
index 000000000..d24203dc9
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-networkpolicy.yaml
@@ -0,0 +1,34 @@
+{{- range .Values.networkpolicy }}
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ template "artifactory.fullname" $ }}-{{ .name }}-networkpolicy
+  labels:
+    app: {{ template "artifactory.name" $ }}
+    chart: {{ template "artifactory.chart" $ }}
+    release: {{ $.Release.Name }}
+    heritage: {{ $.Release.Service }}
+spec:
+{{- if .podSelector }}
+  podSelector:
+{{ .podSelector | toYaml | trimSuffix "\n" | indent 4 -}}
+{{ else }}
+  podSelector: {}
+{{- end }}
+  policyTypes:
+  {{- if .ingress }}
+  - Ingress
+  {{- end }}
+  {{- if .egress }}
+  - Egress
+  {{- end }}
+{{- if .ingress }}
+  ingress:
+{{ .ingress | toYaml | trimSuffix "\n" | indent 2 -}}
+{{- end }}
+{{- if .egress }}
+  egress:
+{{ .egress | toYaml | trimSuffix "\n" | indent 2 -}}
+{{- end }}
+---
+{{- end -}}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-nfs-pvc.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-nfs-pvc.yaml
new file mode 100644
index 000000000..75d6d0c53
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-nfs-pvc.yaml
@@ -0,0 +1,101 @@
+{{- if eq .Values.artifactory.persistence.type "nfs" }}
+### Artifactory HA data
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: {{ template "artifactory.fullname" . }}-data-pv
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    id: {{ template "artifactory.name" . }}-data-pv
+    type: nfs-volume
+spec:
+  {{- if .Values.artifactory.persistence.nfs.mountOptions }}
+  mountOptions:
+{{ toYaml .Values.artifactory.persistence.nfs.mountOptions | indent 4 }}
+  {{- end }}
+  capacity:
+    storage: {{ .Values.artifactory.persistence.nfs.capacity }}
+  accessModes:
+  - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  nfs:
+    server: {{ .Values.artifactory.persistence.nfs.ip }}
+    path: "{{ .Values.artifactory.persistence.nfs.haDataMount }}"
+    readOnly: false
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ template "artifactory.fullname" . }}-data-pvc
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    type: nfs-volume
+spec:
+  accessModes:
+  - ReadWriteOnce
+  storageClassName: ""
+  resources:
+    requests:
+      storage: {{ .Values.artifactory.persistence.nfs.capacity }}
+  selector:
+    matchLabels:
+      id: {{ template "artifactory.name" . }}-data-pv
+      app: {{ template "artifactory.name" . }}
+      release: {{ .Release.Name }}
+---
+### Artifactory HA backup
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: {{ template "artifactory.fullname" . }}-backup-pv
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    id: {{ template "artifactory.name" . }}-backup-pv
+    type: nfs-volume
+spec:
+  {{- if .Values.artifactory.persistence.nfs.mountOptions }}
+  mountOptions:
+{{ toYaml .Values.artifactory.persistence.nfs.mountOptions | indent 4 }}
+  {{- end }}
+  capacity:
+    storage: {{ .Values.artifactory.persistence.nfs.capacity }}
+  accessModes:
+  - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  nfs:
+    server: {{ .Values.artifactory.persistence.nfs.ip }}
+    path: "{{ .Values.artifactory.persistence.nfs.haBackupMount }}"
+    readOnly: false
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ template "artifactory.fullname" . }}-backup-pvc
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    type: nfs-volume
+spec:
+  accessModes:
+  - ReadWriteOnce
+  storageClassName: ""
+  resources:
+    requests:
+      storage: {{ .Values.artifactory.persistence.nfs.capacity }}
+  selector:
+    matchLabels:
+      id: {{ template "artifactory.name" . }}-backup-pv
+      app: {{ template "artifactory.name" . }}
+      release: {{ .Release.Name }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-pdb.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-pdb.yaml
new file mode 100644
index 000000000..68876d23b
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-pdb.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.artifactory.minAvailable -}}
+{{- if semverCompare "<v1.21.0-0" .Capabilities.KubeVersion.Version }}
+apiVersion: policy/v1beta1
+{{- else }}
+apiVersion: policy/v1
+{{- end }}
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "artifactory.fullname" . }}
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+spec:
+  selector:
+    matchLabels:
+      component: {{ .Values.artifactory.name }}
+      app: {{ template "artifactory.name" . }}
+      role: {{ template "artifactory.name" . }}
+      release: {{ .Release.Name }}
+  minAvailable: {{ .Values.artifactory.minAvailable }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-priority-class.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-priority-class.yaml
new file mode 100644
index 000000000..9eb94b35b
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-priority-class.yaml
@@ -0,0 +1,9 @@
+{{- if .Values.artifactory.priorityClass.create }}
+apiVersion: scheduling.k8s.io/v1
+kind: PriorityClass
+metadata:
+  name: {{ default (include "artifactory.fullname" .) .Values.artifactory.priorityClass.name }}
+value: {{ .Values.artifactory.priorityClass.value }}
+globalDefault: false
+description: "Artifactory priority class"
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-role.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-role.yaml
new file mode 100644
index 000000000..db01f235f
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-role.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: {{ template "artifactory.fullname" . }}
+rules:
+{{ toYaml .Values.rbac.role.rules }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-rolebinding.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-rolebinding.yaml
new file mode 100644
index 000000000..dfb42258f
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-rolebinding.yaml
@@ -0,0 +1,19 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: {{ template "artifactory.fullname" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ template "artifactory.serviceAccountName" . }}
+roleRef:
+  kind: Role
+  apiGroup: rbac.authorization.k8s.io
+  name: {{ template "artifactory.fullname" . }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-secrets.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-secrets.yaml
new file mode 100644
index 000000000..266d8e39a
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-secrets.yaml
@@ -0,0 +1,30 @@
+{{- if not .Values.artifactory.unifiedSecretInstallation }}
+{{- if or .Values.artifactory.joinKey .Values.global.joinKey .Values.artifactory.jfConnectToken .Values.artifactory.masterKey .Values.global.masterKey }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "artifactory.fullname" . }}
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+type: Opaque
+data:
+  {{- if or .Values.artifactory.masterKey .Values.global.masterKey }}
+  {{- if not (or .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName) }}
+  master-key: {{ include "artifactory.masterKey" . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+  {{- if or .Values.artifactory.joinKey .Values.global.joinKey }}
+  {{- if not (or .Values.artifactory.joinKeySecretName .Values.global.joinKeySecretName) }}
+  join-key: {{ include "artifactory.joinKey" . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.artifactory.jfConnectToken  }}
+  {{- if not (.Values.artifactory.jfConnectTokenSecretName) }}
+  jfconnect-token: {{ include "artifactory.jfConnectToken" . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-service-grpc.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-service-grpc.yaml
new file mode 100644
index 000000000..b40e94c5f
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-service-grpc.yaml
@@ -0,0 +1,44 @@
+{{- if .Values.ingressGrpc.enabled -}}
+# Service for GRPC communication.
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "artifactory.serviceGrpc.fullname" . }}
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    {{- with .Values.artifactory.labels }}
+{{ toYaml . | indent 4 }}
+    {{- end }}
+{{- if .Values.artifactory.serviceGrpc.annotations }}
+  annotations:
+{{ toYaml .Values.artifactory.serviceGrpc.annotations | indent 4 }}
+{{- end }}
+spec:
+  {{- if .Values.artifactory.serviceGrpc.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.artifactory.serviceGrpc.ipFamilyPolicy }}
+  {{- end }}
+  {{- if not (empty .Values.artifactory.serviceGrpc.ipFamilies)}}
+  ipFamilies: {{- toYaml .Values.artifactory.serviceGrpc.ipFamilies | nindent 4 }}
+  {{- end }}
+  type: {{ .Values.artifactory.serviceGrpc.type }}
+{{- if .Values.artifactory.serviceGrpc.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+{{ toYaml .Values.artifactory.serviceGrpc.loadBalancerSourceRanges | indent 4 }}
+{{- end }}
+  ports:
+  - port: {{ .Values.artifactory.externalPort }}
+    targetPort: {{ .Values.artifactory.internalPort }}
+    {{- if .Values.artifactory.nodePort }}
+    nodePort: {{ .Values.artifactory.nodePort }}
+    {{- end }}
+    protocol: TCP
+    name: http-router
+  selector:
+    app: {{ template "artifactory.name" . }}
+    component: "{{ .Values.artifactory.name }}"
+    release: {{ .Release.Name }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-service.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-service.yaml
new file mode 100644
index 000000000..c0558ba87
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-service.yaml
@@ -0,0 +1,65 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "artifactory.fullname" . }}
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    {{- with .Values.artifactory.labels }}
+{{ toYaml . | indent 4 }}
+    {{- end }}
+{{- if .Values.artifactory.service.annotations }}
+  annotations:
+{{ toYaml .Values.artifactory.service.annotations | indent 4 }}
+{{- end }}
+spec:
+  {{- if .Values.artifactory.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.artifactory.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if not (empty .Values.artifactory.service.ipFamilies)}}
+  ipFamilies: {{- toYaml .Values.artifactory.service.ipFamilies | nindent 4 }}
+  {{- end }}
+  type: {{ .Values.artifactory.service.type }}
+{{- if .Values.artifactory.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+{{ toYaml .Values.artifactory.service.loadBalancerSourceRanges | indent 4 }}
+{{- end }}
+  ports:
+  - port: {{ .Values.artifactory.externalPort }}
+    targetPort: {{ .Values.artifactory.internalPort }}
+    {{- if .Values.artifactory.nodePort }}
+    nodePort: {{ .Values.artifactory.nodePort }}
+    {{- end }}
+    protocol: TCP
+    name: http-router
+  {{- if .Values.federation.enabled }}
+  - port: {{ .Values.federation.internalPort }}
+    targetPort: {{ .Values.federation.internalPort }}
+    protocol: TCP
+    name: http-rtfs
+  {{- end }}
+  - port: {{ .Values.artifactory.externalArtifactoryPort }}
+    targetPort: {{ .Values.artifactory.internalArtifactoryPort }}
+    protocol: TCP
+    name: http-artifactory
+  {{- if .Values.artifactory.ssh.enabled }}
+  - port: {{ .Values.artifactory.ssh.externalPort }}
+    targetPort: {{ .Values.artifactory.ssh.internalPort }}
+    protocol: TCP
+    name: tcp-ssh
+  {{- end }}
+  {{- with .Values.artifactory.javaOpts.jmx }}
+  {{- if .enabled }}
+  - port: {{ .port }}
+    targetPort: {{ .port }}
+    protocol: TCP
+    name: tcp-jmx
+  {{- end }}
+  {{- end }}
+  selector:
+    app: {{ template "artifactory.name" . }}
+    component: "{{ .Values.artifactory.name }}"
+    release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-serviceaccount.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-serviceaccount.yaml
new file mode 100644
index 000000000..03cac128a
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-serviceaccount.yaml
@@ -0,0 +1,17 @@
+{{- if .Values.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+{{- with .Values.serviceAccount.annotations }}
+  annotations:
+{{ tpl (toYaml .) $ | indent 4 }}
+{{- end }}
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: {{ template "artifactory.serviceAccountName" . }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-statefulset.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-statefulset.yaml
new file mode 100644
index 000000000..718cd562e
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-statefulset.yaml
@@ -0,0 +1,1668 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: {{ template "artifactory.fullname" . }}
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    component: {{ .Values.artifactory.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    version: {{ include "artifactory.app.version" . }}
+{{- with .Values.artifactory.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and .Release.IsUpgrade .Values.postgresql.enabled }}
+    databaseUpgradeReady: {{ required "\n\n*********\nIMPORTANT: UPGRADE STOPPED to prevent data loss!\nReview CHANGELOG.md (https://github.com/jfrog/charts/blob/master/stable/artifactory/CHANGELOG.md) \nNote: This applies only when you are using bundled postgresql (postgresql.enabled=true) \nIf you are upgrading from a chart version (< 107.79.x) that has postgresql.image.tag of 9.x or 10.x or 12.x or 13.x, make sure to set the current postgresql.image.tag to the same tag and databaseUpgradeReady=true \nOR \nIf you are upgrading from a chart version (>= 107.79.x), just set databaseUpgradeReady=true \n" .Values.databaseUpgradeReady | quote }}
+{{- end }}
+{{- with .Values.artifactory.statefulset.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if and (eq (include "artifactory.isUsingDerby" .) "true") (gt (.Values.artifactory.replicaCount | int64) 1) }}
+    {{- fail "Derby database is not supported in HA mode" }}
+{{- end }}
+{{- if .Values.artifactory.postStartCommand }}
+    {{- fail ".Values.artifactory.postStartCommand is not supported and should be replaced with .Values.artifactory.lifecycle.postStart.exec.command" }}
+{{- end }}
+{{- if eq .Values.artifactory.persistence.type "aws-s3" }}
+    {{- fail "\nPersistence storage type 'aws-s3' is deprecated and is not supported and should be replaced with 'aws-s3-v3'" }}
+{{- end }}
+{{- if or .Values.artifactory.persistence.googleStorage.identity .Values.artifactory.persistence.googleStorage.credential }}
+    {{- fail "\nGCP Bucket Authentication with Identity and Credential is deprecated" }}
+{{- end }}
+{{- if (eq (.Values.artifactory.setSecurityContext | toString) "false" ) }}
+    {{- fail "\n You need to set security context at the pod level. .Values.artifactory.setSecurityContext is no longer supported. Replace it with .Values.artifactory.podSecurityContext" }}
+{{- end }}
+{{- if or .Values.artifactory.uid .Values.artifactory.gid }}
+{{- if or (not (eq (.Values.artifactory.uid | toString) "1030" )) (not (eq (.Values.artifactory.gid | toString) "1030" )) }}
+    {{- fail "\n .Values.artifactory.uid and .Values.artifactory.gid are no longer supported. You need to set these values at the pod security context level. Replace them with .Values.artifactory.podSecurityContext.runAsUser .Values.artifactory.podSecurityContext.runAsGroup and .Values.artifactory.podSecurityContext.fsGroup" }}
+{{- end }}
+{{- end }}
+{{- if or .Values.artifactory.fsGroupChangePolicy .Values.artifactory.seLinuxOptions }}
+    {{- fail "\n .Values.artifactory.fsGroupChangePolicy and .Values.artifactory.seLinuxOptions are no longer supported. You need to set these values at the pod security context level. Replace them with .Values.artifactory.podSecurityContext.fsGroupChangePolicy and .Values.artifactory.podSecurityContext.seLinuxOptions" }}
+{{- end }}
+{{- if .Values.initContainerImage }}
+    {{- fail "\n .Values.initContainerImage is no longer supported. Replace it with .Values.initContainers.image.registry .Values.initContainers.image.repository and .Values.initContainers.image.tag" }}
+{{- end }}
+spec:
+  serviceName: {{ template "artifactory.name" . }}
+  replicas: {{ .Values.artifactory.replicaCount }}
+  updateStrategy: {{- toYaml .Values.artifactory.updateStrategy | nindent 4 }}
+  selector:
+    matchLabels:
+      app: {{ template "artifactory.name" . }}
+      role: {{ template "artifactory.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "artifactory.name" . }}
+        chart: {{ template "artifactory.chart" . }}
+        heritage: {{ .Release.Service }}
+        role: {{ template "artifactory.name" . }}
+        component: {{ .Values.artifactory.name }}
+        release: {{ .Release.Name }}
+        {{- with .Values.artifactory.labels }}
+{{ toYaml . | indent 8 }}
+        {{- end }}
+      annotations:
+      {{- if not .Values.artifactory.unifiedSecretInstallation }}
+        checksum/database-secrets: {{ include (print $.Template.BasePath "/artifactory-database-secrets.yaml") . | sha256sum }}
+        checksum/binarystore: {{ include (print $.Template.BasePath "/artifactory-binarystore-secret.yaml") . | sha256sum }}
+        checksum/systemyaml: {{ include (print $.Template.BasePath "/artifactory-system-yaml.yaml") . | sha256sum }}
+      {{- if .Values.access.accessConfig }}
+        checksum/access-config: {{ include (print $.Template.BasePath "/artifactory-access-config.yaml") . | sha256sum }}
+      {{- end }}
+      {{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
+        checksum/gcpcredentials: {{ include (print $.Template.BasePath "/artifactory-gcp-credentials-secret.yaml") . | sha256sum }}
+      {{- end }}
+      {{- if not (and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey) }}
+        checksum/admin-creds: {{ include (print $.Template.BasePath "/admin-bootstrap-creds.yaml") . | sha256sum }}
+      {{- end }}
+      {{- else }}
+        checksum/artifactory-unified-secret: {{ include (print $.Template.BasePath "/artifactory-unified-secret.yaml") . | sha256sum }}
+      {{- end }}
+      {{- with .Values.artifactory.annotations }}
+{{ toYaml . | indent 8 }}
+      {{- end }}
+    spec:
+    {{- if .Values.artifactory.schedulerName }}
+      schedulerName: {{ .Values.artifactory.schedulerName | quote }}
+    {{- end }}
+    {{- if .Values.artifactory.priorityClass.existingPriorityClass }}
+      priorityClassName: {{ .Values.artifactory.priorityClass.existingPriorityClass }}
+    {{- else -}}
+      {{- if .Values.artifactory.priorityClass.create }}
+      priorityClassName: {{ default (include "artifactory.fullname" .) .Values.artifactory.priorityClass.name }}
+      {{- end }}
+    {{- end }}
+      serviceAccountName: {{ template "artifactory.serviceAccountName" . }}
+      terminationGracePeriodSeconds: {{ add .Values.artifactory.terminationGracePeriodSeconds 10 }}
+    {{- if or .Values.imagePullSecrets .Values.global.imagePullSecrets }}
+{{- include "artifactory.imagePullSecrets" . | indent 6 }}
+    {{- end }}
+      {{- if .Values.artifactory.podSecurityContext.enabled }}
+      securityContext: {{- omit .Values.artifactory.podSecurityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if .Values.artifactory.topologySpreadConstraints }}
+      topologySpreadConstraints:
+{{ tpl (toYaml .Values.artifactory.topologySpreadConstraints) . | indent 8 }}
+      {{- end }}
+      initContainers:
+    {{- if or .Values.artifactory.customInitContainersBegin .Values.global.customInitContainersBegin }}
+{{ tpl (include "artifactory.customInitContainersBegin" .)  . | indent 6 }}
+    {{- end }}
+    {{- if .Values.artifactory.persistence.enabled }}
+    {{- if .Values.artifactory.deleteDBPropertiesOnStartup }}
+      - name: "delete-db-properties"
+        image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        command:
+          - 'bash'
+          - '-c'
+          - 'rm -fv {{ .Values.artifactory.persistence.mountPath }}/etc/db.properties'
+        volumeMounts:
+          - name: artifactory-volume
+            mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+    {{- end }}
+    {{- end }}
+    {{- if or (and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey) .Values.artifactory.admin.password }}
+      - name: "access-bootstrap-creds"
+        image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        command:
+          - 'bash'
+          - '-c'
+          - >
+            echo "Preparing {{ .Values.artifactory.persistence.mountPath }}/etc/access/bootstrap.creds";
+            mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/access;
+            cp -Lrf /tmp/access/bootstrap.creds {{ .Values.artifactory.persistence.mountPath }}/etc/access/bootstrap.creds;
+            chmod 600 {{ .Values.artifactory.persistence.mountPath }}/etc/access/bootstrap.creds;
+        volumeMounts:
+          - name: artifactory-volume
+            mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+          {{- if or (not .Values.artifactory.unifiedSecretInstallation) (and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey) }}
+          - name: access-bootstrap-creds
+          {{- else }}
+          - name: {{ include "artifactory.unifiedCustomSecretVolumeName" . }}
+          {{- end }}
+            mountPath: "/tmp/access/bootstrap.creds"
+            {{- if and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey }}
+            subPath: {{ .Values.artifactory.admin.dataKey }}
+            {{- else }}
+            subPath: "bootstrap.creds"
+            {{- end }}
+    {{- end }}
+      - name: 'copy-system-configurations'
+        image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          if [[ -e "{{ .Values.artifactory.persistence.mountPath }}/etc/filebeat.yaml" ]]; then chmod 644 {{ .Values.artifactory.persistence.mountPath }}/etc/filebeat.yaml; fi;
+          echo "Copy system.yaml to {{ .Values.artifactory.persistence.mountPath }}/etc";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc;
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/access/keys/trusted;
+          {{- if .Values.systemYamlOverride.existingSecret }}
+          cp -fv /tmp/etc/{{ .Values.systemYamlOverride.dataKey }} {{ .Values.artifactory.persistence.mountPath }}/etc/system.yaml;
+          {{- else }}
+          cp -fv /tmp/etc/system.yaml {{ .Values.artifactory.persistence.mountPath }}/etc/system.yaml;
+          {{- end }}
+          echo "Copy binarystore.xml file";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/artifactory;
+          cp -fv /tmp/etc/artifactory/binarystore.xml {{ .Values.artifactory.persistence.mountPath }}/etc/artifactory/binarystore.xml;
+        {{- if .Values.access.accessConfig }}
+          echo "Copy access.config.patch.yml to {{ .Values.artifactory.persistence.mountPath }}/etc/access";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/access;
+          cp -fv /tmp/etc/access.config.patch.yml {{ .Values.artifactory.persistence.mountPath }}/etc/access/access.config.patch.yml;
+        {{- end }}
+        {{- if .Values.access.resetAccessCAKeys }}
+          echo "Resetting Access CA Keys";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/bootstrap/etc/access/keys;
+          touch {{ .Values.artifactory.persistence.mountPath }}/bootstrap/etc/access/keys/reset_ca_keys;
+        {{- end }}
+        {{- if .Values.access.customCertificatesSecretName }}
+          echo "Copying custom certificates to {{ .Values.artifactory.persistence.mountPath }}/bootstrap/etc/access/keys";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/bootstrap/etc/access/keys;
+          cp -fv /tmp/etc/tls.crt {{ .Values.artifactory.persistence.mountPath }}/bootstrap/etc/access/keys/ca.crt;
+          cp -fv /tmp/etc/tls.key {{ .Values.artifactory.persistence.mountPath }}/bootstrap/etc/access/keys/ca.private.key;
+        {{- end }}
+        {{- if .Values.jfconnect.customCertificatesSecretName }}
+          echo "Copying custom certificates to {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/etc/keys";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/etc/keys;
+          cp -fv /tmp/etc/tls.crt {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/etc/keys/;
+          cp -fv /tmp/etc/tls.cer {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/etc/keys/;
+          cp -fv /tmp/etc/tls.pem {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/etc/keys/;
+          cp -fv /tmp/etc/tls.key {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/etc/keys/;
+        {{- end }}
+        {{- if or .Values.artifactory.joinKey .Values.global.joinKey .Values.artifactory.joinKeySecretName .Values.global.joinKeySecretName }}
+          echo "Copy joinKey to {{ .Values.artifactory.persistence.mountPath }}/bootstrap/access/etc/security";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/bootstrap/access/etc/security;
+          echo -n ${ARTIFACTORY_JOIN_KEY} > {{ .Values.artifactory.persistence.mountPath }}/bootstrap/access/etc/security/join.key;
+        {{- end }}
+        {{- if or .Values.artifactory.jfConnectToken .Values.artifactory.jfConnectTokenSecretName }}
+          echo "Copy jfConnectToken to {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/registration_token";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/;
+          echo -n ${ARTIFACTORY_JFCONNECT_TOKEN} > {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/registration_token;
+        {{- end }}
+        {{- if or .Values.artifactory.masterKey .Values.global.masterKey .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName }}
+          echo "Copy masterKey to {{ .Values.artifactory.persistence.mountPath }}/etc/security";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/security;
+          echo -n ${ARTIFACTORY_MASTER_KEY} > {{ .Values.artifactory.persistence.mountPath }}/etc/security/master.key;
+        {{- end }}
+        env:
+        {{- if or .Values.artifactory.joinKey .Values.global.joinKey .Values.artifactory.joinKeySecretName .Values.global.joinKeySecretName }}
+        - name: ARTIFACTORY_JOIN_KEY
+          valueFrom:
+            secretKeyRef:
+            {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.joinKeySecretName .Values.global.joinKeySecretName }}
+              name: {{ include "artifactory.joinKeySecretName" . }}
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: join-key
+        {{- end }}
+        {{- if or .Values.artifactory.jfConnectToken .Values.artifactory.jfConnectSecretName }}
+        - name: ARTIFACTORY_JFCONNECT_TOKEN
+          valueFrom:
+            secretKeyRef:
+            {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.jfConnectTokenSecretName }}
+              name: {{ include "artifactory.jfConnectTokenSecretName" . }}
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: jfconnect-token
+        {{- end }}
+        {{- if or .Values.artifactory.masterKey .Values.global.masterKey .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName }}
+        - name: ARTIFACTORY_MASTER_KEY
+          valueFrom:
+            secretKeyRef:
+            {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName }}
+              name: {{ include "artifactory.masterKeySecretName" . }}
+            {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+            {{- end }}
+              key: master-key
+        {{- end }}
+        volumeMounts:
+        - name: artifactory-volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.systemYamlOverride.existingSecret }}
+        - name: systemyaml
+        {{- else }}
+        - name: {{ include "artifactory.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          {{- if .Values.systemYamlOverride.existingSecret }}
+          mountPath: "/tmp/etc/{{.Values.systemYamlOverride.dataKey}}"
+          subPath: {{ .Values.systemYamlOverride.dataKey }}
+          {{- else  }}
+          mountPath: "/tmp/etc/system.yaml"
+          subPath: "system.yaml"
+          {{- end }}
+
+        ######################## Binarystore  ##########################
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+        - name: binarystore-xml
+        {{- else }}
+        - name: {{ include "artifactory.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/tmp/etc/artifactory/binarystore.xml"
+          subPath: binarystore.xml
+
+        ######################## Access config  ##########################
+        {{- if .Values.access.accessConfig }}
+        {{- if not .Values.artifactory.unifiedSecretInstallation }}
+        - name: access-config
+        {{- else }}
+        - name: {{ include "artifactory.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/tmp/etc/access.config.patch.yml"
+          subPath: "access.config.patch.yml"
+        {{- end }}
+
+        ######################## Access certs external secret  ##########################
+        {{- if .Values.access.customCertificatesSecretName }}
+        - name: access-certs
+          mountPath: "/tmp/etc/tls.crt"
+          subPath: tls.crt
+        - name: access-certs
+          mountPath: "/tmp/etc/tls.key"
+          subPath: tls.key
+        {{- end }}
+
+        {{- if .Values.jfconnect.customCertificatesSecretName }}
+        - name: jfconnect-certs
+          mountPath: "/tmp/etc/tls.crt"
+          subPath: tls.crt
+        - name: jfconnect-certs
+          mountPath: "/tmp/etc/tls.pem"
+          subPath: tls.pem
+        - name: jfconnect-certs
+          mountPath: "/tmp/etc/tls.cer"
+          subPath: tls.cer
+        - name: jfconnect-certs
+          mountPath: "/tmp/etc/tls.key"
+          subPath: tls.key
+        {{- end }}
+
+      {{- if or .Values.artifactory.customCertificates.enabled .Values.global.customCertificates.enabled }}
+      - name: copy-custom-certificates
+        image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        command:
+        - 'bash'
+        - '-c'
+        - >
+{{ include "artifactory.copyCustomCerts" . | indent 10 }}
+        volumeMounts:
+          - name: artifactory-volume
+            mountPath: {{ .Values.artifactory.persistence.mountPath }}
+          - name: ca-certs
+            mountPath: "/tmp/certs"
+      {{- end }}
+
+      {{- if .Values.artifactory.circleOfTrustCertificatesSecret }}
+      - name: copy-circle-of-trust-certificates
+        image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        command:
+        - 'bash'
+        - '-c'
+        - >
+{{ include "artifactory.copyCircleOfTrustCertsCerts" . | indent 10 }}
+        volumeMounts:
+          - name: artifactory-volume
+            mountPath: {{ .Values.artifactory.persistence.mountPath }}
+          - name: circle-of-trust-certs
+            mountPath: "/tmp/circleoftrustcerts"
+      {{- end }}
+
+    {{- if .Values.waitForDatabase }}
+      {{- if .Values.postgresql.enabled }}
+      - name: "wait-for-db"
+        image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        resources:
+{{ toYaml .Values.initContainers.resources | indent 10 }}
+        command:
+        - /bin/bash
+        - -c
+        - |
+          echo "Waiting for postgresql to come up"
+          ready=false;
+          while ! $ready; do echo waiting;
+            timeout 2s bash -c "</dev/tcp/{{ .Release.Name }}-postgresql/{{ .Values.postgresql.service.port }}"; exit_status=$?;
+            if [[ $exit_status -eq 0 ]]; then ready=true; echo "database ok"; fi; sleep 1;
+          done
+      {{- end }}
+    {{- end }}
+    {{- if or .Values.artifactory.customInitContainers .Values.global.customInitContainers }}
+{{ tpl (include "artifactory.customInitContainers" .)  . | indent 6 }}
+    {{- end }}
+{{- if .Values.artifactory.migration.enabled }}
+      - name: 'migration-artifactory'
+        image: {{ include "artifactory.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+      {{- if .Values.artifactory.resources }}
+        resources:
+{{ toYaml .Values.artifactory.resources | indent 10 }}
+      {{- end }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          {{- if .Values.artifactory.migration.preStartCommand }}
+          echo "Running custom preStartCommand command";
+          {{ tpl .Values.artifactory.migration.preStartCommand . }};
+          {{- end }}
+          scriptsPath="/opt/jfrog/artifactory/app/bin";
+          mkdir -p $scriptsPath;
+          echo "Copy migration scripts and Run migration";
+          cp -fv /tmp/migrate.sh $scriptsPath/migrate.sh;
+          cp -fv /tmp/migrationHelmInfo.yaml $scriptsPath/migrationHelmInfo.yaml;
+          cp -fv /tmp/migrationStatus.sh $scriptsPath/migrationStatus.sh;
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/log;
+          bash $scriptsPath/migrationStatus.sh {{ include "artifactory.app.version" . }} {{ .Values.artifactory.migration.timeoutSeconds }} > >(tee {{ .Values.artifactory.persistence.mountPath }}/log/helm-migration.log) 2>&1;
+        env:
+      {{- if and (not .Values.waitForDatabase) (not .Values.postgresql.enabled) }}
+        - name: SKIP_WAIT_FOR_EXTERNAL_DB
+          value: "true"
+      {{- end }}
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+{{- with .Values.artifactory.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: migration-scripts
+          mountPath: "/tmp/migrate.sh"
+          subPath: migrate.sh
+        - name: migration-scripts
+          mountPath: "/tmp/migrationHelmInfo.yaml"
+          subPath: migrationHelmInfo.yaml
+        - name: migration-scripts
+          mountPath: "/tmp/migrationStatus.sh"
+          subPath: migrationStatus.sh
+        - name: artifactory-volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+
+      ######################## Artifactory persistence nfs ##########################
+      {{- if eq .Values.artifactory.persistence.type "nfs" }}
+        - name: artifactory-data
+          mountPath: "{{ .Values.artifactory.persistence.nfs.dataDir }}"
+        - name: artifactory-backup
+          mountPath: "{{ .Values.artifactory.persistence.nfs.backupDir }}"
+      {{- else }}
+
+        ######################## Artifactory persistence binarystore Xml ##########################
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+        - name: binarystore-xml
+        {{- else }}
+        - name: {{ include "artifactory.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/tmp/etc/artifactory/binarystore.xml"
+          subPath: "binarystore.xml"
+
+      ######################## Artifactory persistence google storage ##########################
+      {{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+        - name: gcpcreds-json
+        {{- else }}
+        - name: {{ include "artifactory.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/artifactory_bootstrap/gcp.credentials.json"
+          subPath: gcp.credentials.json
+        {{- end }}
+      {{- end }}
+
+      ######################## CustomVolumeMounts ##########################
+      {{- if or .Values.artifactory.customVolumeMounts .Values.global.customVolumeMounts }}
+{{ tpl (include "artifactory.customVolumeMounts" .) . | indent 8 }}
+      {{- end }}
+{{- end }}
+      {{- if .Values.hostAliases }}
+      hostAliases:
+{{ toYaml .Values.hostAliases | indent 6 }}
+      {{- end }}
+      containers:
+    {{- if .Values.splitServicesToContainers }}
+      - name: {{ .Values.router.name }}
+        image: {{ include "artifactory.getImageInfoByValue" (list . "router") }}
+        imagePullPolicy: {{ .Values.router.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/router/app/bin/entrypoint-router.sh
+        {{- with .Values.router.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES
+          value: {{ include "artifactory.router.requiredServiceTypes" . }}
+{{- with .Values.router.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: artifactory-volume
+          mountPath: {{ .Values.router.persistence.mountPath | quote }}
+{{- with .Values.router.customVolumeMounts }}
+{{ tpl . $ | indent 8 }}
+{{- end }}
+        resources:
+{{ toYaml .Values.router.resources | indent 10 }}
+      {{- if .Values.router.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.router.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.router.readinessProbe.enabled }}
+        readinessProbe:
+{{ tpl .Values.router.readinessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.router.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.router.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.frontend.enabled }}
+      - name: {{ .Values.frontend.name }}
+        image: {{ include "artifactory.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/third-party/node/bin/node /opt/jfrog/artifactory/app/frontend/bin/server/dist/bundle.js /opt/jfrog/artifactory/app/frontend
+        {{- with .Values.frontend.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+      {{- if and (gt (.Values.artifactory.replicaCount | int64) 1) (eq (include "artifactory.isImageProType" .) "true") (eq (include "artifactory.isUsingDerby" .) "false") }}
+        - name : JF_SHARED_NODE_HAENABLED
+          value: "true"
+      {{- end }}
+{{- with .Values.frontend.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}   
+        volumeMounts:
+        - name: artifactory-volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.frontend.resources | indent 10 }}
+      {{- if .Values.frontend.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.frontend.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.frontend.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.frontend.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.evidence.enabled }}
+      - name: {{ .Values.evidence.name }}
+        image: {{ include "artifactory.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          exec /opt/jfrog/artifactory/app/evidence/bin/jf-evidence start
+        {{- with .Values.evidence.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+{{- with .Values.evidence.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        ports:
+        - containerPort: {{ .Values.evidence.internalPort }}
+          name: http-evidence
+        - containerPort: {{ .Values.evidence.externalPort }}
+          name: grpc-evidence
+        volumeMounts:
+        - name: artifactory-volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.evidence.resources | indent 10 }}
+      {{- if .Values.evidence.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.evidence.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.evidence.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.evidence.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.metadata.enabled }}
+      - name: {{ .Values.metadata.name }}
+        image: {{ include "artifactory.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/metadata/bin/jf-metadata start
+        {{- with .Values.metadata.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+{{- with .Values.metadata.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        {{- if or .Values.artifactory.customVolumeMounts .Values.global.customVolumeMounts }}
+{{ tpl (include "artifactory.customVolumeMounts" .) . | indent 8 }}
+        {{- end }}
+        - name: artifactory-volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.metadata.resources | indent 10 }}
+      {{- if .Values.metadata.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.metadata.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.metadata.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.metadata.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.event.enabled }}
+      - name: {{ .Values.event.name }}
+        image: {{ include "artifactory.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/event/bin/jf-event start
+        {{- with .Values.event.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+{{- with .Values.event.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: artifactory-volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.event.resources | indent 10 }}
+      {{- if .Values.event.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.event.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.event.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.event.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if and .Values.jfconnect.enabled (not (regexMatch "^.*(oss|cpp-ce|jcr).*$" .Values.artifactory.image.repository)) }}
+      - name: {{ .Values.jfconnect.name }}
+        image: {{ include "artifactory.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/jfconnect/bin/jf-connect start
+        {{- with .Values.jfconnect.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+{{- with .Values.jfconnect.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: artifactory-volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.jfconnect.resources | indent 10 }}
+      {{- if .Values.jfconnect.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.jfconnect.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.jfconnect.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.jfconnect.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if and .Values.access.enabled (not (.Values.access.runOnArtifactoryTomcat | default false)) }}
+      - name: {{ .Values.access.name }}
+        image: {{ include "artifactory.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+      {{- if .Values.access.resources }}
+        resources:
+{{ toYaml .Values.access.resources | indent 10 }}
+      {{- end }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          set -e;
+          {{- if .Values.access.preStartCommand }}
+          echo "Running custom preStartCommand command";
+          {{ tpl .Values.access.preStartCommand . }};
+          {{- end }}
+          exec /opt/jfrog/artifactory/app/access/bin/entrypoint-access.sh
+        {{- with .Values.access.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+      {{- if and (gt (.Values.artifactory.replicaCount | int64) 1) (eq (include "artifactory.isImageProType" .) "true") (eq (include "artifactory.isUsingDerby" .) "false") }}
+        - name : JF_SHARED_NODE_HAENABLED
+          value: "true"
+      {{- end }}
+      {{- if and (not .Values.waitForDatabase) (not .Values.postgresql.enabled) }}
+        - name: SKIP_WAIT_FOR_EXTERNAL_DB
+          value: "true"
+      {{- end }}
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+{{- with .Values.access.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+      {{- if .Values.artifactory.customPersistentVolumeClaim }}
+        - name: {{ .Values.artifactory.customPersistentVolumeClaim.name }}
+          mountPath: {{ .Values.artifactory.customPersistentVolumeClaim.mountPath }}
+      {{- end }}
+        - name: artifactory-volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+
+      ######################## Artifactory persistence nfs ##########################
+      {{- if eq .Values.artifactory.persistence.type "nfs" }}
+        - name: artifactory-data
+          mountPath: "{{ .Values.artifactory.persistence.nfs.dataDir }}"
+        - name: artifactory-backup
+          mountPath: "{{ .Values.artifactory.persistence.nfs.backupDir }}"
+      {{- else }}
+
+      ######################## Artifactory persistence googleStorage ##########################
+      {{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+        - name: gcpcreds-json
+        {{- else }}
+        - name: {{ include "artifactory.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/artifactory_bootstrap/gcp.credentials.json"
+          subPath: gcp.credentials.json
+      {{- end }}
+      {{- end }}
+      {{- if or .Values.artifactory.customVolumeMounts .Values.global.customVolumeMounts }}
+{{ tpl (include "artifactory.customVolumeMounts" .) . | indent 8 }}
+      {{- end }}
+      {{- if .Values.access.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.access.startupProbe.config . | indent 10 }}
+        {{- end }}
+    {{- if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}   
+        {{- if .Values.access.readinessProbe.enabled }}
+        readinessProbe:
+{{ tpl .Values.access.readinessProbe.config . | indent 10 }}
+        {{- end }}
+    {{- end }}
+      {{- if .Values.access.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.access.livenessProbe.config . | indent 10 }}
+        {{- end }}
+      {{- end }}
+      {{- if and .Values.federation.enabled .Values.federation.embedded (not (regexMatch "^.*(oss|cpp-ce|jcr).*$" .Values.artifactory.image.repository)) }}
+      - name: {{ .Values.federation.name }}
+        image: {{ include "artifactory.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          exec /opt/jfrog/artifactory/app/third-party/java/bin/java {{ .Values.federation.extraJavaOpts }} -jar /opt/jfrog/artifactory/app/rtfs/lib/jf-rtfs
+        {{- with .Values.federation.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+      # TODO - Password,Url,Username - should be derived from env variable
+{{- with .Values.federation.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+      {{- if .Values.federation.enabled }}
+        ports:
+        - containerPort: {{ .Values.federation.internalPort }}
+          name: http-rtfs
+      {{- end }}
+        volumeMounts:
+        - name: artifactory-volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.federation.resources | indent 10 }}
+      {{- if .Values.federation.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.federation.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.federation.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.federation.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.observability.enabled }}
+      - name: {{ .Values.observability.name }}
+        image: {{ include "artifactory.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+          - '/bin/bash'
+          - '-c'
+          - >
+            exec /opt/jfrog/artifactory/app/observability/bin/jf-observability start
+        {{- with .Values.observability.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+        - name: JF_SHARED_NODE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+{{- with .Values.observability.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        volumeMounts:
+        - name: artifactory-volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+        resources:
+{{ toYaml .Values.observability.resources | indent 10 }}
+      {{- if .Values.observability.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.observability.startupProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.observability.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.observability.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- end }}
+    {{- end }}
+      - name: {{ .Values.artifactory.name }}
+        image: {{ include "artifactory.getImageInfoByValue" (list . "artifactory") }}
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+      {{- if .Values.artifactory.resources }}
+        resources:
+{{ toYaml .Values.artifactory.resources | indent 10 }}
+      {{- end }}
+        command:
+        - '/bin/bash'
+        - '-c'
+        - >
+          set -e;
+          if [ -d /artifactory_extra_conf ] && [ -d /artifactory_bootstrap ]; then
+            echo "Copying bootstrap config from /artifactory_extra_conf to /artifactory_bootstrap";
+            cp -Lrfv /artifactory_extra_conf/ /artifactory_bootstrap/;
+          fi;
+          {{- if .Values.artifactory.configMapName }}
+          echo "Copying bootstrap configs";
+          cp -Lrf /bootstrap/* /artifactory_bootstrap/;
+          {{- end }}
+          {{- if .Values.artifactory.userPluginSecrets }}
+          echo "Copying plugins";
+          cp -Lrf /tmp/plugin/*/* /artifactory_bootstrap/plugins;
+          {{- end }}
+          {{- range .Values.artifactory.copyOnEveryStartup }}
+          {{- $targetPath := printf "%s/%s" $.Values.artifactory.persistence.mountPath .target }}
+          {{- $baseDirectory := regexFind ".*/" $targetPath }}
+          mkdir -p {{ $baseDirectory }};
+          cp -Lrf {{ .source }} {{ $.Values.artifactory.persistence.mountPath }}/{{ .target }};
+          {{- end }}
+          {{- if .Values.artifactory.preStartCommand }}
+          echo "Running custom preStartCommand command";
+          {{ tpl .Values.artifactory.preStartCommand . }};
+          {{- end }}
+          exec /entrypoint-artifactory.sh
+        {{- with .Values.artifactory.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        env:
+      {{- if and (gt (.Values.artifactory.replicaCount | int64) 1) (eq (include "artifactory.isImageProType" .) "true") (eq (include "artifactory.isUsingDerby" .) "false") }}
+        - name : JF_SHARED_NODE_HAENABLED
+          value: "true"
+      {{- end }}
+      {{- if .Values.aws.license.enabled }}
+        - name: IS_AWS_LICENSE
+          value: "true"
+        - name: AWS_REGION
+          value: {{ .Values.aws.region | quote }}
+      {{- if .Values.aws.licenseConfigSecretName }}
+        - name: AWS_WEB_IDENTITY_REFRESH_TOKEN_FILE
+          value: "/var/run/secrets/product-license/license_token"
+        - name: AWS_ROLE_ARN
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.aws.licenseConfigSecretName }}
+              key: iam_role
+      {{- end }}
+      {{- end }}
+      {{- if .Values.splitServicesToContainers }}
+        - name : JF_ROUTER_ENABLED
+          value: "true"
+        - name : JF_ROUTER_SERVICE_ENABLED
+          value: "false"
+        - name : JF_EVENT_ENABLED
+          value: "false"
+        - name : JF_METADATA_ENABLED
+          value: "false"
+        - name : JF_FRONTEND_ENABLED
+          value: "false"
+        - name: JF_FEDERATION_ENABLED
+          value: "false"
+        - name : JF_OBSERVABILITY_ENABLED
+          value: "false"
+        - name : JF_JFCONNECT_SERVICE_ENABLED
+          value: "false"
+        - name : JF_EVIDENCE_ENABLED
+          value: "false"
+        {{- if not (.Values.access.runOnArtifactoryTomcat | default false) }}
+        - name : JF_ACCESS_ENABLED
+          value: "false"
+        {{- end}}
+      {{- end}}
+      {{- if and (not .Values.waitForDatabase) (not .Values.postgresql.enabled) }}
+        - name: SKIP_WAIT_FOR_EXTERNAL_DB
+          value: "true"
+      {{- end }}
+      {{- if or .Values.database.secrets.user .Values.database.user }}
+        - name: JF_SHARED_DATABASE_USERNAME
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.user }}
+              name: {{ tpl .Values.database.secrets.user.name . }}
+              key: {{ tpl .Values.database.secrets.user.key . }}
+        {{- else if .Values.database.user }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-user
+        {{- end }}
+      {{- end }}
+      {{ if or .Values.database.secrets.password .Values.database.password .Values.postgresql.enabled }}
+        - name: JF_SHARED_DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.password }}
+              name: {{ tpl .Values.database.secrets.password.name . }}
+              key: {{ tpl .Values.database.secrets.password.key . }}
+        {{- else if .Values.database.password }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-password
+        {{- else if .Values.postgresql.enabled }}
+              name: {{ .Release.Name }}-postgresql
+              key: postgresql-password
+        {{- end }}
+      {{- end }}
+      {{- if or .Values.database.secrets.url .Values.database.url }}
+        - name: JF_SHARED_DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+        {{- if .Values.database.secrets.url }}
+              name: {{ tpl .Values.database.secrets.url.name . }}
+              key: {{ tpl .Values.database.secrets.url.key . }}
+        {{- else if .Values.database.url }}
+              {{- if not .Values.artifactory.unifiedSecretInstallation }}
+              name: {{ template "artifactory.fullname" . }}-database-creds
+              {{- else }}
+              name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+              {{- end }}
+              key: db-url
+        {{- end }}
+      {{- end }}
+{{- with .Values.artifactory.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 8 }}
+{{- end }}
+        ports:
+        - containerPort: {{ .Values.artifactory.internalPort }}
+          name: http
+        - containerPort: {{ .Values.artifactory.internalArtifactoryPort }}
+          name: http-internal
+        {{- if .Values.federation.enabled }}
+        - containerPort: {{ .Values.federation.internalPort }}
+          name: http-rtfs
+        {{- end }}
+        {{- if .Values.artifactory.javaOpts.jmx.enabled }}
+        - containerPort: {{ .Values.artifactory.javaOpts.jmx.port }}
+          name: tcp-jmx
+        {{- end }}
+        {{- if .Values.artifactory.ssh.enabled }}
+        - containerPort: {{ .Values.artifactory.ssh.internalPort }}
+          name: tcp-ssh
+        {{- end }}
+        volumeMounts:
+      {{- if .Values.artifactory.customPersistentVolumeClaim }}
+        - name: {{ .Values.artifactory.customPersistentVolumeClaim.name }}
+          mountPath: {{ .Values.artifactory.customPersistentVolumeClaim.mountPath }}
+      {{- end }}
+      {{- if .Values.aws.licenseConfigSecretName }}
+        - name: awsmp-product-license
+          mountPath: "/var/run/secrets/product-license"
+      {{- end }}
+      {{- if .Values.artifactory.userPluginSecrets }}
+        - name: bootstrap-plugins
+          mountPath: "/artifactory_bootstrap/plugins/"
+      {{- range .Values.artifactory.userPluginSecrets }}
+        - name: {{ tpl . $ }}
+          mountPath: "/tmp/plugin/{{ tpl . $ }}"
+      {{- end }}
+      {{- end }}
+        - name: artifactory-volume
+          mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+
+      ######################## Artifactory config map ##########################
+      {{- if .Values.artifactory.configMapName }}
+        - name: bootstrap-config
+          mountPath: "/bootstrap/"
+      {{- end }}
+
+      ######################## Artifactory persistence nfs ##########################
+      {{- if eq .Values.artifactory.persistence.type "nfs" }}
+        - name: artifactory-data
+          mountPath: "{{ .Values.artifactory.persistence.nfs.dataDir }}"
+        - name: artifactory-backup
+          mountPath: "{{ .Values.artifactory.persistence.nfs.backupDir }}"
+      {{- else }}
+
+      ######################## Artifactory persistence binarystoreXml ##########################
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+        - name: binarystore-xml
+        {{- else }}
+        - name: {{ include "artifactory.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/tmp/etc/artifactory/binarystore.xml"
+          subPath: binarystore.xml
+
+      ######################## Artifactory persistence googleStorage ##########################
+      {{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+        - name: gcpcreds-json
+        {{- else }}
+        - name: {{ include "artifactory.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/artifactory_bootstrap/gcp.credentials.json"
+          subPath: gcp.credentials.json
+      {{- end }}
+      {{- end }}
+
+      ######################## Artifactory license ##########################
+      {{- if or .Values.artifactory.license.secret .Values.artifactory.license.licenseKey }}
+        {{- if or (not .Values.artifactory.unifiedSecretInstallation) .Values.artifactory.license.secret }}
+        - name: artifactory-license
+        {{- else }}
+        - name: {{ include "artifactory.unifiedCustomSecretVolumeName" . }}
+        {{- end }}
+          mountPath: "/artifactory_bootstrap/artifactory.cluster.license"
+          {{- if .Values.artifactory.license.secret }}
+          subPath: {{ .Values.artifactory.license.dataKey }}
+          {{- else if .Values.artifactory.license.licenseKey }}
+          subPath: artifactory.lic
+          {{- end }}
+      {{- end }}
+
+        - name: installer-info
+          mountPath: "/artifactory_bootstrap/info/installer-info.json"
+          subPath: installer-info.json
+      {{- if or .Values.artifactory.customVolumeMounts .Values.global.customVolumeMounts }}
+{{ tpl (include "artifactory.customVolumeMounts" .) . | indent 8 }}
+      {{- end }}
+      {{- if .Values.artifactory.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.artifactory.startupProbe.config . | indent 10 }}
+        {{- end }}
+    {{- if and (not .Values.splitServicesToContainers) (semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version) }}   
+        {{- if .Values.artifactory.readinessProbe.enabled }}
+        readinessProbe:
+{{ tpl .Values.artifactory.readinessProbe.config . | indent 10 }}
+        {{- end }}
+    {{- end }}
+      {{- if .Values.artifactory.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.artifactory.livenessProbe.config . | indent 10 }}
+        {{- end }}
+      {{- $mountPath := .Values.artifactory.persistence.mountPath }}
+      {{- range .Values.artifactory.loggers }}
+      - name: {{ . | replace "_" "-" | replace "." "-" }}
+        image: {{ include "artifactory.getImageInfoByValue" (list $ "initContainers") }}
+        imagePullPolicy: {{ $.Values.initContainers.image.pullPolicy }}
+      {{- if $.Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit $.Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - 'sh'
+        - '-c'
+        - 'sh /scripts/tail-log.sh {{ $mountPath }}/log {{ . }}'
+        volumeMounts:
+        - name: artifactory-volume
+          mountPath: {{ $mountPath }}
+        - name: tail-logger-script
+          mountPath: /scripts/tail-log.sh
+          subPath: tail-log.sh
+        resources:
+{{ toYaml $.Values.artifactory.loggersResources | indent 10 }}
+      {{- end }}
+      {{ if .Values.artifactory.catalinaLoggers }}
+      {{- range .Values.artifactory.catalinaLoggers }}
+      - name: {{ . | replace "_" "-" | replace "." "-" }}
+        image: {{ include "artifactory.getImageInfoByValue" (list $ "initContainers") }}
+        imagePullPolicy: {{ $.Values.initContainers.image.pullPolicy }}
+      {{- if $.Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit $.Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - 'sh'
+        - '-c'
+        - 'sh /scripts/tail-log.sh {{ $mountPath }}/log/tomcat {{ . }}'
+        volumeMounts:
+        - name: artifactory-volume
+          mountPath: {{ $mountPath }}
+        - name: tail-logger-script
+          mountPath: /scripts/tail-log.sh
+          subPath: tail-log.sh
+        resources:
+{{ toYaml $.Values.artifactory.catalinaLoggersResources | indent 10 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.filebeat.enabled }}
+      - name: {{ .Values.filebeat.name }}
+        image: "{{ .Values.filebeat.image.repository }}:{{ .Values.filebeat.image.version }}"
+        imagePullPolicy: {{ .Values.filebeat.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        args:
+        - "-e"
+        - "-E"
+        - "http.enabled=true"
+        env:
+{{- with .Values.filebeat.extraEnvironmentVariables }}
+{{ tpl (toYaml .) $ | indent 10 }}
+{{- end }}
+        volumeMounts:
+        - name: filebeat-config
+          mountPath: /usr/share/filebeat/filebeat.yml
+          readOnly: true
+          subPath: filebeat.yml
+        - name: artifactory-volume
+          mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+        livenessProbe:
+{{ toYaml .Values.filebeat.livenessProbe | indent 10 }}
+        readinessProbe:
+{{ toYaml .Values.filebeat.readinessProbe | indent 10 }}
+        resources:
+{{ toYaml .Values.filebeat.resources | indent 10 }}
+      {{- end }}
+    {{- if or .Values.artifactory.customSidecarContainers .Values.global.customSidecarContainers }}
+{{ tpl (include "artifactory.customSidecarContainers" .) . | indent 6 }}
+    {{- end }}
+    {{- if or .Values.artifactory.nodeSelector .Values.global.nodeSelector }}
+{{ tpl (include "artifactory.nodeSelector" .) . | indent 6 }}
+    {{- end }}
+    {{- if .Values.artifactory.affinity }}
+    {{- with .Values.artifactory.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- else if eq .Values.artifactory.podAntiAffinity.type "soft" }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: {{ .Values.artifactory.podAntiAffinity.topologyKey }}
+                labelSelector:
+                  matchLabels:
+                    app: {{ template "artifactory.name" . }}
+                    release: {{ .Release.Name }}
+    {{- else if eq .Values.artifactory.podAntiAffinity.type "hard" }}
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - topologyKey: {{ .Values.artifactory.podAntiAffinity.topologyKey }}
+              labelSelector:
+                matchLabels:
+                  app: {{ template "artifactory.name" . }}
+                  release: {{ .Release.Name }}
+    {{- end }}
+    {{- with .Values.artifactory.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+      volumes:
+      ########## External secrets ###########
+      # ca-certs secret
+      {{- if or .Values.artifactory.customCertificates.enabled .Values.global.customCertificates.enabled }}
+      - name: ca-certs
+        secret:
+          secretName: {{ default .Values.global.customCertificates.certificateSecretName .Values.artifactory.customCertificates.certificateSecretName }}
+      {{- end }}
+
+      {{- if .Values.artifactory.circleOfTrustCertificatesSecret }}
+      - name: circle-of-trust-certs
+        secret:
+          secretName: {{ .Values.artifactory.circleOfTrustCertificatesSecret }}
+      {{- end }}
+
+      # aws licence
+      {{- if .Values.aws.licenseConfigSecretName }}
+      - name: awsmp-product-license
+        secret:
+          secretName: {{ .Values.aws.licenseConfigSecretName }}
+      {{- end }}
+
+      # binarystore-xml secret
+      {{- if .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+      - name: binarystore-xml
+        secret:
+          secretName: {{ .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+      {{- end }}
+
+      # access-certs secrets
+      {{- if .Values.access.customCertificatesSecretName }}
+      - name: access-certs
+        secret:
+          secretName: {{ .Values.access.customCertificatesSecretName }}
+      {{- end }}
+
+      # jfconnect-certs secrets
+      {{- if .Values.jfconnect.customCertificatesSecretName }}
+      - name: jfconnect-certs
+        secret:
+          secretName: {{ .Values.jfconnect.customCertificatesSecretName }}
+      {{- end }}
+
+      # system yaml
+      {{- if .Values.systemYamlOverride.existingSecret }}
+      - name: systemyaml
+        secret:
+          secretName: {{ .Values.systemYamlOverride.existingSecret }}
+      {{- end }}
+
+      # artifactory license secrets
+      {{- if .Values.artifactory.license.secret }}
+      - name: artifactory-license
+        secret:
+          secretName: {{ .Values.artifactory.license.secret }}
+      {{- end }}
+      
+      # user Plugin Secrets
+      {{- if .Values.artifactory.userPluginSecrets }}
+      - name: bootstrap-plugins
+        emptyDir: {}
+      {{- range .Values.artifactory.userPluginSecrets }}
+      - name: {{ tpl . $ }}
+        secret:
+          secretName: {{ tpl . $ }}
+      {{- end }}
+      {{- end }}
+
+      # access bootstarp
+      {{- if and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey }}
+      - name: access-bootstrap-creds
+        secret:
+          secretName: {{ .Values.artifactory.admin.secret }}
+      {{- end }}
+
+      # gcpcreds secret
+      {{- if and .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+      - name: gcpcreds-json
+        secret:
+          secretName: {{ .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+      {{- end }}
+
+      ############ Config map, Volumes and Custom Volumes ##############
+    {{- if or .Values.artifactory.customVolumes .Values.global.customVolumes }}
+{{ tpl (include "artifactory.customVolumes" .) . | indent 6 }}
+    {{- end }}
+      {{- if .Values.artifactory.migration.enabled }}
+      - name: migration-scripts
+        configMap:
+          name: {{ template "artifactory.fullname" . }}-migration-scripts
+      {{- end }}
+      - name: installer-info
+        configMap:
+          name: {{ template "artifactory.fullname" . }}-installer-info
+      {{- if and .Values.artifactory.persistence.enabled .Values.artifactory.persistence.existingClaim }}
+      - name: artifactory-volume
+        persistentVolumeClaim:
+          claimName: {{ .Values.artifactory.persistence.existingClaim }}
+      {{- end }}
+      {{- if .Values.artifactory.configMapName }}
+      - name: bootstrap-config
+        configMap:
+          name: {{ .Values.artifactory.configMapName }}
+      {{- end}}
+      {{- if or .Values.artifactory.loggers .Values.artifactory.catalinaLoggers }}
+      - name: tail-logger-script
+        configMap:
+          name: {{ template "artifactory.fullname" . }}-logger
+      {{- end }}
+      {{- if .Values.artifactory.configMaps }}
+      - name: artifactory-configmaps
+        configMap:
+          name: {{ template "artifactory.fullname" . }}-configmaps
+      {{- end }}
+      {{- if eq .Values.artifactory.persistence.type "nfs" }}
+      - name: artifactory-data
+        persistentVolumeClaim:
+          claimName: {{ template "artifactory.fullname" . }}-data-pvc
+      - name: artifactory-backup
+        persistentVolumeClaim:
+          claimName: {{ template "artifactory.fullname" . }}-backup-pvc
+      {{- end }}
+      {{- if not .Values.artifactory.persistence.enabled }}
+      - name: artifactory-volume
+        emptyDir:
+          sizeLimit: {{ .Values.artifactory.persistence.size }}
+      {{- end }}
+      {{- if .Values.filebeat.enabled }}
+      - name: filebeat-config
+        configMap:
+          name: {{ template "artifactory.fullname" . }}-filebeat-config
+      {{- end }}
+  {{- if not .Values.artifactory.persistence.enabled }}
+      - name: volume
+        emptyDir:
+          sizeLimit: {{ .Values.artifactory.persistence.size }}
+  {{- end }}
+
+    #########  unifiedSecretInstallation ###########
+    {{- if and .Values.artifactory.unifiedSecretInstallation (eq (include "artifactory.checkDuplicateUnifiedCustomVolume" .) "false" ) }}
+      - name: {{ include "artifactory.unifiedCustomSecretVolumeName" . }}
+        secret:
+          secretName: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
+
+    {{- else if not .Values.artifactory.unifiedSecretInstallation }}
+      ############ If single secret installation flag is disable ############
+      {{- if and .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled (not .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName) }}
+      - name: gcpcreds-json
+        secret:
+          secretName: {{ template "artifactory.fullname" . }}-gcpcreds
+      {{- end }}
+      {{- if and .Values.artifactory.license.licenseKey (not .Values.artifactory.license.secret) }}
+      - name: artifactory-license
+        secret:
+          secretName: {{ template "artifactory.fullname" . }}-license
+      {{- end }}
+      {{- if and .Values.artifactory.admin.password (and (not .Values.artifactory.admin.secret) (not .Values.artifactory.admin.dataKey)) }}
+      - name: access-bootstrap-creds
+        secret:
+          secretName: {{ template "artifactory.fullname" . }}-bootstrap-creds
+      {{- end }}
+      {{- if and (not .Values.systemYamlOverride.existingSecret) }}
+      - name: systemyaml
+        secret:
+          secretName: {{ printf "%s-%s" (include "artifactory.fullname" .) "systemyaml" }}
+      {{- end }}
+      {{- if .Values.access.accessConfig }}
+      - name: access-config
+        secret:
+          secretName: {{ template "artifactory.fullname" . }}-access-config
+      {{- end }}
+      {{- if not .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+      - name: binarystore-xml
+        secret:
+          secretName: {{ template "artifactory.fullname" . }}-binarystore
+      {{- end }}
+    {{- end }}
+    ########## volumeClaimTemplates #######
+{{- if or (and .Values.artifactory.persistence.enabled (not .Values.artifactory.persistence.existingClaim)) .Values.artifactory.customPersistentVolumeClaim }}
+  volumeClaimTemplates:
+{{- end }}
+{{- with .Values.artifactory.persistence }}
+  {{- if and .enabled (not .existingClaim) }}
+  - metadata:
+      name: artifactory-volume
+    spec:
+      {{- if .storageClassName }}
+      {{- if (eq "-" .storageClassName) }}
+      storageClassName: ""
+      {{- else }}
+      storageClassName: "{{ .storageClassName }}"
+      {{- end }}
+      {{- end }}
+      accessModes: [ "{{ .accessMode }}" ]
+      resources:
+        requests:
+          storage: {{ .size }}
+  {{- end }}
+{{- end }}
+  {{- if .Values.artifactory.customPersistentVolumeClaim }}
+  - metadata:
+      name: {{ .Values.artifactory.customPersistentVolumeClaim.name }}
+    spec:
+    {{- if .Values.artifactory.customPersistentVolumeClaim.storageClassName }}
+      {{- if (eq "-" .Values.artifactory.customPersistentVolumeClaim.storageClassName) }}
+      storageClassName: ""
+      {{- else }}
+      storageClassName: "{{ .Values.artifactory.customPersistentVolumeClaim.storageClassName }}"
+      {{- end }}
+    {{- end }}
+      accessModes:
+     {{- range .Values.artifactory.customPersistentVolumeClaim.accessModes }}
+        - {{ . | quote }}
+     {{- end }}
+      resources:
+        requests:
+          storage: {{ .Values.artifactory.customPersistentVolumeClaim.size }}
+  {{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-system-yaml.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-system-yaml.yaml
new file mode 100644
index 000000000..80974274d
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-system-yaml.yaml
@@ -0,0 +1,16 @@
+{{- if and (not .Values.systemYamlOverride.existingSecret) (not .Values.artifactory.unifiedSecretInstallation) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "artifactory.fullname" . }}-systemyaml
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+type: Opaque
+stringData:
+  system.yaml: |
+{{ include "artifactory.finalSystemYaml" . | nindent 4 }}
+{{- end }}
+
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-unified-secret.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-unified-secret.yaml
new file mode 100644
index 000000000..bb6719b4e
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/artifactory-unified-secret.yaml
@@ -0,0 +1,94 @@
+{{- if .Values.artifactory.unifiedSecretInstallation }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret
+  labels:
+    app: "{{ template "artifactory.name" $ }}"
+    chart: "{{ template "artifactory.chart" $ }}"
+    component: "{{ $.Values.artifactory.name }}"
+    heritage: {{ $.Release.Service | quote }}
+    release: {{ $.Release.Name | quote }}
+type: Opaque
+stringData:
+
+{{- if .Values.access.accessConfig }}
+  access.config.patch.yml: |
+{{ tpl (toYaml .Values.access.accessConfig) . | indent 4 }}
+{{- end }}
+
+{{- if not .Values.artifactory.persistence.customBinarystoreXmlSecret }}
+  binarystore.xml: |-
+{{- if .Values.artifactory.persistence.binarystoreXml }} 
+{{ tpl .Values.artifactory.persistence.binarystoreXml . | indent 4 }}
+{{- else }}
+{{ tpl ( .Files.Get "files/binarystore.xml" ) . | indent 4 }}
+{{- end }}
+{{- end }}
+
+{{- if and (not .Values.systemYamlOverride.existingSecret) }}
+  system.yaml: |
+{{ include "artifactory.finalSystemYaml" . | nindent 4 }}
+{{- end }}
+
+{{- if and .Values.artifactory.customSecrets }}
+{{- range .Values.artifactory.customSecrets }}
+  {{ .key }}: |
+{{ .data | indent 4 -}}
+{{- end }}
+{{- end }}
+
+{{- if not .Values.artifactory.persistence.googleStorage.gcpServiceAccount.customSecretName }}
+{{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
+  gcp.credentials.json: |-
+{{ tpl .Values.artifactory.persistence.googleStorage.gcpServiceAccount.config . | indent 4 }}
+{{- end }}
+{{- end }}
+
+data:
+
+  {{- if and  (not .Values.database.secrets) (not .Values.postgresql.enabled) }}
+  {{- if or .Values.database.url .Values.database.user .Values.database.password }}
+
+  {{- with .Values.database.url }}
+  db-url: {{ tpl . $ | b64enc | quote }}
+  {{- end }}
+  {{- with .Values.database.user }}
+  db-user: {{ tpl . $ | b64enc | quote }}
+  {{- end }}
+  {{- with .Values.database.password }}
+  db-password: {{ tpl . $ | b64enc | quote }}
+  {{- end }}
+
+  {{- end }}
+  {{- end }}
+
+  {{- if not (and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey) }}
+  {{- if .Values.artifactory.admin.password }}
+  bootstrap.creds: {{ (printf "%s@%s=%s" .Values.artifactory.admin.username .Values.artifactory.admin.ip .Values.artifactory.admin.password) | b64enc }}
+  {{- end }}
+  {{- end }}
+
+  {{- if not .Values.artifactory.license.secret }}
+  {{- with .Values.artifactory.license.licenseKey }}
+  artifactory.lic: {{ . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+
+  {{- if or .Values.artifactory.masterKey .Values.global.masterKey }}
+  {{- if not (or .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName) }}
+  master-key: {{ include "artifactory.masterKey" . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+  {{- if or .Values.artifactory.joinKey .Values.global.joinKey }}
+  {{- if not (or .Values.artifactory.joinKeySecretName .Values.global.joinKeySecretName) }}
+  join-key: {{ include "artifactory.joinKey" . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.artifactory.jfConnectToken }}
+  {{- if not .Values.artifactory.jfConnectTokenSecretName }}
+  jfconnect-token: {{ include "artifactory.jfConnectToken" . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/filebeat-configmap.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/filebeat-configmap.yaml
new file mode 100644
index 000000000..382ad3df6
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/filebeat-configmap.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.filebeat.enabled }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "artifactory.fullname" . }}-filebeat-config
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
+data:
+  filebeat.yml: |
+{{ tpl .Values.filebeat.filebeatYml . | indent 4 }}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/ingress-grpc.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/ingress-grpc.yaml
new file mode 100644
index 000000000..b68026297
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/ingress-grpc.yaml
@@ -0,0 +1,80 @@
+{{- if .Values.ingressGrpc.enabled -}}
+{{- $serviceName := include "artifactory.serviceGrpc.fullname" . -}}
+{{- $servicePort := .Values.artifactory.externalPort -}}
+{{- $ingressName := include "artifactory.ingressGrpc.fullname" . -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+apiVersion: networking.k8s.io/v1
+{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $ingressName }}
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- if .Values.ingressGrpc.labels }}
+{{ .Values.ingressGrpc.labels | toYaml | trimSuffix "\n"| indent 4 -}}
+{{- end}}
+{{- if .Values.ingressGrpc.annotations }}
+  annotations:
+{{ .Values.ingressGrpc.annotations | toYaml | trimSuffix "\n" | indent 4 -}}
+{{- end }}
+spec:
+  {{- if and .Values.ingressGrpc.className (semverCompare ">=1.18.0-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingressGrpc.className }}
+  {{- end }}
+  {{- if .Values.ingressGrpc.defaultBackend.enabled }}
+    {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+  defaultBackend:
+    service:
+      name: {{ $serviceName }}
+      port:
+        number: {{ $servicePort }}
+    {{- else }}
+  backend:
+    serviceName: {{ $serviceName }}
+    servicePort: {{ $servicePort }}
+    {{- end }}
+  {{- end }}
+  rules:
+{{- if .Values.ingressGrpc.hosts }}
+  {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+    {{- range $host := .Values.ingressGrpc.hosts }}
+  - host: {{ $host | quote }}
+    http:
+      paths:
+        - path: {{ $.Values.ingressGrpc.grpcPath }}
+          pathType: ImplementationSpecific
+          backend:
+            service:
+              name: {{ $serviceName }}
+              port:
+                number: {{ $servicePort }}
+    {{- end }}
+  {{- else }}
+    {{- range $host := .Values.ingressGrpc.hosts }}
+  - host: {{ $host | quote }}
+    http:
+      paths:
+        - path: {{ $.Values.ingressGrpc.grpcPath }}
+          backend:
+            serviceName: {{ $serviceName }}
+            servicePort: {{ $servicePort }}
+    {{- end }}
+  {{- end }}
+{{- end -}}
+  {{- with .Values.ingressGrpc.additionalRules }}
+{{ tpl . $ | indent 2 }}
+  {{- end }}
+
+  {{- if .Values.ingressGrpc.tls }}
+  tls:
+{{ toYaml .Values.ingressGrpc.tls | indent 4 }}
+  {{- end -}}
+
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/ingress.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/ingress.yaml
new file mode 100644
index 000000000..fca895e47
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/ingress.yaml
@@ -0,0 +1,109 @@
+{{- if .Values.ingress.enabled -}}
+{{- $serviceName := include "artifactory.fullname" . -}}
+{{- $servicePort := .Values.artifactory.externalPort -}}
+{{- $artifactoryServicePort := .Values.artifactory.externalArtifactoryPort -}}
+{{- $ingressName := default ( include "artifactory.fullname" . ) .Values.ingress.name -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+apiVersion: networking.k8s.io/v1
+{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $ingressName }}
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- if .Values.ingress.labels }}
+{{ .Values.ingress.labels | toYaml | trimSuffix "\n"| indent 4 -}}
+{{- end}}
+{{- if .Values.ingress.annotations }}
+  annotations:
+{{ .Values.ingress.annotations | toYaml | trimSuffix "\n" | indent 4 -}}
+{{- end }}
+spec:
+  {{- if and .Values.ingress.className (semverCompare ">=1.18.0-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
+  {{- if .Values.ingress.defaultBackend.enabled }}
+    {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+  defaultBackend:
+    service:
+      name: {{ $serviceName }}
+      port:
+        number: {{ $servicePort }}
+    {{- else }}
+  backend:
+    serviceName: {{ $serviceName }}
+    servicePort: {{ $servicePort }}
+    {{- end }}
+  {{- end }}
+  rules:
+{{- if .Values.ingress.hosts }}
+  {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+    {{- range $host := .Values.ingress.hosts }}
+  - host: {{ $host | quote }}
+    http:
+      paths:
+        - path: {{ $.Values.ingress.routerPath }}
+          pathType: ImplementationSpecific
+          backend:
+            service:
+              name: {{ $serviceName }}
+              port:
+                number: {{ $servicePort }}
+        {{- if not $.Values.ingress.disableRouterBypass }}
+        - path: {{ $.Values.ingress.artifactoryPath }}
+          pathType: ImplementationSpecific
+          backend:
+            service:
+              name: {{ $serviceName }}
+              port:
+                number: {{ $artifactoryServicePort }}
+        {{- end }}
+        {{- if and $.Values.federation.enabled (not (regexMatch "^.*(oss|cpp-ce|jcr).*$" $.Values.artifactory.image.repository)) }}
+        - path: {{ $.Values.ingress.rtfsPath }}
+          pathType: ImplementationSpecific
+          backend:
+            service:
+              name: {{ $serviceName }}
+              port:
+                number: {{ $.Values.federation.internalPort }}
+        {{- end }}
+    {{- end }}
+  {{- else }}
+    {{- range $host := .Values.ingress.hosts }}
+  - host: {{ $host | quote }}
+    http:
+      paths:
+        - path: {{ $.Values.ingress.routerPath }}
+          backend:
+            serviceName: {{ $serviceName }}
+            servicePort: {{ $servicePort }}
+        {{- if not $.Values.ingress.disableRouterBypass }}
+        - path: {{ $.Values.ingress.artifactoryPath }}
+          backend:
+            serviceName: {{ $serviceName }}
+            servicePort: {{ $artifactoryServicePort }}
+        {{- end }}
+      {{- end }}
+  {{- end }}
+{{- end -}}
+  {{- with .Values.ingress.additionalRules }}
+{{ tpl . $ | indent 2 }}
+  {{- end }}
+
+  {{- if .Values.ingress.tls }}
+  tls:
+{{ toYaml .Values.ingress.tls | indent 4 }}
+  {{- end -}}
+
+{{- if .Values.customIngress }}
+---
+{{ .Values.customIngress | toYaml | trimSuffix "\n" }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/logger-configmap.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/logger-configmap.yaml
new file mode 100644
index 000000000..41a078b02
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/logger-configmap.yaml
@@ -0,0 +1,63 @@
+{{- if or .Values.artifactory.loggers .Values.artifactory.catalinaLoggers }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "artifactory.fullname" . }}-logger
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  tail-log.sh: |
+    #!/bin/sh
+
+    LOG_DIR=$1
+    LOG_NAME=$2
+    PID=
+
+    # Wait for log dir to appear
+    while [ ! -d ${LOG_DIR} ]; do
+      sleep 1
+    done
+
+    cd ${LOG_DIR}
+
+    LOG_PREFIX=$(echo ${LOG_NAME} | sed 's/.log$//g')
+
+    # Find the log to tail
+    LOG_FILE=$(ls -1t ./${LOG_PREFIX}.log 2>/dev/null)
+
+    # Wait for the log file
+    while [ -z "${LOG_FILE}" ]; do
+      sleep 1
+      LOG_FILE=$(ls -1t ./${LOG_PREFIX}.log 2>/dev/null)
+    done
+
+    echo "Log file ${LOG_FILE} is ready!"
+
+    # Get inode number
+    INODE_ID=$(ls -i ${LOG_FILE})
+
+    # echo "Tailing ${LOG_FILE}"
+    tail -F ${LOG_FILE} &
+    PID=$!
+
+    # Loop forever to see if a new log was created
+    while true; do
+      # Check inode number
+      NEW_INODE_ID=$(ls -i ${LOG_FILE})
+
+      # If inode number changed, this means log was rotated and need to start a new tail
+      if [ "${INODE_ID}" != "${NEW_INODE_ID}" ]; then
+        kill -9 ${PID} 2>/dev/null
+        INODE_ID="${NEW_INODE_ID}"
+
+        # Start a new tail
+        tail -F ${LOG_FILE} &
+        PID=$!
+      fi
+      sleep 1
+    done
+
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-artifactory-conf.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-artifactory-conf.yaml
new file mode 100644
index 000000000..343448994
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-artifactory-conf.yaml
@@ -0,0 +1,18 @@
+{{- if and (not .Values.nginx.customArtifactoryConfigMap) .Values.nginx.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "artifactory.fullname" . }}-nginx-artifactory-conf
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  artifactory.conf: |
+{{- if .Values.nginx.artifactoryConf }} 
+{{ tpl .Values.nginx.artifactoryConf . | indent 4 }}
+{{- else }}
+{{ tpl ( .Files.Get "files/nginx-artifactory-conf.yaml" ) . | indent 4 }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-certificate-secret.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-certificate-secret.yaml
new file mode 100644
index 000000000..f13d40174
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-certificate-secret.yaml
@@ -0,0 +1,14 @@
+{{- if and (not .Values.nginx.tlsSecretName) .Values.nginx.enabled .Values.nginx.https.enabled }}
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/tls
+metadata:
+  name: {{ template "artifactory.fullname" . }}-nginx-certificate
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+{{ ( include "artifactory.gen-certs" . ) | indent 2 }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-conf.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-conf.yaml
new file mode 100644
index 000000000..31219d58a
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-conf.yaml
@@ -0,0 +1,18 @@
+{{- if and (not .Values.nginx.customConfigMap) .Values.nginx.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "artifactory.fullname" . }}-nginx-conf
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  nginx.conf: |
+{{- if .Values.nginx.mainConf }} 
+{{ tpl .Values.nginx.mainConf . | indent 4 }}
+{{- else }}
+{{ tpl ( .Files.Get "files/nginx-main-conf.yaml" ) . | indent 4 }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-deployment.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-deployment.yaml
new file mode 100644
index 000000000..774bedcca
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-deployment.yaml
@@ -0,0 +1,223 @@
+{{- if .Values.nginx.enabled -}}
+{{- $serviceName := include "artifactory.fullname" . -}}
+{{- $servicePort := .Values.artifactory.externalPort -}}
+apiVersion: apps/v1
+kind: {{ .Values.nginx.kind }}
+metadata:
+  name: {{ template "artifactory.nginx.fullname" . }}
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    component: {{ .Values.nginx.name }}
+{{- if .Values.nginx.labels }}
+{{ toYaml .Values.nginx.labels | indent 4 }}
+{{- end }}
+{{- with .Values.nginx.deployment.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if eq .Values.nginx.kind "StatefulSet" }}
+  serviceName: {{ template "artifactory.nginx.fullname" . }}
+{{- end }}
+{{- if ne .Values.nginx.kind "DaemonSet" }}
+  replicas: {{ .Values.nginx.replicaCount }}
+{{- end }}
+  selector:
+    matchLabels:
+      app: {{ template "artifactory.name" . }}
+      release: {{ .Release.Name }}
+      component: {{ .Values.nginx.name }}
+  template:
+    metadata:
+      annotations:
+        checksum/nginx-conf: {{ include (print $.Template.BasePath "/nginx-conf.yaml") . | sha256sum }}
+        checksum/nginx-artifactory-conf: {{ include (print $.Template.BasePath "/nginx-artifactory-conf.yaml") . | sha256sum }}
+      {{- range $key, $value := .Values.nginx.annotations }}
+        {{ $key }}: {{ $value | quote }}
+      {{- end }}
+      labels:
+        app: {{ template "artifactory.name" . }}
+        chart: {{ template "artifactory.chart" . }}
+        component: {{ .Values.nginx.name }}
+        heritage: {{ .Release.Service }}
+        release: {{ .Release.Name }}
+{{- if .Values.nginx.labels }}
+{{ toYaml .Values.nginx.labels | indent 8 }}
+{{- end }}
+    spec:
+    {{- if .Values.nginx.podSecurityContext.enabled }}
+      securityContext: {{- omit .Values.nginx.podSecurityContext "enabled" | toYaml | nindent 8 }}
+    {{- end }}
+      serviceAccountName: {{ template "artifactory.serviceAccountName" . }}
+      terminationGracePeriodSeconds: {{ .Values.nginx.terminationGracePeriodSeconds }}
+    {{- if or .Values.imagePullSecrets .Values.global.imagePullSecrets }}
+{{- include "artifactory.imagePullSecrets" . | indent 6 }}
+    {{- end }}
+      {{- if .Values.nginx.priorityClassName }}
+      priorityClassName: {{ .Values.nginx.priorityClassName | quote }}
+      {{- end }}
+      {{- if .Values.nginx.topologySpreadConstraints }}
+      topologySpreadConstraints:
+{{ tpl (toYaml .Values.nginx.topologySpreadConstraints) . | indent 8 }}
+      {{- end }}
+      initContainers:
+        {{- if .Values.nginx.customInitContainers }}
+{{ tpl (include "artifactory.nginx.customInitContainers" .)  . | indent 6 }}
+        {{- end }}
+      - name: "setup"
+        image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+      {{- if .Values.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+      {{- end }}
+        command:
+        - '/bin/sh'
+        - '-c'
+        - >
+          rm -rfv {{ .Values.nginx.persistence.mountPath }}/lost+found;
+          mkdir -p {{ .Values.nginx.persistence.mountPath }}/logs;
+        resources:
+          {{- toYaml .Values.initContainers.resources | nindent 10 }}
+        volumeMounts:
+        - mountPath: {{ .Values.nginx.persistence.mountPath | quote }}
+          name: nginx-volume
+      containers:
+      - name: {{ .Values.nginx.name }}
+        image: {{ include "artifactory.getImageInfoByValue" (list . "nginx") }}
+        imagePullPolicy: {{ .Values.nginx.image.pullPolicy }}
+        {{- if .Values.nginx.containerSecurityContext.enabled }}
+        securityContext: {{- omit .Values.nginx.containerSecurityContext "enabled" | toYaml | nindent 10 }}
+        {{- end }}
+        {{- if .Values.nginx.customCommand }}
+        command:
+{{- tpl (include "nginx.command" .) . | indent 10 }}
+        {{- end }}
+        ports:
+{{ if .Values.nginx.customPorts }}
+{{ toYaml .Values.nginx.customPorts | indent 8 }}
+{{ end }}
+        # DEPRECATION NOTE: The following is to maintain support for values pre 1.3.1 and
+        # will be cleaned up in a later version
+        {{- if .Values.nginx.http }}
+        {{- if .Values.nginx.http.enabled }}
+        - containerPort: {{ .Values.nginx.http.internalPort }}
+          name: http
+        {{- end }}
+        {{- else }} # DEPRECATED
+        - containerPort: {{ .Values.nginx.internalPortHttp }}
+          name: http-internal
+        {{- end }}
+        {{- if .Values.nginx.https }}
+        {{- if .Values.nginx.https.enabled }}
+        - containerPort: {{ .Values.nginx.https.internalPort }}
+          name: https
+        {{- end }}
+        {{- else }} # DEPRECATED
+        - containerPort: {{ .Values.nginx.internalPortHttps }}
+          name: https-internal
+        {{- end }}
+        {{- if .Values.artifactory.ssh.enabled }}
+        - containerPort: {{ .Values.nginx.ssh.internalPort }}
+          name: tcp-ssh
+        {{- end }}
+        {{- with .Values.nginx.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+        volumeMounts:
+        - name: nginx-conf
+          mountPath: /etc/nginx/nginx.conf
+          subPath: nginx.conf
+        - name: nginx-artifactory-conf
+          mountPath: "{{ .Values.nginx.persistence.mountPath }}/conf.d/"
+        - name: nginx-volume
+          mountPath: {{ .Values.nginx.persistence.mountPath | quote }}
+        {{- if .Values.nginx.https.enabled }}  
+        - name: ssl-certificates
+          mountPath: "{{ .Values.nginx.persistence.mountPath }}/ssl"
+        {{- end }}
+        {{- if .Values.nginx.customVolumeMounts }}
+{{ tpl (include "artifactory.nginx.customVolumeMounts" .) . | indent 8 }}
+        {{- end }}  
+        resources:
+{{ toYaml .Values.nginx.resources | indent 10 }}
+        {{- if .Values.nginx.startupProbe.enabled }}
+        startupProbe:
+{{ tpl .Values.nginx.startupProbe.config . | indent 10 }}
+        {{- end }}
+        {{- if .Values.nginx.readinessProbe.enabled }}
+        readinessProbe:
+{{ tpl .Values.nginx.readinessProbe.config . | indent 10 }}
+        {{- end }}
+        {{- if .Values.nginx.livenessProbe.enabled }}
+        livenessProbe:
+{{ tpl .Values.nginx.livenessProbe.config . | indent 10 }}
+        {{- end }}
+      {{- $mountPath := .Values.nginx.persistence.mountPath }}
+      {{- range .Values.nginx.loggers }}
+      - name: {{ . | replace "_" "-" | replace "." "-" }}
+        image: {{ include "artifactory.getImageInfoByValue" (list $ "initContainers") }}
+        imagePullPolicy: {{ $.Values.initContainers.image.pullPolicy }}
+        command:
+        - tail
+        args:
+        - '-F'
+        - '{{ $mountPath }}/logs/{{ . }}'
+        volumeMounts:
+        - name: nginx-volume
+          mountPath: {{ $mountPath }}
+        resources:
+{{ toYaml $.Values.nginx.loggersResources | indent 10 }}
+      {{- end }}
+        {{- if .Values.nginx.customSidecarContainers }}
+{{ tpl (include "artifactory.nginx.customSidecarContainers" .)  . | indent 6 }}
+        {{- end }}
+    {{- if or .Values.nginx.nodeSelector .Values.global.nodeSelector }}
+{{ tpl (include "nginx.nodeSelector" .) . | indent 6 }}
+    {{- end }}
+    {{- with .Values.nginx.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.nginx.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+      volumes:
+        {{- if .Values.nginx.customVolumes }}
+{{ tpl (include "artifactory.nginx.customVolumes" .)  . | indent 6 }}
+        {{- end }}
+      - name: nginx-conf
+        configMap:
+        {{- if .Values.nginx.customConfigMap }}
+          name: {{ .Values.nginx.customConfigMap }}
+        {{- else }}
+          name: {{ template "artifactory.fullname" . }}-nginx-conf
+        {{- end }}
+      - name: nginx-artifactory-conf
+        configMap:
+      {{- if .Values.nginx.customArtifactoryConfigMap }}
+          name: {{ .Values.nginx.customArtifactoryConfigMap }}
+      {{- else }}
+          name: {{ template "artifactory.fullname" . }}-nginx-artifactory-conf
+      {{- end }}
+      - name: nginx-volume
+      {{- if .Values.nginx.persistence.enabled }}
+        persistentVolumeClaim:
+          claimName: {{ .Values.nginx.persistence.existingClaim | default (include "artifactory.nginx.fullname" .) }}
+      {{- else }}
+        emptyDir: {}
+      {{- end }}
+      {{- if .Values.nginx.https.enabled }}
+      - name: ssl-certificates
+        secret:
+      {{- if .Values.nginx.tlsSecretName }}
+          secretName: {{ .Values.nginx.tlsSecretName }}
+      {{- else }}
+          secretName: {{ template "artifactory.fullname" . }}-nginx-certificate
+      {{- end }}
+      {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-pdb.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-pdb.yaml
new file mode 100644
index 000000000..dff0c23a3
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-pdb.yaml
@@ -0,0 +1,23 @@
+{{- if .Values.nginx.enabled -}}
+{{- if semverCompare "<v1.21.0-0" .Capabilities.KubeVersion.Version }}
+apiVersion: policy/v1beta1
+{{- else }}
+apiVersion: policy/v1
+{{- end }}
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "artifactory.nginx.fullname" . }}
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    component: {{ .Values.nginx.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+spec:
+  selector:
+    matchLabels:
+      component: {{ .Values.nginx.name }}
+      app: {{ template "artifactory.name" . }}
+      release: {{ .Release.Name }}
+  minAvailable: {{ .Values.nginx.minAvailable }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-pvc.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-pvc.yaml
new file mode 100644
index 000000000..3394a0ade
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-pvc.yaml
@@ -0,0 +1,26 @@
+{{- if and .Values.nginx.persistence.enabled (.Values.nginx.enabled ) }}
+{{- if (not .Values.nginx.persistence.existingClaim) }}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ template "artifactory.nginx.fullname" . }}
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  accessModes:
+    - {{ .Values.nginx.persistence.accessMode | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.nginx.persistence.size | quote }}
+{{- if .Values.nginx.persistence.storageClassName }}
+{{- if (eq "-" .Values.nginx.persistence.storageClassName) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.nginx.persistence.storageClassName }}"
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-scripts-conf.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-scripts-conf.yaml
new file mode 100644
index 000000000..a69952785
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-scripts-conf.yaml
@@ -0,0 +1,52 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "artifactory.fullname" . }}-nginx-scripts
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+data:
+  configreloader.sh: |
+    #!/bin/sh
+    ####
+    # A helper script to use inotifyd to reload nginx config
+    # upon configmap/ssl secrets changes.
+    #
+    # Synopsis: setup the nginx command via the values file
+    # as follows:
+    #
+    ####
+    # nginx:
+    #   customVolumes: |
+    #     - name: scripts
+    #       configMap:
+    #         name: {{ "{{" }} template "artifactory.fullname" . {{ "}}" }}-nginx-scripts
+    #         defaultMode: 0550
+    #   customVolumeMounts: |
+    #     - name: scripts
+    #       mountPath: /var/opt/jfrog/nginx/scripts/
+    #   customCommand:
+    #     - /bin/sh
+    #     - -c
+    #     - |
+    #       # watch for configmap changes
+    #       /sbin/inotifyd /var/opt/jfrog/nginx/scripts/configreloader.sh {{ "{{" }} .Values.nginx.persistence.mountPath {{ "-}}" }}/conf.d:n &
+    #       {{ "{{" }} if .Values.nginx.https.enabled {{ "-}}" }}
+    #       # watch for tls secret changes
+    #       /sbin/inotifyd /var/opt/jfrog/nginx/scripts/configreloader.sh {{ "{{" }} .Values.nginx.persistence.mountPath {{ "-}}" }}/ssl:n &
+    #       {{ "{{" }} end {{ "-}}" }}
+    #       nginx -g 'daemon off;'
+    if [[ "$3" =~ data_tmp ]] && [ "$1" = "n" ]
+    then
+      # a symlink has changed in one of the watched folders
+      # lets verify the config
+      nginx -t -q
+      if [ $? -eq 0 ]
+      then
+        # config is valid, lets reload nginx config
+        nginx -q -s reload
+      fi
+    fi
+
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-service.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-service.yaml
new file mode 100644
index 000000000..29fb9132d
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/templates/nginx-service.yaml
@@ -0,0 +1,88 @@
+{{- if .Values.nginx.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "artifactory.nginx.fullname" . }}
+  labels:
+    app: {{ template "artifactory.name" . }}
+    chart: {{ template "artifactory.chart" . }}
+    component: {{ .Values.nginx.name }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+{{- if .Values.nginx.service.annotations }}
+  annotations:
+{{ toYaml .Values.nginx.service.annotations | indent 4 }}
+{{- end }}
+spec:
+  {{- if .Values.nginx.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.nginx.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if not (empty .Values.nginx.service.ipFamilies)}}
+  ipFamilies: {{- toYaml .Values.nginx.service.ipFamilies | nindent 4 }}
+  {{- end }}
+  type: {{ .Values.nginx.service.type }}
+{{- if eq .Values.nginx.service.type "LoadBalancer" }}
+  {{ if .Values.nginx.service.loadBalancerIP -}}
+  loadBalancerIP: {{ .Values.nginx.service.loadBalancerIP }}
+  {{ end -}}
+  {{- if .Values.nginx.service.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.nginx.service.externalTrafficPolicy }}
+  {{- end }}
+{{- end }}
+{{- if .Values.nginx.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+{{ toYaml .Values.nginx.service.loadBalancerSourceRanges | indent 4 }}
+{{- end }}
+  ports:
+{{- if .Values.nginx.service.customPorts }}
+{{ toYaml .Values.nginx.service.customPorts | indent 2 }}
+{{ end }}
+  # DEPRECATION NOTE: The following is to maintain support for values pre 1.3.0 and
+  # will be cleaned up in a later version
+  {{- if .Values.nginx.http }}
+  {{- if .Values.nginx.http.enabled }}
+  - port: {{ .Values.nginx.http.externalPort }}
+    targetPort: {{ .Values.nginx.http.internalPort }}
+    {{- if .Values.nginx.service.nodePort }}
+    nodePort: {{ .Values.nginx.service.nodePort }}
+    {{- end }}
+    protocol: TCP
+    name: http
+  {{- end }}
+  {{- else }} # DEPRECATED
+  - port: {{ .Values.nginx.externalPortHttp }}
+    targetPort: {{ .Values.nginx.internalPortHttp }}
+    protocol: TCP
+    name: http
+  {{- end }}
+  {{- if .Values.nginx.https }}
+  {{- if or .Values.nginx.https.enabled .Values.nginx.service.ssloffload }}
+  - port: {{ .Values.nginx.https.externalPort }}
+    {{- if and .Values.nginx.service.ssloffload (not .Values.nginx.service.ssloffloadForceHttps) }}
+    targetPort: {{ .Values.nginx.http.internalPort }}
+    {{- else }}
+    targetPort: {{ .Values.nginx.https.internalPort}}
+    {{- end }}
+    {{- if .Values.nginx.service.nodePort }}
+    nodePort: {{ .Values.nginx.service.nodePort }}
+    {{- end }}
+    protocol: TCP
+    name: https
+  {{- end }}
+  {{- else }} # DEPRECATED
+  - port: {{ .Values.nginx.externalPortHttps }}
+    targetPort: {{ .Values.nginx.internalPortHttps }}
+    protocol: TCP
+    name: https
+  {{- end }}
+  {{- if .Values.artifactory.ssh.enabled }}
+  - port: {{ .Values.nginx.ssh.externalPort }}
+    targetPort: {{ .Values.nginx.ssh.internalPort }}
+    protocol: TCP
+    name: tcp-ssh
+  {{- end }}
+  selector:
+    app: {{ template "artifactory.name" . }}
+    component: {{ .Values.nginx.name }}
+    release: {{ .Release.Name }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/values.yaml
new file mode 100644
index 000000000..7f63ed057
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/charts/artifactory/values.yaml
@@ -0,0 +1,1817 @@
+## Default values for artifactory.
+## This is a YAML-formatted file.
+
+## Beware when changing values here. You should know what you are doing!
+## Access the values with {{ .Values.key.subkey }}
+
+global:
+  # imageRegistry: releases-docker.jfrog.io
+  # imagePullSecrets:
+  #   - myRegistryKeySecretName
+  ## Chart.AppVersion can be overidden using global.versions.artifactory or .Values.artifactory.image.tag
+  ## Note: Order of preference is 1) global.versions 2) .Values.artifactory.image.tag 3) Chart.AppVersion
+  ## This applies also for nginx images (.Values.nginx.image.tag)
+  versions: {}
+  # artifactory:
+  # initContainers:
+  # joinKey:
+  # masterKey:
+  # joinKeySecretName:
+  # masterKeySecretName:
+
+  ## Note: tags customInitContainersBegin,customInitContainers,customVolumes,customVolumeMounts,customSidecarContainers can be used both from global and application level simultaneously
+  # customInitContainersBegin: |
+
+  # customInitContainers: |
+
+  # customVolumes: |
+
+  # customVolumeMounts: |
+
+  # customSidecarContainers: |
+
+  ## certificates added to this secret will be copied to $JFROG_HOME/artifactory/var/etc/security/keys/trusted directory
+  customCertificates:
+    enabled: false
+    # certificateSecretName:
+  ## Applies to artifactory and nginx pods
+  nodeSelector: {}
+## String to partially override artifactory.fullname template (will maintain the release name)
+# nameOverride:
+
+## String to fully override artifactory.fullname template
+# fullnameOverride:
+
+## Init containers
+initContainers:
+  image:
+    registry: releases-docker.jfrog.io
+    repository: ubi9/ubi-minimal
+    tag: 9.5.1731604394
+    pullPolicy: IfNotPresent
+  resources:
+    requests:
+      memory: "50Mi"
+      cpu: "10m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+installer:
+  type:
+  platform:
+## The installerInfo is intentionally commented out and the previous content has been moved under `files/installer-info.json`
+## To override the content in `files/installer-info.json`, Uncomment the `installerInfo` and  add relevant data
+# installerInfo: '{}'
+
+## For supporting pulling from private registries
+# imagePullSecrets:
+#   - myRegistryKeySecretName
+
+## Artifactory systemYaml override
+## This is for advanced usecases where users wants to provide their own systemYaml for configuring artifactory
+## Refer: https://www.jfrog.com/confluence/display/JFROG/Artifactory+System+YAML
+## Note: This will override existing (default) .Values.artifactory.systemYaml in values.yaml
+## Alternatively, systemYaml can be overidden via customInitContainers using external sources like vaults, external repositories etc. Please refer customInitContainer section below for an example.
+## Note: Order of preference is 1) customInitContainers 2) systemYamlOverride existingSecret 3) default systemYaml in values.yaml
+systemYamlOverride:
+  ## You can use a pre-existing secret by specifying existingSecret
+  existingSecret:
+  ## The dataKey should be the name of the secret data key created.
+  dataKey:
+## Role Based Access Control
+## Ref: https://kubernetes.io/docs/admin/authorization/rbac/
+rbac:
+  create: false
+  role:
+    ## Rules to create. It follows the role specification
+    rules:
+      - apiGroups:
+          - ''
+        resources:
+          - services
+          - endpoints
+          - pods
+        verbs:
+          - get
+          - watch
+          - list
+## Service Account
+## Ref: https://kubernetes.io/docs/admin/service-accounts-admin/
+serviceAccount:
+  create: false
+  ## The name of the ServiceAccount to use.
+  ## If not set and create is true, a name is generated using the fullname template
+  name:
+  ## Service Account annotations
+  annotations: {}
+  ## Explicitly mounts the API credentials for the Service Account
+  automountServiceAccountToken: false
+ingress:
+  enabled: false
+  defaultBackend:
+    enabled: true
+  ## Used to create an Ingress record.
+  hosts: []
+  routerPath: /
+  artifactoryPath: /artifactory/
+  rtfsPath: /artifactory/service/rtfs/
+  className: ""
+  annotations: {}
+  # nginx.ingress.kubernetes.io/configuration-snippet: |
+  #   proxy_pass_header   Server;
+  #   proxy_set_header    X-JFrog-Override-Base-Url https://<artifactory-domain>;
+  # kubernetes.io/tls-acme: "true"
+  # nginx.ingress.kubernetes.io/proxy-body-size: "0"
+  labels: {}
+  # traffic-type: external
+  # traffic-type: internal
+  tls: []
+  ## Secrets must be manually created in the namespace.
+  # - secretName: chart-example-tls
+  #   hosts:
+  #     - artifactory.domain.example
+
+  ## Additional ingress rules
+  additionalRules: []
+  ## This is an experimental feature, enabling this feature will route all traffic through the Router.
+  disableRouterBypass: false
+## Allows to add custom ingress
+customIngress: ""
+## There is a need to separate HTTP1.1 traffic from gRPC (HTTP2) to benefit
+## 1. Use the Nginx keepalive for HTTP1.1
+## 2. Keep gRPC over the HTTP2 connections only
+ingressGrpc:
+  enabled: false
+  name: grpc
+  defaultBackend:
+    enabled: true
+  ## Used to create an Ingress record.
+  hosts: []
+  grpcPath: /com.jfrog
+  className: ""
+  ## For supporting GRPC protocol traffic sent to the backend it is necessary to change the backend protocol
+  ## Example: nginx.ingress.kubernetes.io/backend-protocol: GRPCS
+  annotations: {}
+  # nginx.ingress.kubernetes.io/configuration-snippet: |
+  #   proxy_pass_header   Server;
+  #   proxy_set_header    X-JFrog-Override-Base-Url https://<artifactory-domain>;
+  # kubernetes.io/tls-acme: "true"
+  # nginx.ingress.kubernetes.io/proxy-body-size: "0"
+  labels: {}
+  # traffic-type: external
+  # traffic-type: internal
+  tls: []
+  ## Secrets must be manually created in the namespace.
+  # - secretName: chart-example-tls
+  #   hosts:
+  #     - artifactory.domain.example
+
+  ## Additional ingress rules
+  additionalRules: []
+networkpolicy: []
+## Allows all ingress and egress
+# - name: artifactory
+#   podSelector:
+#     matchLabels:
+#       app: artifactory
+#   egress:
+#   - {}
+#   ingress:
+#   - {}
+## Uncomment to allow only artifactory pods to communicate with postgresql (if postgresql.enabled is true)
+# - name: postgresql
+#   podSelector:
+#     matchLabels:
+#       app: postgresql
+#   ingress:
+#   - from:
+#     - podSelector:
+#         matchLabels:
+#           app: artifactory
+
+## Apply horizontal pod auto scaling on artifactory pods
+## Ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 3
+  targetCPUUtilizationPercentage: 70
+## You can use a pre-existing secret with keys license_token and iam_role by specifying licenseConfigSecretName
+## Example : Create a generic secret using `kubectl create secret generic <secret-name> --from-literal=license_token=${TOKEN} --from-literal=iam_role=${ROLE_ARN}`
+aws:
+  license:
+    enabled: false
+  licenseConfigSecretName:
+  region: us-east-1
+## Container Security Context
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
+## @param containerSecurityContext.enabled Enabled containers' Security Context
+## @param containerSecurityContext.runAsNonRoot Set container's Security Context runAsNonRoot
+## @param containerSecurityContext.privileged Set container's Security Context privileged
+## @param containerSecurityContext.allowPrivilegeEscalation Set container's Security Context allowPrivilegeEscalation
+## @param containerSecurityContext.capabilities.drop List of capabilities to be dropped
+## @param containerSecurityContext.seccompProfile.type Set container's Security Context seccomp profile
+##
+containerSecurityContext:
+  enabled: true
+  runAsNonRoot: true
+  privileged: false
+  allowPrivilegeEscalation: false
+  seccompProfile:
+    type: RuntimeDefault
+  capabilities:
+    drop:
+      - ALL
+## The following router settings are to configure only when splitServicesToContainers set to true
+router:
+  name: router
+  image:
+    registry: releases-docker.jfrog.io
+    repository: jfrog/router
+    tag: 7.135.2
+    pullPolicy: IfNotPresent
+  serviceRegistry:
+    ## Service registry (Access) TLS verification skipped if enabled
+    insecure: false
+  internalPort: 8082
+  externalPort: 8082
+  tlsEnabled: false
+  ## Extra environment variables that can be used to tune router to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  resources: {}
+  #  requests:
+  #    memory: "100Mi"
+  #    cpu: "100m"
+  #  limits:
+  #    memory: "1Gi"
+  #    cpu: "1"
+
+  ## Add lifecycle hooks for router container
+  lifecycle:
+    ## From Artifactory versions 7.52.x, Wait for Artifactory to complete any open uploads or downloads before terminating
+    preStop:
+      exec:
+        command: ["sh", "-c", "while [[ $(curl --fail --silent --connect-timeout 2 http://localhost:8081/artifactory/api/v1/system/liveness) =~ OK ]]; do echo Artifactory is still alive; sleep 2; done"]
+        # postStart:
+        #   exec:
+        #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  ## Add custom volumesMounts
+  customVolumeMounts: |
+    # - name: custom-script
+    #   mountPath: /scripts/script.sh
+    #   subPath: script.sh
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "artifactory.scheme" . }}://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}90{{ else }}0{{ end }}
+      periodSeconds: 10
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      failureThreshold: 5
+      successThreshold: 1
+  readinessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "artifactory.scheme" . }}://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/readiness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}60{{ else }}0{{ end }}
+      periodSeconds: 10
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      failureThreshold: 5
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "artifactory.scheme" . }}://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/readiness
+      initialDelaySeconds: 10
+      failureThreshold: 30
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+  persistence:
+    mountPath: "/var/opt/jfrog/router"
+## Artifactory
+artifactory:
+  name: artifactory
+  ## refer - https://www.jfrog.com/confluence/display/JFROG/Access+Federation#AccessFederation-EstablishingtheCircleofTrust
+  ## root certificates added will be copied to $JFROG_HOME/artifactory/var/etc/access/keys/trusted folder.
+  circleOfTrustCertificatesSecret:
+  ## unifiedSecretInstallation flag enables single unified secret holding all the artifactory internal(chart) secrets, It won't be affecting external secrets.
+  ## Note: unifiedSecretInstallation flag is enabled by true by default from chart version 107.79.x, Users can switch to false to continue with the old way of secret creation.
+  unifiedSecretInstallation: true
+  ## unifiedSecretPrependReleaseName Set this flag to false if unifiedSecret should not be created with <release-name> prepended.
+  unifiedSecretPrependReleaseName: true
+  ## For HA installation, set this value > 1. This is only supported in Artifactory 7.25.x (appVersions) and above.
+  replicaCount: 1
+  # minAvailable: 1
+
+  ## Note that by default we use appVersion to get image tag/version
+  image:
+    registry: releases-docker.jfrog.io
+    repository: jfrog/artifactory-pro
+    # tag:
+    pullPolicy: IfNotPresent
+  labels: {}
+  updateStrategy:
+    type: RollingUpdate
+  ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+  schedulerName:
+  ## Create a priority class for the Artifactory pod or use an existing one
+  ## NOTE - Maximum allowed value of a user defined priority is 1000000000
+  priorityClass:
+    create: false
+    value: 1000000000
+    ## Override default name
+    # name:
+    ## Use an existing priority class
+    # existingPriorityClass:
+  ## Spread Artifactory pods evenly across your nodes or some other topology
+  topologySpreadConstraints: []
+  # - maxSkew: 1
+  #   topologyKey: kubernetes.io/hostname
+  #   whenUnsatisfiable: DoNotSchedule
+  #   labelSelector:
+  #     matchLabels:
+  #       app: '{{ template "artifactory.name" . }}'
+  #       role: '{{ template "artifactory.name" . }}'
+  #       release: "{{ .Release.Name }}"
+
+  ## Delete the db.properties file in ARTIFACTORY_HOME/etc/db.properties
+  deleteDBPropertiesOnStartup: true
+  ## certificates added to this secret will be copied to $JFROG_HOME/artifactory/var/etc/security/keys/trusted directory
+  customCertificates:
+    enabled: false
+    # certificateSecretName:
+  database:
+    maxOpenConnections: 80
+  tomcat:
+    maintenanceConnector:
+      port: 8091
+    connector:
+      maxThreads: 200
+      sendReasonPhrase: false
+      extraConfig: 'acceptCount="400"'
+  ## Support for metrics is only available for Artifactory 7.7.x (appVersions) and above.
+  ## To enable set `.Values.artifactory.metrics.enabled` to `true`
+  ## Note : Depricated openMetrics as part of 7.87.x and renamed to `metrics`
+  ## Refer - https://www.jfrog.com/confluence/display/JFROG/Open+Metrics
+  metrics:
+    enabled: false
+    ## Settings for pushing metrics to Insight - enable filebeat to true
+    filebeat:
+      enabled: false
+      log:
+        enabled: false
+        ## Log level for filebeat. Possible values: debug, info, warning, or error.
+        level: "info"
+      ## Elasticsearch details for filebeat to connect
+      elasticsearch:
+        url: "Elasticsearch url where JFrog Insight is installed For example, http://<ip_address>:8082"
+        username: ""
+        password: ""
+  ## Support for Cold Artifact Storage
+  ## set 'coldStorage.enabled' to 'true' only for Artifactory instance that you are designating as the Cold instance
+  ## Refer - https://jfrog.com/help/r/jfrog-platform-administration-documentation/setting-up-cold-artifact-storage
+  coldStorage:
+    enabled: false
+  ## Support for workers
+  ## set 'worker.enabled' to 'true' to enable artifactory addon that executes workers on artifactory events
+  worker:
+    enabled: false
+  ## This directory is intended for use with NFS eventual configuration for HA
+  haDataDir:
+    enabled: false
+    path:
+  haBackupDir:
+    enabled: false
+    path:
+  ## Files to copy to ARTIFACTORY_HOME/ on each Artifactory startup
+  ## Note : From 107.46.x chart versions, copyOnEveryStartup is not needed for binarystore.xml, it is always copied via initContainers
+  copyOnEveryStartup:
+  ## Absolute path
+  # - source: /artifactory_bootstrap/artifactory.lic
+  ## Relative to ARTIFACTORY_HOME/
+  #   target: etc/artifactory/
+
+  ## Sidecar containers for tailing Artifactory logs
+  loggers: []
+  # - access-audit.log
+  # - access-request.log
+  # - access-security-audit.log
+  # - access-service.log
+  # - artifactory-access.log
+  # - artifactory-event.log
+  # - artifactory-import-export.log
+  # - artifactory-request.log
+  # - artifactory-service.log
+  # - frontend-request.log
+  # - frontend-service.log
+  # - metadata-request.log
+  # - metadata-service.log
+  # - router-request.log
+  # - router-service.log
+  # - router-traefik.log
+  # - derby.log
+
+  ## Loggers containers resources
+  loggersResources: {}
+  # requests:
+  #   memory: "10Mi"
+  #   cpu: "10m"
+  # limits:
+  #   memory: "100Mi"
+  #   cpu: "50m"
+
+  ## Sidecar containers for tailing Tomcat (catalina) logs
+  catalinaLoggers: []
+  # - tomcat-catalina.log
+  # - tomcat-localhost.log
+
+  ## Tomcat (catalina) loggers resources
+  catalinaLoggersResources: {}
+  # requests:
+  #   memory: "10Mi"
+  #   cpu: "10m"
+  # limits:
+  #   memory: "100Mi"
+  #   cpu: "50m"
+
+  ## Migration support from 6.x to 7.x
+  migration:
+    enabled: false
+    timeoutSeconds: 3600
+    ## Extra pre-start command in migration Init Container to install JDBC driver for MySql/MariaDb/Oracle
+    # preStartCommand: "mkdir -p /opt/jfrog/artifactory/var/bootstrap/artifactory/tomcat/lib; cd /opt/jfrog/artifactory/var/bootstrap/artifactory/tomcat/lib && curl -o /opt/jfrog/artifactory/var/bootstrap/artifactory/tomcat/lib/mysql-connector-java-5.1.41.jar https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.41/mysql-connector-java-5.1.41.jar"
+  ## Add custom init containers execution before predefined init containers
+  customInitContainersBegin: |
+    # - name: "custom-setup"
+    #   image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+    #   imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+    #   securityContext:
+    #     runAsNonRoot: true
+    #     allowPrivilegeEscalation: false
+    #     capabilities:
+    #       drop:
+    #         - NET_RAW
+    #   command:
+    #     - 'sh'
+    #     - '-c'
+    #     - 'touch {{ .Values.artifactory.persistence.mountPath }}/example-custom-setup'
+    #   volumeMounts:
+    #     - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+    #       name: artifactory-volume
+  ## Add custom init containers execution after predefined init containers
+  customInitContainers: |
+    # - name: "custom-systemyaml-setup"
+    #   image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+    #   imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+    #   securityContext:
+    #     runAsNonRoot: true
+    #     allowPrivilegeEscalation: false
+    #     capabilities:
+    #       drop:
+    #         - NET_RAW
+    #   command:
+    #     - 'sh'
+    #     - '-c'
+    #     - 'curl -o {{ .Values.artifactory.persistence.mountPath }}/etc/system.yaml https://<repo-url>/systemyaml'
+    #   volumeMounts:
+    #     - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+    #       name: artifactory-volume
+  ## Add custom sidecar containers
+  ## - The provided example uses a custom volume (customVolumes)
+  customSidecarContainers: |
+    # - name: "sidecar-list-etc"
+    #   image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+    #   imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
+    #   securityContext:
+    #     runAsNonRoot: true
+    #     allowPrivilegeEscalation: false
+    #     capabilities:
+    #       drop:
+    #         - NET_RAW
+    #   command:
+    #     - 'sh'
+    #     - '-c'
+    #     - 'sh /scripts/script.sh'
+    #   volumeMounts:
+    #     - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
+    #       name: artifactory-volume
+    #     - mountPath: "/scripts/script.sh"
+    #       name: custom-script
+    #       subPath: script.sh
+    #   resources:
+    #     requests:
+    #       memory: "32Mi"
+    #       cpu: "50m"
+    #     limits:
+    #       memory: "128Mi"
+    #       cpu: "100m"
+  ## Add custom volumes
+  ## If .Values.artifactory.unifiedSecretInstallation is true then secret name should be '{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret'
+  customVolumes: |
+    # - name: custom-script
+    #   configMap:
+    #     name: custom-script
+  ## Add custom volumesMounts
+  customVolumeMounts: |
+    # - name: custom-script
+    #   mountPath: "/scripts/script.sh"
+    #   subPath: script.sh
+    # - name: posthook-start
+    #   mountPath: "/scripts/posthoook-start.sh"
+    #   subPath: posthoook-start.sh
+    # - name: prehook-start
+    #   mountPath: "/scripts/prehook-start.sh"
+    #   subPath: prehook-start.sh
+  ## Add custom persistent volume mounts - Available to the entire namespace
+  customPersistentVolumeClaim: {}
+  # name:
+  # mountPath:
+  # accessModes:
+  #   - "-"
+  # size:
+  # storageClassName:
+
+  ## Artifactory license.
+  license:
+    ## licenseKey is the license key in plain text. Use either this or the license.secret setting
+    licenseKey:
+    ## If artifactory.license.secret is passed, it will be mounted as
+    ## ARTIFACTORY_HOME/etc/artifactory.lic and loaded at run time.
+    secret:
+    ## The dataKey should be the name of the secret data key created.
+    dataKey:
+  ## Create configMap with artifactory.config.import.xml and security.import.xml and pass name of configMap in following parameter
+  configMapName:
+  ## Add any list of configmaps to Artifactory
+  configMaps: |
+    # posthook-start.sh: |-
+    #   echo "This is a post start script"
+    # posthook-end.sh: |-
+    #   echo "This is a post end script"
+  ## List of secrets for Artifactory user plugins.
+  ## One Secret per plugin's files.
+  userPluginSecrets:
+  # - archive-old-artifacts
+  # - build-cleanup
+  # - webhook
+  # - '{{ template "my-chart.fullname" . }}'
+
+  ## Artifactory requires a unique master key.
+  ## You can generate one with the command: "openssl rand -hex 32"
+  ## An initial one is auto generated by Artifactory on first startup.
+  # masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  ## Alternatively, you can use a pre-existing secret with a key called master-key by specifying masterKeySecretName
+  # masterKeySecretName:
+
+  ## Join Key to connect other services to Artifactory
+  ## IMPORTANT: Setting this value overrides the existing joinKey
+  ## IMPORTANT: You should NOT use the example joinKey for a production deployment!
+  # joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+  ## Alternatively, you can use a pre-existing secret with a key called join-key by specifying joinKeySecretName
+  # joinKeySecretName:
+
+  ## Registration Token for JFConnect
+  # jfConnectToken:
+  ## Alternatively, you can use a pre-existing secret with a key called jfconnect-token by specifying jfConnectTokenSecretName
+  # jfConnectTokenSecretName:
+
+  ## Add custom secrets - secret per file
+  ## If .Values.artifactory.unifiedSecretInstallation is true then secret name should be '{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret' common to all secrets
+  customSecrets:
+  #  - name: custom-secret
+  #    key: custom-secret.yaml
+  #    data: >
+  #      custom_secret_config:
+  #        parameter1: value1
+  #        parameter2: value2
+  #  - name: custom-secret2
+  #    key: custom-secret2.config
+  #    data: |
+  #      here the custom secret 2 config
+
+  ## If false, all service console logs will not redirect to a common console.log
+  consoleLog: false
+  ## admin allows to set the password for the default admin user.
+  ## See: https://www.jfrog.com/confluence/display/JFROG/Users+and+Groups#UsersandGroups-RecreatingtheDefaultAdminUserrecreate
+  admin:
+    ip: "127.0.0.1"
+    username: "admin"
+    password:
+    secret:
+    dataKey:
+  ## Extra pre-start command to install JDBC driver for MySql/MariaDb/Oracle
+  # preStartCommand: "mkdir -p /opt/jfrog/artifactory/var/bootstrap/artifactory/tomcat/lib; cd /opt/jfrog/artifactory/var/bootstrap/artifactory/tomcat/lib && curl -o /opt/jfrog/artifactory/var/bootstrap/artifactory/tomcat/lib/mysql-connector-java-5.1.41.jar https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.41/mysql-connector-java-5.1.41.jar"
+
+  ## Add lifecycle hooks for artifactory container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## Extra environment variables that can be used to tune Artifactory to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: SERVER_XML_ARTIFACTORY_PORT
+  #   value: "8081"
+  # - name: SERVER_XML_ARTIFACTORY_MAX_THREADS
+  #   value: "200"
+  # - name: SERVER_XML_ACCESS_MAX_THREADS
+  #   value: "50"
+  # - name: SERVER_XML_ARTIFACTORY_EXTRA_CONFIG
+  #   value: ""
+  # - name: SERVER_XML_ACCESS_EXTRA_CONFIG
+  #   value: ""
+  # - name: SERVER_XML_EXTRA_CONNECTOR
+  #   value: ""
+  # - name: DB_POOL_MAX_ACTIVE
+  #   value: "100"
+  # - name: DB_POOL_MAX_IDLE
+  #   value: "10"
+  # - name: MY_SECRET_ENV_VAR
+  #   valueFrom:
+  #     secretKeyRef:
+  #       name: my-secret-name
+  #       key: my-secret-key
+
+  ## System YAML entries now reside under files/system.yaml.
+  ## You can provide the specific values that you want to add or override under 'artifactory.extraSystemYaml'.
+  ## For example:
+  ## extraSystemYaml:
+  ##   shared:
+  ##     node:
+  ##       id: my-instance
+  ## The entries provided under 'artifactory.extraSystemYaml' are merged with files/system.yaml to create the final system.yaml.
+  ## If you have already provided system.yaml under, 'artifactory.systemYaml', the values in that entry take precedence over files/system.yaml
+  ## You can modify specific entries with your own value under `artifactory.extraSystemYaml`, The values under extraSystemYaml overrides the values under 'artifactory.systemYaml' and files/system.yaml
+  extraSystemYaml: {}
+  ## systemYaml is intentionally commented and the previous content has been moved under files/system.yaml.
+  ## You have to add the all entries of the system.yaml file here, and it overrides the values in files/system.yaml.
+  # systemYaml:
+  annotations: {}
+  service:
+    name: artifactory
+    type: ClusterIP
+    ## @param service.ipFamilyPolicy Controller Service ipFamilyPolicy (optional, cloud specific)
+    ## This can be either SingleStack, PreferDualStack or RequireDualStack
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services
+    ##
+    ipFamilyPolicy: ""
+    ## @param service.ipFamilies Controller Service ipFamilies (optional, cloud specific)
+    ## This can be either ["IPv4"], ["IPv6"], ["IPv4", "IPv6"] or ["IPv6", "IPv4"]
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services
+    ##
+    ipFamilies: []
+    ## For supporting whitelist on the Artifactory service (useful if setting service.type=LoadBalancer)
+    ## Set this to a list of IP CIDR ranges
+    ## Example: loadBalancerSourceRanges: ['10.10.10.5/32', '10.11.10.5/32']
+    ## or pass from helm command line
+    ## Example: helm install ... --set nginx.service.loadBalancerSourceRanges='{10.10.10.5/32,10.11.10.5/32}'
+    loadBalancerSourceRanges: []
+    annotations: {}
+    ## If the type is NodePort you can set a fixed port
+    # nodePort: 32082
+  serviceGrpc:
+    name: grpc
+    type: ClusterIP
+    ## @param service.ipFamilyPolicy Controller Service ipFamilyPolicy (optional, cloud specific)
+    ## This can be either SingleStack, PreferDualStack or RequireDualStack
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services
+    ##
+    ipFamilyPolicy: ""
+    ## @param service.ipFamilies Controller Service ipFamilies (optional, cloud specific)
+    ## This can be either ["IPv4"], ["IPv6"], ["IPv4", "IPv6"] or ["IPv6", "IPv4"]
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services
+    ##
+    ipFamilies: []
+    ## For supporting whitelist on the Artifactory service (useful if setting service.type=LoadBalancer)
+    ## Set this to a list of IP CIDR ranges
+    ## Example: loadBalancerSourceRanges: ['10.10.10.5/32', '10.11.10.5/32']
+    ## or pass from helm command line
+    ## Example: helm install ... --set nginx.service.loadBalancerSourceRanges='{10.10.10.5/32,10.11.10.5/32}'
+    loadBalancerSourceRanges: []
+    annotations: {}
+    ## If the type is NodePort you can set a fixed port
+    # nodePort: 32082
+  statefulset:
+    annotations: {}
+  ## IMPORTANT: If overriding artifactory.internalPort:
+  ## DO NOT use port lower than 1024 as Artifactory runs as non-root and cannot bind to ports lower than 1024!
+  externalPort: 8082
+  internalPort: 8082
+  externalArtifactoryPort: 8081
+  internalArtifactoryPort: 8081
+  terminationGracePeriodSeconds: 30
+  ## Pod Security Context
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+  ## @param artifactory.podSecurityContext.enabled Enable security context
+  ## @param artifactory.podSecurityContext.runAsNonRoot Set pod's Security Context runAsNonRoot
+  ## @param artifactory.podSecurityContext.runAsUser User ID for the pod
+  ## @param artifactory.podSecurityContext.runASGroup Group ID for the pod
+  ## @param artifactory.podSecurityContext.fsGroup Group ID for the pod
+  ##
+  podSecurityContext:
+    enabled: true
+    runAsNonRoot: true
+    runAsUser: 1030
+    runAsGroup: 1030
+    fsGroup: 1030
+    # fsGroupChangePolicy: "Always"
+    # seLinuxOptions: {}
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.artifactory.tomcat.maintenanceConnector.port }}/artifactory/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      periodSeconds: 10
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      failureThreshold: 5
+      successThreshold: 1
+  readinessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.artifactory.tomcat.maintenanceConnector.port }}/artifactory/api/v1/system/readiness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}90{{ else }}0{{ end }}
+      periodSeconds: 10
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      failureThreshold: 5
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.artifactory.tomcat.maintenanceConnector.port }}/artifactory/api/v1/system/readiness
+      initialDelaySeconds: 10
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+  persistence:
+    mountPath: "/var/opt/jfrog/artifactory"
+    enabled: true
+    ## A manually managed Persistent Volume and Claim
+    ## Requires persistence.enabled: true
+    ## If defined, PVC must be created manually before volume will be bound
+    # existingClaim:
+
+    accessMode: ReadWriteOnce
+    ## Storage default size. Should be increased for production deployments.
+    size: 20Gi
+    ## Use a custom Secret to be mounted as your binarystore.xml
+    ## NOTE: This will ignore all settings below that make up binarystore.xml
+    customBinarystoreXmlSecret:
+    ## Redundancy required For HA deployments, with "cluster" persistence storage type
+    redundancy: 3
+    lenientLimit: 1
+    ## cache-fs binary provider configurations
+    ## Refer: https://jfrog.com/help/r/jfrog-installation-setup-documentation/cache-fs-template-configuration
+    maxCacheSize: 5000000000
+    cacheProviderDir: cache
+    ## maxFileSizeLimit:
+    ## skipDuringUpload:
+
+    ## Set the persistence storage type. This will apply the matching binarystore.xml to Artifactory config
+    ## Supported types are:
+    ## file-system (default)
+    ## cluster-file-system
+    ## nfs
+    ## google-storage
+    ## google-storage-v2
+    ## google-storage-v2-direct (Recommended for GCS - Google Cloud Storage)
+    ## cluster-google-storage-v2
+    ## aws-s3-v3
+    ## s3-storage-v3-direct (Recommended for AWS S3)
+    ## cluster-s3-storage-v3
+    ## s3-storage-v3-archive
+    ## azure-blob
+    ## azure-blob-storage-direct
+    ## azure-blob-storage-v2-direct (Recommended for Azure Blob Storage)
+    ## cluster-azure-blob-storage
+    type: file-system
+    ## Use binarystoreXml to provide a custom binarystore.xml
+    ## This is intentionally commented and below previous content of binarystoreXml is moved under files/binarystore.xml
+    ## binarystoreXml:
+
+    ## For artifactory.persistence.type nfs
+    ## If using NFS as the shared storage, you must have a running NFS server that is accessible by your Kubernetes
+    ## cluster nodes.
+    ## Need to have the following set
+    nfs:
+      ## Must pass actual IP of NFS server with '--set For artifactory.persistence.nfs.ip=${NFS_IP}'
+      ip:
+      haDataMount: "/data"
+      haBackupMount: "/backup"
+      dataDir: "/var/opt/jfrog/artifactory"
+      backupDir: "/var/opt/jfrog/artifactory-backup"
+      capacity: 200Gi
+    ## For artifactory.persistence.type file-system
+    fileSystem:
+      cache:
+        enabled: false
+    ## For artifactory.persistence.type google-storage, google-storage-v2, google-storage-v2-direct, cluster-google-storage-v2
+    googleStorage:
+      ## When using GCP buckets as your binary store
+      gcpServiceAccount:
+        enabled: false
+        ## Use either an existing secret prepared in advance or put the config (replace the content) in the values
+        ## ref: https://github.com/jfrog/charts/blob/master/stable/artifactory-ha/README.md#google-storage
+        # customSecretName:
+        # config: |
+        #   {
+        #      "type": "service_account",
+        #      "project_id": "<project_id>",
+        #      "private_key_id": "?????",
+        #      "private_key": "-----BEGIN PRIVATE KEY-----\n????????==\n-----END PRIVATE KEY-----\n",
+        #      "client_email": "???@j<project_id>.iam.gserviceaccount.com",
+        #      "client_id": "???????",
+        #      "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+        #      "token_uri": "https://oauth2.googleapis.com/token",
+        #      "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+        #      "client_x509_cert_url": "https://www.googleapis.com/robot/v1....."
+        #   }
+      endpoint: commondatastorage.googleapis.com
+      httpsOnly: false
+      ## Set a unique bucket name
+      bucketName: "artifactory-gcp"
+      ## GCP Bucket Authentication with Identity and Credential is deprecated.
+      ## identity:
+      ## credential:
+      path: "artifactory/filestore"
+      bucketExists: false
+      useInstanceCredentials: false
+      enableSignedUrlRedirect: false
+      # signedUrlExpirySeconds: 30
+    ## For artifactory.persistence.type aws-s3-v3, s3-storage-v3-direct, cluster-s3-storage-v3, s3-storage-v3-archive
+    awsS3V3:
+      testConnection: false
+      identity:
+      credential:
+      region:
+      bucketName: artifactory-aws
+      path: artifactory/filestore
+      endpoint:
+      port:
+      useHttp:
+      maxConnections: 50
+      connectionTimeout:
+      socketTimeout:
+      kmsServerSideEncryptionKeyId:
+      kmsKeyRegion:
+      kmsCryptoMode:
+      useInstanceCredentials: true
+      usePresigning: false
+      signatureExpirySeconds: 300
+      signedUrlExpirySeconds: 30
+      cloudFrontDomainName:
+      cloudFrontKeyPairId:
+      cloudFrontPrivateKey:
+      enableSignedUrlRedirect: false
+      enablePathStyleAccess: false
+      multiPartLimit:
+      multipartElementSize:
+    ## For artifactory.persistence.type azure-blob, azure-blob-storage-direct, cluster-azure-blob-storage, azure-blob-storage-v2-direct
+    azureBlob:
+      accountName:
+      accountKey:
+      endpoint:
+      containerName:
+      multiPartLimit: 100000000
+      multipartElementSize: 50000000
+      testConnection: false
+    ## artifactory data Persistent Volume Storage Class
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    ##
+    # storageClassName: "-"
+    ## Annotations for the Persistent Volume Claim
+    annotations: {}
+  ## Uncomment the following resources definitions or pass them from command line
+  ## to control the cpu and memory resources allocated by the Kubernetes cluster
+  resources: {}
+  # requests:
+  #   memory: "1Gi"
+  #   cpu: "500m"
+  # limits:
+  #   memory: "2Gi"
+  #   cpu: "1"
+  ## The following Java options are passed to the java process running Artifactory.
+  ## You should set them according to the resources set above
+  javaOpts:
+    # xms: "1g"
+    # xmx: "2g"
+    jmx:
+      enabled: false
+      port: 9010
+      host:
+      ssl: false
+      ## When authenticate is true, accessFile and passwordFile are required
+      authenticate: false
+      accessFile:
+      passwordFile:
+      # corePoolSize: 24
+      # other: ""
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+  ## Only used if "affinity" is empty
+  podAntiAffinity:
+    ## Valid values are "soft" or "hard"; any other value indicates no anti-affinity
+    type: "soft"
+    topologyKey: "kubernetes.io/hostname"
+  ssh:
+    enabled: false
+    internalPort: 1339
+    externalPort: 1339
+frontend:
+  name: frontend
+  enabled: true
+  internalPort: 8070
+  ## Extra environment variables that can be used to tune frontend to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "1Gi"
+  #   cpu: "1"
+
+  ## Add lifecycle hooks for frontend container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## Session settings
+  session:
+    ## Time in minutes after which the frontend token will need to be refreshed
+    timeoutMinutes: '30'
+  ## The following settings are to configure the frequency of the liveness and startup probes when splitServicesToContainers set to true
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.frontend.internalPort }}/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.frontend.internalPort }}/api/v1/system/readiness
+      initialDelaySeconds: 30
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+access:
+  name: access
+  enabled: true
+  ## Enable TLS by changing the tls entry (under the security section) in the access.config.yaml file.
+  ## ref: https://www.jfrog.com/confluence/display/JFROG/Managing+TLS+Certificates#ManagingTLSCertificates
+  ## When security.tls is set to true, JFrog Access will act as the Certificate Authority (CA) and sign the TLS certificates used by all the different JFrog Platform nodes.
+  ## This ensures that the node to node communication is done over TLS.
+  accessConfig:
+    security:
+      tls: false
+  ## You can use a pre-existing secret by specifying customCertificatesSecretName
+  ## Example : Create a tls secret using `kubectl create secret tls <secret-name> --cert=ca.crt --key=ca.private.key`
+  # customCertificatesSecretName:
+
+  ## When resetAccessCAKeys is true, Access will regenerate the CA certificate and matching private key
+  # resetAccessCAKeys: false
+  database:
+    maxOpenConnections: 80
+  tomcat:
+    connector:
+      maxThreads: 50
+      sendReasonPhrase: false
+      extraConfig: 'acceptCount="100"'
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:8040/access/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}30{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  readinessProbe:
+    enabled: false
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:8040/access/api/v1/system/readiness
+      initialDelaySeconds: 5
+      failureThreshold: 30
+      periodSeconds: 15
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:8040/access/api/v1/system/readiness
+      initialDelaySeconds: 5
+      failureThreshold: 30
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+  ## access container's resource requests and limits
+  ## ref: https://kubernetes.io/docs/user-guide/compute-resources/
+  ## We usually recommend not to specify default resources and to leave this as a conscious
+  ## choice for the user. This also increases chances charts run on environments with little
+  ## resources, such as Minikube. If you do want to specify resources, uncomment the following
+  ## lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  ## @param access.resources.limits The resources limits for access containers
+  ## @param access.resources.requests The requested resources for access containers
+  ##
+  resources: {}
+  # limits:
+  #   cpu: 1000m
+  #   memory: 2Gi
+  # requests:
+  #   cpu: 1000m
+  #   memory: 2Gi
+  javaOpts:
+  # other: ""
+
+  ## Extra environment variables that can be used to tune access to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+metadata:
+  name: metadata
+  enabled: true
+  internalPort: 8086
+  database:
+    maxOpenConnections: 80
+  ## Extra environment variables that can be used to tune metadata to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "1Gi"
+  #   cpu: "1"
+
+  ## Add lifecycle hooks for metadata container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## The following settings are to configure the frequency of the liveness and startup probes when splitServicesToContainers set to true
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.metadata.internalPort }}/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.metadata.internalPort }}/api/v1/system/readiness
+      initialDelaySeconds: 30
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+evidence:
+  name: evidence
+  enabled: false
+  internalPort: 8051
+  externalPort: 8052
+  ## Extra environment variables that can be used to tune evidence to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  resources: {}
+  #  requests:
+  #    memory: "100Mi"
+  #    cpu: "100m"
+  #  limits:
+  #    memory: "1Gi"
+  #    cpu: "1"
+
+  # Add lifecycle hooks for evidence container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## The following settings are to configure the frequency of the liveness and startup probes when splitServicesToContainers set to true
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.evidence.internalPort }}/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.evidence.internalPort }}/api/v1/system/readiness
+      initialDelaySeconds: 30
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+event:
+  name: event
+  enabled: true
+  internalPort: 8061
+  ## WebHook handlers settings for event
+  webhooks: {}
+  # urlStrictPolicy: false
+
+  ## Extra environment variables that can be used to tune event to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "1Gi"
+  #   cpu: "1"
+
+  ## Add lifecycle hooks for event container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## The following settings are to configure the frequency of the liveness and startup probes when splitServicesToContainers set to true
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.event.internalPort }}/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.event.internalPort }}/api/v1/system/readiness
+      initialDelaySeconds: 30
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+jfconnect:
+  name: jfconnect
+  enabled: true
+  internalPort: 8030
+  ## Extra environment variables that can be used to tune jfconnect to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "1Gi"
+  #   cpu: "1"
+
+  ## Add lifecycle hooks for jfconnect container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## You can use a pre-existing secret by specifying customCertificatesSecretName
+  ## Example : Create a tls secret using `kubectl create secret tls <secret-name> --cert=tls.crt --key=tls.key`
+  # customCertificatesSecretName:
+
+  ## The following settings are to configure the frequency of the liveness and startup probes when splitServicesToContainers set to true
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.jfconnect.internalPort }}/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.jfconnect.internalPort }}/api/v1/system/readiness
+      initialDelaySeconds: 30
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+federation:
+  ## This is an experimental service which is not in production yet, therefore should not be enabled
+  name: federation
+  enabled: false
+  embedded: false
+  internalPort: 8025
+  extraJavaOpts: ""
+  ## This section should be removed once rtfs service is GA
+  database:
+    port: 5432
+    host: postgresql
+    name: rtfs
+    username: rtfs
+    password: ""
+  ## Extra environment variables that can be used to tune federation to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "1Gi"
+  #   cpu: "1"
+
+  ## Add lifecycle hooks for federation container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## The following settings are to configure the frequency of the liveness and startup probes when splitServicesToContainers set to true
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.federation.internalPort }}/artifactory/service/rtfs/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.federation.internalPort }}/artifactory/service/rtfs/api/v1/system/readiness
+      initialDelaySeconds: 30
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+observability:
+  name: observability
+  enabled: true
+  internalPort: 8036
+  ## Extra environment variables that can be used to tune observability to your needs.
+  ## Uncomment and set value as needed
+  extraEnvironmentVariables:
+  # - name: MY_ENV_VAR
+  #   value: ""
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "1Gi"
+  #   cpu: "1"
+
+  ## Add lifecycle hooks for observability container
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","echo Hello from the preStop handler"]
+
+  ## The following settings are to configure the frequency of the liveness and startup probes when splitServicesToContainers set to true
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.observability.internalPort }}/api/v1/system/liveness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      failureThreshold: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      periodSeconds: 10
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.observability.internalPort }}/api/v1/system/readiness
+      initialDelaySeconds: 30
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+## MISSION_CONTROL
+mc:
+  enabled: false
+  database:
+    maxOpenConnections: 10
+  idgenerator:
+    maxOpenConnections: 2
+  tomcat:
+    connector:
+      maxThreads: 50
+      sendReasonPhrase: false
+      extraConfig: 'acceptCount="100"'
+## Nginx
+nginx:
+  enabled: true
+  kind: Deployment
+  name: nginx
+  labels: {}
+  hosts: []
+  replicaCount: 1
+  minAvailable: 0
+  podSecurityContext:
+    enabled: true
+    runAsUser: 104
+    runAsGroup: 107
+    fsGroup: 107
+  containerSecurityContext:
+    enabled: true
+    runAsNonRoot: true
+    privileged: false
+    readOnlyRootFilesystem: false
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop: ["ALL"]
+    seccompProfile:
+      type: "RuntimeDefault"
+  annotations: {}
+  terminationGracePeriodSeconds: 30
+  disableProxyBuffering: false
+  ## singleStackIPv6Cluster flag, which manages the Nginx configuration to enable listening on IPv6 and proxy.
+  ## If .Values.nginx.service.ipFamilies and .Values.artifactory.service.ipFamilies is configured for only IPv6, users need to enable this flag.
+  singleStackIPv6Cluster: false
+  deployment:
+    annotations: {}
+  ## Note that by default we use appVersion to get image tag/version
+  image:
+    registry: releases-docker.jfrog.io
+    repository: jfrog/nginx-artifactory-pro
+    # tag:
+    pullPolicy: IfNotPresent
+  ## Priority Class name to be used in deployment if provided
+  priorityClassName:
+  ## Spread nginx pods evenly across your nodes or some other topology
+  topologySpreadConstraints: []
+  # - maxSkew: 1
+  #   topologyKey: kubernetes.io/hostname
+  #   whenUnsatisfiable: DoNotSchedule
+  #   labelSelector:
+  #     matchLabels:
+  #       app: '{{ template "artifactory.name" . }}'
+  #       release: '{{ .Release.Name }}'
+  #       component: '{{ .Values.nginx.name }}'
+
+  ## Add lifecycle hooks for the nginx pods
+  ## For example, you can add a `preStop` hook that sends a SIGQUIT to nginx and wait for it to terminate gracefully
+  lifecycle: {}
+  # postStart:
+  #   exec:
+  #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /var/opt/jfrog/nginx/message"]
+  # preStop:
+  #   exec:
+  #     command: ["/bin/sh","-c","nginx -s quit; while killall -0 nginx; do sleep 1; done"]
+
+  ## Sidecar containers for tailing Nginx logs
+  loggers: []
+  # - access.log
+  # - error.log
+
+  ## Loggers containers resources
+  loggersResources: {}
+  # requests:
+  #   memory: "64Mi"
+  #   cpu: "25m"
+  # limits:
+  #   memory: "128Mi"
+  #   cpu: "50m"
+
+  ## Logs options
+  logs:
+    stderr: false
+    stdout: false
+    level: warn
+  ## A list of custom ports to expose on the NGINX pod. Follows the conventional Kubernetes yaml syntax for container ports.
+  customPorts: []
+  # - containerPort: 8066
+  #   name: docker
+
+  ## The nginx main conf was moved to files/nginx-main-conf.yaml. This key is commented out to keep support for the old configuration
+  # mainConf: |
+
+  ## The nginx artifactory conf was moved to files/nginx-artifactory-conf.yaml. This key is commented out to keep support for the old configuration
+  # artifactoryConf: |
+  customInitContainers: ""
+  customSidecarContainers: ""
+  customVolumes: ""
+  customVolumeMounts: ""
+  customCommand:
+  ##  allows overwriting the command for the nginx container.
+  ##  defaults to [ 'nginx', '-g', 'daemon off;' ]
+
+  service:
+    ## For minikube, set this to NodePort, elsewhere use LoadBalancer
+    type: LoadBalancer
+    ssloffload: false
+    ## @param service.ssloffloadForceHttps Only enabled when service.ssloffload is set to True.
+    ## Force all requests from NGINX to the upstream server are over HTTPS, even when SSL offloading is enabled.
+    ## This is useful in environments where internal traffic must remain secure with https only.
+    ssloffloadForceHttps: false
+    ## @param service.ipFamilyPolicy Controller Service ipFamilyPolicy (optional, cloud specific)
+    ## This can be either SingleStack, PreferDualStack or RequireDualStack
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services
+    ##
+    ipFamilyPolicy: ""
+    ## @param service.ipFamilies Controller Service ipFamilies (optional, cloud specific)
+    ## This can be either ["IPv4"], ["IPv6"], ["IPv4", "IPv6"] or ["IPv6", "IPv4"]
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services
+    ##
+    ipFamilies: []
+    ## For supporting whitelist on the Nginx LoadBalancer service
+    ## Set this to a list of IP CIDR ranges
+    ## Example: loadBalancerSourceRanges: ['10.10.10.5/32', '10.11.10.5/32']
+    ## or pass from helm command line
+    ## Example: helm install ... --set nginx.service.loadBalancerSourceRanges='{10.10.10.5/32,10.11.10.5/32}'
+    loadBalancerSourceRanges: []
+    annotations: {}
+    ## Provide static ip address
+    loadBalancerIP:
+    ## There are two available options: "Cluster" (default) and "Local".
+    externalTrafficPolicy: Cluster
+    ## If the type is NodePort you can set a fixed port
+    # nodePort: 32082
+    ## A list of custom ports to be exposed on nginx service. Follows the conventional Kubernetes yaml syntax for service ports.
+    customPorts: []
+    # - port: 8066
+    #   targetPort: 8066
+    #   protocol: TCP
+    #   name: docker
+  ## Renamed nginx internalPort 80,443 to 8080,8443 to support openshift
+  http:
+    enabled: true
+    externalPort: 80
+    internalPort: 8080
+  https:
+    enabled: true
+    externalPort: 443
+    internalPort: 8443
+  ssh:
+    internalPort: 1339
+    externalPort: 1339
+  ## DEPRECATED: The following will be removed in a future release
+  # externalPortHttp: 8080
+  # internalPortHttp: 8080
+  # externalPortHttps: 8443
+  # internalPortHttps: 8443
+
+  ## The following settings are to configure the frequency of the liveness and readiness probes.
+  livenessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "nginx.scheme" . }}://localhost:{{ include "nginx.port" . }}/
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}180{{ else }}0{{ end }}
+      periodSeconds: 10
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      failureThreshold: 5
+      successThreshold: 1
+  readinessProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "nginx.scheme" . }}://localhost:{{ include "nginx.port" . }}/router/api/v1/system/readiness
+      initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}90{{ else }}0{{ end }}
+      periodSeconds: 10
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+      failureThreshold: 5
+      successThreshold: 1
+  startupProbe:
+    enabled: true
+    config: |
+      exec:
+        command:
+          - sh
+          - -c
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "nginx.scheme" . }}://localhost:{{ include "nginx.port" . }}/router/api/v1/system/readiness
+      initialDelaySeconds: 3
+      failureThreshold: 90
+      periodSeconds: 5
+      timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
+  ## The SSL secret that will be used by the Nginx pod
+  # tlsSecretName: chart-example-tls
+  ## Custom ConfigMap for nginx.conf
+  customConfigMap:
+  ## Custom ConfigMap for artifactory-ha.conf
+  customArtifactoryConfigMap:
+  persistence:
+    mountPath: "/var/opt/jfrog/nginx"
+    enabled: false
+    ## A manually managed Persistent Volume and Claim
+    ## Requires persistence.enabled: true
+    ## If defined, PVC must be created manually before volume will be bound
+    # existingClaim:
+
+    accessMode: ReadWriteOnce
+    size: 5Gi
+    ## nginx data Persistent Volume Storage Class
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    ##
+    # storageClassName: "-"
+  resources: {}
+  # requests:
+  #   memory: "250Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "250Mi"
+  #   cpu: "500m"
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+## Database configurations
+## Use the wait-for-db init container. Set to false to skip
+waitForDatabase: true
+## Configuration values for the PostgreSQL dependency sub-chart
+## ref: https://github.com/bitnami/charts/blob/master/bitnami/postgresql/README.md
+postgresql:
+  enabled: true
+  image:
+    registry: releases-docker.jfrog.io
+    repository: bitnami/postgresql
+    tag: 15.6.0-debian-11-r16
+  postgresqlUsername: artifactory
+  postgresqlPassword: ""
+  postgresqlDatabase: artifactory
+  postgresqlExtendedConf:
+    listenAddresses: "*"
+    maxConnections: "1500"
+  persistence:
+    enabled: true
+    size: 200Gi
+    # existingClaim:
+  service:
+    port: 5432
+  primary:
+    nodeSelector: {}
+    affinity: {}
+    tolerations: []
+  readReplicas:
+    nodeSelector: {}
+    affinity: {}
+    tolerations: []
+  resources: {}
+  securityContext:
+    enabled: true
+  containerSecurityContext:
+    enabled: true
+    # requests:
+    #   memory: "512Mi"
+    #   cpu: "100m"
+    # limits:
+    #   memory: "1Gi"
+    #   cpu: "500m"
+## If NOT using the PostgreSQL in this chart (postgresql.enabled=false),
+## specify custom database details here or leave empty and Artifactory will use embedded derby
+database:
+  ## To run Artifactory with any database other than PostgreSQL allowNonPostgresql set to true.
+  allowNonPostgresql: false
+  type:
+  driver:
+  ## If you set the url, leave host and port empty
+  url:
+  ## If you would like this chart to create the secret containing the db
+  ## password, use these values
+  user:
+  password:
+  ## If you have existing Kubernetes secrets containing db credentials, use
+  ## these values
+  secrets: {}
+  # user:
+  #   name: "rds-artifactory"
+  #   key: "db-user"
+  # password:
+  #   name: "rds-artifactory"
+  #   key: "db-password"
+  # url:
+  #   name: "rds-artifactory"
+  #   key: "db-url"
+## Filebeat Sidecar container
+## The provided filebeat configuration is for Artifactory logs. It assumes you have a logstash installed and configured properly.
+filebeat:
+  enabled: false
+  name: artifactory-filebeat
+  image:
+    repository: "docker.elastic.co/beats/filebeat"
+    version: 7.16.2
+  logstashUrl: "logstash:5044"
+  livenessProbe:
+    exec:
+      command:
+        - sh
+        - -c
+        - |
+          #!/usr/bin/env bash -e
+          curl --fail 127.0.0.1:5066
+    failureThreshold: 3
+    initialDelaySeconds: 10
+    periodSeconds: 10
+    timeoutSeconds: 5
+  readinessProbe:
+    exec:
+      command:
+        - sh
+        - -c
+        - |
+          #!/usr/bin/env bash -e
+          filebeat test output
+    failureThreshold: 3
+    initialDelaySeconds: 10
+    periodSeconds: 10
+    timeoutSeconds: 5
+  resources: {}
+  # requests:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+  # limits:
+  #   memory: "100Mi"
+  #   cpu: "100m"
+
+  filebeatYml: |
+    logging.level: info
+    path.data: {{ .Values.artifactory.persistence.mountPath }}/log/filebeat
+    name: artifactory-filebeat
+    queue.spool:
+      file:
+        permissions: 0760
+    filebeat.inputs:
+    - type: log
+      enabled: true
+      close_eof: ${CLOSE:false}
+      paths:
+         - {{ .Values.artifactory.persistence.mountPath }}/log/*.log
+      fields:
+        service: "jfrt"
+        log_type: "artifactory"
+    output:
+      logstash:
+         hosts: ["{{ .Values.filebeat.logstashUrl }}"]
+  extraEnvironmentVariables: {}
+  #   - name: MY_ENV_VAR
+  #     value: "s"
+## Allows to add additional kubernetes resources
+## Use --- as a separator between multiple resources
+## For an example, refer - https://github.com/jfrog/log-analytics-prometheus/blob/master/helm/artifactory-values.yaml
+additionalResources: ""
+## Adding entries to a Pod's /etc/hosts file
+## For an example, refer - https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases
+hostAliases: []
+# - ip: "127.0.0.1"
+#   hostnames:
+#     - "foo.local"
+#     - "bar.local"
+# - ip: "10.1.2.3"
+#   hostnames:
+#     - "foo.remote"
+#     - "bar.remote"
+
+## Toggling this feature is seamless and requires helm upgrade
+## will enable all microservices to run in different containers in a single pod (by default it is true)
+splitServicesToContainers: true
+## Specify common probes parameters
+probes:
+  timeoutSeconds: 5
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/ci/default-values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/ci/default-values.yaml
new file mode 100644
index 000000000..86355d3b3
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/ci/default-values.yaml
@@ -0,0 +1,7 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+artifactory:
+  databaseUpgradeReady: true
+
+  # To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+  postgresql:
+    postgresqlPassword: password
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/logo/jcr-logo.png b/charts/jfrog/artifactory-jcr/107.98.14/logo/jcr-logo.png
new file mode 100644
index 000000000..b1e312e32
Binary files /dev/null and b/charts/jfrog/artifactory-jcr/107.98.14/logo/jcr-logo.png differ
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/questions.yml b/charts/jfrog/artifactory-jcr/107.98.14/questions.yml
new file mode 100644
index 000000000..9cde42870
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/questions.yml
@@ -0,0 +1,271 @@
+questions:
+# Advance Settings
+- variable: artifactory.artifactory.masterKey
+  default: "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+  description: "Artifactory master key. For security reasons, we strongly recommend you generate your own master key using this command: 'openssl rand -hex 32'"
+  type: string
+  label: Artifactory master key
+  group: "Security Settings"
+
+# Container Images
+- variable: defaultImage
+  default: true
+  description: "Use default Docker image"
+  label: Use Default Image
+  type: boolean
+  show_subquestion_if: false
+  group: "Container Images"
+  subquestions:
+  - variable: artifactory.artifactory.image.repository
+    default: "docker.bintray.io/jfrog/artifactory-jcr"
+    description: "JFrog Container Registry image name"
+    type: string
+    label: JFrog Container Registry Image Name
+  - variable: artifactory.artifactory.image.version
+    default: "7.6.3"
+    description: "JFrog Container Registry image tag"
+    type: string
+    label: JFrog Container Registry Image Tag
+  - variable: artifactory.imagePullSecrets
+    description: "Image Pull Secret"
+    type: string
+    label: Image Pull Secret
+
+# Services and LoadBalancing Settings
+- variable: artifactory.ingress.enabled
+  default: false
+  description: "Expose app using Layer 7 Load Balancer - ingress"
+  type: boolean
+  label: Expose app using Layer 7 Load Balancer
+  show_subquestion_if: true
+  group: "Services and Load Balancing"
+  required: true
+  subquestions:
+  - variable: artifactory.ingress.hosts[0]
+    default: "xip.io"
+    description: "Hostname to your artifactory installation"
+    type: hostname
+    required: true
+    label: Hostname
+
+# Nginx Settings
+- variable: artifactory.nginx.enabled
+  default: true
+  description: "Enable nginx server"
+  type: boolean
+  label: Enable Nginx Server
+  group: "Services and Load Balancing"
+  required: true
+  show_if: "artifactory.ingress.enabled=false"
+- variable: artifactory.nginx.service.type
+  default: "LoadBalancer"
+  description: "Nginx service type"
+  type: enum
+  required: true
+  label: Nginx Service Type
+  show_if: "artifactory.nginx.enabled=true&&artifactory.ingress.enabled=false"
+  group: "Services and Load Balancing"
+  options:
+  - "ClusterIP"
+  - "NodePort"
+  - "LoadBalancer"
+- variable: artifactory.nginx.service.loadBalancerIP
+  default: ""
+  description: "Provide Static IP to configure with Nginx"
+  type: string
+  label: Config Nginx LoadBalancer IP
+  show_if: "artifactory.nginx.enabled=true&&artifactory.nginx.service.type=LoadBalancer&&artifactory.ingress.enabled=false"
+  group: "Services and Load Balancing"
+- variable: artifactory.nginx.tlsSecretName
+  default: ""
+  description: "Provide SSL Secret name to configure with Nginx"
+  type: string
+  label: Config Nginx SSL Secret
+  show_if: "artifactory.nginx.enabled=true&&artifactory.ingress.enabled=false"
+  group: "Services and Load Balancing"
+- variable: artifactory.nginx.customArtifactoryConfigMap
+  default: ""
+  description: "Provide configMap name to configure Nginx with custom `artifactory.conf`"
+  type: string
+  label: ConfigMap for Nginx Artifactory Config
+  show_if: "artifactory.nginx.enabled=true&&artifactory.ingress.enabled=false"
+  group: "Services and Load Balancing"
+
+# Database Settings
+- variable: artifactory.postgresql.enabled
+  default: true
+  description: "Enable PostgreSQL"
+  type: boolean
+  required: true
+  label: Enable PostgreSQL
+  group: "Database Settings"
+  show_subquestion_if: true
+  subquestions:
+  - variable: artifactory.postgresql.postgresqlPassword
+    default: ""
+    description: "PostgreSQL password"
+    type: password
+    required: true
+    label: PostgreSQL Password
+    group: "Database Settings"
+    show_if: "artifactory.postgresql.enabled=true"
+  - variable: artifactory.postgresql.persistence.size
+    default: 20Gi
+    description: "PostgreSQL persistent volume size"
+    type: string
+    label: PostgreSQL Persistent Volume Size
+    show_if: "artifactory.postgresql.enabled=true"
+  - variable: artifactory.postgresql.persistence.storageClass
+    default: ""
+    description: "If undefined or null, uses the default StorageClass. Default to null"
+    type: storageclass
+    label: Default StorageClass for PostgreSQL
+    show_if: "artifactory.postgresql.enabled=true"
+  - variable: artifactory.postgresql.resources.requests.cpu
+    default: "200m"
+    description: "PostgreSQL initial cpu request"
+    type: string
+    label: PostgreSQL Initial CPU Request
+    show_if: "artifactory.postgresql.enabled=true"
+  - variable: artifactory.postgresql.resources.requests.memory
+    default: "500Mi"
+    description: "PostgreSQL initial memory request"
+    type: string
+    label: PostgreSQL Initial Memory Request
+    show_if: "artifactory.postgresql.enabled=true"
+  - variable: artifactory.postgresql.resources.limits.cpu
+    default: "1"
+    description: "PostgreSQL cpu limit"
+    type: string
+    label: PostgreSQL CPU Limit
+    show_if: "artifactory.postgresql.enabled=true"
+  - variable: artifactory.postgresql.resources.limits.memory
+    default: "1Gi"
+    description: "PostgreSQL memory limit"
+    type: string
+    label: PostgreSQL Memory Limit
+    show_if: "artifactory.postgresql.enabled=true"
+- variable: artifactory.database.type
+  default: "postgresql"
+  description: "xternal database type (postgresql, mysql, oracle or mssql)"
+  type: enum
+  required: true
+  label: External Database Type
+  group: "Database Settings"
+  show_if: "artifactory.postgresql.enabled=false"
+  options:
+    - "postgresql"
+    - "mysql"
+    - "oracle"
+    - "mssql"
+- variable: artifactory.database.url
+  default: ""
+  description: "External database URL. If you set the url, leave host and port empty"
+  type: string
+  label: External Database URL
+  group: "Database Settings"
+  show_if: "artifactory.postgresql.enabled=false"
+- variable: artifactory.database.host
+  default: ""
+  description: "External database hostname"
+  type: string
+  label: External Database Hostname
+  group: "Database Settings"
+  show_if: "artifactory.postgresql.enabled=false"
+- variable: artifactory.database.port
+  default: ""
+  description: "External database port"
+  type: string
+  label: External Database Port
+  group: "Database Settings"
+  show_if: "artifactory.postgresql.enabled=false"
+- variable: artifactory.database.user
+  default: ""
+  description: "External database username"
+  type: string
+  label: External Database Username
+  group: "Database Settings"
+  show_if: "artifactory.postgresql.enabled=false"
+- variable: artifactory.database.password
+  default: ""
+  description: "External database password"
+  type: password
+  label: External Database Password
+  group: "Database Settings"
+  show_if: "artifactory.postgresql.enabled=false"
+
+# Advance Settings
+- variable: artifactory.advancedOptions
+  default: false
+  description: "Show advanced configurations"
+  label: Show Advanced Configurations
+  type: boolean
+  show_subquestion_if: true
+  group: "Advanced Options"
+  subquestions:
+  - variable: artifactory.artifactory.primary.resources.requests.cpu
+    default: "500m"
+    description: "Artifactory primary node initial cpu request"
+    type: string
+    label: Artifactory Primary Node Initial CPU Request
+  - variable: artifactory.artifactory.primary.resources.requests.memory
+    default: "1Gi"
+    description: "Artifactory primary node initial memory request"
+    type: string
+    label: Artifactory Primary Node Initial Memory Request
+  - variable: artifactory.artifactory.primary.javaOpts.xms
+    default: "1g"
+    description: "Artifactory primary node java Xms size"
+    type: string
+    label: Artifactory Primary Node Java Xms Size
+  - variable: artifactory.artifactory.primary.resources.limits.cpu
+    default: "2"
+    description: "Artifactory primary node cpu limit"
+    type: string
+    label: Artifactory Primary Node CPU Limit
+  - variable: artifactory.artifactory.primary.resources.limits.memory
+    default: "4Gi"
+    description: "Artifactory primary node memory limit"
+    type: string
+    label: Artifactory Primary Node Memory Limit
+  - variable: artifactory.artifactory.primary.javaOpts.xmx
+    default: "4g"
+    description: "Artifactory primary node java Xmx size"
+    type: string
+    label: Artifactory Primary Node Java Xmx Size
+  - variable: artifactory.artifactory.node.resources.requests.cpu
+    default: "500m"
+    description: "Artifactory member node initial cpu request"
+    type: string
+    label: Artifactory Member Node Initial CPU Request
+  - variable: artifactory.artifactory.node.resources.requests.memory
+    default: "2Gi"
+    description: "Artifactory member node initial memory request"
+    type: string
+    label: Artifactory Member Node Initial Memory Request
+  - variable: artifactory.artifactory.node.javaOpts.xms
+    default: "1g"
+    description: "Artifactory member node java Xms size"
+    type: string
+    label: Artifactory Member Node Java Xms Size
+  - variable: artifactory.artifactory.node.resources.limits.cpu
+    default: "2"
+    description: "Artifactory member node cpu limit"
+    type: string
+    label: Artifactory Member Node CPU Limit
+  - variable: artifactory.artifactory.node.resources.limits.memory
+    default: "4Gi"
+    description: "Artifactory member node memory limit"
+    type: string
+    label: Artifactory Member Node Memory Limit
+  - variable: artifactory.artifactory.node.javaOpts.xmx
+    default: "4g"
+    description: "Artifactory member node java Xmx size"
+    type: string
+    label: Artifactory Member Node Java Xmx Size
+
+# Internal Settings
+- variable: installerInfo
+  default: '\{\"productId\": \"RancherHelm_artifactory-jcr/7.6.3\", \"features\": \[\{\"featureId\": \"Partner/ACC-007246\"\}\]\}'
+  type: string
+  group: "Internal Settings (Do not modify)"
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/templates/NOTES.txt b/charts/jfrog/artifactory-jcr/107.98.14/templates/NOTES.txt
new file mode 100644
index 000000000..035bf8417
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/templates/NOTES.txt
@@ -0,0 +1 @@
+Congratulations. You have just deployed JFrog Container Registry!
diff --git a/charts/jfrog/artifactory-jcr/107.98.14/values.yaml b/charts/jfrog/artifactory-jcr/107.98.14/values.yaml
new file mode 100644
index 000000000..6aa1d6525
--- /dev/null
+++ b/charts/jfrog/artifactory-jcr/107.98.14/values.yaml
@@ -0,0 +1,75 @@
+# Default values for artifactory-jcr.
+# This is a YAML-formatted file.
+
+# Beware when changing values here. You should know what you are doing!
+# Access the values with {{ .Values.key.subkey }}
+
+# This chart is based on the main artifactory chart with some customizations.
+# See all supported configuration keys in https://github.com/jfrog/charts/tree/master/stable/artifactory
+
+## All values are under the 'artifactory' sub chart.
+artifactory:
+  ## Artifactory
+  ## See full list of supported Artifactory options and documentation in artifactory chart: https://github.com/jfrog/charts/tree/master/stable/artifactory
+  artifactory:
+    ## Default tag is from the artifactory sub-chart in the requirements.yaml
+    image:
+      registry: releases-docker.jfrog.io
+      repository: jfrog/artifactory-jcr
+      # tag:
+    ## Uncomment the following resources definitions or pass them from command line
+    ## to control the cpu and memory resources allocated by the Kubernetes cluster
+    resources: {}
+    #  requests:
+    #    memory: "1Gi"
+    #    cpu: "500m"
+    #  limits:
+    #    memory: "4Gi"
+    #    cpu: "1"
+    ## The following Java options are passed to the java process running Artifactory.
+    ## You should set them according to the resources set above.
+    ## IMPORTANT: Make sure resources.limits.memory is at least 1G more than Xmx.
+    javaOpts: {}
+    # xms: "1g"
+    # xmx: "3g"
+    # other: ""
+  installer:
+    platform: jcr-helm
+  installerInfo: '{"productId":"Helm_artifactory-jcr/{{ .Chart.Version }}","features":[{"featureId":"Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"},{"featureId":"Database/{{ .Values.database.type }}"},{"featureId":"PostgreSQL_Enabled/{{ .Values.postgresql.enabled }}"},{"featureId":"Nginx_Enabled/{{ .Values.nginx.enabled }}"},{"featureId":"ArtifactoryPersistence_Type/{{ .Values.artifactory.persistence.type }}"},{"featureId":"SplitServicesToContainers_Enabled/{{ .Values.splitServicesToContainers }}"},{"featureId":"UnifiedSecretInstallation_Enabled/{{ .Values.artifactory.unifiedSecretInstallation }}"},{"featureId":"Filebeat_Enabled/{{ .Values.filebeat.enabled }}"},{"featureId":"ReplicaCount/{{ .Values.artifactory.replicaCount }}"}]}'
+  ## Nginx
+  ## See full list of supported Nginx options and documentation in artifactory chart: https://github.com/jfrog/charts/tree/master/stable/artifactory
+  nginx:
+    enabled: true
+    tlsSecretName: ""
+    service:
+      type: LoadBalancer
+  ## Ingress
+  ## See full list of supported Ingress options and documentation in artifactory chart: https://github.com/jfrog/charts/tree/master/stable/artifactory
+  ingress:
+    enabled: false
+    tls:
+  ## PostgreSQL
+  ## See list of supported postgresql options and documentation in artifactory chart: https://github.com/jfrog/charts/tree/master/stable/artifactory
+  ## Configuration values for the PostgreSQL dependency sub-chart
+  ## ref: https://github.com/bitnami/charts/blob/master/bitnami/postgresql/README.md
+  postgresql:
+    enabled: true
+  ## This key is required for upgrades to protect old PostgreSQL chart's breaking changes.
+  databaseUpgradeReady: "yes"
+  ## If NOT using the PostgreSQL in this chart (artifactory.postgresql.enabled=false),
+  ## specify custom database details here or leave empty and Artifactory will use embedded derby.
+  ## See full list of database options and documentation in artifactory chart: https://github.com/jfrog/charts/tree/master/stable/artifactory
+  # database:
+  jfconnect:
+    enabled: false
+  federation:
+    enabled: false
+## Enable the PostgreSQL sub chart
+postgresql:
+  enabled: true
+router:
+  image:
+    tag: 7.135.2
+initContainers:
+  image:
+    tag: 9.5.1731604394
diff --git a/charts/kuma/kuma/2.9.3/.helmdocsignore b/charts/kuma/kuma/2.9.3/.helmdocsignore
new file mode 100644
index 000000000..d8a5db8f8
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/.helmdocsignore
@@ -0,0 +1 @@
+# Charts to ignore from helm-docs
\ No newline at end of file
diff --git a/charts/kuma/kuma/2.9.3/.helmignore b/charts/kuma/kuma/2.9.3/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/kuma/kuma/2.9.3/Chart.yaml b/charts/kuma/kuma/2.9.3/Chart.yaml
new file mode 100644
index 000000000..20b75e6f4
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/Chart.yaml
@@ -0,0 +1,26 @@
+annotations:
+  catalog.cattle.io/certified: partner
+  catalog.cattle.io/display-name: Kuma
+  catalog.cattle.io/namespace: kuma-system
+  catalog.cattle.io/release-name: kuma
+apiVersion: v2
+appVersion: 2.9.3
+description: A Helm chart for the Kuma Control Plane
+home: https://github.com/kumahq/kuma
+icon: file://assets/icons/kuma.svg
+keywords:
+- service mesh
+- control plane
+maintainers:
+- email: jakub.dyszkiewicz@konghq.com
+  name: Jakub Dyszkiewicz
+  url: https://github.com/jakubdyszkiewicz
+- email: charly.molter@konghq.com
+  name: Charly Molter
+  url: https://github.com/lahabana
+- email: michael.beaumont@konghq.com
+  name: Mike Beaumont
+  url: https://github.com/michaelbeaumont
+name: kuma
+type: application
+version: 2.9.3
diff --git a/charts/kuma/kuma/2.9.3/README.md b/charts/kuma/kuma/2.9.3/README.md
new file mode 100644
index 000000000..785f64c10
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/README.md
@@ -0,0 +1,316 @@
+[![][kuma-logo]][kuma-url]
+
+A Helm chart for the Kuma Control Plane
+
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 2.9.3](https://img.shields.io/badge/Version-2.9.3-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square)
+
+**Homepage:** <https://github.com/kumahq/kuma>
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| global.image.registry | string | `"docker.io/kumahq"` | Default registry for all Kuma Images |
+| global.image.tag | string | `nil` | The default tag for all Kuma images, which itself defaults to .Chart.AppVersion |
+| global.imagePullSecrets | list | `[]` | Add `imagePullSecrets` to all the service accounts used for Kuma components |
+| patchSystemNamespace | bool | `true` | Whether to patch the target namespace with the system label |
+| installCrdsOnUpgrade.enabled | bool | `true` | Whether install new CRDs before upgrade (if any were introduced with the new version of Kuma) |
+| installCrdsOnUpgrade.imagePullSecrets | list | `[]` | The `imagePullSecrets` to attach to the Service Account running CRD installation. This field will be deprecated in a future release, please use .global.imagePullSecrets |
+| noHelmHooks | bool | `false` | Whether to disable all helm hooks |
+| restartOnSecretChange | bool | `true` | Whether to restart control-plane by calculating a new checksum for the secret |
+| controlPlane.environment | string | `"kubernetes"` | Environment that control plane is run in, useful when running universal global control plane on k8s |
+| controlPlane.extraLabels | object | `{}` | Labels to add to resources in addition to default labels |
+| controlPlane.logLevel | string | `"info"` | Kuma CP log level: one of off,info,debug |
+| controlPlane.logOutputPath | string | `""` | Kuma CP log output path: Defaults to /dev/stdout |
+| controlPlane.mode | string | `"zone"` | Kuma CP modes: one of zone,global |
+| controlPlane.zone | string | `nil` | Kuma CP zone, if running multizone |
+| controlPlane.kdsGlobalAddress | string | `""` | Only used in `zone` mode |
+| controlPlane.replicas | int | `1` | Number of replicas of the Kuma CP. Ignored when autoscaling is enabled |
+| controlPlane.minReadySeconds | int | `0` | Minimum number of seconds for which a newly created pod should be ready for it to be considered available. |
+| controlPlane.deploymentAnnotations | object | `{}` | Annotations applied only to the `Deployment` resource |
+| controlPlane.podAnnotations | object | `{}` | Annotations applied only to the `Pod` resource |
+| controlPlane.autoscaling.enabled | bool | `false` | Whether to enable Horizontal Pod Autoscaling, which requires the [Metrics Server](https://github.com/kubernetes-sigs/metrics-server) in the cluster |
+| controlPlane.autoscaling.minReplicas | int | `2` | The minimum CP pods to allow |
+| controlPlane.autoscaling.maxReplicas | int | `5` | The max CP pods to scale to |
+| controlPlane.autoscaling.targetCPUUtilizationPercentage | int | `80` | For clusters that don't support autoscaling/v2, autoscaling/v1 is used |
+| controlPlane.autoscaling.metrics | list | `[{"resource":{"name":"cpu","target":{"averageUtilization":80,"type":"Utilization"}},"type":"Resource"}]` | For clusters that do support autoscaling/v2, use metrics |
+| controlPlane.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node selector for the Kuma Control Plane pods |
+| controlPlane.tolerations | list | `[]` | Tolerations for the Kuma Control Plane pods |
+| controlPlane.podDisruptionBudget.enabled | bool | `false` | Whether to create a pod disruption budget |
+| controlPlane.podDisruptionBudget.maxUnavailable | int | `1` | The maximum number of unavailable pods allowed by the budget |
+| controlPlane.affinity | object | `{"podAntiAffinity":{"preferredDuringSchedulingIgnoredDuringExecution":[{"podAffinityTerm":{"labelSelector":{"matchExpressions":[{"key":"app.kubernetes.io/name","operator":"In","values":["{{ include \"kuma.name\" . }}"]},{"key":"app.kubernetes.io/instance","operator":"In","values":["{{ .Release.Name }}"]},{"key":"app","operator":"In","values":["{{ include \"kuma.name\" . }}-control-plane"]}]},"topologyKey":"kubernetes.io/hostname"},"weight":100}]}}` | Affinity placement rule for the Kuma Control Plane pods. This is rendered as a template, so you can reference other helm variables or includes. |
+| controlPlane.topologySpreadConstraints | string | `nil` | Topology spread constraints rule for the Kuma Control Plane pods. This is rendered as a template, so you can use variables to generate match labels. |
+| controlPlane.injectorFailurePolicy | string | `"Fail"` | Failure policy of the mutating webhook implemented by the Kuma Injector component |
+| controlPlane.service.apiServer.http.nodePort | int | `30681` | Port on which Http api server Service is exposed on Node for service of type NodePort |
+| controlPlane.service.apiServer.https.nodePort | int | `30682` | Port on which Https api server Service is exposed on Node for service of type NodePort |
+| controlPlane.service.enabled | bool | `true` | Whether to create a service resource. |
+| controlPlane.service.name | string | `nil` | Optionally override of the Kuma Control Plane Service's name |
+| controlPlane.service.type | string | `"ClusterIP"` | Service type of the Kuma Control Plane |
+| controlPlane.service.annotations | object | `{"prometheus.io/port":"5680","prometheus.io/scrape":"true"}` | Annotations to put on the Kuma Control Plane |
+| controlPlane.ingress.enabled | bool | `false` | Install K8s Ingress resource that exposes GUI and API |
+| controlPlane.ingress.ingressClassName | string | `nil` | IngressClass defines which controller will implement the resource |
+| controlPlane.ingress.hostname | string | `nil` | Ingress hostname |
+| controlPlane.ingress.annotations | object | `{}` | Map of ingress annotations. |
+| controlPlane.ingress.path | string | `"/"` | Ingress path. |
+| controlPlane.ingress.pathType | string | `"ImplementationSpecific"` | Each path in an Ingress is required to have a corresponding path type. (ImplementationSpecific/Exact/Prefix) |
+| controlPlane.ingress.servicePort | int | `5681` | Port from kuma-cp to use to expose API and GUI. Switch to 5682 to expose TLS port |
+| controlPlane.globalZoneSyncService.enabled | bool | `true` | Whether to create a k8s service for the global zone sync service. It will only be created when enabled and deploying the global control plane. |
+| controlPlane.globalZoneSyncService.type | string | `"LoadBalancer"` | Service type of the Global-zone sync |
+| controlPlane.globalZoneSyncService.loadBalancerIP | string | `nil` | Optionally specify IP to be used by cloud provider when configuring load balancer |
+| controlPlane.globalZoneSyncService.loadBalancerSourceRanges | list | `[]` | Optionally specify allowed source ranges that can access the load balancer |
+| controlPlane.globalZoneSyncService.annotations | object | `{}` | Additional annotations to put on the Global Zone Sync Service |
+| controlPlane.globalZoneSyncService.nodePort | int | `30685` | Port on which Global Zone Sync Service is exposed on Node for service of type NodePort |
+| controlPlane.globalZoneSyncService.port | int | `5685` | Port on which Global Zone Sync Service is exposed |
+| controlPlane.globalZoneSyncService.protocol | string | `"grpc"` | Protocol of the Global Zone Sync service port |
+| controlPlane.defaults.skipMeshCreation | bool | `false` | Whether to skip creating the default Mesh |
+| controlPlane.automountServiceAccountToken | bool | `true` | Whether to automountServiceAccountToken for cp. Optionally set to false |
+| controlPlane.resources | object | `{"limits":{"memory":"256Mi"},"requests":{"cpu":"500m","memory":"256Mi"}}` | Optionally override the resource spec |
+| controlPlane.lifecycle | object | `{}` | Pod lifecycle settings (useful for adding a preStop hook, when using AWS ALB or NLB) |
+| controlPlane.terminationGracePeriodSeconds | int | `30` | Number of seconds to wait before force killing the pod. Make sure to update this if you add a preStop hook. |
+| controlPlane.tls.general.secretName | string | `""` | Secret that contains tls.crt, tls.key [and ca.crt when no controlPlane.tls.general.caSecretName specified] for protecting Kuma in-cluster communication |
+| controlPlane.tls.general.caSecretName | string | `""` | Secret that contains ca.crt that was used to sign cert for protecting Kuma in-cluster communication (ca.crt present in this secret have precedence over the one provided in the controlPlane.tls.general.secretName) |
+| controlPlane.tls.general.caBundle | string | `""` | Base64 encoded CA certificate (the same as in controlPlane.tls.general.secret#ca.crt) |
+| controlPlane.tls.apiServer.secretName | string | `""` | Secret that contains tls.crt, tls.key for protecting Kuma API on HTTPS |
+| controlPlane.tls.apiServer.clientCertsSecretName | string | `""` | Secret that contains list of .pem certificates that can access admin endpoints of Kuma API on HTTPS |
+| controlPlane.tls.kdsGlobalServer.secretName | string | `""` | Name of the K8s TLS Secret resource. If you set this and don't set create=true, you have to create the secret manually. |
+| controlPlane.tls.kdsGlobalServer.create | bool | `false` | Whether to create the TLS secret in helm. |
+| controlPlane.tls.kdsGlobalServer.cert | string | `""` | The TLS certificate to offer. |
+| controlPlane.tls.kdsGlobalServer.key | string | `""` | The TLS key to use. |
+| controlPlane.tls.kdsZoneClient.secretName | string | `""` | Name of the K8s Secret resource that contains ca.crt which was used to sign the certificate of KDS Global Server. If you set this and don't set create=true, you have to create the secret manually. |
+| controlPlane.tls.kdsZoneClient.create | bool | `false` | Whether to create the TLS secret in helm. |
+| controlPlane.tls.kdsZoneClient.cert | string | `""` | CA bundle that was used to sign the certificate of KDS Global Server. |
+| controlPlane.tls.kdsZoneClient.skipVerify | bool | `false` | If true, TLS cert of the server is not verified. |
+| controlPlane.serviceAccountAnnotations | object | `{}` | Annotations to add for Control Plane's Service Account |
+| controlPlane.image.pullPolicy | string | `"IfNotPresent"` | Kuma CP ImagePullPolicy |
+| controlPlane.image.repository | string | `"kuma-cp"` | Kuma CP image repository |
+| controlPlane.image.tag | string | `nil` | Kuma CP Image tag. When not specified, the value is copied from global.tag |
+| controlPlane.secrets | object with { Env: string, Secret: string, Key: string } | `nil` | Secrets to add as environment variables, where `Env` is the name of the env variable, `Secret` is the name of the Secret, and `Key` is the key of the Secret value to use |
+| controlPlane.envVars | object | `{}` | Additional environment variables that will be passed to the control plane |
+| controlPlane.envVarEntries | string | `nil` | Additional environment variables that will be passed to the control plane. Can be used with Kubernetes downward API |
+| controlPlane.extraConfigMaps | list | `[]` | Additional config maps to mount into the control plane, with optional inline values |
+| controlPlane.extraSecrets | object with { name: string, mountPath: string, readOnly: string } | `nil` | Additional secrets to mount into the control plane, where `Env` is the name of the env variable, `Secret` is the name of the Secret, and `Key` is the key of the Secret value to use |
+| controlPlane.webhooks.validator.additionalRules | string | `""` | Additional rules to apply on Kuma validator webhook. Useful when building custom policy on top of Kuma. |
+| controlPlane.webhooks.ownerReference.additionalRules | string | `""` | Additional rules to apply on Kuma owner reference webhook. Useful when building custom policy on top of Kuma. |
+| controlPlane.hostNetwork | bool | `false` | Specifies if the deployment should be started in hostNetwork mode. |
+| controlPlane.admissionServerPort | int | `5443` | Define a new server port for the admission controller. Recommended to set in combination with hostNetwork to prevent multiple port bindings on the same port (like Calico in AWS EKS). |
+| controlPlane.podSecurityContext | object | `{"runAsNonRoot":true}` | Security context at the pod level for control plane. |
+| controlPlane.containerSecurityContext | object | `{"readOnlyRootFilesystem":true}` | Security context at the container level for control plane. |
+| controlPlane.supportGatewaySecretsInAllNamespaces | bool | `false` | If true, then control plane can support TLS secrets for builtin gateway outside of mesh system namespace. The downside is that control plane requires permission to read Secrets in all namespaces. |
+| controlPlane.dns | object | `{"config":{"nameservers":[],"searches":[]},"policy":""}` | DNS configuration for the control-plane pod. This is equivalent to the [Kubernetes DNS policy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy). |
+| controlPlane.dns.policy | string | `""` | Defines how DNS resolution is configured for that Pod. |
+| controlPlane.dns.config | object | `{"nameservers":[],"searches":[]}` | Optional dns configuration, required when policy is 'None' |
+| controlPlane.dns.config.nameservers | list | `[]` | A list of IP addresses that will be used as DNS servers for the Pod. There can be at most 3 IP addresses specified. |
+| controlPlane.dns.config.searches | list | `[]` | A list of DNS search domains for hostname lookup in the Pod. |
+| cni.enabled | bool | `false` | Install Kuma with CNI instead of proxy init container |
+| cni.chained | bool | `false` | Install CNI in chained mode |
+| cni.netDir | string | `"/etc/cni/multus/net.d"` | Set the CNI install directory |
+| cni.binDir | string | `"/var/lib/cni/bin"` | Set the CNI bin directory |
+| cni.confName | string | `"kuma-cni.conf"` | Set the CNI configuration name |
+| cni.logLevel | string | `"info"` | CNI log level: one of off,info,debug |
+| cni.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node Selector for the CNI pods |
+| cni.tolerations | list | `[]` | Tolerations for the CNI pods |
+| cni.podAnnotations | object | `{}` | Additional pod annotations |
+| cni.namespace | string | `"kube-system"` | Set the CNI namespace |
+| cni.image.repository | string | `"kuma-cni"` | CNI image repository |
+| cni.image.tag | string | `nil` | CNI image tag - defaults to .Chart.AppVersion |
+| cni.image.imagePullPolicy | string | `"IfNotPresent"` | CNI image pull policy |
+| cni.delayStartupSeconds | int | `0` | it's only useful in tests to trigger a possible race condition |
+| cni.experimental | object | `{"imageEbpf":{"registry":"docker.io/kumahq","repository":"merbridge","tag":"0.8.5"}}` | use new CNI (experimental) |
+| cni.experimental.imageEbpf.registry | string | `"docker.io/kumahq"` | CNI experimental eBPF image registry |
+| cni.experimental.imageEbpf.repository | string | `"merbridge"` | CNI experimental eBPF image repository |
+| cni.experimental.imageEbpf.tag | string | `"0.8.5"` | CNI experimental eBPF image tag |
+| cni.resources.requests.cpu | string | `"100m"` |  |
+| cni.resources.requests.memory | string | `"100Mi"` |  |
+| cni.resources.limits.memory | string | `"100Mi"` |  |
+| cni.podSecurityContext | object | `{}` | Security context at the pod level for cni |
+| cni.containerSecurityContext | object | `{"readOnlyRootFilesystem":true,"runAsGroup":0,"runAsNonRoot":false,"runAsUser":0}` | Security context at the container level for cni |
+| dataPlane.dnsLogging | bool | `false` | If true, then turn on CoreDNS query logging |
+| dataPlane.image.repository | string | `"kuma-dp"` | The Kuma DP image repository |
+| dataPlane.image.pullPolicy | string | `"IfNotPresent"` | Kuma DP ImagePullPolicy |
+| dataPlane.image.tag | string | `nil` | Kuma DP Image Tag. When not specified, the value is copied from global.tag |
+| dataPlane.initImage.repository | string | `"kuma-init"` | The Kuma DP init image repository |
+| dataPlane.initImage.tag | string | `nil` | Kuma DP init image tag When not specified, the value is copied from global.tag |
+| ingress.enabled | bool | `false` | If true, it deploys Ingress for cross cluster communication |
+| ingress.extraLabels | object | `{}` | Labels to add to resources, in addition to default labels |
+| ingress.drainTime | string | `"30s"` | Time for which old listener will still be active as draining |
+| ingress.replicas | int | `1` | Number of replicas of the Ingress. Ignored when autoscaling is enabled. |
+| ingress.logLevel | string | `"info"` | Log level for ingress (available values: off|info|debug) |
+| ingress.resources | object | `{"limits":{"cpu":"1000m","memory":"512Mi"},"requests":{"cpu":"50m","memory":"64Mi"}}` | Define the resources to allocate to mesh ingress |
+| ingress.lifecycle | object | `{}` | Pod lifecycle settings (useful for adding a preStop hook, when using AWS ALB or NLB) |
+| ingress.terminationGracePeriodSeconds | int | `40` | Number of seconds to wait before force killing the pod. Make sure to update this if you add a preStop hook. |
+| ingress.autoscaling.enabled | bool | `false` | Whether to enable Horizontal Pod Autoscaling, which requires the [Metrics Server](https://github.com/kubernetes-sigs/metrics-server) in the cluster |
+| ingress.autoscaling.minReplicas | int | `2` | The minimum CP pods to allow |
+| ingress.autoscaling.maxReplicas | int | `5` | The max CP pods to scale to |
+| ingress.autoscaling.targetCPUUtilizationPercentage | int | `80` | For clusters that don't support autoscaling/v2, autoscaling/v1 is used |
+| ingress.autoscaling.metrics | list | `[{"resource":{"name":"cpu","target":{"averageUtilization":80,"type":"Utilization"}},"type":"Resource"}]` | For clusters that do support autoscaling/v2, use metrics |
+| ingress.service.enabled | bool | `true` | Whether to create a Service resource. |
+| ingress.service.type | string | `"LoadBalancer"` | Service type of the Ingress |
+| ingress.service.loadBalancerIP | string | `nil` | Optionally specify IP to be used by cloud provider when configuring load balancer |
+| ingress.service.annotations | object | `{}` | Additional annotations to put on the Ingress service |
+| ingress.service.port | int | `10001` | Port on which Ingress is exposed |
+| ingress.service.nodePort | string | `nil` | Port on which service is exposed on Node for service of type NodePort |
+| ingress.annotations | object | `{}` | Additional pod annotations (deprecated favor `podAnnotations`) |
+| ingress.podAnnotations | object | `{}` | Additional pod annotations |
+| ingress.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node Selector for the Ingress pods |
+| ingress.tolerations | list | `[]` | Tolerations for the Ingress pods |
+| ingress.podDisruptionBudget.enabled | bool | `false` | Whether to create a pod disruption budget |
+| ingress.podDisruptionBudget.maxUnavailable | int | `1` | The maximum number of unavailable pods allowed by the budget |
+| ingress.affinity | object | `{"podAntiAffinity":{"preferredDuringSchedulingIgnoredDuringExecution":[{"podAffinityTerm":{"labelSelector":{"matchExpressions":[{"key":"app.kubernetes.io/name","operator":"In","values":["{{ include \"kuma.name\" . }}"]},{"key":"app.kubernetes.io/instance","operator":"In","values":["{{ .Release.Name }}"]},{"key":"app","operator":"In","values":["kuma-ingress"]}]},"topologyKey":"kubernetes.io/hostname"},"weight":100}]}}` | Affinity placement rule for the Kuma Ingress pods This is rendered as a template, so you can reference other helm variables or includes. |
+| ingress.topologySpreadConstraints | string | `nil` | Topology spread constraints rule for the Kuma Mesh Ingress pods. This is rendered as a template, so you can use variables to generate match labels. |
+| ingress.podSecurityContext | object | `{"runAsGroup":5678,"runAsNonRoot":true,"runAsUser":5678}` | Security context at the pod level for ingress |
+| ingress.containerSecurityContext | object | `{"readOnlyRootFilesystem":true}` | Security context at the container level for ingress |
+| ingress.serviceAccountAnnotations | object | `{}` | Annotations to add for Control Plane's Service Account |
+| ingress.automountServiceAccountToken | bool | `true` | Whether to automountServiceAccountToken for cp. Optionally set to false |
+| ingress.dns | object | `{"config":{"nameservers":[],"searches":[]},"policy":""}` | DNS configuration for the ingress pod. This is equivalent to the [Kubernetes DNS policy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy). |
+| ingress.dns.policy | string | `""` | Defines how DNS resolution is configured for that Pod. |
+| ingress.dns.config | object | `{"nameservers":[],"searches":[]}` | Optional dns configuration, required when policy is 'None' |
+| ingress.dns.config.nameservers | list | `[]` | A list of IP addresses that will be used as DNS servers for the Pod. There can be at most 3 IP addresses specified. |
+| ingress.dns.config.searches | list | `[]` | A list of DNS search domains for hostname lookup in the Pod. |
+| egress.enabled | bool | `false` | If true, it deploys Egress for cross cluster communication |
+| egress.extraLabels | object | `{}` | Labels to add to resources, in addition to the default labels. |
+| egress.drainTime | string | `"30s"` | Time for which old listener will still be active as draining |
+| egress.replicas | int | `1` | Number of replicas of the Egress. Ignored when autoscaling is enabled. |
+| egress.logLevel | string | `"info"` | Log level for egress (available values: off|info|debug) |
+| egress.autoscaling.enabled | bool | `false` | Whether to enable Horizontal Pod Autoscaling, which requires the [Metrics Server](https://github.com/kubernetes-sigs/metrics-server) in the cluster |
+| egress.autoscaling.minReplicas | int | `2` | The minimum CP pods to allow |
+| egress.autoscaling.maxReplicas | int | `5` | The max CP pods to scale to |
+| egress.autoscaling.targetCPUUtilizationPercentage | int | `80` | For clusters that don't support autoscaling/v2, autoscaling/v1 is used |
+| egress.autoscaling.metrics | list | `[{"resource":{"name":"cpu","target":{"averageUtilization":80,"type":"Utilization"}},"type":"Resource"}]` | For clusters that do support autoscaling/v2, use metrics |
+| egress.resources.requests.cpu | string | `"50m"` |  |
+| egress.resources.requests.memory | string | `"64Mi"` |  |
+| egress.resources.limits.cpu | string | `"1000m"` |  |
+| egress.resources.limits.memory | string | `"512Mi"` |  |
+| egress.service.enabled | bool | `true` | Whether to create the service object |
+| egress.service.type | string | `"ClusterIP"` | Service type of the Egress |
+| egress.service.loadBalancerIP | string | `nil` | Optionally specify IP to be used by cloud provider when configuring load balancer |
+| egress.service.annotations | object | `{}` | Additional annotations to put on the Egress service |
+| egress.service.port | int | `10002` | Port on which Egress is exposed |
+| egress.service.nodePort | string | `nil` | Port on which service is exposed on Node for service of type NodePort |
+| egress.annotations | object | `{}` | Additional pod annotations (deprecated favor `podAnnotations`) |
+| egress.podAnnotations | object | `{}` | Additional pod annotations |
+| egress.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node Selector for the Egress pods |
+| egress.tolerations | list | `[]` | Tolerations for the Egress pods |
+| egress.podDisruptionBudget.enabled | bool | `false` | Whether to create a pod disruption budget |
+| egress.podDisruptionBudget.maxUnavailable | int | `1` | The maximum number of unavailable pods allowed by the budget |
+| egress.affinity | object | `{"podAntiAffinity":{"preferredDuringSchedulingIgnoredDuringExecution":[{"podAffinityTerm":{"labelSelector":{"matchExpressions":[{"key":"app.kubernetes.io/name","operator":"In","values":["{{ include \"kuma.name\" . }}"]},{"key":"app.kubernetes.io/instance","operator":"In","values":["{{ .Release.Name }}"]},{"key":"app","operator":"In","values":["kuma-egress"]}]},"topologyKey":"kubernetes.io/hostname"},"weight":100}]}}` | Affinity placement rule for the Kuma Egress pods. This is rendered as a template, so you can reference other helm variables or includes. |
+| egress.topologySpreadConstraints | string | `nil` | Topology spread constraints rule for the Kuma Egress pods. This is rendered as a template, so you can use variables to generate match labels. |
+| egress.podSecurityContext | object | `{"runAsGroup":5678,"runAsNonRoot":true,"runAsUser":5678}` | Security context at the pod level for egress |
+| egress.containerSecurityContext | object | `{"readOnlyRootFilesystem":true}` | Security context at the container level for egress |
+| egress.serviceAccountAnnotations | object | `{}` | Annotations to add for Control Plane's Service Account |
+| egress.automountServiceAccountToken | bool | `true` | Whether to automountServiceAccountToken for cp. Optionally set to false |
+| egress.dns | object | `{"config":{"nameservers":[],"searches":[]},"policy":""}` | DNS configuration for the egress pod. This is equivalent to the [Kubernetes DNS policy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy). |
+| egress.dns.policy | string | `""` | Defines how DNS resolution is configured for that Pod. |
+| egress.dns.config | object | `{"nameservers":[],"searches":[]}` | Optional dns configuration, required when policy is 'None' |
+| egress.dns.config.nameservers | list | `[]` | A list of IP addresses that will be used as DNS servers for the Pod. There can be at most 3 IP addresses specified. |
+| egress.dns.config.searches | list | `[]` | A list of DNS search domains for hostname lookup in the Pod. |
+| kumactl.image.repository | string | `"kumactl"` | The kumactl image repository |
+| kumactl.image.tag | string | `nil` | The kumactl image tag. When not specified, the value is copied from global.tag |
+| kubectl.image.registry | string | `"docker.io"` | The kubectl image registry |
+| kubectl.image.repository | string | `"bitnami/kubectl"` | The kubectl image repository |
+| kubectl.image.tag | string | `"1.27.5"` | The kubectl image tag |
+| hooks.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node selector for the HELM hooks |
+| hooks.tolerations | list | `[]` | Tolerations for the HELM hooks |
+| hooks.podSecurityContext | object | `{"runAsNonRoot":true}` | Security context at the pod level for crd/webhook/ns |
+| hooks.containerSecurityContext | object | `{"readOnlyRootFilesystem":true}` | Security context at the container level for crd/webhook/ns |
+| hooks.ebpfCleanup | object | `{"containerSecurityContext":{"readOnlyRootFilesystem":false},"podSecurityContext":{"runAsNonRoot":false}}` | ebpf-cleanup hook needs write access to the root filesystem to clean ebpf programs Changing below values will potentially break ebpf cleanup completely, so be cautious when doing so. |
+| hooks.ebpfCleanup.podSecurityContext | object | `{"runAsNonRoot":false}` | Security context at the pod level for crd/webhook/cleanup-ebpf |
+| hooks.ebpfCleanup.containerSecurityContext | object | `{"readOnlyRootFilesystem":false}` | Security context at the container level for crd/webhook/cleanup-ebpf |
+| transparentProxy.configMap.enabled | bool | `false` | If true, enables the use of a ConfigMap to manage transparent proxy configuration instead of directly configuring it within the Kuma system |
+| transparentProxy.configMap.name | string | `"kuma-transparent-proxy-config"` | The name of the ConfigMap used to store the transparent proxy configuration |
+| transparentProxy.configMap.config.kumaDPUser | string | `"5678"` | The username or UID of the user that will run kuma-dp. If not provided, the system will use the default UID ("5678") or the default username ("kuma-dp") |
+| transparentProxy.configMap.config.ipFamilyMode | string | `"dualstack"` | The IP family mode used for configuring traffic redirection in the transparent proxy Supports "dualstack" (for both IPv4 and IPv6) and "ipv4" modes |
+| transparentProxy.configMap.config.redirect.dns.enabled | bool | `true` | Enables DNS redirection in the transparent proxy |
+| transparentProxy.configMap.config.redirect.dns.captureAll | bool | `true` | Redirect all DNS queries |
+| transparentProxy.configMap.config.redirect.dns.port | int | `15053` | The port on which the DNS server listens |
+| transparentProxy.configMap.config.redirect.dns.resolvConfigPath | string | `"/etc/resolv.conf"` | Path to the system's resolv.conf file |
+| transparentProxy.configMap.config.redirect.dns.skipConntrackZoneSplit | bool | `false` | Disables conntrack zone splitting, which can prevent potential DNS issues |
+| transparentProxy.configMap.config.redirect.inbound.enabled | bool | `true` | Enables inbound traffic redirection |
+| transparentProxy.configMap.config.redirect.inbound.port | int | `15006` | Port used for redirecting inbound traffic |
+| transparentProxy.configMap.config.redirect.inbound.excludePorts | list | `[]` | List of ports to exclude from inbound traffic redirection |
+| transparentProxy.configMap.config.redirect.inbound.excludePortsForIPs | list | `[]` | List of IP addresses to exclude from inbound traffic redirection for specific ports |
+| transparentProxy.configMap.config.redirect.inbound.excludePortsForUIDs | list | `[]` | List of UIDs to exclude from inbound traffic redirection for specific ports |
+| transparentProxy.configMap.config.redirect.inbound.includePorts | list | `[]` | List of ports to include in inbound traffic redirection |
+| transparentProxy.configMap.config.redirect.inbound.insertRedirectInsteadOfAppend | bool | `false` | Inserts the redirection rule at the beginning of the chain instead of appending it |
+| transparentProxy.configMap.config.redirect.outbound.enabled | bool | `true` | Enables outbound traffic redirection |
+| transparentProxy.configMap.config.redirect.outbound.port | int | `15001` | Port used for redirecting outbound traffic |
+| transparentProxy.configMap.config.redirect.outbound.excludePorts | list | `[]` | List of ports to exclude from outbound traffic redirection |
+| transparentProxy.configMap.config.redirect.outbound.excludePortsForIPs | list | `[]` | List of IP addresses to exclude from outbound traffic redirection for specific ports |
+| transparentProxy.configMap.config.redirect.outbound.excludePortsForUIDs | list | `[]` | List of UIDs to exclude from outbound traffic redirection for specific ports |
+| transparentProxy.configMap.config.redirect.outbound.includePorts | list | `[]` | List of ports to include in outbound traffic redirection |
+| transparentProxy.configMap.config.redirect.outbound.insertRedirectInsteadOfAppend | bool | `false` | Inserts the redirection rule at the beginning of the chain instead of appending it |
+| transparentProxy.configMap.config.redirect.vnet.networks | list | `[]` | Specifies virtual networks using the format interfaceName:CIDR Allows matching traffic on specific network interfaces Examples: - "docker0:172.17.0.0/16" - "br+:172.18.0.0/16" (matches any interface starting with "br") - "iface:::1/64" (for IPv6) |
+| transparentProxy.configMap.config.ebpf.enabled | bool | `false` | Enables eBPF support for handling traffic redirection in the transparent proxy |
+| transparentProxy.configMap.config.ebpf.bpffsPath | string | `"/run/kuma/bpf"` | The path of the BPF filesystem |
+| transparentProxy.configMap.config.ebpf.cgroupPath | string | `"/sys/fs/cgroup"` | The path of cgroup2 |
+| transparentProxy.configMap.config.ebpf.instanceIPEnvVarName | string | `""` | The name of the environment variable containing the IP address of the instance (pod/vm) where transparent proxy will be installed |
+| transparentProxy.configMap.config.ebpf.programsSourcePath | string | `"/tmp/kuma-ebpf"` | Path where compiled eBPF programs and other necessary files for eBPF mode can be found |
+| transparentProxy.configMap.config.ebpf.tcAttachIface | string | `""` | The network interface for TC eBPF programs to bind to. If not provided, it will be automatically determined |
+| transparentProxy.configMap.config.retry.maxRetries | int | `4` | The maximum number of retry attempts for operations |
+| transparentProxy.configMap.config.retry.sleepBetweenRetries | string | `"2s"` | The time duration to wait between retry attempts |
+| transparentProxy.configMap.config.iptablesExecutables.iptables | string | `""` | Custom path for the iptables executable (IPv4) |
+| transparentProxy.configMap.config.iptablesExecutables.iptables-save | string | `""` | Custom path for the iptables-save executable (IPv4) |
+| transparentProxy.configMap.config.iptablesExecutables.iptables-restore | string | `""` | Custom path for the iptables-restore executable (IPv4) |
+| transparentProxy.configMap.config.iptablesExecutables.ip6tables | string | `""` | Custom path for the ip6tables executable (IPv6) |
+| transparentProxy.configMap.config.iptablesExecutables.ip6tables-save | string | `""` | Custom path for the ip6tables-save executable (IPv6) |
+| transparentProxy.configMap.config.iptablesExecutables.ip6tables-restore | string | `""` | Custom path for the ip6tables-restore executable (IPv6) |
+| transparentProxy.configMap.config.log.enabled | bool | `false` | Enables logging of iptables rules for diagnostics and monitoring |
+| transparentProxy.configMap.config.comments.disabled | bool | `false` | Disables comments in the generated iptables rules |
+| transparentProxy.configMap.config.wait | int | `5` | Time in seconds to wait for acquiring the xtables lock before failing Value 0 means wait indefinitely |
+| transparentProxy.configMap.config.waitInterval | int | `0` | Time interval between retries to acquire the xtables lock in seconds |
+| transparentProxy.configMap.config.dropInvalidPackets | bool | `false` | Drops invalid packets to avoid connection resets in high-throughput scenarios |
+| transparentProxy.configMap.config.storeFirewalld | bool | `false` | Enables firewalld support to store iptables rules |
+| transparentProxy.configMap.config.verbose | bool | `false` | Enables verbose mode with longer argument/flag names and additional comments |
+| experimental.ebpf.enabled | bool | `false` | If true, ebpf will be used instead of using iptables to install/configure transparent proxy |
+| experimental.ebpf.instanceIPEnvVarName | string | `"INSTANCE_IP"` | Name of the environmental variable which will contain the IP address of a pod |
+| experimental.ebpf.bpffsPath | string | `"/sys/fs/bpf"` | Path where BPF file system should be mounted |
+| experimental.ebpf.cgroupPath | string | `"/sys/fs/cgroup"` | Host's cgroup2 path |
+| experimental.ebpf.tcAttachIface | string | `""` | Name of the network interface which TC programs should be attached to, we'll try to automatically determine it if empty |
+| experimental.ebpf.programsSourcePath | string | `"/tmp/kuma-ebpf"` | Path where compiled eBPF programs which will be installed can be found |
+| experimental.sidecarContainers | bool | `false` | If true, enable native Kubernetes sidecars. This requires at least Kubernetes v1.29 |
+| postgres.port | string | `"5432"` | Postgres port, password should be provided as a secret reference in "controlPlane.secrets" with the Env value "KUMA_STORE_POSTGRES_PASSWORD". Example: controlPlane:   secrets:     - Secret: postgres-postgresql       Key: postgresql-password       Env: KUMA_STORE_POSTGRES_PASSWORD |
+| postgres.tls.mode | string | `"disable"` | Mode of TLS connection. Available values are: "disable", "verifyNone", "verifyCa", "verifyFull" |
+| postgres.tls.disableSSLSNI | bool | `false` | Whether to disable SNI the postgres `sslsni` option. |
+| postgres.tls.caSecretName | string | `nil` | Secret name that contains the ca.crt |
+| postgres.tls.secretName | string | `nil` | Secret name that contains the client tls.crt, tls.key |
+
+## Custom Resource Definitions
+
+All Kuma CRDs are loaded via the [`crds`](crds) directory. For more detailed information on CRDs and Helm,
+please refer to [the Helm documentation][helm-crd].
+
+## Deleting
+
+As part of [Helm's limitations][helm-crd-limitations], CRDs will not be deleted when the `kuma` chart is deleted and
+must be deleted manually. When a CRD is deleted Kubernetes deletes all resources of that kind as well, so this should
+be done carefully.
+
+To do this with `kubectl` on *nix platforms, run:
+
+```shell
+kubectl get crds | grep kuma.io | tr -s " " | cut -d " " -f1 | xargs kubectl delete crd
+
+# or with jq
+kubectl get crds -o json | jq '.items[].metadata.name | select(.|test(".*kuma\\.io"))' | xargs kubectl delete crd
+```
+
+## Autoscaling
+
+In production, it is advisable to enable Control Plane autoscaling for High Availability. Autoscaling uses the
+`HorizontalPodAutoscaler` resource to add redundancy and scale the CP pods based on CPU utilization, which requires
+the [k8s metrics-server][kube-metrics-server] to be running on the cluster.
+
+## Development
+
+The charts are used internally in `kumactl install`, therefore the following rules apply when developing new chat features:
+ * all templates that start with `pre-` and `post-` are omitted when processing in `kumactl install`
+
+### Installing Metrics Server for Autoscaling
+
+If running on kind, or on a cluster with a similarly self-signed cert, the metrics server must be configured to allow
+insecure kubelet TLS. The make task `kind/deploy/metrics-server` installs this patched version of the server.
+
+[kuma-url]: https://kuma.io/
+[kuma-logo]: https://kuma-public-assets.s3.amazonaws.com/kuma-logo-v2.png
+[helm-crd]: https://helm.sh/docs/chart_best_practices/custom_resource_definitions/
+[helm-crd-limitations]: https://helm.sh/docs/topics/charts/#limitations-on-crds
+[kube-metrics-server]: https://github.com/kubernetes-sigs/metrics-server
diff --git a/charts/kuma/kuma/2.9.3/README.md.gotmpl b/charts/kuma/kuma/2.9.3/README.md.gotmpl
new file mode 100644
index 000000000..3b296a411
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/README.md.gotmpl
@@ -0,0 +1,52 @@
+[![][kuma-logo]][kuma-url]
+
+{{ template "chart.description" . }}
+
+{{ template "chart.typeBadge" . }}{{ template "chart.versionBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+{{ template "chart.homepageLine" . }}
+
+{{ template "chart.valuesSection" . }}
+
+## Custom Resource Definitions
+
+All Kuma CRDs are loaded via the [`crds`](crds) directory. For more detailed information on CRDs and Helm,
+please refer to [the Helm documentation][helm-crd].
+
+## Deleting
+
+As part of [Helm's limitations][helm-crd-limitations], CRDs will not be deleted when the `kuma` chart is deleted and
+must be deleted manually. When a CRD is deleted Kubernetes deletes all resources of that kind as well, so this should
+be done carefully.
+
+To do this with `kubectl` on *nix platforms, run:
+
+```shell
+kubectl get crds | grep kuma.io | tr -s " " | cut -d " " -f1 | xargs kubectl delete crd
+
+# or with jq
+kubectl get crds -o json | jq '.items[].metadata.name | select(.|test(".*kuma\\.io"))' | xargs kubectl delete crd
+```
+
+## Autoscaling
+
+In production, it is advisable to enable Control Plane autoscaling for High Availability. Autoscaling uses the
+`HorizontalPodAutoscaler` resource to add redundancy and scale the CP pods based on CPU utilization, which requires
+the [k8s metrics-server][kube-metrics-server] to be running on the cluster.
+
+## Development
+
+The charts are used internally in `kumactl install`, therefore the following rules apply when developing new chat features:
+ * all templates that start with `pre-` and `post-` are omitted when processing in `kumactl install`
+
+### Installing Metrics Server for Autoscaling
+
+If running on kind, or on a cluster with a similarly self-signed cert, the metrics server must be configured to allow
+insecure kubelet TLS. The make task `kind/deploy/metrics-server` installs this patched version of the server.
+
+
+[kuma-url]: https://kuma.io/
+[kuma-logo]: https://kuma-public-assets.s3.amazonaws.com/kuma-logo-v2.png
+[helm-crd]: https://helm.sh/docs/chart_best_practices/custom_resource_definitions/
+[helm-crd-limitations]: https://helm.sh/docs/topics/charts/#limitations-on-crds
+[kube-metrics-server]: https://github.com/kubernetes-sigs/metrics-server
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_circuitbreakers.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_circuitbreakers.yaml
new file mode 100644
index 000000000..ea955f2ab
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_circuitbreakers.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: circuitbreakers.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: CircuitBreaker
+    listKind: CircuitBreakerList
+    plural: circuitbreakers
+    singular: circuitbreaker
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma CircuitBreaker resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_containerpatches.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_containerpatches.yaml
new file mode 100644
index 000000000..9fc77a966
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_containerpatches.yaml
@@ -0,0 +1,114 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: containerpatches.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: ContainerPatch
+    listKind: ContainerPatchList
+    plural: containerpatches
+    singular: containerpatch
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: ContainerPatch stores a list of patches to apply to init and
+          sidecar containers.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ContainerPatchSpec specifies the options available for a
+              ContainerPatch
+            properties:
+              initPatch:
+                description: InitPatch specifies jsonpatch to apply to an init container.
+                items:
+                  description: JsonPatchBlock is one json patch operation block.
+                  properties:
+                    from:
+                      description: From is a jsonpatch from string, used by move and
+                        copy operations.
+                      type: string
+                    op:
+                      description: Op is a jsonpatch operation string.
+                      enum:
+                      - add
+                      - remove
+                      - replace
+                      - move
+                      - copy
+                      type: string
+                    path:
+                      description: Path is a jsonpatch path string.
+                      type: string
+                    value:
+                      description: |-
+                        Value must be a string representing a valid json object used
+                        by replace and add operations. String has to be escaped with " to be valid a json object.
+                      type: string
+                  required:
+                  - op
+                  - path
+                  type: object
+                type: array
+              sidecarPatch:
+                description: SidecarPatch specifies jsonpatch to apply to a sidecar
+                  container.
+                items:
+                  description: JsonPatchBlock is one json patch operation block.
+                  properties:
+                    from:
+                      description: From is a jsonpatch from string, used by move and
+                        copy operations.
+                      type: string
+                    op:
+                      description: Op is a jsonpatch operation string.
+                      enum:
+                      - add
+                      - remove
+                      - replace
+                      - move
+                      - copy
+                      type: string
+                    path:
+                      description: Path is a jsonpatch path string.
+                      type: string
+                    value:
+                      description: |-
+                        Value must be a string representing a valid json object used
+                        by replace and add operations. String has to be escaped with " to be valid a json object.
+                      type: string
+                  required:
+                  - op
+                  - path
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_dataplaneinsights.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_dataplaneinsights.yaml
new file mode 100644
index 000000000..23c4538ea
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_dataplaneinsights.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: dataplaneinsights.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: DataplaneInsight
+    listKind: DataplaneInsightList
+    plural: dataplaneinsights
+    singular: dataplaneinsight
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          status:
+            description: Status is the status the Kuma resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_dataplanes.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_dataplanes.yaml
new file mode 100644
index 000000000..ec8f06342
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_dataplanes.yaml
@@ -0,0 +1,70 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: dataplanes.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: Dataplane
+    listKind: DataplaneList
+    plural: dataplanes
+    singular: dataplane
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - description: Service tag of the first inbound
+      jsonPath: .spec.networking.inbound[0].tags['kuma\.io/service']
+      name: kuma.io/service
+      type: string
+    - description: Service tag of the second inbound
+      jsonPath: .spec.networking.inbound[1].tags['kuma\.io/service']
+      name: kuma.io/service
+      type: string
+    - description: Service tag of the third inbound
+      jsonPath: .spec.networking.inbound[2].tags['kuma\.io/service']
+      name: kuma.io/service
+      priority: 1
+      type: string
+    - description: Service tag of the fourth inbound
+      jsonPath: .spec.networking.inbound[3].tags['kuma\.io/service']
+      name: kuma.io/service
+      priority: 1
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma Dataplane resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_externalservices.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_externalservices.yaml
new file mode 100644
index 000000000..be37a7b7f
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_externalservices.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: externalservices.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: ExternalService
+    listKind: ExternalServiceList
+    plural: externalservices
+    singular: externalservice
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma ExternalService resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_faultinjections.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_faultinjections.yaml
new file mode 100644
index 000000000..6fb6366d5
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_faultinjections.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: faultinjections.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: FaultInjection
+    listKind: FaultInjectionList
+    plural: faultinjections
+    singular: faultinjection
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma FaultInjection resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_healthchecks.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_healthchecks.yaml
new file mode 100644
index 000000000..9f2d075b5
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_healthchecks.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: healthchecks.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: HealthCheck
+    listKind: HealthCheckList
+    plural: healthchecks
+    singular: healthcheck
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma HealthCheck resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_hostnamegenerators.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_hostnamegenerators.yaml
new file mode 100644
index 000000000..943421775
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_hostnamegenerators.yaml
@@ -0,0 +1,72 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: hostnamegenerators.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: HostnameGenerator
+    listKind: HostnameGeneratorList
+    plural: hostnamegenerators
+    singular: hostnamegenerator
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma HostnameGenerator resource.
+            properties:
+              selector:
+                properties:
+                  meshExternalService:
+                    properties:
+                      matchLabels:
+                        additionalProperties:
+                          type: string
+                        type: object
+                    type: object
+                  meshMultiZoneService:
+                    properties:
+                      matchLabels:
+                        additionalProperties:
+                          type: string
+                        type: object
+                    type: object
+                  meshService:
+                    properties:
+                      matchLabels:
+                        additionalProperties:
+                          type: string
+                        type: object
+                    type: object
+                type: object
+              template:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshaccesslogs.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshaccesslogs.yaml
new file mode 100644
index 000000000..16191c5ba
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshaccesslogs.yaml
@@ -0,0 +1,557 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshaccesslogs.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshAccessLog
+    listKind: MeshAccessLogList
+    plural: meshaccesslogs
+    singular: meshaccesslog
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshAccessLog resource.
+            properties:
+              from:
+                description: From list makes a match between clients and corresponding
+                  configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of clients referenced in
+                        'targetRef'
+                      properties:
+                        backends:
+                          items:
+                            properties:
+                              file:
+                                description: FileBackend defines configuration for
+                                  file based access logs
+                                properties:
+                                  format:
+                                    description: |-
+                                      Format of access logs. Placeholders available on
+                                      https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage#command-operators
+                                    properties:
+                                      json:
+                                        example:
+                                        - key: start_time
+                                          value: '%START_TIME%'
+                                        - key: bytes_received
+                                          value: '%BYTES_RECEIVED%'
+                                        items:
+                                          properties:
+                                            key:
+                                              type: string
+                                            value:
+                                              type: string
+                                          type: object
+                                        type: array
+                                      omitEmptyValues:
+                                        default: false
+                                        type: boolean
+                                      plain:
+                                        example: '[%START_TIME%] %KUMA_MESH% %UPSTREAM_HOST%'
+                                        type: string
+                                      type:
+                                        enum:
+                                        - Plain
+                                        - Json
+                                        type: string
+                                    required:
+                                    - type
+                                    type: object
+                                  path:
+                                    description: Path to a file that logs will be
+                                      written to
+                                    example: /tmp/access.log
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - path
+                                type: object
+                              openTelemetry:
+                                description: Defines an OpenTelemetry logging backend.
+                                properties:
+                                  attributes:
+                                    description: |-
+                                      Attributes can contain placeholders available on
+                                      https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage#command-operators
+                                    example:
+                                    - key: mesh
+                                      value: '%KUMA_MESH%'
+                                    items:
+                                      properties:
+                                        key:
+                                          type: string
+                                        value:
+                                          type: string
+                                      type: object
+                                    type: array
+                                  body:
+                                    description: |-
+                                      Body is a raw string or an OTLP any value as described at
+                                      https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/logs/data-model.md#field-body
+                                      It can contain placeholders available on
+                                      https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage#command-operators
+                                    example:
+                                      kvlistValue:
+                                        values:
+                                        - key: mesh
+                                          value:
+                                            stringValue: '%KUMA_MESH%'
+                                    x-kubernetes-preserve-unknown-fields: true
+                                  endpoint:
+                                    description: Endpoint of OpenTelemetry collector.
+                                      An empty port defaults to 4317.
+                                    example: otel-collector:4317
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - endpoint
+                                type: object
+                              tcp:
+                                description: TCPBackend defines a TCP logging backend.
+                                properties:
+                                  address:
+                                    description: Address of the TCP logging backend
+                                    example: 127.0.0.1:5000
+                                    minLength: 1
+                                    type: string
+                                  format:
+                                    description: |-
+                                      Format of access logs. Placeholders available on
+                                      https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage#command-operators
+                                    properties:
+                                      json:
+                                        example:
+                                        - key: start_time
+                                          value: '%START_TIME%'
+                                        - key: bytes_received
+                                          value: '%BYTES_RECEIVED%'
+                                        items:
+                                          properties:
+                                            key:
+                                              type: string
+                                            value:
+                                              type: string
+                                          type: object
+                                        type: array
+                                      omitEmptyValues:
+                                        default: false
+                                        type: boolean
+                                      plain:
+                                        example: '[%START_TIME%] %KUMA_MESH% %UPSTREAM_HOST%'
+                                        type: string
+                                      type:
+                                        enum:
+                                        - Plain
+                                        - Json
+                                        type: string
+                                    required:
+                                    - type
+                                    type: object
+                                required:
+                                - address
+                                type: object
+                              type:
+                                enum:
+                                - Tcp
+                                - File
+                                - OpenTelemetry
+                                type: string
+                            required:
+                            - type
+                            type: object
+                          type: array
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        clients.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined in-place.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+              to:
+                description: To list makes a match between the consumed services and
+                  corresponding configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of destinations referenced in
+                        'targetRef'
+                      properties:
+                        backends:
+                          items:
+                            properties:
+                              file:
+                                description: FileBackend defines configuration for
+                                  file based access logs
+                                properties:
+                                  format:
+                                    description: |-
+                                      Format of access logs. Placeholders available on
+                                      https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage#command-operators
+                                    properties:
+                                      json:
+                                        example:
+                                        - key: start_time
+                                          value: '%START_TIME%'
+                                        - key: bytes_received
+                                          value: '%BYTES_RECEIVED%'
+                                        items:
+                                          properties:
+                                            key:
+                                              type: string
+                                            value:
+                                              type: string
+                                          type: object
+                                        type: array
+                                      omitEmptyValues:
+                                        default: false
+                                        type: boolean
+                                      plain:
+                                        example: '[%START_TIME%] %KUMA_MESH% %UPSTREAM_HOST%'
+                                        type: string
+                                      type:
+                                        enum:
+                                        - Plain
+                                        - Json
+                                        type: string
+                                    required:
+                                    - type
+                                    type: object
+                                  path:
+                                    description: Path to a file that logs will be
+                                      written to
+                                    example: /tmp/access.log
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - path
+                                type: object
+                              openTelemetry:
+                                description: Defines an OpenTelemetry logging backend.
+                                properties:
+                                  attributes:
+                                    description: |-
+                                      Attributes can contain placeholders available on
+                                      https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage#command-operators
+                                    example:
+                                    - key: mesh
+                                      value: '%KUMA_MESH%'
+                                    items:
+                                      properties:
+                                        key:
+                                          type: string
+                                        value:
+                                          type: string
+                                      type: object
+                                    type: array
+                                  body:
+                                    description: |-
+                                      Body is a raw string or an OTLP any value as described at
+                                      https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/logs/data-model.md#field-body
+                                      It can contain placeholders available on
+                                      https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage#command-operators
+                                    example:
+                                      kvlistValue:
+                                        values:
+                                        - key: mesh
+                                          value:
+                                            stringValue: '%KUMA_MESH%'
+                                    x-kubernetes-preserve-unknown-fields: true
+                                  endpoint:
+                                    description: Endpoint of OpenTelemetry collector.
+                                      An empty port defaults to 4317.
+                                    example: otel-collector:4317
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - endpoint
+                                type: object
+                              tcp:
+                                description: TCPBackend defines a TCP logging backend.
+                                properties:
+                                  address:
+                                    description: Address of the TCP logging backend
+                                    example: 127.0.0.1:5000
+                                    minLength: 1
+                                    type: string
+                                  format:
+                                    description: |-
+                                      Format of access logs. Placeholders available on
+                                      https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage#command-operators
+                                    properties:
+                                      json:
+                                        example:
+                                        - key: start_time
+                                          value: '%START_TIME%'
+                                        - key: bytes_received
+                                          value: '%BYTES_RECEIVED%'
+                                        items:
+                                          properties:
+                                            key:
+                                              type: string
+                                            value:
+                                              type: string
+                                          type: object
+                                        type: array
+                                      omitEmptyValues:
+                                        default: false
+                                        type: boolean
+                                      plain:
+                                        example: '[%START_TIME%] %KUMA_MESH% %UPSTREAM_HOST%'
+                                        type: string
+                                      type:
+                                        enum:
+                                        - Plain
+                                        - Json
+                                        type: string
+                                    required:
+                                    - type
+                                    type: object
+                                required:
+                                - address
+                                type: object
+                              type:
+                                enum:
+                                - Tcp
+                                - File
+                                - OpenTelemetry
+                                type: string
+                            required:
+                            - type
+                            type: object
+                          type: array
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        destinations.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshcircuitbreakers.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshcircuitbreakers.yaml
new file mode 100644
index 000000000..bea1fb597
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshcircuitbreakers.yaml
@@ -0,0 +1,739 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshcircuitbreakers.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshCircuitBreaker
+    listKind: MeshCircuitBreakerList
+    plural: meshcircuitbreakers
+    singular: meshcircuitbreaker
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshCircuitBreaker
+              resource.
+            properties:
+              from:
+                description: From list makes a match between clients and corresponding
+                  configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of destinations
+                        referenced in 'targetRef'
+                      properties:
+                        connectionLimits:
+                          description: |-
+                            ConnectionLimits contains configuration of each circuit breaking limit,
+                            which when exceeded makes the circuit breaker to become open (no traffic
+                            is allowed like no current is allowed in the circuits when physical
+                            circuit breaker ir open)
+                          properties:
+                            maxConnectionPools:
+                              description: |-
+                                The maximum number of connection pools per cluster that are concurrently
+                                supported at once. Set this for clusters which create a large number of
+                                connection pools.
+                              format: int32
+                              type: integer
+                            maxConnections:
+                              description: |-
+                                The maximum number of connections allowed to be made to the upstream
+                                cluster.
+                              format: int32
+                              type: integer
+                            maxPendingRequests:
+                              description: |-
+                                The maximum number of pending requests that are allowed to the upstream
+                                cluster. This limit is applied as a connection limit for non-HTTP
+                                traffic.
+                              format: int32
+                              type: integer
+                            maxRequests:
+                              description: |-
+                                The maximum number of parallel requests that are allowed to be made
+                                to the upstream cluster. This limit does not apply to non-HTTP traffic.
+                              format: int32
+                              type: integer
+                            maxRetries:
+                              description: |-
+                                The maximum number of parallel retries that will be allowed to
+                                the upstream cluster.
+                              format: int32
+                              type: integer
+                          type: object
+                        outlierDetection:
+                          description: |-
+                            OutlierDetection contains the configuration of the process of dynamically
+                            determining whether some number of hosts in an upstream cluster are
+                            performing unlike the others and removing them from the healthy load
+                            balancing set. Performance might be along different axes such as
+                            consecutive failures, temporal success rate, temporal latency, etc.
+                            Outlier detection is a form of passive health checking.
+                          properties:
+                            baseEjectionTime:
+                              description: |-
+                                The base time that a host is ejected for. The real time is equal to
+                                the base time multiplied by the number of times the host has been
+                                ejected.
+                              type: string
+                            detectors:
+                              description: Contains configuration for supported outlier
+                                detectors
+                              properties:
+                                failurePercentage:
+                                  description: |-
+                                    Failure Percentage based outlier detection functions similarly to success
+                                    rate detection, in that it relies on success rate data from each host in
+                                    a cluster. However, rather than compare those values to the mean success
+                                    rate of the cluster as a whole, they are compared to a flat
+                                    user-configured threshold. This threshold is configured via the
+                                    outlierDetection.failurePercentageThreshold field.
+                                    The other configuration fields for failure percentage based detection are
+                                    similar to the fields for success rate detection. As with success rate
+                                    detection, detection will not be performed for a host if its request
+                                    volume over the aggregation interval is less than the
+                                    outlierDetection.detectors.failurePercentage.requestVolume value.
+                                    Detection also will not be performed for a cluster if the number of hosts
+                                    with the minimum required request volume in an interval is less than the
+                                    outlierDetection.detectors.failurePercentage.minimumHosts value.
+                                  properties:
+                                    minimumHosts:
+                                      description: |-
+                                        The minimum number of hosts in a cluster in order to perform failure
+                                        percentage-based ejection. If the total number of hosts in the cluster is
+                                        less than this value, failure percentage-based ejection will not be
+                                        performed.
+                                      format: int32
+                                      type: integer
+                                    requestVolume:
+                                      description: |-
+                                        The minimum number of total requests that must be collected in one
+                                        interval (as defined by the interval duration above) to perform failure
+                                        percentage-based ejection for this host. If the volume is lower than this
+                                        setting, failure percentage-based ejection will not be performed for this
+                                        host.
+                                      format: int32
+                                      type: integer
+                                    threshold:
+                                      description: |-
+                                        The failure percentage to use when determining failure percentage-based
+                                        outlier detection. If the failure percentage of a given host is greater
+                                        than or equal to this value, it will be ejected.
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                gatewayFailures:
+                                  description: |-
+                                    In the default mode (outlierDetection.splitExternalLocalOriginErrors is
+                                    false) this detection type takes into account a subset of 5xx errors,
+                                    called "gateway errors" (502, 503 or 504 status code) and local origin
+                                    failures, such as timeout, TCP reset etc.
+                                    In split mode (outlierDetection.splitExternalLocalOriginErrors is true)
+                                    this detection type takes into account a subset of 5xx errors, called
+                                    "gateway errors" (502, 503 or 504 status code) and is supported only by
+                                    the http router.
+                                  properties:
+                                    consecutive:
+                                      description: |-
+                                        The number of consecutive gateway failures (502, 503, 504 status codes)
+                                        before a consecutive gateway failure ejection occurs.
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                localOriginFailures:
+                                  description: |-
+                                    This detection type is enabled only when
+                                    outlierDetection.splitExternalLocalOriginErrors is true and takes into
+                                    account only locally originated errors (timeout, reset, etc).
+                                    If Envoy repeatedly cannot connect to an upstream host or communication
+                                    with the upstream host is repeatedly interrupted, it will be ejected.
+                                    Various locally originated problems are detected: timeout, TCP reset,
+                                    ICMP errors, etc. This detection type is supported by http router and
+                                    tcp proxy.
+                                  properties:
+                                    consecutive:
+                                      description: |-
+                                        The number of consecutive locally originated failures before ejection
+                                        occurs. Parameter takes effect only when splitExternalAndLocalErrors
+                                        is set to true.
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                successRate:
+                                  description: |-
+                                    Success Rate based outlier detection aggregates success rate data from
+                                    every host in a cluster. Then at given intervals ejects hosts based on
+                                    statistical outlier detection. Success Rate outlier detection will not be
+                                    calculated for a host if its request volume over the aggregation interval
+                                    is less than the outlierDetection.detectors.successRate.requestVolume
+                                    value.
+                                    Moreover, detection will not be performed for a cluster if the number of
+                                    hosts with the minimum required request volume in an interval is less
+                                    than the outlierDetection.detectors.successRate.minimumHosts value.
+                                    In the default configuration mode
+                                    (outlierDetection.splitExternalLocalOriginErrors is false) this detection
+                                    type takes into account all types of errors: locally and externally
+                                    originated.
+                                    In split mode (outlierDetection.splitExternalLocalOriginErrors is true),
+                                    locally originated errors and externally originated (transaction) errors
+                                    are counted and treated separately.
+                                  properties:
+                                    minimumHosts:
+                                      description: |-
+                                        The number of hosts in a cluster that must have enough request volume to
+                                        detect success rate outliers. If the number of hosts is less than this
+                                        setting, outlier detection via success rate statistics is not performed
+                                        for any host in the cluster.
+                                      format: int32
+                                      type: integer
+                                    requestVolume:
+                                      description: |-
+                                        The minimum number of total requests that must be collected in one
+                                        interval (as defined by the interval duration configured in
+                                        outlierDetection section) to include this host in success rate based
+                                        outlier detection. If the volume is lower than this setting, outlier
+                                        detection via success rate statistics is not performed for that host.
+                                      format: int32
+                                      type: integer
+                                    standardDeviationFactor:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      description: |-
+                                        This factor is used to determine the ejection threshold for success rate
+                                        outlier ejection. The ejection threshold is the difference between
+                                        the mean success rate, and the product of this factor and the standard
+                                        deviation of the mean success rate: mean - (standard_deviation *
+                                        success_rate_standard_deviation_factor).
+                                        Either int or decimal represented as string.
+                                      x-kubernetes-int-or-string: true
+                                  type: object
+                                totalFailures:
+                                  description: |-
+                                    In the default mode (outlierDetection.splitExternalAndLocalErrors is
+                                    false) this detection type takes into account all generated errors:
+                                    locally originated and externally originated (transaction) errors.
+                                    In split mode (outlierDetection.splitExternalLocalOriginErrors is true)
+                                    this detection type takes into account only externally originated
+                                    (transaction) errors, ignoring locally originated errors.
+                                    If an upstream host is an HTTP-server, only 5xx types of error are taken
+                                    into account (see Consecutive Gateway Failure for exceptions).
+                                    Properly formatted responses, even when they carry an operational error
+                                    (like index not found, access denied) are not taken into account.
+                                  properties:
+                                    consecutive:
+                                      description: |-
+                                        The number of consecutive server-side error responses (for HTTP traffic,
+                                        5xx responses; for TCP traffic, connection failures; for Redis, failure
+                                        to respond PONG; etc.) before a consecutive total failure ejection
+                                        occurs.
+                                      format: int32
+                                      type: integer
+                                  type: object
+                              type: object
+                            disabled:
+                              description: When set to true, outlierDetection configuration
+                                won't take any effect
+                              type: boolean
+                            interval:
+                              description: |-
+                                The time interval between ejection analysis sweeps. This can result in
+                                both new ejections and hosts being returned to service.
+                              type: string
+                            maxEjectionPercent:
+                              description: |-
+                                The maximum % of an upstream cluster that can be ejected due to outlier
+                                detection. Defaults to 10% but will eject at least one host regardless of
+                                the value.
+                              format: int32
+                              type: integer
+                            splitExternalAndLocalErrors:
+                              description: |-
+                                Determines whether to distinguish local origin failures from external
+                                errors. If set to true the following configuration parameters are taken
+                                into account: detectors.localOriginFailures.consecutive
+                              type: boolean
+                          type: object
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        destinations.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined in place.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+              to:
+                description: |-
+                  To list makes a match between the consumed services and corresponding
+                  configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of destinations
+                        referenced in 'targetRef'
+                      properties:
+                        connectionLimits:
+                          description: |-
+                            ConnectionLimits contains configuration of each circuit breaking limit,
+                            which when exceeded makes the circuit breaker to become open (no traffic
+                            is allowed like no current is allowed in the circuits when physical
+                            circuit breaker ir open)
+                          properties:
+                            maxConnectionPools:
+                              description: |-
+                                The maximum number of connection pools per cluster that are concurrently
+                                supported at once. Set this for clusters which create a large number of
+                                connection pools.
+                              format: int32
+                              type: integer
+                            maxConnections:
+                              description: |-
+                                The maximum number of connections allowed to be made to the upstream
+                                cluster.
+                              format: int32
+                              type: integer
+                            maxPendingRequests:
+                              description: |-
+                                The maximum number of pending requests that are allowed to the upstream
+                                cluster. This limit is applied as a connection limit for non-HTTP
+                                traffic.
+                              format: int32
+                              type: integer
+                            maxRequests:
+                              description: |-
+                                The maximum number of parallel requests that are allowed to be made
+                                to the upstream cluster. This limit does not apply to non-HTTP traffic.
+                              format: int32
+                              type: integer
+                            maxRetries:
+                              description: |-
+                                The maximum number of parallel retries that will be allowed to
+                                the upstream cluster.
+                              format: int32
+                              type: integer
+                          type: object
+                        outlierDetection:
+                          description: |-
+                            OutlierDetection contains the configuration of the process of dynamically
+                            determining whether some number of hosts in an upstream cluster are
+                            performing unlike the others and removing them from the healthy load
+                            balancing set. Performance might be along different axes such as
+                            consecutive failures, temporal success rate, temporal latency, etc.
+                            Outlier detection is a form of passive health checking.
+                          properties:
+                            baseEjectionTime:
+                              description: |-
+                                The base time that a host is ejected for. The real time is equal to
+                                the base time multiplied by the number of times the host has been
+                                ejected.
+                              type: string
+                            detectors:
+                              description: Contains configuration for supported outlier
+                                detectors
+                              properties:
+                                failurePercentage:
+                                  description: |-
+                                    Failure Percentage based outlier detection functions similarly to success
+                                    rate detection, in that it relies on success rate data from each host in
+                                    a cluster. However, rather than compare those values to the mean success
+                                    rate of the cluster as a whole, they are compared to a flat
+                                    user-configured threshold. This threshold is configured via the
+                                    outlierDetection.failurePercentageThreshold field.
+                                    The other configuration fields for failure percentage based detection are
+                                    similar to the fields for success rate detection. As with success rate
+                                    detection, detection will not be performed for a host if its request
+                                    volume over the aggregation interval is less than the
+                                    outlierDetection.detectors.failurePercentage.requestVolume value.
+                                    Detection also will not be performed for a cluster if the number of hosts
+                                    with the minimum required request volume in an interval is less than the
+                                    outlierDetection.detectors.failurePercentage.minimumHosts value.
+                                  properties:
+                                    minimumHosts:
+                                      description: |-
+                                        The minimum number of hosts in a cluster in order to perform failure
+                                        percentage-based ejection. If the total number of hosts in the cluster is
+                                        less than this value, failure percentage-based ejection will not be
+                                        performed.
+                                      format: int32
+                                      type: integer
+                                    requestVolume:
+                                      description: |-
+                                        The minimum number of total requests that must be collected in one
+                                        interval (as defined by the interval duration above) to perform failure
+                                        percentage-based ejection for this host. If the volume is lower than this
+                                        setting, failure percentage-based ejection will not be performed for this
+                                        host.
+                                      format: int32
+                                      type: integer
+                                    threshold:
+                                      description: |-
+                                        The failure percentage to use when determining failure percentage-based
+                                        outlier detection. If the failure percentage of a given host is greater
+                                        than or equal to this value, it will be ejected.
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                gatewayFailures:
+                                  description: |-
+                                    In the default mode (outlierDetection.splitExternalLocalOriginErrors is
+                                    false) this detection type takes into account a subset of 5xx errors,
+                                    called "gateway errors" (502, 503 or 504 status code) and local origin
+                                    failures, such as timeout, TCP reset etc.
+                                    In split mode (outlierDetection.splitExternalLocalOriginErrors is true)
+                                    this detection type takes into account a subset of 5xx errors, called
+                                    "gateway errors" (502, 503 or 504 status code) and is supported only by
+                                    the http router.
+                                  properties:
+                                    consecutive:
+                                      description: |-
+                                        The number of consecutive gateway failures (502, 503, 504 status codes)
+                                        before a consecutive gateway failure ejection occurs.
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                localOriginFailures:
+                                  description: |-
+                                    This detection type is enabled only when
+                                    outlierDetection.splitExternalLocalOriginErrors is true and takes into
+                                    account only locally originated errors (timeout, reset, etc).
+                                    If Envoy repeatedly cannot connect to an upstream host or communication
+                                    with the upstream host is repeatedly interrupted, it will be ejected.
+                                    Various locally originated problems are detected: timeout, TCP reset,
+                                    ICMP errors, etc. This detection type is supported by http router and
+                                    tcp proxy.
+                                  properties:
+                                    consecutive:
+                                      description: |-
+                                        The number of consecutive locally originated failures before ejection
+                                        occurs. Parameter takes effect only when splitExternalAndLocalErrors
+                                        is set to true.
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                successRate:
+                                  description: |-
+                                    Success Rate based outlier detection aggregates success rate data from
+                                    every host in a cluster. Then at given intervals ejects hosts based on
+                                    statistical outlier detection. Success Rate outlier detection will not be
+                                    calculated for a host if its request volume over the aggregation interval
+                                    is less than the outlierDetection.detectors.successRate.requestVolume
+                                    value.
+                                    Moreover, detection will not be performed for a cluster if the number of
+                                    hosts with the minimum required request volume in an interval is less
+                                    than the outlierDetection.detectors.successRate.minimumHosts value.
+                                    In the default configuration mode
+                                    (outlierDetection.splitExternalLocalOriginErrors is false) this detection
+                                    type takes into account all types of errors: locally and externally
+                                    originated.
+                                    In split mode (outlierDetection.splitExternalLocalOriginErrors is true),
+                                    locally originated errors and externally originated (transaction) errors
+                                    are counted and treated separately.
+                                  properties:
+                                    minimumHosts:
+                                      description: |-
+                                        The number of hosts in a cluster that must have enough request volume to
+                                        detect success rate outliers. If the number of hosts is less than this
+                                        setting, outlier detection via success rate statistics is not performed
+                                        for any host in the cluster.
+                                      format: int32
+                                      type: integer
+                                    requestVolume:
+                                      description: |-
+                                        The minimum number of total requests that must be collected in one
+                                        interval (as defined by the interval duration configured in
+                                        outlierDetection section) to include this host in success rate based
+                                        outlier detection. If the volume is lower than this setting, outlier
+                                        detection via success rate statistics is not performed for that host.
+                                      format: int32
+                                      type: integer
+                                    standardDeviationFactor:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      description: |-
+                                        This factor is used to determine the ejection threshold for success rate
+                                        outlier ejection. The ejection threshold is the difference between
+                                        the mean success rate, and the product of this factor and the standard
+                                        deviation of the mean success rate: mean - (standard_deviation *
+                                        success_rate_standard_deviation_factor).
+                                        Either int or decimal represented as string.
+                                      x-kubernetes-int-or-string: true
+                                  type: object
+                                totalFailures:
+                                  description: |-
+                                    In the default mode (outlierDetection.splitExternalAndLocalErrors is
+                                    false) this detection type takes into account all generated errors:
+                                    locally originated and externally originated (transaction) errors.
+                                    In split mode (outlierDetection.splitExternalLocalOriginErrors is true)
+                                    this detection type takes into account only externally originated
+                                    (transaction) errors, ignoring locally originated errors.
+                                    If an upstream host is an HTTP-server, only 5xx types of error are taken
+                                    into account (see Consecutive Gateway Failure for exceptions).
+                                    Properly formatted responses, even when they carry an operational error
+                                    (like index not found, access denied) are not taken into account.
+                                  properties:
+                                    consecutive:
+                                      description: |-
+                                        The number of consecutive server-side error responses (for HTTP traffic,
+                                        5xx responses; for TCP traffic, connection failures; for Redis, failure
+                                        to respond PONG; etc.) before a consecutive total failure ejection
+                                        occurs.
+                                      format: int32
+                                      type: integer
+                                  type: object
+                              type: object
+                            disabled:
+                              description: When set to true, outlierDetection configuration
+                                won't take any effect
+                              type: boolean
+                            interval:
+                              description: |-
+                                The time interval between ejection analysis sweeps. This can result in
+                                both new ejections and hosts being returned to service.
+                              type: string
+                            maxEjectionPercent:
+                              description: |-
+                                The maximum % of an upstream cluster that can be ejected due to outlier
+                                detection. Defaults to 10% but will eject at least one host regardless of
+                                the value.
+                              format: int32
+                              type: integer
+                            splitExternalAndLocalErrors:
+                              description: |-
+                                Determines whether to distinguish local origin failures from external
+                                errors. If set to true the following configuration parameters are taken
+                                into account: detectors.localOriginFailures.consecutive
+                              type: boolean
+                          type: object
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        destinations.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshes.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshes.yaml
new file mode 100644
index 000000000..a9fec649c
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshes.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshes.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: Mesh
+    listKind: MeshList
+    plural: meshes
+    singular: mesh
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma Mesh resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshexternalservices.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshexternalservices.yaml
new file mode 100644
index 000000000..12f87ab5a
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshexternalservices.yaml
@@ -0,0 +1,333 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshexternalservices.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshExternalService
+    listKind: MeshExternalServiceList
+    plural: meshexternalservices
+    singular: meshexternalservice
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.addresses[0].hostname
+      name: Hostname
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshExternalService
+              resource.
+            properties:
+              endpoints:
+                description: Endpoints defines a list of destinations to send traffic
+                  to.
+                items:
+                  properties:
+                    address:
+                      description: Address defines an address to which a user want
+                        to send a request. Is possible to provide `domain`, `ip`.
+                      example: example.com
+                      minLength: 1
+                      type: string
+                    port:
+                      description: Port of the endpoint
+                      maximum: 65535
+                      minimum: 1
+                      type: integer
+                  required:
+                  - address
+                  - port
+                  type: object
+                type: array
+              extension:
+                description: Extension struct for a plugin configuration, in the presence
+                  of an extension `endpoints` and `tls` are not required anymore -
+                  it's up to the extension to validate them independently.
+                properties:
+                  config:
+                    description: Config freeform configuration for the extension.
+                    x-kubernetes-preserve-unknown-fields: true
+                  type:
+                    description: Type of the extension.
+                    type: string
+                required:
+                - config
+                - type
+                type: object
+              match:
+                description: Match defines traffic that should be routed through the
+                  sidecar.
+                properties:
+                  port:
+                    description: Port defines a port to which a user does request.
+                    maximum: 65535
+                    minimum: 1
+                    type: integer
+                  protocol:
+                    default: tcp
+                    description: 'Protocol defines a protocol of the communication.
+                      Possible values: `tcp`, `grpc`, `http`, `http2`.'
+                    enum:
+                    - tcp
+                    - grpc
+                    - http
+                    - http2
+                    type: string
+                  type:
+                    default: HostnameGenerator
+                    description: Type of the match, only `HostnameGenerator` is available
+                      at the moment.
+                    enum:
+                    - HostnameGenerator
+                    type: string
+                required:
+                - port
+                type: object
+              tls:
+                description: Tls provides a TLS configuration when proxy is resposible
+                  for a TLS origination
+                properties:
+                  allowRenegotiation:
+                    default: false
+                    description: |-
+                      AllowRenegotiation defines if TLS sessions will allow renegotiation.
+                      Setting this to true is not recommended for security reasons.
+                    type: boolean
+                  enabled:
+                    default: false
+                    description: Enabled defines if proxy should originate TLS.
+                    type: boolean
+                  verification:
+                    description: Verification section for providing TLS verification
+                      details.
+                    properties:
+                      caCert:
+                        description: CaCert defines a certificate of CA.
+                        properties:
+                          inline:
+                            description: Data source is inline bytes.
+                            format: byte
+                            type: string
+                          inlineString:
+                            description: Data source is inline string`
+                            type: string
+                          secret:
+                            description: Data source is a secret with given Secret
+                              key.
+                            type: string
+                        type: object
+                      clientCert:
+                        description: ClientCert defines a certificate of a client.
+                        properties:
+                          inline:
+                            description: Data source is inline bytes.
+                            format: byte
+                            type: string
+                          inlineString:
+                            description: Data source is inline string`
+                            type: string
+                          secret:
+                            description: Data source is a secret with given Secret
+                              key.
+                            type: string
+                        type: object
+                      clientKey:
+                        description: ClientKey defines a client private key.
+                        properties:
+                          inline:
+                            description: Data source is inline bytes.
+                            format: byte
+                            type: string
+                          inlineString:
+                            description: Data source is inline string`
+                            type: string
+                          secret:
+                            description: Data source is a secret with given Secret
+                              key.
+                            type: string
+                        type: object
+                      mode:
+                        default: Secured
+                        description: Mode defines if proxy should skip verification,
+                          one of `SkipSAN`, `SkipCA`, `Secured`, `SkipAll`. Default
+                          `Secured`.
+                        enum:
+                        - SkipSAN
+                        - SkipCA
+                        - Secured
+                        - SkipAll
+                        type: string
+                      serverName:
+                        description: ServerName overrides the default Server Name
+                          Indicator set by Kuma.
+                        type: string
+                      subjectAltNames:
+                        description: SubjectAltNames list of names to verify in the
+                          certificate.
+                        items:
+                          properties:
+                            type:
+                              default: Exact
+                              description: 'Type specifies matching type, one of `Exact`,
+                                `Prefix`. Default: `Exact`'
+                              enum:
+                              - Exact
+                              - Prefix
+                              type: string
+                            value:
+                              description: Value to match.
+                              type: string
+                          required:
+                          - value
+                          type: object
+                        type: array
+                    type: object
+                  version:
+                    description: Version section for providing version specification.
+                    properties:
+                      max:
+                        default: TLSAuto
+                        description: Max defines maximum supported version. One of
+                          `TLSAuto`, `TLS10`, `TLS11`, `TLS12`, `TLS13`.
+                        enum:
+                        - TLSAuto
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      min:
+                        default: TLSAuto
+                        description: Min defines minimum supported version. One of
+                          `TLSAuto`, `TLS10`, `TLS11`, `TLS12`, `TLS13`.
+                        enum:
+                        - TLSAuto
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                    type: object
+                type: object
+            required:
+            - match
+            type: object
+          status:
+            description: Status is the current status of the Kuma MeshExternalService
+              resource.
+            properties:
+              addresses:
+                description: Addresses section for generated domains
+                items:
+                  properties:
+                    hostname:
+                      type: string
+                    hostnameGeneratorRef:
+                      properties:
+                        coreName:
+                          type: string
+                      required:
+                      - coreName
+                      type: object
+                    origin:
+                      type: string
+                  type: object
+                type: array
+              hostnameGenerators:
+                items:
+                  properties:
+                    conditions:
+                      description: Conditions is an array of hostname generator conditions.
+                      items:
+                        properties:
+                          message:
+                            description: |-
+                              message is a human readable message indicating details about the transition.
+                              This may be an empty string.
+                            maxLength: 32768
+                            type: string
+                          reason:
+                            description: |-
+                              reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                              Producers of specific condition types may define expected values and meanings for this field,
+                              and whether the values are considered a guaranteed API.
+                              The value should be a CamelCase string.
+                              This field may not be empty.
+                            maxLength: 1024
+                            minLength: 1
+                            pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                            type: string
+                          status:
+                            description: status of the condition, one of True, False,
+                              Unknown.
+                            enum:
+                            - "True"
+                            - "False"
+                            - Unknown
+                            type: string
+                          type:
+                            description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                            maxLength: 316
+                            pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                            type: string
+                        required:
+                        - message
+                        - reason
+                        - status
+                        - type
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - type
+                      x-kubernetes-list-type: map
+                    hostnameGeneratorRef:
+                      properties:
+                        coreName:
+                          type: string
+                      required:
+                      - coreName
+                      type: object
+                  required:
+                  - hostnameGeneratorRef
+                  type: object
+                type: array
+              vip:
+                description: Vip section for allocated IP
+                properties:
+                  ip:
+                    description: Value allocated IP for a provided domain with `HostnameGenerator`
+                      type in a match section.
+                    type: string
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshfaultinjections.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshfaultinjections.yaml
new file mode 100644
index 000000000..538675b6e
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshfaultinjections.yaml
@@ -0,0 +1,420 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshfaultinjections.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshFaultInjection
+    listKind: MeshFaultInjectionList
+    plural: meshfaultinjections
+    singular: meshfaultinjection
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshFaultInjection
+              resource.
+            properties:
+              from:
+                description: From list makes a match between clients and corresponding
+                  configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of destinations referenced in
+                        'targetRef'
+                      properties:
+                        http:
+                          description: Http allows to define list of Http faults between
+                            dataplanes.
+                          items:
+                            description: FaultInjection defines the configuration
+                              of faults between dataplanes.
+                            properties:
+                              abort:
+                                description: |-
+                                  Abort defines a configuration of not delivering requests to destination
+                                  service and replacing the responses from destination dataplane by
+                                  predefined status code
+                                properties:
+                                  httpStatus:
+                                    description: HTTP status code which will be returned
+                                      to source side
+                                    format: int32
+                                    type: integer
+                                  percentage:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: |-
+                                      Percentage of requests on which abort will be injected, has to be
+                                      either int or decimal represented as string.
+                                    x-kubernetes-int-or-string: true
+                                required:
+                                - httpStatus
+                                - percentage
+                                type: object
+                              delay:
+                                description: Delay defines configuration of delaying
+                                  a response from a destination
+                                properties:
+                                  percentage:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: |-
+                                      Percentage of requests on which delay will be injected, has to be
+                                      either int or decimal represented as string.
+                                    x-kubernetes-int-or-string: true
+                                  value:
+                                    description: The duration during which the response
+                                      will be delayed
+                                    type: string
+                                required:
+                                - percentage
+                                - value
+                                type: object
+                              responseBandwidth:
+                                description: |-
+                                  ResponseBandwidth defines a configuration to limit the speed of
+                                  responding to the requests
+                                properties:
+                                  limit:
+                                    description: |-
+                                      Limit is represented by value measure in Gbps, Mbps, kbps, e.g.
+                                      10kbps
+                                    type: string
+                                  percentage:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: |-
+                                      Percentage of requests on which response bandwidth limit will be
+                                      either int or decimal represented as string.
+                                    x-kubernetes-int-or-string: true
+                                required:
+                                - limit
+                                - percentage
+                                type: object
+                            type: object
+                          type: array
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        destinations.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined inplace.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+              to:
+                description: To list makes a match between clients and corresponding
+                  configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of destinations referenced in
+                        'targetRef'
+                      properties:
+                        http:
+                          description: Http allows to define list of Http faults between
+                            dataplanes.
+                          items:
+                            description: FaultInjection defines the configuration
+                              of faults between dataplanes.
+                            properties:
+                              abort:
+                                description: |-
+                                  Abort defines a configuration of not delivering requests to destination
+                                  service and replacing the responses from destination dataplane by
+                                  predefined status code
+                                properties:
+                                  httpStatus:
+                                    description: HTTP status code which will be returned
+                                      to source side
+                                    format: int32
+                                    type: integer
+                                  percentage:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: |-
+                                      Percentage of requests on which abort will be injected, has to be
+                                      either int or decimal represented as string.
+                                    x-kubernetes-int-or-string: true
+                                required:
+                                - httpStatus
+                                - percentage
+                                type: object
+                              delay:
+                                description: Delay defines configuration of delaying
+                                  a response from a destination
+                                properties:
+                                  percentage:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: |-
+                                      Percentage of requests on which delay will be injected, has to be
+                                      either int or decimal represented as string.
+                                    x-kubernetes-int-or-string: true
+                                  value:
+                                    description: The duration during which the response
+                                      will be delayed
+                                    type: string
+                                required:
+                                - percentage
+                                - value
+                                type: object
+                              responseBandwidth:
+                                description: |-
+                                  ResponseBandwidth defines a configuration to limit the speed of
+                                  responding to the requests
+                                properties:
+                                  limit:
+                                    description: |-
+                                      Limit is represented by value measure in Gbps, Mbps, kbps, e.g.
+                                      10kbps
+                                    type: string
+                                  percentage:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: |-
+                                      Percentage of requests on which response bandwidth limit will be
+                                      either int or decimal represented as string.
+                                    x-kubernetes-int-or-string: true
+                                required:
+                                - limit
+                                - percentage
+                                type: object
+                            type: object
+                          type: array
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        destinations.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshgatewayinstances.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshgatewayinstances.yaml
new file mode 100644
index 000000000..f68545cf0
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshgatewayinstances.yaml
@@ -0,0 +1,354 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshgatewayinstances.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshGatewayInstance
+    listKind: MeshGatewayInstanceList
+    plural: meshgatewayinstances
+    singular: meshgatewayinstance
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          MeshGatewayInstance represents a managed instance of a dataplane proxy for a Kuma
+          Gateway.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: MeshGatewayInstanceSpec specifies the options available for
+              a GatewayDataplane.
+            properties:
+              podTemplate:
+                description: PodTemplate configures the Pod owned by this config.
+                properties:
+                  metadata:
+                    description: Metadata holds metadata configuration for a Service.
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        description: Annotations holds annotations to be set on an
+                          object.
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        description: Labels holds labels to be set on an objects.
+                        type: object
+                    type: object
+                  spec:
+                    description: Spec holds some customizable fields of a Pod.
+                    properties:
+                      container:
+                        description: Container corresponds to PodSpec.Container
+                        properties:
+                          securityContext:
+                            description: ContainerSecurityContext corresponds to PodSpec.Container.SecurityContext
+                            properties:
+                              readOnlyRootFilesystem:
+                                description: ReadOnlyRootFilesystem corresponds to
+                                  PodSpec.Container.SecurityContext.ReadOnlyRootFilesystem
+                                type: boolean
+                            type: object
+                        type: object
+                      securityContext:
+                        description: PodSecurityContext corresponds to PodSpec.SecurityContext
+                        properties:
+                          fsGroup:
+                            description: FSGroup corresponds to PodSpec.SecurityContext.FSGroup
+                            format: int64
+                            type: integer
+                        type: object
+                      serviceAccountName:
+                        description: ServiceAccountName corresponds to PodSpec.ServiceAccountName.
+                        type: string
+                    type: object
+                type: object
+              replicas:
+                default: 1
+                description: |-
+                  Replicas is the number of dataplane proxy replicas to create. For
+                  now this is a fixed number, but in the future it could be
+                  automatically scaled based on metrics.
+                format: int32
+                minimum: 1
+                type: integer
+              resources:
+                description: |-
+                  Resources specifies the compute resources for the proxy container.
+                  The default can be set in the control plane config.
+                properties:
+                  claims:
+                    description: |-
+                      Claims lists the names of resources, defined in spec.resourceClaims,
+                      that are used by this container.
+
+                      This is an alpha field and requires enabling the
+                      DynamicResourceAllocation feature gate.
+
+                      This field is immutable. It can only be set for containers.
+                    items:
+                      description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                      properties:
+                        name:
+                          description: |-
+                            Name must match the name of one entry in pod.spec.resourceClaims of
+                            the Pod where this field is used. It makes that resource available
+                            inside a container.
+                          type: string
+                        request:
+                          description: |-
+                            Request is the name chosen for a request in the referenced claim.
+                            If empty, everything from the claim is made available, otherwise
+                            only the result of this request.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  limits:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Limits describes the maximum amount of compute resources allowed.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                  requests:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Requests describes the minimum amount of compute resources required.
+                      If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                      otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                type: object
+              serviceTemplate:
+                description: ServiceTemplate configures the Service owned by this
+                  config.
+                properties:
+                  metadata:
+                    description: Metadata holds metadata configuration for a Service.
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        description: Annotations holds annotations to be set on an
+                          object.
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        description: Labels holds labels to be set on an objects.
+                        type: object
+                    type: object
+                  spec:
+                    description: Spec holds some customizable fields of a Service.
+                    properties:
+                      loadBalancerIP:
+                        description: LoadBalancerIP corresponds to ServiceSpec.LoadBalancerIP.
+                        type: string
+                    type: object
+                type: object
+              serviceType:
+                default: LoadBalancer
+                description: |-
+                  ServiceType specifies the type of managed Service that will be
+                  created to expose the dataplane proxies to traffic from outside
+                  the cluster. The ports to expose will be taken from the matching Gateway
+                  resource. If there is no matching Gateway, the managed Service will
+                  be deleted.
+                enum:
+                - LoadBalancer
+                - ClusterIP
+                - NodePort
+                type: string
+              tags:
+                additionalProperties:
+                  type: string
+                description: |-
+                  Tags specifies the Kuma tags that are propagated to the managed
+                  dataplane proxies. These tags should not include `kuma.io/service` tag
+                  since is auto-generated, and should match exactly one Gateway
+                  resource.
+                type: object
+            type: object
+          status:
+            description: |-
+              MeshGatewayInstanceStatus holds information about the status of the gateway
+              instance.
+            properties:
+              conditions:
+                description: Conditions is an array of gateway instance conditions.
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
+              loadBalancer:
+                description: |-
+                  LoadBalancer contains the current status of the load-balancer,
+                  if one is present.
+                properties:
+                  ingress:
+                    description: |-
+                      Ingress is a list containing ingress points for the load-balancer.
+                      Traffic intended for the service should be sent to these ingress points.
+                    items:
+                      description: |-
+                        LoadBalancerIngress represents the status of a load-balancer ingress point:
+                        traffic intended for the service should be sent to an ingress point.
+                      properties:
+                        hostname:
+                          description: |-
+                            Hostname is set for load-balancer ingress points that are DNS based
+                            (typically AWS load-balancers)
+                          type: string
+                        ip:
+                          description: |-
+                            IP is set for load-balancer ingress points that are IP based
+                            (typically GCE or OpenStack load-balancers)
+                          type: string
+                        ipMode:
+                          description: |-
+                            IPMode specifies how the load-balancer IP behaves, and may only be specified when the ip field is specified.
+                            Setting this to "VIP" indicates that traffic is delivered to the node with
+                            the destination set to the load-balancer's IP and port.
+                            Setting this to "Proxy" indicates that traffic is delivered to the node or pod with
+                            the destination set to the node's IP and node port or the pod's IP and port.
+                            Service implementations may use this information to adjust traffic routing.
+                          type: string
+                        ports:
+                          description: |-
+                            Ports is a list of records of service ports
+                            If used, every port defined in the service should have an entry in it
+                          items:
+                            properties:
+                              error:
+                                description: |-
+                                  Error is to record the problem with the service port
+                                  The format of the error shall comply with the following rules:
+                                  - built-in error values shall be specified in this file and those shall use
+                                    CamelCase names
+                                  - cloud provider specific error values must have names that comply with the
+                                    format foo.example.com/CamelCase.
+                                maxLength: 316
+                                pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                                type: string
+                              port:
+                                description: Port is the port number of the service
+                                  port of which status is recorded here
+                                format: int32
+                                type: integer
+                              protocol:
+                                description: |-
+                                  Protocol is the protocol of the service port of which status is recorded here
+                                  The supported values are: "TCP", "UDP", "SCTP"
+                                type: string
+                            required:
+                            - error
+                            - port
+                            - protocol
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshgatewayroutes.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshgatewayroutes.yaml
new file mode 100644
index 000000000..ef006e9cb
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshgatewayroutes.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshgatewayroutes.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshGatewayRoute
+    listKind: MeshGatewayRouteList
+    plural: meshgatewayroutes
+    singular: meshgatewayroute
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshGatewayRoute resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshgateways.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshgateways.yaml
new file mode 100644
index 000000000..20ff66677
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshgateways.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshgateways.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshGateway
+    listKind: MeshGatewayList
+    plural: meshgateways
+    singular: meshgateway
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshGateway resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshhealthchecks.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshhealthchecks.yaml
new file mode 100644
index 000000000..d1a3a49f9
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshhealthchecks.yaml
@@ -0,0 +1,382 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshhealthchecks.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshHealthCheck
+    listKind: MeshHealthCheckList
+    plural: meshhealthchecks
+    singular: meshhealthcheck
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshHealthCheck resource.
+            properties:
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined inplace.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+              to:
+                description: To list makes a match between the consumed services and
+                  corresponding configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of destinations referenced in
+                        'targetRef'
+                      properties:
+                        alwaysLogHealthCheckFailures:
+                          description: |-
+                            If set to true, health check failure events will always be logged. If set
+                            to false, only the initial health check failure event will be logged. The
+                            default value is false.
+                          type: boolean
+                        eventLogPath:
+                          description: |-
+                            Specifies the path to the file where Envoy can log health check events.
+                            If empty, no event log will be written.
+                          type: string
+                        failTrafficOnPanic:
+                          description: |-
+                            If set to true, Envoy will not consider any hosts when the cluster is in
+                            'panic mode'. Instead, the cluster will fail all requests as if all hosts
+                            are unhealthy. This can help avoid potentially overwhelming a failing
+                            service.
+                          type: boolean
+                        grpc:
+                          description: |-
+                            GrpcHealthCheck defines gRPC configuration which will instruct the service
+                            the health check will be made for is a gRPC service.
+                          properties:
+                            authority:
+                              description: |-
+                                The value of the :authority header in the gRPC health check request,
+                                by default name of the cluster this health check is associated with
+                              type: string
+                            disabled:
+                              description: If true the GrpcHealthCheck is disabled
+                              type: boolean
+                            serviceName:
+                              description: Service name parameter which will be sent
+                                to gRPC service
+                              type: string
+                          type: object
+                        healthyPanicThreshold:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: |-
+                            Allows to configure panic threshold for Envoy cluster. If not specified,
+                            the default is 50%. To disable panic mode, set to 0%.
+                            Either int or decimal represented as string.
+                          x-kubernetes-int-or-string: true
+                        healthyThreshold:
+                          default: 1
+                          description: Number of consecutive healthy checks before
+                            considering a host healthy.
+                          format: int32
+                          type: integer
+                        http:
+                          description: |-
+                            HttpHealthCheck defines HTTP configuration which will instruct the service
+                            the health check will be made for is an HTTP service.
+                          properties:
+                            disabled:
+                              description: If true the HttpHealthCheck is disabled
+                              type: boolean
+                            expectedStatuses:
+                              description: List of HTTP response statuses which are
+                                considered healthy
+                              items:
+                                format: int32
+                                type: integer
+                              type: array
+                            path:
+                              default: /
+                              description: |-
+                                The HTTP path which will be requested during the health check
+                                (ie. /health)
+                              type: string
+                            requestHeadersToAdd:
+                              description: |-
+                                The list of HTTP headers which should be added to each health check
+                                request
+                              properties:
+                                add:
+                                  items:
+                                    properties:
+                                      name:
+                                        maxLength: 256
+                                        minLength: 1
+                                        pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                        type: string
+                                      value:
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  maxItems: 16
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - name
+                                  x-kubernetes-list-type: map
+                                set:
+                                  items:
+                                    properties:
+                                      name:
+                                        maxLength: 256
+                                        minLength: 1
+                                        pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                        type: string
+                                      value:
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  maxItems: 16
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - name
+                                  x-kubernetes-list-type: map
+                              type: object
+                          type: object
+                        initialJitter:
+                          description: |-
+                            If specified, Envoy will start health checking after a random time in
+                            ms between 0 and initialJitter. This only applies to the first health
+                            check.
+                          type: string
+                        interval:
+                          default: 1m
+                          description: Interval between consecutive health checks.
+                          type: string
+                        intervalJitter:
+                          description: |-
+                            If specified, during every interval Envoy will add IntervalJitter to the
+                            wait time.
+                          type: string
+                        intervalJitterPercent:
+                          description: |-
+                            If specified, during every interval Envoy will add IntervalJitter *
+                            IntervalJitterPercent / 100 to the wait time. If IntervalJitter and
+                            IntervalJitterPercent are both set, both of them will be used to
+                            increase the wait time.
+                          format: int32
+                          type: integer
+                        noTrafficInterval:
+                          description: |-
+                            The "no traffic interval" is a special health check interval that is used
+                            when a cluster has never had traffic routed to it. This lower interval
+                            allows cluster information to be kept up to date, without sending a
+                            potentially large amount of active health checking traffic for no reason.
+                            Once a cluster has been used for traffic routing, Envoy will shift back
+                            to using the standard health check interval that is defined. Note that
+                            this interval takes precedence over any other. The default value for "no
+                            traffic interval" is 60 seconds.
+                          type: string
+                        reuseConnection:
+                          description: Reuse health check connection between health
+                            checks. Default is true.
+                          type: boolean
+                        tcp:
+                          description: |-
+                            TcpHealthCheck defines configuration for specifying bytes to send and
+                            expected response during the health check
+                          properties:
+                            disabled:
+                              description: If true the TcpHealthCheck is disabled
+                              type: boolean
+                            receive:
+                              description: |-
+                                List of Base64 encoded blocks of strings expected as a response. When checking the response,
+                                "fuzzy" matching is performed such that each block must be found, and
+                                in the order specified, but not necessarily contiguous.
+                                If not provided or empty, checks will be performed as "connect only" and be marked as successful when TCP connection is successfully established.
+                              items:
+                                type: string
+                              type: array
+                            send:
+                              description: Base64 encoded content of the message which
+                                will be sent during the health check to the target
+                              type: string
+                          type: object
+                        timeout:
+                          default: 15s
+                          description: Maximum time to wait for a health check response.
+                          type: string
+                        unhealthyThreshold:
+                          default: 5
+                          description: |-
+                            Number of consecutive unhealthy checks before considering a host
+                            unhealthy.
+                          format: int32
+                          type: integer
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        destinations.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshhttproutes.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshhttproutes.yaml
new file mode 100644
index 000000000..14f8974b1
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshhttproutes.yaml
@@ -0,0 +1,668 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshhttproutes.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshHTTPRoute
+    listKind: MeshHTTPRouteList
+    plural: meshhttproutes
+    singular: meshhttproute
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshHTTPRoute resource.
+            properties:
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined inplace.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+              to:
+                description: To matches destination services of requests and holds
+                  configuration.
+                items:
+                  properties:
+                    hostnames:
+                      description: |-
+                        Hostnames is only valid when targeting MeshGateway and limits the
+                        effects of the rules to requests to this hostname.
+                        Given hostnames must intersect with the hostname of the listeners the
+                        route attaches to.
+                      items:
+                        type: string
+                      type: array
+                    rules:
+                      description: |-
+                        Rules contains the routing rules applies to a combination of top-level
+                        targetRef and the targetRef in this entry.
+                      items:
+                        properties:
+                          default:
+                            description: |-
+                              Default holds routing rules that can be merged with rules from other
+                              policies.
+                            properties:
+                              backendRefs:
+                                items:
+                                  description: BackendRef defines where to forward
+                                    traffic.
+                                  properties:
+                                    kind:
+                                      description: Kind of the referenced resource
+                                      enum:
+                                      - Mesh
+                                      - MeshSubset
+                                      - MeshGateway
+                                      - MeshService
+                                      - MeshExternalService
+                                      - MeshMultiZoneService
+                                      - MeshServiceSubset
+                                      - MeshHTTPRoute
+                                      type: string
+                                    labels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        Labels are used to select group of MeshServices that match labels. Either Labels or
+                                        Name and Namespace can be used.
+                                      type: object
+                                    mesh:
+                                      description: Mesh is reserved for future use
+                                        to identify cross mesh resources.
+                                      type: string
+                                    name:
+                                      description: |-
+                                        Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                                        `MeshServiceSubset` and `MeshGatewayRoute`
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                                        will be targeted.
+                                      type: string
+                                    port:
+                                      description: Port is only supported when this
+                                        ref refers to a real MeshService object
+                                      format: int32
+                                      type: integer
+                                    proxyTypes:
+                                      description: |-
+                                        ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                                        all data plane types are targeted by the policy.
+                                      items:
+                                        enum:
+                                        - Sidecar
+                                        - Gateway
+                                        type: string
+                                      minItems: 1
+                                      type: array
+                                    sectionName:
+                                      description: |-
+                                        SectionName is used to target specific section of resource.
+                                        For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                                      type: string
+                                    tags:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        Tags used to select a subset of proxies by tags. Can only be used with kinds
+                                        `MeshSubset` and `MeshServiceSubset`
+                                      type: object
+                                    weight:
+                                      default: 1
+                                      minimum: 0
+                                      type: integer
+                                  type: object
+                                type: array
+                              filters:
+                                items:
+                                  properties:
+                                    requestHeaderModifier:
+                                      description: |-
+                                        Only one action is supported per header name.
+                                        Configuration to set or add multiple values for a header must use RFC 7230
+                                        header value formatting, separating each value with a comma.
+                                      properties:
+                                        add:
+                                          items:
+                                            properties:
+                                              name:
+                                                maxLength: 256
+                                                minLength: 1
+                                                pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          maxItems: 16
+                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
+                                        remove:
+                                          items:
+                                            type: string
+                                          maxItems: 16
+                                          type: array
+                                        set:
+                                          items:
+                                            properties:
+                                              name:
+                                                maxLength: 256
+                                                minLength: 1
+                                                pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          maxItems: 16
+                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
+                                      type: object
+                                    requestMirror:
+                                      properties:
+                                        backendRef:
+                                          description: BackendRef defines where to
+                                            forward traffic.
+                                          properties:
+                                            kind:
+                                              description: Kind of the referenced
+                                                resource
+                                              enum:
+                                              - Mesh
+                                              - MeshSubset
+                                              - MeshGateway
+                                              - MeshService
+                                              - MeshExternalService
+                                              - MeshMultiZoneService
+                                              - MeshServiceSubset
+                                              - MeshHTTPRoute
+                                              type: string
+                                            labels:
+                                              additionalProperties:
+                                                type: string
+                                              description: |-
+                                                Labels are used to select group of MeshServices that match labels. Either Labels or
+                                                Name and Namespace can be used.
+                                              type: object
+                                            mesh:
+                                              description: Mesh is reserved for future
+                                                use to identify cross mesh resources.
+                                              type: string
+                                            name:
+                                              description: |-
+                                                Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                                                `MeshServiceSubset` and `MeshGatewayRoute`
+                                              type: string
+                                            namespace:
+                                              description: |-
+                                                Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                                                will be targeted.
+                                              type: string
+                                            port:
+                                              description: Port is only supported
+                                                when this ref refers to a real MeshService
+                                                object
+                                              format: int32
+                                              type: integer
+                                            proxyTypes:
+                                              description: |-
+                                                ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                                                all data plane types are targeted by the policy.
+                                              items:
+                                                enum:
+                                                - Sidecar
+                                                - Gateway
+                                                type: string
+                                              minItems: 1
+                                              type: array
+                                            sectionName:
+                                              description: |-
+                                                SectionName is used to target specific section of resource.
+                                                For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                                              type: string
+                                            tags:
+                                              additionalProperties:
+                                                type: string
+                                              description: |-
+                                                Tags used to select a subset of proxies by tags. Can only be used with kinds
+                                                `MeshSubset` and `MeshServiceSubset`
+                                              type: object
+                                            weight:
+                                              default: 1
+                                              minimum: 0
+                                              type: integer
+                                          type: object
+                                        percentage:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Percentage of requests to mirror. If not specified, all requests
+                                            to the target cluster will be mirrored.
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - backendRef
+                                      type: object
+                                    requestRedirect:
+                                      properties:
+                                        hostname:
+                                          description: |-
+                                            PreciseHostname is the fully qualified domain name of a network host. This
+                                            matches the RFC 1123 definition of a hostname with 1 notable exception that
+                                            numeric IP addresses are not allowed.
+
+                                            Note that as per RFC1035 and RFC1123, a *label* must consist of lower case
+                                            alphanumeric characters or '-', and must start and end with an alphanumeric
+                                            character. No other punctuation is allowed.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        path:
+                                          description: |-
+                                            Path defines parameters used to modify the path of the incoming request.
+                                            The modified path is then used to construct the location header.
+                                            When empty, the request path is used as-is.
+                                          properties:
+                                            replaceFullPath:
+                                              type: string
+                                            replacePrefixMatch:
+                                              type: string
+                                            type:
+                                              enum:
+                                              - ReplaceFullPath
+                                              - ReplacePrefixMatch
+                                              type: string
+                                          required:
+                                          - type
+                                          type: object
+                                        port:
+                                          description: |-
+                                            Port is the port to be used in the value of the `Location`
+                                            header in the response.
+                                            When empty, port (if specified) of the request is used.
+                                          format: int32
+                                          maximum: 65535
+                                          minimum: 1
+                                          type: integer
+                                        scheme:
+                                          enum:
+                                          - http
+                                          - https
+                                          type: string
+                                        statusCode:
+                                          default: 302
+                                          description: StatusCode is the HTTP status
+                                            code to be used in response.
+                                          enum:
+                                          - 301
+                                          - 302
+                                          - 303
+                                          - 307
+                                          - 308
+                                          type: integer
+                                      type: object
+                                    responseHeaderModifier:
+                                      description: |-
+                                        Only one action is supported per header name.
+                                        Configuration to set or add multiple values for a header must use RFC 7230
+                                        header value formatting, separating each value with a comma.
+                                      properties:
+                                        add:
+                                          items:
+                                            properties:
+                                              name:
+                                                maxLength: 256
+                                                minLength: 1
+                                                pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          maxItems: 16
+                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
+                                        remove:
+                                          items:
+                                            type: string
+                                          maxItems: 16
+                                          type: array
+                                        set:
+                                          items:
+                                            properties:
+                                              name:
+                                                maxLength: 256
+                                                minLength: 1
+                                                pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          maxItems: 16
+                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
+                                      type: object
+                                    type:
+                                      enum:
+                                      - RequestHeaderModifier
+                                      - ResponseHeaderModifier
+                                      - RequestRedirect
+                                      - URLRewrite
+                                      - RequestMirror
+                                      type: string
+                                    urlRewrite:
+                                      properties:
+                                        hostToBackendHostname:
+                                          description: |-
+                                            HostToBackendHostname rewrites the hostname to the hostname of the
+                                            upstream host. This option is only available when targeting MeshGateways.
+                                          type: boolean
+                                        hostname:
+                                          description: Hostname is the value to be
+                                            used to replace the host header value
+                                            during forwarding.
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                          type: string
+                                        path:
+                                          description: Path defines a path rewrite.
+                                          properties:
+                                            replaceFullPath:
+                                              type: string
+                                            replacePrefixMatch:
+                                              type: string
+                                            type:
+                                              enum:
+                                              - ReplaceFullPath
+                                              - ReplacePrefixMatch
+                                              type: string
+                                          required:
+                                          - type
+                                          type: object
+                                      type: object
+                                  required:
+                                  - type
+                                  type: object
+                                type: array
+                            type: object
+                          matches:
+                            description: |-
+                              Matches describes how to match HTTP requests this rule should be applied
+                              to.
+                            items:
+                              properties:
+                                headers:
+                                  items:
+                                    description: |-
+                                      HeaderMatch describes how to select an HTTP route by matching HTTP request
+                                      headers.
+                                    properties:
+                                      name:
+                                        description: |-
+                                          Name is the name of the HTTP Header to be matched. Name MUST be lower case
+                                          as they will be handled with case insensitivity (See https://tools.ietf.org/html/rfc7230#section-3.2).
+                                        maxLength: 256
+                                        minLength: 1
+                                        pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                        type: string
+                                      type:
+                                        default: Exact
+                                        description: Type specifies how to match against
+                                          the value of the header.
+                                        enum:
+                                        - Exact
+                                        - Present
+                                        - RegularExpression
+                                        - Absent
+                                        - Prefix
+                                        type: string
+                                      value:
+                                        description: Value is the value of HTTP Header
+                                          to be matched.
+                                        type: string
+                                    required:
+                                    - name
+                                    type: object
+                                  type: array
+                                method:
+                                  enum:
+                                  - CONNECT
+                                  - DELETE
+                                  - GET
+                                  - HEAD
+                                  - OPTIONS
+                                  - PATCH
+                                  - POST
+                                  - PUT
+                                  - TRACE
+                                  type: string
+                                path:
+                                  properties:
+                                    type:
+                                      enum:
+                                      - Exact
+                                      - PathPrefix
+                                      - RegularExpression
+                                      type: string
+                                    value:
+                                      description: |-
+                                        Exact or prefix matches must be an absolute path. A prefix matches only
+                                        if separated by a slash or the entire path.
+                                      minLength: 1
+                                      type: string
+                                  required:
+                                  - type
+                                  - value
+                                  type: object
+                                queryParams:
+                                  description: |-
+                                    QueryParams matches based on HTTP URL query parameters. Multiple matches
+                                    are ANDed together such that all listed matches must succeed.
+                                  items:
+                                    properties:
+                                      name:
+                                        minLength: 1
+                                        type: string
+                                      type:
+                                        enum:
+                                        - Exact
+                                        - RegularExpression
+                                        type: string
+                                      value:
+                                        type: string
+                                    required:
+                                    - name
+                                    - type
+                                    - value
+                                    type: object
+                                  type: array
+                              type: object
+                            minItems: 1
+                            type: array
+                        required:
+                        - default
+                        - matches
+                        type: object
+                      type: array
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        request destinations.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshinsights.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshinsights.yaml
new file mode 100644
index 000000000..93b570048
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshinsights.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshinsights.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshInsight
+    listKind: MeshInsightList
+    plural: meshinsights
+    singular: meshinsight
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshInsight resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshloadbalancingstrategies.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshloadbalancingstrategies.yaml
new file mode 100644
index 000000000..8fe3d6634
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshloadbalancingstrategies.yaml
@@ -0,0 +1,572 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshloadbalancingstrategies.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshLoadBalancingStrategy
+    listKind: MeshLoadBalancingStrategyList
+    plural: meshloadbalancingstrategies
+    singular: meshloadbalancingstrategy
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshLoadBalancingStrategy
+              resource.
+            properties:
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined inplace.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+              to:
+                description: To list makes a match between the consumed services and
+                  corresponding configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of destinations referenced in
+                        'targetRef'
+                      properties:
+                        loadBalancer:
+                          description: LoadBalancer allows to specify load balancing
+                            algorithm.
+                          properties:
+                            leastRequest:
+                              description: |-
+                                LeastRequest selects N random available hosts as specified in 'choiceCount' (2 by default)
+                                and picks the host which has the fewest active requests
+                              properties:
+                                activeRequestBias:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    ActiveRequestBias refers to dynamic weights applied when hosts have varying load
+                                    balancing weights. A higher value here aggressively reduces the weight of endpoints
+                                    that are currently handling active requests. In essence, the higher the ActiveRequestBias
+                                    value, the more forcefully it reduces the load balancing weight of endpoints that are
+                                    actively serving requests.
+                                  x-kubernetes-int-or-string: true
+                                choiceCount:
+                                  description: |-
+                                    ChoiceCount is the number of random healthy hosts from which the host with
+                                    the fewest active requests will be chosen. Defaults to 2 so that Envoy performs
+                                    two-choice selection if the field is not set.
+                                  format: int32
+                                  minimum: 2
+                                  type: integer
+                              type: object
+                            maglev:
+                              description: |-
+                                Maglev implements consistent hashing to upstream hosts. Maglev can be used as
+                                a drop in replacement for the ring hash load balancer any place in which
+                                consistent hashing is desired.
+                              properties:
+                                hashPolicies:
+                                  description: |-
+                                    HashPolicies specify a list of request/connection properties that are used to calculate a hash.
+                                    These hash policies are executed in the specified order. If a hash policy has the “terminal” attribute
+                                    set to true, and there is already a hash generated, the hash is returned immediately,
+                                    ignoring the rest of the hash policy list.
+                                  items:
+                                    properties:
+                                      connection:
+                                        properties:
+                                          sourceIP:
+                                            description: Hash on source IP address.
+                                            type: boolean
+                                        type: object
+                                      cookie:
+                                        properties:
+                                          name:
+                                            description: The name of the cookie that
+                                              will be used to obtain the hash key.
+                                            minLength: 1
+                                            type: string
+                                          path:
+                                            description: The name of the path for
+                                              the cookie.
+                                            type: string
+                                          ttl:
+                                            description: If specified, a cookie with
+                                              the TTL will be generated if the cookie
+                                              is not present.
+                                            type: string
+                                        required:
+                                        - name
+                                        type: object
+                                      filterState:
+                                        properties:
+                                          key:
+                                            description: |-
+                                              The name of the Object in the per-request filterState, which is
+                                              an Envoy::Hashable object. If there is no data associated with the key,
+                                              or the stored object is not Envoy::Hashable, no hash will be produced.
+                                            minLength: 1
+                                            type: string
+                                        required:
+                                        - key
+                                        type: object
+                                      header:
+                                        properties:
+                                          name:
+                                            description: The name of the request header
+                                              that will be used to obtain the hash
+                                              key.
+                                            minLength: 1
+                                            type: string
+                                        required:
+                                        - name
+                                        type: object
+                                      queryParameter:
+                                        properties:
+                                          name:
+                                            description: |-
+                                              The name of the URL query parameter that will be used to obtain the hash key.
+                                              If the parameter is not present, no hash will be produced. Query parameter names
+                                              are case-sensitive.
+                                            minLength: 1
+                                            type: string
+                                        required:
+                                        - name
+                                        type: object
+                                      terminal:
+                                        description: |-
+                                          Terminal is a flag that short-circuits the hash computing. This field provides
+                                          a ‘fallback’ style of configuration: “if a terminal policy doesn’t work, fallback
+                                          to rest of the policy list”, it saves time when the terminal policy works.
+                                          If true, and there is already a hash computed, ignore rest of the list of hash polices.
+                                        type: boolean
+                                      type:
+                                        enum:
+                                        - Header
+                                        - Cookie
+                                        - SourceIP
+                                        - QueryParameter
+                                        - FilterState
+                                        type: string
+                                    required:
+                                    - type
+                                    type: object
+                                  type: array
+                                tableSize:
+                                  description: |-
+                                    The table size for Maglev hashing. Maglev aims for “minimal disruption”
+                                    rather than an absolute guarantee. Minimal disruption means that when
+                                    the set of upstream hosts change, a connection will likely be sent
+                                    to the same upstream as it was before. Increasing the table size reduces
+                                    the amount of disruption. The table size must be prime number limited to 5000011.
+                                    If it is not specified, the default is 65537.
+                                  format: int32
+                                  maximum: 5000011
+                                  minimum: 1
+                                  type: integer
+                              type: object
+                            random:
+                              description: |-
+                                Random selects a random available host. The random load balancer generally
+                                performs better than round-robin if no health checking policy is configured.
+                                Random selection avoids bias towards the host in the set that comes after a failed host.
+                              type: object
+                            ringHash:
+                              description: |-
+                                RingHash  implements consistent hashing to upstream hosts. Each host is mapped
+                                onto a circle (the “ring”) by hashing its address; each request is then routed
+                                to a host by hashing some property of the request, and finding the nearest
+                                corresponding host clockwise around the ring.
+                              properties:
+                                hashFunction:
+                                  description: |-
+                                    HashFunction is a function used to hash hosts onto the ketama ring.
+                                    The value defaults to XX_HASH. Available values – XX_HASH, MURMUR_HASH_2.
+                                  enum:
+                                  - XXHash
+                                  - MurmurHash2
+                                  type: string
+                                hashPolicies:
+                                  description: |-
+                                    HashPolicies specify a list of request/connection properties that are used to calculate a hash.
+                                    These hash policies are executed in the specified order. If a hash policy has the “terminal” attribute
+                                    set to true, and there is already a hash generated, the hash is returned immediately,
+                                    ignoring the rest of the hash policy list.
+                                  items:
+                                    properties:
+                                      connection:
+                                        properties:
+                                          sourceIP:
+                                            description: Hash on source IP address.
+                                            type: boolean
+                                        type: object
+                                      cookie:
+                                        properties:
+                                          name:
+                                            description: The name of the cookie that
+                                              will be used to obtain the hash key.
+                                            minLength: 1
+                                            type: string
+                                          path:
+                                            description: The name of the path for
+                                              the cookie.
+                                            type: string
+                                          ttl:
+                                            description: If specified, a cookie with
+                                              the TTL will be generated if the cookie
+                                              is not present.
+                                            type: string
+                                        required:
+                                        - name
+                                        type: object
+                                      filterState:
+                                        properties:
+                                          key:
+                                            description: |-
+                                              The name of the Object in the per-request filterState, which is
+                                              an Envoy::Hashable object. If there is no data associated with the key,
+                                              or the stored object is not Envoy::Hashable, no hash will be produced.
+                                            minLength: 1
+                                            type: string
+                                        required:
+                                        - key
+                                        type: object
+                                      header:
+                                        properties:
+                                          name:
+                                            description: The name of the request header
+                                              that will be used to obtain the hash
+                                              key.
+                                            minLength: 1
+                                            type: string
+                                        required:
+                                        - name
+                                        type: object
+                                      queryParameter:
+                                        properties:
+                                          name:
+                                            description: |-
+                                              The name of the URL query parameter that will be used to obtain the hash key.
+                                              If the parameter is not present, no hash will be produced. Query parameter names
+                                              are case-sensitive.
+                                            minLength: 1
+                                            type: string
+                                        required:
+                                        - name
+                                        type: object
+                                      terminal:
+                                        description: |-
+                                          Terminal is a flag that short-circuits the hash computing. This field provides
+                                          a ‘fallback’ style of configuration: “if a terminal policy doesn’t work, fallback
+                                          to rest of the policy list”, it saves time when the terminal policy works.
+                                          If true, and there is already a hash computed, ignore rest of the list of hash polices.
+                                        type: boolean
+                                      type:
+                                        enum:
+                                        - Header
+                                        - Cookie
+                                        - SourceIP
+                                        - QueryParameter
+                                        - FilterState
+                                        type: string
+                                    required:
+                                    - type
+                                    type: object
+                                  type: array
+                                maxRingSize:
+                                  description: |-
+                                    Maximum hash ring size. Defaults to 8M entries, and limited to 8M entries,
+                                    but can be lowered to further constrain resource use.
+                                  format: int32
+                                  maximum: 8000000
+                                  minimum: 1
+                                  type: integer
+                                minRingSize:
+                                  description: |-
+                                    Minimum hash ring size. The larger the ring is (that is,
+                                    the more hashes there are for each provided host) the better the request distribution
+                                    will reflect the desired weights. Defaults to 1024 entries, and limited to 8M entries.
+                                  format: int32
+                                  maximum: 8000000
+                                  minimum: 1
+                                  type: integer
+                              type: object
+                            roundRobin:
+                              description: |-
+                                RoundRobin is a load balancing algorithm that distributes requests
+                                across available upstream hosts in round-robin order.
+                              type: object
+                            type:
+                              enum:
+                              - RoundRobin
+                              - LeastRequest
+                              - RingHash
+                              - Random
+                              - Maglev
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        localityAwareness:
+                          description: LocalityAwareness contains configuration for
+                            locality aware load balancing.
+                          properties:
+                            crossZone:
+                              description: |-
+                                CrossZone defines locality aware load balancing priorities when dataplane proxies inside local zone
+                                are unavailable
+                              properties:
+                                failover:
+                                  description: Failover defines list of load balancing
+                                    rules in order of priority
+                                  items:
+                                    properties:
+                                      from:
+                                        description: From defines the list of zones
+                                          to which the rule applies
+                                        properties:
+                                          zones:
+                                            items:
+                                              type: string
+                                            type: array
+                                        required:
+                                        - zones
+                                        type: object
+                                      to:
+                                        description: To defines to which zones the
+                                          traffic should be load balanced
+                                        properties:
+                                          type:
+                                            description: Type defines how target zones
+                                              will be picked from available zones
+                                            enum:
+                                            - None
+                                            - Only
+                                            - Any
+                                            - AnyExcept
+                                            type: string
+                                          zones:
+                                            items:
+                                              type: string
+                                            type: array
+                                        required:
+                                        - type
+                                        type: object
+                                    required:
+                                    - to
+                                    type: object
+                                  type: array
+                                failoverThreshold:
+                                  description: |-
+                                    FailoverThreshold defines the percentage of live destination dataplane proxies below which load balancing to the
+                                    next priority starts.
+                                    Example: If you configure failoverThreshold to 70, and you have deployed 10 destination dataplane proxies.
+                                    Load balancing to next priority will start when number of live destination dataplane proxies drops below 7.
+                                    Default 50
+                                  properties:
+                                    percentage:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      x-kubernetes-int-or-string: true
+                                  required:
+                                  - percentage
+                                  type: object
+                              type: object
+                            disabled:
+                              description: |-
+                                Disabled allows to disable locality-aware load balancing.
+                                When disabled requests are distributed across all endpoints regardless of locality.
+                              type: boolean
+                            localZone:
+                              description: LocalZone defines locality aware load balancing
+                                priorities between dataplane proxies inside a zone
+                              properties:
+                                affinityTags:
+                                  description: AffinityTags list of tags for local
+                                    zone load balancing.
+                                  items:
+                                    properties:
+                                      key:
+                                        description: Key defines tag for which affinity
+                                          is configured
+                                        type: string
+                                      weight:
+                                        description: |-
+                                          Weight of the tag used for load balancing. The bigger the weight the bigger the priority.
+                                          Percentage of local traffic load balanced to tag is computed by dividing weight by sum of weights from all tags.
+                                          For example with two affinity tags first with weight 80 and second with weight 20,
+                                          then 80% of traffic will be redirected to the first tag, and 20% of traffic will be redirected to second one.
+                                          Setting weights is not mandatory. When weights are not set control plane will compute default weight based on list order.
+                                          Default: If you do not specify weight we will adjust them so that 90% traffic goes to first tag, 9% to next, and 1% to third and so on.
+                                        format: int32
+                                        type: integer
+                                    required:
+                                    - key
+                                    type: object
+                                  type: array
+                              type: object
+                          type: object
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        destinations.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshmetrics.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshmetrics.yaml
new file mode 100644
index 000000000..d244c2e04
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshmetrics.yaml
@@ -0,0 +1,292 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshmetrics.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshMetric
+    listKind: MeshMetricList
+    plural: meshmetrics
+    singular: meshmetric
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshMetric resource.
+            properties:
+              default:
+                description: MeshMetric configuration.
+                properties:
+                  applications:
+                    description: Applications is a list of application that Dataplane
+                      Proxy will scrape
+                    items:
+                      properties:
+                        address:
+                          description: Address on which an application listens.
+                          type: string
+                        name:
+                          description: Name of the application to scrape
+                          type: string
+                        path:
+                          default: /metrics/prometheus
+                          description: Path on which an application expose HTTP endpoint
+                            with metrics.
+                          type: string
+                        port:
+                          description: Port on which an application expose HTTP endpoint
+                            with metrics.
+                          format: int32
+                          type: integer
+                      required:
+                      - port
+                      type: object
+                    type: array
+                  backends:
+                    description: Backends list that will be used to collect metrics.
+                    items:
+                      properties:
+                        openTelemetry:
+                          description: OpenTelemetry backend configuration
+                          properties:
+                            endpoint:
+                              description: Endpoint for OpenTelemetry collector
+                              type: string
+                            refreshInterval:
+                              description: RefreshInterval defines how frequent metrics
+                                should be pushed to collector
+                              type: string
+                          required:
+                          - endpoint
+                          type: object
+                        prometheus:
+                          description: Prometheus backend configuration.
+                          properties:
+                            clientId:
+                              description: ClientId of the Prometheus backend. Needed
+                                when using MADS for DP discovery.
+                              type: string
+                            path:
+                              default: /metrics
+                              description: Path on which a dataplane should expose
+                                HTTP endpoint with Prometheus metrics.
+                              type: string
+                            port:
+                              default: 5670
+                              description: Port on which a dataplane should expose
+                                HTTP endpoint with Prometheus metrics.
+                              format: int32
+                              type: integer
+                            tls:
+                              description: Configuration of TLS for prometheus listener.
+                              properties:
+                                mode:
+                                  default: Disabled
+                                  description: Configuration of TLS for Prometheus
+                                    listener.
+                                  enum:
+                                  - Disabled
+                                  - ProvidedTLS
+                                  - ActiveMTLSBackend
+                                  type: string
+                              required:
+                              - mode
+                              type: object
+                          required:
+                          - path
+                          - port
+                          type: object
+                        type:
+                          description: Type of the backend that will be used to collect
+                            metrics. At the moment only Prometheus backend is available.
+                          enum:
+                          - Prometheus
+                          - OpenTelemetry
+                          type: string
+                      required:
+                      - type
+                      type: object
+                    type: array
+                  sidecar:
+                    description: Sidecar metrics collection configuration
+                    properties:
+                      includeUnused:
+                        default: false
+                        description: |-
+                          IncludeUnused if false will scrape only metrics that has been by sidecar (counters incremented
+                          at least once, gauges changed at least once, and histograms added to at
+                          least once). If true will scrape all metrics (even the ones with zeros).
+                        type: boolean
+                      profiles:
+                        description: Profiles allows to customize which metrics are
+                          published.
+                        properties:
+                          appendProfiles:
+                            description: AppendProfiles allows to combine the metrics
+                              from multiple predefined profiles.
+                            items:
+                              properties:
+                                name:
+                                  description: 'Name of the predefined profile, one
+                                    of: all, basic, none'
+                                  enum:
+                                  - All
+                                  - Basic
+                                  - None
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                          exclude:
+                            description: |-
+                              Exclude makes it possible to exclude groups of metrics from a resulting profile.
+                              Exclude is subordinate to Include.
+                            items:
+                              properties:
+                                match:
+                                  description: Match is the value used to match using
+                                    particular Type
+                                  type: string
+                                type:
+                                  description: 'Type defined the type of selector,
+                                    one of: prefix, regex, exact'
+                                  enum:
+                                  - Prefix
+                                  - Regex
+                                  - Exact
+                                  - Contains
+                                  type: string
+                              required:
+                              - match
+                              - type
+                              type: object
+                            type: array
+                          include:
+                            description: |-
+                              Include makes it possible to include additional metrics in a selected profiles.
+                              Include takes precedence over Exclude.
+                            items:
+                              properties:
+                                match:
+                                  description: Match is the value used to match using
+                                    particular Type
+                                  type: string
+                                type:
+                                  description: 'Type defined the type of selector,
+                                    one of: prefix, regex, exact'
+                                  enum:
+                                  - Prefix
+                                  - Regex
+                                  - Exact
+                                  - Contains
+                                  type: string
+                              required:
+                              - match
+                              - type
+                              type: object
+                            type: array
+                        type: object
+                    type: object
+                type: object
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined in-place.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshmultizoneservices.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshmultizoneservices.yaml
new file mode 100644
index 000000000..4772b0cfb
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshmultizoneservices.yaml
@@ -0,0 +1,199 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshmultizoneservices.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshMultiZoneService
+    listKind: MeshMultiZoneServiceList
+    plural: meshmultizoneservices
+    singular: meshmultizoneservice
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.addresses[0].hostname
+      name: Hostname
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshMultiZoneService
+              resource.
+            properties:
+              ports:
+                description: Ports is a list of ports from selected MeshServices
+                items:
+                  properties:
+                    appProtocol:
+                      default: tcp
+                      description: Protocol identifies a protocol supported by a service.
+                      type: string
+                    name:
+                      type: string
+                    port:
+                      format: int32
+                      type: integer
+                  required:
+                  - port
+                  type: object
+                minItems: 1
+                type: array
+              selector:
+                description: Selector is a way to select multiple MeshServices
+                properties:
+                  meshService:
+                    description: MeshService selects MeshServices
+                    properties:
+                      matchLabels:
+                        additionalProperties:
+                          type: string
+                        description: MatchLabels matches multiple MeshServices by
+                          labels
+                        type: object
+                    required:
+                    - matchLabels
+                    type: object
+                required:
+                - meshService
+                type: object
+            required:
+            - selector
+            type: object
+          status:
+            description: Status is the current status of the Kuma MeshMultiZoneService
+              resource.
+            properties:
+              addresses:
+                description: Addresses is a list of addresses generated by HostnameGenerator
+                items:
+                  properties:
+                    hostname:
+                      type: string
+                    hostnameGeneratorRef:
+                      properties:
+                        coreName:
+                          type: string
+                      required:
+                      - coreName
+                      type: object
+                    origin:
+                      type: string
+                  type: object
+                type: array
+              hostnameGenerators:
+                description: Status of hostnames generator applied on this resource
+                items:
+                  properties:
+                    conditions:
+                      description: Conditions is an array of hostname generator conditions.
+                      items:
+                        properties:
+                          message:
+                            description: |-
+                              message is a human readable message indicating details about the transition.
+                              This may be an empty string.
+                            maxLength: 32768
+                            type: string
+                          reason:
+                            description: |-
+                              reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                              Producers of specific condition types may define expected values and meanings for this field,
+                              and whether the values are considered a guaranteed API.
+                              The value should be a CamelCase string.
+                              This field may not be empty.
+                            maxLength: 1024
+                            minLength: 1
+                            pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                            type: string
+                          status:
+                            description: status of the condition, one of True, False,
+                              Unknown.
+                            enum:
+                            - "True"
+                            - "False"
+                            - Unknown
+                            type: string
+                          type:
+                            description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                            maxLength: 316
+                            pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                            type: string
+                        required:
+                        - message
+                        - reason
+                        - status
+                        - type
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - type
+                      x-kubernetes-list-type: map
+                    hostnameGeneratorRef:
+                      properties:
+                        coreName:
+                          type: string
+                      required:
+                      - coreName
+                      type: object
+                  required:
+                  - hostnameGeneratorRef
+                  type: object
+                type: array
+              meshServices:
+                description: MeshServices is a list of matched MeshServices
+                items:
+                  properties:
+                    mesh:
+                      type: string
+                    name:
+                      description: Name is a core name of MeshService
+                      type: string
+                    namespace:
+                      type: string
+                    zone:
+                      type: string
+                  required:
+                  - mesh
+                  - name
+                  - namespace
+                  - zone
+                  type: object
+                type: array
+              vips:
+                description: VIPs is a list of assigned Kuma VIPs.
+                items:
+                  properties:
+                    ip:
+                      type: string
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshpassthroughs.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshpassthroughs.yaml
new file mode 100644
index 000000000..4c2d96eac
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshpassthroughs.yaml
@@ -0,0 +1,165 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshpassthroughs.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshPassthrough
+    listKind: MeshPassthroughList
+    plural: meshpassthroughs
+    singular: meshpassthrough
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshPassthrough resource.
+            properties:
+              default:
+                description: MeshPassthrough configuration.
+                properties:
+                  appendMatch:
+                    description: AppendMatch is a list of destinations that should
+                      be allowed through the sidecar.
+                    items:
+                      properties:
+                        port:
+                          description: Port defines the port to which a user makes
+                            a request.
+                          format: int32
+                          type: integer
+                        protocol:
+                          default: tcp
+                          description: 'Protocol defines the communication protocol.
+                            Possible values: `tcp`, `tls`, `grpc`, `http`, `http2`.'
+                          enum:
+                          - tcp
+                          - tls
+                          - grpc
+                          - http
+                          - http2
+                          type: string
+                        type:
+                          description: Type of the match, one of `Domain`, `IP` or
+                            `CIDR` is available.
+                          enum:
+                          - Domain
+                          - IP
+                          - CIDR
+                          type: string
+                        value:
+                          description: Value for the specified Type.
+                          type: string
+                      type: object
+                    type: array
+                  passthroughMode:
+                    default: None
+                    description: |-
+                      Defines the passthrough behavior. Possible values: `All`, `None`, `Matched`
+                      When `All` or `None` `appendMatch` has no effect.
+                    enum:
+                    - All
+                    - Matched
+                    - None
+                    type: string
+                type: object
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined in-place.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshproxypatches.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshproxypatches.yaml
new file mode 100644
index 000000000..bf6342d25
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshproxypatches.yaml
@@ -0,0 +1,550 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshproxypatches.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshProxyPatch
+    listKind: MeshProxyPatchList
+    plural: meshproxypatches
+    singular: meshproxypatch
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshProxyPatch resource.
+            properties:
+              default:
+                description: |-
+                  Default is a configuration specific to the group of destinations
+                  referenced in 'targetRef'.
+                properties:
+                  appendModifications:
+                    description: AppendModifications is a list of modifications applied
+                      on the selected proxy.
+                    items:
+                      properties:
+                        cluster:
+                          description: Cluster is a modification of Envoy's Cluster
+                            resource.
+                          properties:
+                            jsonPatches:
+                              description: |-
+                                JsonPatches specifies list of jsonpatches to apply to on Envoy's Cluster
+                                resource
+                              items:
+                                description: JsonPatchBlock is one json patch operation
+                                  block.
+                                properties:
+                                  from:
+                                    description: From is a jsonpatch from string,
+                                      used by move and copy operations.
+                                    type: string
+                                  op:
+                                    description: Op is a jsonpatch operation string.
+                                    enum:
+                                    - add
+                                    - remove
+                                    - replace
+                                    - move
+                                    - copy
+                                    type: string
+                                  path:
+                                    description: Path is a jsonpatch path string.
+                                    type: string
+                                  value:
+                                    description: Value must be a valid json value
+                                      used by replace and add operations.
+                                    x-kubernetes-preserve-unknown-fields: true
+                                required:
+                                - op
+                                - path
+                                type: object
+                              type: array
+                            match:
+                              description: Match is a set of conditions that have
+                                to be matched for modification operation to happen.
+                              properties:
+                                name:
+                                  description: Name of the cluster to match.
+                                  type: string
+                                origin:
+                                  description: |-
+                                    Origin is the name of the component or plugin that generated the resource.
+
+                                    Here is the list of well-known origins:
+                                    inbound - resources generated for handling incoming traffic.
+                                    outbound - resources generated for handling outgoing traffic.
+                                    transparent - resources generated for transparent proxy functionality.
+                                    prometheus - resources generated when Prometheus metrics are enabled.
+                                    direct-access - resources generated for Direct Access functionality.
+                                    ingress - resources generated for Zone Ingress.
+                                    egress - resources generated for Zone Egress.
+                                    gateway - resources generated for MeshGateway.
+
+                                    The list is not complete, because policy plugins can introduce new resources.
+                                    For example MeshTrace plugin can create Cluster with "mesh-trace" origin.
+                                  type: string
+                              type: object
+                            operation:
+                              description: Operation to execute on matched cluster.
+                              enum:
+                              - Add
+                              - Remove
+                              - Patch
+                              type: string
+                            value:
+                              description: Value of xDS resource in YAML format to
+                                add or patch.
+                              type: string
+                          required:
+                          - operation
+                          type: object
+                        httpFilter:
+                          description: |-
+                            HTTPFilter is a modification of Envoy HTTP Filter
+                            available in HTTP Connection Manager in a Listener resource.
+                          properties:
+                            jsonPatches:
+                              description: |-
+                                JsonPatches specifies list of jsonpatches to apply to on Envoy's
+                                HTTP Filter available in HTTP Connection Manager in a Listener resource.
+                              items:
+                                description: JsonPatchBlock is one json patch operation
+                                  block.
+                                properties:
+                                  from:
+                                    description: From is a jsonpatch from string,
+                                      used by move and copy operations.
+                                    type: string
+                                  op:
+                                    description: Op is a jsonpatch operation string.
+                                    enum:
+                                    - add
+                                    - remove
+                                    - replace
+                                    - move
+                                    - copy
+                                    type: string
+                                  path:
+                                    description: Path is a jsonpatch path string.
+                                    type: string
+                                  value:
+                                    description: Value must be a valid json value
+                                      used by replace and add operations.
+                                    x-kubernetes-preserve-unknown-fields: true
+                                required:
+                                - op
+                                - path
+                                type: object
+                              type: array
+                            match:
+                              description: Match is a set of conditions that have
+                                to be matched for modification operation to happen.
+                              properties:
+                                listenerName:
+                                  description: Name of the listener to match.
+                                  type: string
+                                listenerTags:
+                                  additionalProperties:
+                                    type: string
+                                  description: Listener tags available in Listener#Metadata#FilterMetadata[io.kuma.tags]
+                                  type: object
+                                name:
+                                  description: Name of the HTTP filter. For example
+                                    "envoy.filters.http.local_ratelimit"
+                                  type: string
+                                origin:
+                                  description: |-
+                                    Origin is the name of the component or plugin that generated the resource.
+
+                                    Here is the list of well-known origins:
+                                    inbound - resources generated for handling incoming traffic.
+                                    outbound - resources generated for handling outgoing traffic.
+                                    transparent - resources generated for transparent proxy functionality.
+                                    prometheus - resources generated when Prometheus metrics are enabled.
+                                    direct-access - resources generated for Direct Access functionality.
+                                    ingress - resources generated for Zone Ingress.
+                                    egress - resources generated for Zone Egress.
+                                    gateway - resources generated for MeshGateway.
+
+                                    The list is not complete, because policy plugins can introduce new resources.
+                                    For example MeshTrace plugin can create Cluster with "mesh-trace" origin.
+                                  type: string
+                              type: object
+                            operation:
+                              description: Operation to execute on matched listener.
+                              enum:
+                              - Remove
+                              - Patch
+                              - AddFirst
+                              - AddBefore
+                              - AddAfter
+                              - AddLast
+                              type: string
+                            value:
+                              description: Value of xDS resource in YAML format to
+                                add or patch.
+                              type: string
+                          required:
+                          - operation
+                          type: object
+                        listener:
+                          description: Listener is a modification of Envoy's Listener
+                            resource.
+                          properties:
+                            jsonPatches:
+                              description: |-
+                                JsonPatches specifies list of jsonpatches to apply to on Envoy's Listener
+                                resource
+                              items:
+                                description: JsonPatchBlock is one json patch operation
+                                  block.
+                                properties:
+                                  from:
+                                    description: From is a jsonpatch from string,
+                                      used by move and copy operations.
+                                    type: string
+                                  op:
+                                    description: Op is a jsonpatch operation string.
+                                    enum:
+                                    - add
+                                    - remove
+                                    - replace
+                                    - move
+                                    - copy
+                                    type: string
+                                  path:
+                                    description: Path is a jsonpatch path string.
+                                    type: string
+                                  value:
+                                    description: Value must be a valid json value
+                                      used by replace and add operations.
+                                    x-kubernetes-preserve-unknown-fields: true
+                                required:
+                                - op
+                                - path
+                                type: object
+                              type: array
+                            match:
+                              description: Match is a set of conditions that have
+                                to be matched for modification operation to happen.
+                              properties:
+                                name:
+                                  description: Name of the listener to match.
+                                  type: string
+                                origin:
+                                  description: |-
+                                    Origin is the name of the component or plugin that generated the resource.
+
+                                    Here is the list of well-known origins:
+                                    inbound - resources generated for handling incoming traffic.
+                                    outbound - resources generated for handling outgoing traffic.
+                                    transparent - resources generated for transparent proxy functionality.
+                                    prometheus - resources generated when Prometheus metrics are enabled.
+                                    direct-access - resources generated for Direct Access functionality.
+                                    ingress - resources generated for Zone Ingress.
+                                    egress - resources generated for Zone Egress.
+                                    gateway - resources generated for MeshGateway.
+
+                                    The list is not complete, because policy plugins can introduce new resources.
+                                    For example MeshTrace plugin can create Cluster with "mesh-trace" origin.
+                                  type: string
+                                tags:
+                                  additionalProperties:
+                                    type: string
+                                  description: Tags available in Listener#Metadata#FilterMetadata[io.kuma.tags]
+                                  type: object
+                              type: object
+                            operation:
+                              description: Operation to execute on matched listener.
+                              enum:
+                              - Add
+                              - Remove
+                              - Patch
+                              type: string
+                            value:
+                              description: Value of xDS resource in YAML format to
+                                add or patch.
+                              type: string
+                          required:
+                          - operation
+                          type: object
+                        networkFilter:
+                          description: NetworkFilter is a modification of Envoy Listener's
+                            filter.
+                          properties:
+                            jsonPatches:
+                              description: |-
+                                JsonPatches specifies list of jsonpatches to apply to on Envoy Listener's
+                                filter.
+                              items:
+                                description: JsonPatchBlock is one json patch operation
+                                  block.
+                                properties:
+                                  from:
+                                    description: From is a jsonpatch from string,
+                                      used by move and copy operations.
+                                    type: string
+                                  op:
+                                    description: Op is a jsonpatch operation string.
+                                    enum:
+                                    - add
+                                    - remove
+                                    - replace
+                                    - move
+                                    - copy
+                                    type: string
+                                  path:
+                                    description: Path is a jsonpatch path string.
+                                    type: string
+                                  value:
+                                    description: Value must be a valid json value
+                                      used by replace and add operations.
+                                    x-kubernetes-preserve-unknown-fields: true
+                                required:
+                                - op
+                                - path
+                                type: object
+                              type: array
+                            match:
+                              description: Match is a set of conditions that have
+                                to be matched for modification operation to happen.
+                              properties:
+                                listenerName:
+                                  description: Name of the listener to match.
+                                  type: string
+                                listenerTags:
+                                  additionalProperties:
+                                    type: string
+                                  description: Listener tags available in Listener#Metadata#FilterMetadata[io.kuma.tags]
+                                  type: object
+                                name:
+                                  description: Name of the network filter. For example
+                                    "envoy.filters.network.ratelimit"
+                                  type: string
+                                origin:
+                                  description: |-
+                                    Origin is the name of the component or plugin that generated the resource.
+
+                                    Here is the list of well-known origins:
+                                    inbound - resources generated for handling incoming traffic.
+                                    outbound - resources generated for handling outgoing traffic.
+                                    transparent - resources generated for transparent proxy functionality.
+                                    prometheus - resources generated when Prometheus metrics are enabled.
+                                    direct-access - resources generated for Direct Access functionality.
+                                    ingress - resources generated for Zone Ingress.
+                                    egress - resources generated for Zone Egress.
+                                    gateway - resources generated for MeshGateway.
+
+                                    The list is not complete, because policy plugins can introduce new resources.
+                                    For example MeshTrace plugin can create Cluster with "mesh-trace" origin.
+                                  type: string
+                              type: object
+                            operation:
+                              description: Operation to execute on matched listener.
+                              enum:
+                              - Remove
+                              - Patch
+                              - AddFirst
+                              - AddBefore
+                              - AddAfter
+                              - AddLast
+                              type: string
+                            value:
+                              description: Value of xDS resource in YAML format to
+                                add or patch.
+                              type: string
+                          required:
+                          - operation
+                          type: object
+                        virtualHost:
+                          description: |-
+                            VirtualHost is a modification of Envoy's VirtualHost
+                            referenced in HTTP Connection Manager in a Listener resource.
+                          properties:
+                            jsonPatches:
+                              description: |-
+                                JsonPatches specifies list of jsonpatches to apply to on Envoy's
+                                VirtualHost resource
+                              items:
+                                description: JsonPatchBlock is one json patch operation
+                                  block.
+                                properties:
+                                  from:
+                                    description: From is a jsonpatch from string,
+                                      used by move and copy operations.
+                                    type: string
+                                  op:
+                                    description: Op is a jsonpatch operation string.
+                                    enum:
+                                    - add
+                                    - remove
+                                    - replace
+                                    - move
+                                    - copy
+                                    type: string
+                                  path:
+                                    description: Path is a jsonpatch path string.
+                                    type: string
+                                  value:
+                                    description: Value must be a valid json value
+                                      used by replace and add operations.
+                                    x-kubernetes-preserve-unknown-fields: true
+                                required:
+                                - op
+                                - path
+                                type: object
+                              type: array
+                            match:
+                              description: Match is a set of conditions that have
+                                to be matched for modification operation to happen.
+                              properties:
+                                name:
+                                  description: Name of the VirtualHost to match.
+                                  type: string
+                                origin:
+                                  description: |-
+                                    Origin is the name of the component or plugin that generated the resource.
+
+                                    Here is the list of well-known origins:
+                                    inbound - resources generated for handling incoming traffic.
+                                    outbound - resources generated for handling outgoing traffic.
+                                    transparent - resources generated for transparent proxy functionality.
+                                    prometheus - resources generated when Prometheus metrics are enabled.
+                                    direct-access - resources generated for Direct Access functionality.
+                                    ingress - resources generated for Zone Ingress.
+                                    egress - resources generated for Zone Egress.
+                                    gateway - resources generated for MeshGateway.
+
+                                    The list is not complete, because policy plugins can introduce new resources.
+                                    For example MeshTrace plugin can create Cluster with "mesh-trace" origin.
+                                  type: string
+                                routeConfigurationName:
+                                  description: Name of the RouteConfiguration resource
+                                    to match.
+                                  type: string
+                              type: object
+                            operation:
+                              description: Operation to execute on matched listener.
+                              enum:
+                              - Add
+                              - Remove
+                              - Patch
+                              type: string
+                            value:
+                              description: Value of xDS resource in YAML format to
+                                add or patch.
+                              type: string
+                          required:
+                          - match
+                          - operation
+                          type: object
+                      type: object
+                    type: array
+                required:
+                - appendModifications
+                type: object
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined inplace.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+            required:
+            - default
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshratelimits.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshratelimits.yaml
new file mode 100644
index 000000000..52424a985
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshratelimits.yaml
@@ -0,0 +1,499 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshratelimits.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshRateLimit
+    listKind: MeshRateLimitList
+    plural: meshratelimits
+    singular: meshratelimit
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshRateLimit resource.
+            properties:
+              from:
+                description: From list makes a match between clients and corresponding
+                  configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of clients referenced in
+                        'targetRef'
+                      properties:
+                        local:
+                          description: LocalConf defines local http or/and tcp rate
+                            limit configuration
+                          properties:
+                            http:
+                              description: |-
+                                LocalHTTP defines configuration of local HTTP rate limiting
+                                https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/local_rate_limit_filter
+                              properties:
+                                disabled:
+                                  description: Define if rate limiting should be disabled.
+                                  type: boolean
+                                onRateLimit:
+                                  description: Describes the actions to take on a
+                                    rate limit event
+                                  properties:
+                                    headers:
+                                      description: The Headers to be added to the
+                                        HTTP response on a rate limit event
+                                      properties:
+                                        add:
+                                          items:
+                                            properties:
+                                              name:
+                                                maxLength: 256
+                                                minLength: 1
+                                                pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          maxItems: 16
+                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
+                                        set:
+                                          items:
+                                            properties:
+                                              name:
+                                                maxLength: 256
+                                                minLength: 1
+                                                pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          maxItems: 16
+                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
+                                      type: object
+                                    status:
+                                      description: The HTTP status code to be set
+                                        on a rate limit event
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                requestRate:
+                                  description: Defines how many requests are allowed
+                                    per interval.
+                                  properties:
+                                    interval:
+                                      description: The interval the number of units
+                                        is accounted for.
+                                      type: string
+                                    num:
+                                      description: |-
+                                        Number of units per interval (depending on usage it can be a number of requests,
+                                        or a number of connections).
+                                      format: int32
+                                      type: integer
+                                  required:
+                                  - interval
+                                  - num
+                                  type: object
+                              type: object
+                            tcp:
+                              description: |-
+                                LocalTCP defines confguration of local TCP rate limiting
+                                https://www.envoyproxy.io/docs/envoy/latest/configuration/listeners/network_filters/local_rate_limit_filter
+                              properties:
+                                connectionRate:
+                                  description: Defines how many connections are allowed
+                                    per interval.
+                                  properties:
+                                    interval:
+                                      description: The interval the number of units
+                                        is accounted for.
+                                      type: string
+                                    num:
+                                      description: |-
+                                        Number of units per interval (depending on usage it can be a number of requests,
+                                        or a number of connections).
+                                      format: int32
+                                      type: integer
+                                  required:
+                                  - interval
+                                  - num
+                                  type: object
+                                disabled:
+                                  description: |-
+                                    Define if rate limiting should be disabled.
+                                    Default: false
+                                  type: boolean
+                              type: object
+                          type: object
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        clients.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined inplace.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+              to:
+                description: To list makes a match between clients and corresponding
+                  configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of clients referenced in
+                        'targetRef'
+                      properties:
+                        local:
+                          description: LocalConf defines local http or/and tcp rate
+                            limit configuration
+                          properties:
+                            http:
+                              description: |-
+                                LocalHTTP defines configuration of local HTTP rate limiting
+                                https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/local_rate_limit_filter
+                              properties:
+                                disabled:
+                                  description: Define if rate limiting should be disabled.
+                                  type: boolean
+                                onRateLimit:
+                                  description: Describes the actions to take on a
+                                    rate limit event
+                                  properties:
+                                    headers:
+                                      description: The Headers to be added to the
+                                        HTTP response on a rate limit event
+                                      properties:
+                                        add:
+                                          items:
+                                            properties:
+                                              name:
+                                                maxLength: 256
+                                                minLength: 1
+                                                pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          maxItems: 16
+                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
+                                        set:
+                                          items:
+                                            properties:
+                                              name:
+                                                maxLength: 256
+                                                minLength: 1
+                                                pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          maxItems: 16
+                                          type: array
+                                          x-kubernetes-list-map-keys:
+                                          - name
+                                          x-kubernetes-list-type: map
+                                      type: object
+                                    status:
+                                      description: The HTTP status code to be set
+                                        on a rate limit event
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                requestRate:
+                                  description: Defines how many requests are allowed
+                                    per interval.
+                                  properties:
+                                    interval:
+                                      description: The interval the number of units
+                                        is accounted for.
+                                      type: string
+                                    num:
+                                      description: |-
+                                        Number of units per interval (depending on usage it can be a number of requests,
+                                        or a number of connections).
+                                      format: int32
+                                      type: integer
+                                  required:
+                                  - interval
+                                  - num
+                                  type: object
+                              type: object
+                            tcp:
+                              description: |-
+                                LocalTCP defines confguration of local TCP rate limiting
+                                https://www.envoyproxy.io/docs/envoy/latest/configuration/listeners/network_filters/local_rate_limit_filter
+                              properties:
+                                connectionRate:
+                                  description: Defines how many connections are allowed
+                                    per interval.
+                                  properties:
+                                    interval:
+                                      description: The interval the number of units
+                                        is accounted for.
+                                      type: string
+                                    num:
+                                      description: |-
+                                        Number of units per interval (depending on usage it can be a number of requests,
+                                        or a number of connections).
+                                      format: int32
+                                      type: integer
+                                  required:
+                                  - interval
+                                  - num
+                                  type: object
+                                disabled:
+                                  description: |-
+                                    Define if rate limiting should be disabled.
+                                    Default: false
+                                  type: boolean
+                              type: object
+                          type: object
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        clients.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshretries.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshretries.yaml
new file mode 100644
index 000000000..f4337a105
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshretries.yaml
@@ -0,0 +1,507 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshretries.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshRetry
+    listKind: MeshRetryList
+    plural: meshretries
+    singular: meshretry
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshRetry resource.
+            properties:
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined inplace.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+              to:
+                description: To list makes a match between the consumed services and
+                  corresponding configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of destinations referenced in
+                        'targetRef'
+                      properties:
+                        grpc:
+                          description: GRPC defines a configuration of retries for
+                            GRPC traffic
+                          properties:
+                            backOff:
+                              description: |-
+                                BackOff is a configuration of durations which will be used in an exponential
+                                backoff strategy between retries.
+                              properties:
+                                baseInterval:
+                                  default: 25ms
+                                  description: |-
+                                    BaseInterval is an amount of time which should be taken between retries.
+                                    Must be greater than zero. Values less than 1 ms are rounded up to 1 ms.
+                                  type: string
+                                maxInterval:
+                                  description: |-
+                                    MaxInterval is a maximal amount of time which will be taken between retries.
+                                    Default is 10 times the "BaseInterval".
+                                  type: string
+                              type: object
+                            numRetries:
+                              description: |-
+                                NumRetries is the number of attempts that will be made on failed (and
+                                retriable) requests. If not set, the default value is 1.
+                              format: int32
+                              type: integer
+                            perTryTimeout:
+                              description: |-
+                                PerTryTimeout is the maximum amount of time each retry attempt can take
+                                before it times out. If not set, the global request timeout for the route
+                                will be used. Setting this value to 0 will disable the per-try timeout.
+                              type: string
+                            rateLimitedBackOff:
+                              description: |-
+                                RateLimitedBackOff is a configuration of backoff which will be used when
+                                the upstream returns one of the headers configured.
+                              properties:
+                                maxInterval:
+                                  default: 300s
+                                  description: MaxInterval is a maximal amount of
+                                    time which will be taken between retries.
+                                  type: string
+                                resetHeaders:
+                                  description: |-
+                                    ResetHeaders specifies the list of headers (like Retry-After or X-RateLimit-Reset)
+                                    to match against the response. Headers are tried in order, and matched
+                                    case-insensitive. The first header to be parsed successfully is used.
+                                    If no headers match the default exponential BackOff is used instead.
+                                  items:
+                                    properties:
+                                      format:
+                                        description: The format of the reset header.
+                                        enum:
+                                        - Seconds
+                                        - UnixTimestamp
+                                        type: string
+                                      name:
+                                        description: The Name of the reset header.
+                                        maxLength: 256
+                                        minLength: 1
+                                        pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                        type: string
+                                    required:
+                                    - format
+                                    - name
+                                    type: object
+                                  type: array
+                              type: object
+                            retryOn:
+                              description: RetryOn is a list of conditions which will
+                                cause a retry.
+                              example:
+                              - Canceled
+                              - DeadlineExceeded
+                              - Internal
+                              - ResourceExhausted
+                              - Unavailable
+                              items:
+                                enum:
+                                - Canceled
+                                - DeadlineExceeded
+                                - Internal
+                                - ResourceExhausted
+                                - Unavailable
+                                type: string
+                              type: array
+                          type: object
+                        http:
+                          description: HTTP defines a configuration of retries for
+                            HTTP traffic
+                          properties:
+                            backOff:
+                              description: |-
+                                BackOff is a configuration of durations which will be used in exponential
+                                backoff strategy between retries.
+                              properties:
+                                baseInterval:
+                                  default: 25ms
+                                  description: |-
+                                    BaseInterval is an amount of time which should be taken between retries.
+                                    Must be greater than zero. Values less than 1 ms are rounded up to 1 ms.
+                                  type: string
+                                maxInterval:
+                                  description: |-
+                                    MaxInterval is a maximal amount of time which will be taken between retries.
+                                    Default is 10 times the "BaseInterval".
+                                  type: string
+                              type: object
+                            hostSelection:
+                              description: |-
+                                HostSelection is a list of predicates that dictate how hosts should be selected
+                                when requests are retried.
+                              items:
+                                properties:
+                                  predicate:
+                                    description: Type is requested predicate mode.
+                                    enum:
+                                    - OmitPreviousHosts
+                                    - OmitHostsWithTags
+                                    - OmitPreviousPriorities
+                                    type: string
+                                  tags:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      Tags is a map of metadata to match against for selecting the omitted hosts. Required if Type is
+                                      OmitHostsWithTags
+                                    type: object
+                                  updateFrequency:
+                                    default: 2
+                                    description: |-
+                                      UpdateFrequency is how often the priority load should be updated based on previously attempted priorities.
+                                      Used for OmitPreviousPriorities.
+                                    format: int32
+                                    type: integer
+                                required:
+                                - predicate
+                                type: object
+                              type: array
+                            hostSelectionMaxAttempts:
+                              description: |-
+                                HostSelectionMaxAttempts is the maximum number of times host selection will be
+                                reattempted before giving up, at which point the host that was last selected will
+                                be routed to. If unspecified, this will default to retrying once.
+                              format: int64
+                              type: integer
+                            numRetries:
+                              description: |-
+                                NumRetries is the number of attempts that will be made on failed (and
+                                retriable) requests.  If not set, the default value is 1.
+                              format: int32
+                              type: integer
+                            perTryTimeout:
+                              description: |-
+                                PerTryTimeout is the amount of time after which retry attempt should time out.
+                                If left unspecified, the global route timeout for the request will be used.
+                                Consequently, when using a 5xx based retry policy, a request that times out
+                                will not be retried as the total timeout budget would have been exhausted.
+                                Setting this timeout to 0 will disable it.
+                              type: string
+                            rateLimitedBackOff:
+                              description: |-
+                                RateLimitedBackOff is a configuration of backoff which will be used
+                                when the upstream returns one of the headers configured.
+                              properties:
+                                maxInterval:
+                                  default: 300s
+                                  description: MaxInterval is a maximal amount of
+                                    time which will be taken between retries.
+                                  type: string
+                                resetHeaders:
+                                  description: |-
+                                    ResetHeaders specifies the list of headers (like Retry-After or X-RateLimit-Reset)
+                                    to match against the response. Headers are tried in order, and matched
+                                    case-insensitive. The first header to be parsed successfully is used.
+                                    If no headers match the default exponential BackOff is used instead.
+                                  items:
+                                    properties:
+                                      format:
+                                        description: The format of the reset header.
+                                        enum:
+                                        - Seconds
+                                        - UnixTimestamp
+                                        type: string
+                                      name:
+                                        description: The Name of the reset header.
+                                        maxLength: 256
+                                        minLength: 1
+                                        pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                        type: string
+                                    required:
+                                    - format
+                                    - name
+                                    type: object
+                                  type: array
+                              type: object
+                            retriableRequestHeaders:
+                              description: |-
+                                RetriableRequestHeaders is an HTTP headers which must be present in the request
+                                for retries to be attempted.
+                              items:
+                                description: |-
+                                  HeaderMatch describes how to select an HTTP route by matching HTTP request
+                                  headers.
+                                properties:
+                                  name:
+                                    description: |-
+                                      Name is the name of the HTTP Header to be matched. Name MUST be lower case
+                                      as they will be handled with case insensitivity (See https://tools.ietf.org/html/rfc7230#section-3.2).
+                                    maxLength: 256
+                                    minLength: 1
+                                    pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                    type: string
+                                  type:
+                                    default: Exact
+                                    description: Type specifies how to match against
+                                      the value of the header.
+                                    enum:
+                                    - Exact
+                                    - Present
+                                    - RegularExpression
+                                    - Absent
+                                    - Prefix
+                                    type: string
+                                  value:
+                                    description: Value is the value of HTTP Header
+                                      to be matched.
+                                    type: string
+                                required:
+                                - name
+                                type: object
+                              type: array
+                            retriableResponseHeaders:
+                              description: |-
+                                RetriableResponseHeaders is an HTTP response headers that trigger a retry
+                                if present in the response. A retry will be triggered if any of the header
+                                matches the upstream response headers.
+                              items:
+                                description: |-
+                                  HeaderMatch describes how to select an HTTP route by matching HTTP request
+                                  headers.
+                                properties:
+                                  name:
+                                    description: |-
+                                      Name is the name of the HTTP Header to be matched. Name MUST be lower case
+                                      as they will be handled with case insensitivity (See https://tools.ietf.org/html/rfc7230#section-3.2).
+                                    maxLength: 256
+                                    minLength: 1
+                                    pattern: ^[a-z0-9!#$%&'*+\-.^_\x60|~]+$
+                                    type: string
+                                  type:
+                                    default: Exact
+                                    description: Type specifies how to match against
+                                      the value of the header.
+                                    enum:
+                                    - Exact
+                                    - Present
+                                    - RegularExpression
+                                    - Absent
+                                    - Prefix
+                                    type: string
+                                  value:
+                                    description: Value is the value of HTTP Header
+                                      to be matched.
+                                    type: string
+                                required:
+                                - name
+                                type: object
+                              type: array
+                            retryOn:
+                              description: |-
+                                RetryOn is a list of conditions which will cause a retry. Available values are:
+                                [5XX, GatewayError, Reset, Retriable4xx, ConnectFailure, EnvoyRatelimited,
+                                RefusedStream, Http3PostConnectFailure, HttpMethodConnect, HttpMethodDelete,
+                                HttpMethodGet, HttpMethodHead, HttpMethodOptions, HttpMethodPatch,
+                                HttpMethodPost, HttpMethodPut, HttpMethodTrace].
+                                Also, any HTTP status code (500, 503, etc.).
+                              example:
+                              - 5XX
+                              - GatewayError
+                              - Reset
+                              - Retriable4xx
+                              - ConnectFailure
+                              - EnvoyRatelimited
+                              - RefusedStream
+                              - Http3PostConnectFailure
+                              - HttpMethodConnect
+                              - HttpMethodDelete
+                              - HttpMethodGet
+                              - HttpMethodHead
+                              - HttpMethodOptions
+                              - HttpMethodPatch
+                              - HttpMethodPost
+                              - HttpMethodPut
+                              - HttpMethodTrace
+                              - "500"
+                              - "503"
+                              items:
+                                type: string
+                              type: array
+                          type: object
+                        tcp:
+                          description: TCP defines a configuration of retries for
+                            TCP traffic
+                          properties:
+                            maxConnectAttempt:
+                              description: |-
+                                MaxConnectAttempt is a maximal amount of TCP connection attempts
+                                which will be made before giving up
+                              format: int32
+                              type: integer
+                          type: object
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        destinations.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshservices.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshservices.yaml
new file mode 100644
index 000000000..5ac9cf40b
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshservices.yaml
@@ -0,0 +1,218 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshservices.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshService
+    listKind: MeshServiceList
+    plural: meshservices
+    singular: meshservice
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.addresses[0].hostname
+      name: Hostname
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshService resource.
+            properties:
+              identities:
+                items:
+                  properties:
+                    type:
+                      enum:
+                      - ServiceTag
+                      type: string
+                    value:
+                      type: string
+                  required:
+                  - type
+                  - value
+                  type: object
+                type: array
+              ports:
+                items:
+                  properties:
+                    appProtocol:
+                      default: tcp
+                      description: Protocol identifies a protocol supported by a service.
+                      type: string
+                    name:
+                      type: string
+                    port:
+                      format: int32
+                      type: integer
+                    targetPort:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      x-kubernetes-int-or-string: true
+                  required:
+                  - port
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - port
+                - appProtocol
+                x-kubernetes-list-type: map
+              selector:
+                properties:
+                  dataplaneRef:
+                    properties:
+                      name:
+                        type: string
+                    type: object
+                  dataplaneTags:
+                    additionalProperties:
+                      type: string
+                    type: object
+                type: object
+              state:
+                description: |-
+                  State of MeshService. Available if there is at least one healthy endpoint. Otherwise, Unavailable.
+                  It's used for cross zone communication to check if we should send traffic to it, when MeshService is aggregated into MeshMultiZoneService.
+                enum:
+                - Available
+                - Unavailable
+                type: string
+            type: object
+          status:
+            description: Status is the current status of the Kuma MeshService resource.
+            properties:
+              addresses:
+                items:
+                  properties:
+                    hostname:
+                      type: string
+                    hostnameGeneratorRef:
+                      properties:
+                        coreName:
+                          type: string
+                      required:
+                      - coreName
+                      type: object
+                    origin:
+                      type: string
+                  type: object
+                type: array
+              dataplaneProxies:
+                description: Data plane proxies statistics selected by this MeshService.
+                properties:
+                  connected:
+                    description: Number of data plane proxies connected to the zone
+                      control plane
+                    type: integer
+                  healthy:
+                    description: Number of data plane proxies with all healthy inbounds
+                      selected by this MeshService.
+                    type: integer
+                  total:
+                    description: Total number of data plane proxies.
+                    type: integer
+                type: object
+              hostnameGenerators:
+                items:
+                  properties:
+                    conditions:
+                      description: Conditions is an array of hostname generator conditions.
+                      items:
+                        properties:
+                          message:
+                            description: |-
+                              message is a human readable message indicating details about the transition.
+                              This may be an empty string.
+                            maxLength: 32768
+                            type: string
+                          reason:
+                            description: |-
+                              reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                              Producers of specific condition types may define expected values and meanings for this field,
+                              and whether the values are considered a guaranteed API.
+                              The value should be a CamelCase string.
+                              This field may not be empty.
+                            maxLength: 1024
+                            minLength: 1
+                            pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                            type: string
+                          status:
+                            description: status of the condition, one of True, False,
+                              Unknown.
+                            enum:
+                            - "True"
+                            - "False"
+                            - Unknown
+                            type: string
+                          type:
+                            description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                            maxLength: 316
+                            pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                            type: string
+                        required:
+                        - message
+                        - reason
+                        - status
+                        - type
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - type
+                      x-kubernetes-list-type: map
+                    hostnameGeneratorRef:
+                      properties:
+                        coreName:
+                          type: string
+                      required:
+                      - coreName
+                      type: object
+                  required:
+                  - hostnameGeneratorRef
+                  type: object
+                type: array
+              tls:
+                properties:
+                  status:
+                    enum:
+                    - Ready
+                    - NotReady
+                    type: string
+                type: object
+              vips:
+                items:
+                  properties:
+                    ip:
+                      type: string
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtcproutes.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtcproutes.yaml
new file mode 100644
index 000000000..9d1d0ad7e
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtcproutes.yaml
@@ -0,0 +1,282 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshtcproutes.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshTCPRoute
+    listKind: MeshTCPRouteList
+    plural: meshtcproutes
+    singular: meshtcproute
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshTCPRoute resource.
+            properties:
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined in-place.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+              to:
+                description: |-
+                  To list makes a match between the consumed services and corresponding
+                  configurations
+                items:
+                  properties:
+                    rules:
+                      description: |-
+                        Rules contains the routing rules applies to a combination of top-level
+                        targetRef and the targetRef in this entry.
+                      items:
+                        properties:
+                          default:
+                            description: |-
+                              Default holds routing rules that can be merged with rules from other
+                              policies.
+                            properties:
+                              backendRefs:
+                                items:
+                                  description: BackendRef defines where to forward
+                                    traffic.
+                                  properties:
+                                    kind:
+                                      description: Kind of the referenced resource
+                                      enum:
+                                      - Mesh
+                                      - MeshSubset
+                                      - MeshGateway
+                                      - MeshService
+                                      - MeshExternalService
+                                      - MeshMultiZoneService
+                                      - MeshServiceSubset
+                                      - MeshHTTPRoute
+                                      type: string
+                                    labels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        Labels are used to select group of MeshServices that match labels. Either Labels or
+                                        Name and Namespace can be used.
+                                      type: object
+                                    mesh:
+                                      description: Mesh is reserved for future use
+                                        to identify cross mesh resources.
+                                      type: string
+                                    name:
+                                      description: |-
+                                        Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                                        `MeshServiceSubset` and `MeshGatewayRoute`
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                                        will be targeted.
+                                      type: string
+                                    port:
+                                      description: Port is only supported when this
+                                        ref refers to a real MeshService object
+                                      format: int32
+                                      type: integer
+                                    proxyTypes:
+                                      description: |-
+                                        ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                                        all data plane types are targeted by the policy.
+                                      items:
+                                        enum:
+                                        - Sidecar
+                                        - Gateway
+                                        type: string
+                                      minItems: 1
+                                      type: array
+                                    sectionName:
+                                      description: |-
+                                        SectionName is used to target specific section of resource.
+                                        For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                                      type: string
+                                    tags:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        Tags used to select a subset of proxies by tags. Can only be used with kinds
+                                        `MeshSubset` and `MeshServiceSubset`
+                                      type: object
+                                    weight:
+                                      default: 1
+                                      minimum: 0
+                                      type: integer
+                                  type: object
+                                minItems: 1
+                                type: array
+                            required:
+                            - backendRefs
+                            type: object
+                        required:
+                        - default
+                        type: object
+                      maxItems: 1
+                      type: array
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        destinations.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                minItems: 1
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtimeouts.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtimeouts.yaml
new file mode 100644
index 000000000..330873a94
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtimeouts.yaml
@@ -0,0 +1,363 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshtimeouts.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshTimeout
+    listKind: MeshTimeoutList
+    plural: meshtimeouts
+    singular: meshtimeout
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshTimeout resource.
+            properties:
+              from:
+                description: From list makes a match between clients and corresponding
+                  configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of clients referenced in
+                        'targetRef'
+                      properties:
+                        connectionTimeout:
+                          description: |-
+                            ConnectionTimeout specifies the amount of time proxy will wait for an TCP connection to be established.
+                            Default value is 5 seconds. Cannot be set to 0.
+                          type: string
+                        http:
+                          description: Http provides configuration for HTTP specific
+                            timeouts
+                          properties:
+                            maxConnectionDuration:
+                              description: |-
+                                MaxConnectionDuration is the time after which a connection will be drained and/or closed,
+                                starting from when it was first established. Setting this timeout to 0 will disable it.
+                                Disabled by default.
+                              type: string
+                            maxStreamDuration:
+                              description: |-
+                                MaxStreamDuration is the maximum time that a stream’s lifetime will span.
+                                Setting this timeout to 0 will disable it. Disabled by default.
+                              type: string
+                            requestHeadersTimeout:
+                              description: |-
+                                RequestHeadersTimeout The amount of time that proxy will wait for the request headers to be received. The timer is
+                                activated when the first byte of the headers is received, and is disarmed when the last byte of
+                                the headers has been received. If not specified or set to 0, this timeout is disabled.
+                                Disabled by default.
+                              type: string
+                            requestTimeout:
+                              description: |-
+                                RequestTimeout The amount of time that proxy will wait for the entire request to be received.
+                                The timer is activated when the request is initiated, and is disarmed when the last byte of the request is sent,
+                                OR when the response is initiated. Setting this timeout to 0 will disable it.
+                                Default is 15s.
+                              type: string
+                            streamIdleTimeout:
+                              description: |-
+                                StreamIdleTimeout is the amount of time that proxy will allow a stream to exist with no activity.
+                                Setting this timeout to 0 will disable it. Default is 30m
+                              type: string
+                          type: object
+                        idleTimeout:
+                          description: |-
+                            IdleTimeout is defined as the period in which there are no bytes sent or received on connection
+                            Setting this timeout to 0 will disable it. Be cautious when disabling it because
+                            it can lead to connection leaking. Default value is 1h.
+                          type: string
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        clients.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined inplace.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+              to:
+                description: To list makes a match between the consumed services and
+                  corresponding configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of destinations referenced in
+                        'targetRef'
+                      properties:
+                        connectionTimeout:
+                          description: |-
+                            ConnectionTimeout specifies the amount of time proxy will wait for an TCP connection to be established.
+                            Default value is 5 seconds. Cannot be set to 0.
+                          type: string
+                        http:
+                          description: Http provides configuration for HTTP specific
+                            timeouts
+                          properties:
+                            maxConnectionDuration:
+                              description: |-
+                                MaxConnectionDuration is the time after which a connection will be drained and/or closed,
+                                starting from when it was first established. Setting this timeout to 0 will disable it.
+                                Disabled by default.
+                              type: string
+                            maxStreamDuration:
+                              description: |-
+                                MaxStreamDuration is the maximum time that a stream’s lifetime will span.
+                                Setting this timeout to 0 will disable it. Disabled by default.
+                              type: string
+                            requestHeadersTimeout:
+                              description: |-
+                                RequestHeadersTimeout The amount of time that proxy will wait for the request headers to be received. The timer is
+                                activated when the first byte of the headers is received, and is disarmed when the last byte of
+                                the headers has been received. If not specified or set to 0, this timeout is disabled.
+                                Disabled by default.
+                              type: string
+                            requestTimeout:
+                              description: |-
+                                RequestTimeout The amount of time that proxy will wait for the entire request to be received.
+                                The timer is activated when the request is initiated, and is disarmed when the last byte of the request is sent,
+                                OR when the response is initiated. Setting this timeout to 0 will disable it.
+                                Default is 15s.
+                              type: string
+                            streamIdleTimeout:
+                              description: |-
+                                StreamIdleTimeout is the amount of time that proxy will allow a stream to exist with no activity.
+                                Setting this timeout to 0 will disable it. Default is 30m
+                              type: string
+                          type: object
+                        idleTimeout:
+                          description: |-
+                            IdleTimeout is defined as the period in which there are no bytes sent or received on connection
+                            Setting this timeout to 0 will disable it. Be cautious when disabling it because
+                            it can lead to connection leaking. Default value is 1h.
+                          type: string
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        destinations.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtlses.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtlses.yaml
new file mode 100644
index 000000000..4ddbfffcb
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtlses.yaml
@@ -0,0 +1,239 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshtlses.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshTLS
+    listKind: MeshTLSList
+    plural: meshtlses
+    singular: meshtls
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshTLS resource.
+            properties:
+              from:
+                description: From list makes a match between clients and corresponding
+                  configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of clients referenced in
+                        'targetRef'
+                      properties:
+                        mode:
+                          description: Mode defines the behavior of inbound listeners
+                            with regard to traffic encryption.
+                          enum:
+                          - Permissive
+                          - Strict
+                          type: string
+                        tlsCiphers:
+                          description: TlsCiphers section for providing ciphers specification.
+                          items:
+                            enum:
+                            - ECDHE-ECDSA-AES128-GCM-SHA256
+                            - ECDHE-ECDSA-AES256-GCM-SHA384
+                            - ECDHE-ECDSA-CHACHA20-POLY1305
+                            - ECDHE-RSA-AES128-GCM-SHA256
+                            - ECDHE-RSA-AES256-GCM-SHA384
+                            - ECDHE-RSA-CHACHA20-POLY1305
+                            type: string
+                          type: array
+                        tlsVersion:
+                          description: Version section for providing version specification.
+                          properties:
+                            max:
+                              default: TLSAuto
+                              description: Max defines maximum supported version.
+                                One of `TLSAuto`, `TLS10`, `TLS11`, `TLS12`, `TLS13`.
+                              enum:
+                              - TLSAuto
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            min:
+                              default: TLSAuto
+                              description: Min defines minimum supported version.
+                                One of `TLSAuto`, `TLS10`, `TLS11`, `TLS12`, `TLS13`.
+                              enum:
+                              - TLSAuto
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                          type: object
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        clients.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined in-place.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtraces.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtraces.yaml
new file mode 100644
index 000000000..b16244ce6
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtraces.yaml
@@ -0,0 +1,283 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshtraces.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshTrace
+    listKind: MeshTraceList
+    plural: meshtraces
+    singular: meshtrace
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshTrace resource.
+            properties:
+              default:
+                description: MeshTrace configuration.
+                properties:
+                  backends:
+                    description: |-
+                      A one element array of backend definition.
+                      Envoy allows configuring only 1 backend, so the natural way of
+                      representing that would be just one object. Unfortunately due to the
+                      reasons explained in MADR 009-tracing-policy this has to be a one element
+                      array for now.
+                    items:
+                      description: Only one of zipkin, datadog or openTelemetry can
+                        be used.
+                      properties:
+                        datadog:
+                          description: Datadog backend configuration.
+                          properties:
+                            splitService:
+                              default: false
+                              description: |-
+                                Determines if datadog service name should be split based on traffic
+                                direction and destination. For example, with `splitService: true` and a
+                                `backend` service that communicates with a couple of databases, you would
+                                get service names like `backend_INBOUND`, `backend_OUTBOUND_db1`, and
+                                `backend_OUTBOUND_db2` in Datadog.
+                              type: boolean
+                            url:
+                              description: |-
+                                Address of Datadog collector, only host and port are allowed (no paths,
+                                fragments etc.)
+                              type: string
+                          required:
+                          - url
+                          type: object
+                        openTelemetry:
+                          description: OpenTelemetry backend configuration.
+                          properties:
+                            endpoint:
+                              description: Address of OpenTelemetry collector.
+                              example: otel-collector:4317
+                              minLength: 1
+                              type: string
+                          required:
+                          - endpoint
+                          type: object
+                        type:
+                          enum:
+                          - Zipkin
+                          - Datadog
+                          - OpenTelemetry
+                          type: string
+                        zipkin:
+                          description: Zipkin backend configuration.
+                          properties:
+                            apiVersion:
+                              default: httpJson
+                              description: |-
+                                Version of the API.
+                                https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/trace/v3/zipkin.proto#L66
+                              enum:
+                              - httpJson
+                              - httpProto
+                              type: string
+                            sharedSpanContext:
+                              default: true
+                              description: |-
+                                Determines whether client and server spans will share the same span
+                                context.
+                                https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/trace/v3/zipkin.proto#L63
+                              type: boolean
+                            traceId128bit:
+                              default: false
+                              description: Generate 128bit traces.
+                              type: boolean
+                            url:
+                              description: Address of Zipkin collector.
+                              type: string
+                          required:
+                          - url
+                          type: object
+                      required:
+                      - type
+                      type: object
+                    maxItems: 1
+                    type: array
+                  sampling:
+                    description: |-
+                      Sampling configuration.
+                      Sampling is the process by which a decision is made on whether to
+                      process/export a span or not.
+                    properties:
+                      client:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        default: 100
+                        description: |-
+                          Target percentage of requests that will be force traced if the
+                          'x-client-trace-id' header is set. Mirror of client_sampling in Envoy
+                          https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto#L127-L133
+                          Either int or decimal represented as string.
+                        x-kubernetes-int-or-string: true
+                      overall:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        default: 100
+                        description: |-
+                          Target percentage of requests will be traced
+                          after all other sampling checks have been applied (client, force tracing,
+                          random sampling). This field functions as an upper limit on the total
+                          configured sampling rate. For instance, setting client to 100
+                          but overall to 1 will result in only 1% of client requests with
+                          the appropriate headers to be force traced. Mirror of
+                          overall_sampling in Envoy
+                          https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto#L142-L150
+                          Either int or decimal represented as string.
+                        x-kubernetes-int-or-string: true
+                      random:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        default: 100
+                        description: |-
+                          Target percentage of requests that will be randomly selected for trace
+                          generation, if not requested by the client or not forced.
+                          Mirror of random_sampling in Envoy
+                          https://github.com/envoyproxy/envoy/blob/v1.22.0/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto#L135-L140
+                          Either int or decimal represented as string.
+                        x-kubernetes-int-or-string: true
+                    type: object
+                  tags:
+                    description: |-
+                      Custom tags configuration. You can add custom tags to traces based on
+                      headers or literal values.
+                    items:
+                      description: |-
+                        Custom tags configuration.
+                        Only one of literal or header can be used.
+                      properties:
+                        header:
+                          description: Tag taken from a header.
+                          properties:
+                            default:
+                              description: |-
+                                Default value to use if header is missing.
+                                If the default is missing and there is no value the tag will not be
+                                included.
+                              type: string
+                            name:
+                              description: Name of the header.
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        literal:
+                          description: Tag taken from literal value.
+                          type: string
+                        name:
+                          description: Name of the tag.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                type: object
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined inplace.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtrafficpermissions.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtrafficpermissions.yaml
new file mode 100644
index 000000000..3e38acc06
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_meshtrafficpermissions.yaml
@@ -0,0 +1,203 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: meshtrafficpermissions.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: MeshTrafficPermission
+    listKind: MeshTrafficPermissionList
+    plural: meshtrafficpermissions
+    singular: meshtrafficpermission
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.targetRef.kind
+      name: TargetRef Kind
+      type: string
+    - jsonPath: .spec.targetRef.name
+      name: TargetRef Name
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma MeshTrafficPermission
+              resource.
+            properties:
+              from:
+                description: From list makes a match between clients and corresponding
+                  configurations
+                items:
+                  properties:
+                    default:
+                      description: |-
+                        Default is a configuration specific to the group of clients referenced in
+                        'targetRef'
+                      properties:
+                        action:
+                          description: 'Action defines a behavior for the specified
+                            group of clients:'
+                          enum:
+                          - Allow
+                          - Deny
+                          - AllowWithShadowDeny
+                          type: string
+                      type: object
+                    targetRef:
+                      description: |-
+                        TargetRef is a reference to the resource that represents a group of
+                        clients.
+                      properties:
+                        kind:
+                          description: Kind of the referenced resource
+                          enum:
+                          - Mesh
+                          - MeshSubset
+                          - MeshGateway
+                          - MeshService
+                          - MeshExternalService
+                          - MeshMultiZoneService
+                          - MeshServiceSubset
+                          - MeshHTTPRoute
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Labels are used to select group of MeshServices that match labels. Either Labels or
+                            Name and Namespace can be used.
+                          type: object
+                        mesh:
+                          description: Mesh is reserved for future use to identify
+                            cross mesh resources.
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                            `MeshServiceSubset` and `MeshGatewayRoute`
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                            will be targeted.
+                          type: string
+                        proxyTypes:
+                          description: |-
+                            ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                            all data plane types are targeted by the policy.
+                          items:
+                            enum:
+                            - Sidecar
+                            - Gateway
+                            type: string
+                          minItems: 1
+                          type: array
+                        sectionName:
+                          description: |-
+                            SectionName is used to target specific section of resource.
+                            For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                          type: string
+                        tags:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            Tags used to select a subset of proxies by tags. Can only be used with kinds
+                            `MeshSubset` and `MeshServiceSubset`
+                          type: object
+                      type: object
+                  required:
+                  - targetRef
+                  type: object
+                type: array
+              targetRef:
+                description: |-
+                  TargetRef is a reference to the resource the policy takes an effect on.
+                  The resource could be either a real store object or virtual resource
+                  defined inplace.
+                properties:
+                  kind:
+                    description: Kind of the referenced resource
+                    enum:
+                    - Mesh
+                    - MeshSubset
+                    - MeshGateway
+                    - MeshService
+                    - MeshExternalService
+                    - MeshMultiZoneService
+                    - MeshServiceSubset
+                    - MeshHTTPRoute
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are used to select group of MeshServices that match labels. Either Labels or
+                      Name and Namespace can be used.
+                    type: object
+                  mesh:
+                    description: Mesh is reserved for future use to identify cross
+                      mesh resources.
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced resource. Can only be used with kinds: `MeshService`,
+                      `MeshServiceSubset` and `MeshGatewayRoute`
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace specifies the namespace of target resource. If empty only resources in policy namespace
+                      will be targeted.
+                    type: string
+                  proxyTypes:
+                    description: |-
+                      ProxyTypes specifies the data plane types that are subject to the policy. When not specified,
+                      all data plane types are targeted by the policy.
+                    items:
+                      enum:
+                      - Sidecar
+                      - Gateway
+                      type: string
+                    minItems: 1
+                    type: array
+                  sectionName:
+                    description: |-
+                      SectionName is used to target specific section of resource.
+                      For example, you can target port from MeshService.ports[] by its name. Only traffic to this port will be affected.
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags used to select a subset of proxies by tags. Can only be used with kinds
+                      `MeshSubset` and `MeshServiceSubset`
+                    type: object
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_proxytemplates.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_proxytemplates.yaml
new file mode 100644
index 000000000..78b1d55e4
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_proxytemplates.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: proxytemplates.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: ProxyTemplate
+    listKind: ProxyTemplateList
+    plural: proxytemplates
+    singular: proxytemplate
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma ProxyTemplate resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_ratelimits.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_ratelimits.yaml
new file mode 100644
index 000000000..85f1876eb
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_ratelimits.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: ratelimits.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: RateLimit
+    listKind: RateLimitList
+    plural: ratelimits
+    singular: ratelimit
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma RateLimit resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_retries.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_retries.yaml
new file mode 100644
index 000000000..10a4843e1
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_retries.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: retries.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: Retry
+    listKind: RetryList
+    plural: retries
+    singular: retry
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma Retry resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_serviceinsights.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_serviceinsights.yaml
new file mode 100644
index 000000000..827ea521d
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_serviceinsights.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: serviceinsights.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: ServiceInsight
+    listKind: ServiceInsightList
+    plural: serviceinsights
+    singular: serviceinsight
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma ServiceInsight resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_timeouts.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_timeouts.yaml
new file mode 100644
index 000000000..ba78d88c5
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_timeouts.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: timeouts.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: Timeout
+    listKind: TimeoutList
+    plural: timeouts
+    singular: timeout
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma Timeout resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_trafficlogs.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_trafficlogs.yaml
new file mode 100644
index 000000000..ece8562e5
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_trafficlogs.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: trafficlogs.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: TrafficLog
+    listKind: TrafficLogList
+    plural: trafficlogs
+    singular: trafficlog
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma TrafficLog resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_trafficpermissions.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_trafficpermissions.yaml
new file mode 100644
index 000000000..9c79605af
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_trafficpermissions.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: trafficpermissions.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: TrafficPermission
+    listKind: TrafficPermissionList
+    plural: trafficpermissions
+    singular: trafficpermission
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma TrafficPermission resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_trafficroutes.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_trafficroutes.yaml
new file mode 100644
index 000000000..5bdd3ac85
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_trafficroutes.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: trafficroutes.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: TrafficRoute
+    listKind: TrafficRouteList
+    plural: trafficroutes
+    singular: trafficroute
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma TrafficRoute resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_traffictraces.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_traffictraces.yaml
new file mode 100644
index 000000000..c224ea526
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_traffictraces.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: traffictraces.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: TrafficTrace
+    listKind: TrafficTraceList
+    plural: traffictraces
+    singular: traffictrace
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma TrafficTrace resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_virtualoutbounds.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_virtualoutbounds.yaml
new file mode 100644
index 000000000..c4372dd0b
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_virtualoutbounds.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: virtualoutbounds.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: VirtualOutbound
+    listKind: VirtualOutboundList
+    plural: virtualoutbounds
+    singular: virtualoutbound
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma VirtualOutbound resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneegresses.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneegresses.yaml
new file mode 100644
index 000000000..143aaafdb
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneegresses.yaml
@@ -0,0 +1,56 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: zoneegresses.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: ZoneEgress
+    listKind: ZoneEgressList
+    plural: zoneegresses
+    singular: zoneegress
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - description: Zone name
+      jsonPath: .spec.zone
+      name: zone
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma ZoneEgress resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneegressinsights.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneegressinsights.yaml
new file mode 100644
index 000000000..05746b39a
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneegressinsights.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: zoneegressinsights.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: ZoneEgressInsight
+    listKind: ZoneEgressInsightList
+    plural: zoneegressinsights
+    singular: zoneegressinsight
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma ZoneEgressInsight resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneingresses.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneingresses.yaml
new file mode 100644
index 000000000..d02c5b35b
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneingresses.yaml
@@ -0,0 +1,56 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: zoneingresses.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: ZoneIngress
+    listKind: ZoneIngressList
+    plural: zoneingresses
+    singular: zoneingress
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - description: Zone name
+      jsonPath: .spec.zone
+      name: zone
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma ZoneIngress resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneingressinsights.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneingressinsights.yaml
new file mode 100644
index 000000000..ded86e6c2
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneingressinsights.yaml
@@ -0,0 +1,51 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: zoneingressinsights.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: ZoneIngressInsight
+    listKind: ZoneIngressInsightList
+    plural: zoneingressinsights
+    singular: zoneingressinsight
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma ZoneIngressInsight
+              resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneinsights.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneinsights.yaml
new file mode 100644
index 000000000..aad82d4be
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_zoneinsights.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: zoneinsights.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: ZoneInsight
+    listKind: ZoneInsightList
+    plural: zoneinsights
+    singular: zoneinsight
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma ZoneInsight resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/crds/kuma.io_zones.yaml b/charts/kuma/kuma/2.9.3/crds/kuma.io_zones.yaml
new file mode 100644
index 000000000..12022fce9
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/crds/kuma.io_zones.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: zones.kuma.io
+spec:
+  group: kuma.io
+  names:
+    categories:
+    - kuma
+    kind: Zone
+    listKind: ZoneList
+    plural: zones
+    singular: zone
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          mesh:
+            description: |-
+              Mesh is the name of the Kuma mesh this resource belongs to.
+              It may be omitted for cluster-scoped resources.
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the specification of the Kuma Zone resource.
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
diff --git a/charts/kuma/kuma/2.9.3/templates/NOTES.txt b/charts/kuma/kuma/2.9.3/templates/NOTES.txt
new file mode 100644
index 000000000..228ac26e7
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/NOTES.txt
@@ -0,0 +1,42 @@
+{{ .Chart.Name }} has been installed!
+
+Your release is named '{{ .Release.Name }}'.
+
+You can access the control-plane via either the GUI, kubectl, the HTTP API, or the kumactl CLI.
+{{- if .Values.noHelmHooks }}
+
+-------------------------------------------------------------------------------
+
+ WARNING
+
+    When the "noHelmHooks" value is provided, you will need to manually delete
+    the "ValidatingWebhookConfiguration" responsible for validating {{ include "kuma.name" . }} resources
+    before you can uninstall Helm release. This is because the validation provided
+    by the webhook is not necessary during the release removal and might potentially
+    even prevent you from doing it. You can do this by running the following command:
+
+    kubectl delete ValidatingWebhookConfiguration {{ include "kuma.name" . }}-validating-webhook-configuration
+
+ WARNING
+
+    When the "noHelmHooks" value is set, Helm will not automatically update
+    the CustomResourceDefinitions (CRDs) when upgrading release. You must manually
+    update the CRDs if the new {{ include "kuma.name" . }} version has changes
+    to the CRDs. You can achieve this by calling the following command:
+
+    kumactl install crds --no-config | kubectl apply -f
+
+{{- if and .Values.experimental.ebpf.enabled (not .Values.cni.enabled) }}
+
+ WARNING
+
+    When the "noHelmHooks" value is set, Helm will not automatically uninstall
+    the eBPF resources. You will need to manually uninstall these resources after
+    uninstalling Helm release. To do this, run the following command:
+
+    kumactl uninstall ebpf --cleanup-image-registry {{ .Values.global.image.registry }} --cleanup-image-repository {{ .Values.dataPlane.initImage.repository }}
+
+{{- end }}
+
+-------------------------------------------------------------------------------
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/_helpers.tpl b/charts/kuma/kuma/2.9.3/templates/_helpers.tpl
new file mode 100644
index 000000000..a33fa04dc
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/_helpers.tpl
@@ -0,0 +1,432 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "kuma.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+This is the Kuma version the chart is intended to be used with.
+*/}}
+{{- define "kuma.appVersion" -}}
+{{- .Chart.AppVersion -}}
+{{- end }}
+
+{{/*
+This is only used in the `kuma.formatImage` function below.
+*/}}
+{{- define "kuma.defaultRegistry" -}}
+docker.io/kumahq
+{{- end }}
+
+{{- define "kuma.product" -}}
+Kuma
+{{- end }}
+
+{{- define "kuma.tagPrefix" -}}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "kuma.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "kuma.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{- define "kuma.controlPlane.serviceName" -}}
+{{- $defaultSvcName := printf "%s-control-plane" (include "kuma.name" .) -}}
+{{ printf "%s" (default $defaultSvcName .Values.controlPlane.service.name) }}
+{{- end }}
+
+{{- define "kuma.controlPlane.globalZoneSync.serviceName" -}}
+{{- $defaultSvcName := printf "%s-global-zone-sync" (include "kuma.name" .) -}}
+{{ printf "%s" (default $defaultSvcName .Values.controlPlane.globalZoneSyncService.name) }}
+{{- end }}
+
+{{- define "kuma.ingress.serviceName" -}}
+{{- $defaultSvcName := printf "%s-ingress" (include "kuma.name" .) -}}
+{{ printf "%s" (default $defaultSvcName .Values.ingress.service.name) }}
+{{- end }}
+
+{{- define "kuma.egress.serviceName" -}}
+{{- $defaultSvcName := printf "%s-egress" (include "kuma.name" .) -}}
+{{ printf "%s" (default $defaultSvcName .Values.egress.service.name) }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "kuma.labels" -}}
+helm.sh/chart: {{ include "kuma.chart" . }}
+{{ include "kuma.selectorLabels" . }}
+{{- if (include "kuma.appVersion" .) }}
+app.kubernetes.io/version: {{ (include "kuma.appVersion" .) | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "kuma.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kuma.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+CNI labels
+*/}}
+{{- define "kuma.cniLabels" -}}
+app: {{ include "kuma.name" . }}-cni
+{{ include "kuma.labels" . }}
+{{- end }}
+
+{{/*
+control plane labels
+*/}}
+{{- define "kuma.cpLabels" -}}
+app: {{ include "kuma.name" . }}-control-plane
+{{- range $key, $value := $.Values.controlPlane.extraLabels }}
+{{ $key | quote }}: {{ $value | quote }}
+{{- end }}
+{{ include "kuma.labels" . }}
+{{- end }}
+
+{{/*
+control plane deployment annotations
+*/}}
+{{- define "kuma.cpDeploymentAnnotations" -}}
+{{- range $key, $value := $.Values.controlPlane.deploymentAnnotations }}
+{{ $key | quote }}: {{ $value | quote }}
+{{- end }}
+{{- end }}
+
+{{/*
+ingress labels
+*/}}
+{{- define "kuma.ingressLabels" -}}
+app: {{ include "kuma.name" . }}-ingress
+{{- range $key, $value := .Values.ingress.extraLabels }}
+{{ $key | quote }}: {{ $value | quote }}
+{{- end }}
+{{ include "kuma.labels" . }}
+{{- end }}
+
+{{/*
+egress labels
+*/}}
+{{- define "kuma.egressLabels" -}}
+app: {{ include "kuma.name" . }}-egress
+{{ range $key, $value := .Values.egress.extraLabels }}
+{{ $key | quote }}: {{ $value | quote }}
+{{ end }}
+{{- include "kuma.labels" . }}
+{{- end }}
+
+{{/*
+CNI selector labels
+*/}}
+{{- define "kuma.cniSelectorLabels" -}}
+app: {{ include "kuma.name" . }}-cni
+{{ include "kuma.selectorLabels" . }}
+{{- end }}
+
+{{/*
+params: { dns: { policy?, config: {nameservers?, searches?}} }
+returns: formatted dnsConfig
+*/}}
+{{- define "kuma.dnsConfig" -}}
+{{- $dns := .dns }}
+{{- if $dns.policy }}
+dnsPolicy: {{ $dns.policy }}
+{{- end }}
+{{- if or (gt (len $dns.config.nameservers) 0) (gt (len $dns.config.searches) 0) }}
+dnsConfig:
+  {{- if gt (len $dns.config.nameservers) 0 }}
+  nameservers:
+    {{- range $nameserver := $dns.config.nameservers }}
+    - {{ $nameserver }}
+    {{- end }}
+  {{- end }}
+  {{- if gt (len $dns.config.searches) 0 }}
+  searches:
+    {{- range $search := $dns.config.searches }}
+    - {{ $search }}
+    {{- end }}
+  {{- end }}
+{{- end }}
+{{- end -}}
+
+{{/*
+params: { image: { registry?, repository, tag? }, root: $ }
+returns: formatted image string
+*/}}
+{{- define "kuma.formatImage" -}}
+{{- $img := .image }}
+{{- $root := .root }}
+{{- $registry := ($img.registry | default $root.Values.global.image.registry) -}}
+{{- $repo := ($img.repository | required "Must specify image repository") -}}
+{{- $product := (include "kuma.product" .) }}
+{{- $tagPrefix := (include "kuma.tagPrefix" .) }}
+{{- $expectedVersion := (include "kuma.appVersion" $root) }}
+{{- if
+  and
+    $root.Values.global.image.tag
+    (ne $root.Values.global.image.tag (include "kuma.appVersion" $root))
+    (eq $root.Values.global.image.registry (include "kuma.defaultRegistry" .))
+-}}
+{{- fail (
+  printf "This chart only supports %s version %q but %sglobal.image.tag is set to %q. Set %sglobal.image.tag to %q or skip this check by setting %s*.image.tag for each individual component."
+  $product $expectedVersion $tagPrefix $root.Values.global.image.tag $tagPrefix $expectedVersion $tagPrefix
+) -}}
+{{- end -}}
+{{- $defaultTag := ($root.Values.global.image.tag | default (include "kuma.appVersion" $root)) -}}
+{{- $tag := ($img.tag | default $defaultTag) -}}
+{{- printf "%s/%s:%s" $registry $repo $tag -}}
+{{- end -}}
+
+{{- define "kuma.parentEnv" -}}
+{{- end -}}
+
+{{- define "kuma.parentSecrets" -}}
+{{- end -}}
+
+{{- define "kuma.pluginPoliciesEnabled" -}}
+{{- $list := list -}}
+{{- range $k, $v := .Values.plugins.policies -}}
+{{- if $v -}}
+{{- $list = append $list (printf "%s" $k) -}}
+{{- end -}}
+{{- end -}}
+{{ join "," $list }}
+{{- end -}}
+
+{{- define "kuma.transparentProxyConfigMapName" -}}
+{{- if .Values.transparentProxy.configMap.name }}
+{{- .Values.transparentProxy.configMap.name | trunc 253 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-transparent-proxy-config" .Chart.Name }}
+{{- end }}
+{{- end }}
+
+{{- define "kuma.defaultEnv" -}}
+env:
+{{ include "kuma.parentEnv" . }}
+- name: KUMA_ENVIRONMENT
+  value: "kubernetes"
+- name: KUMA_STORE_TYPE
+  value: "kubernetes"
+- name: KUMA_STORE_KUBERNETES_SYSTEM_NAMESPACE
+  value: {{ .Release.Namespace | quote }}
+- name: KUMA_RUNTIME_KUBERNETES_CONTROL_PLANE_SERVICE_NAME
+  value: {{ include "kuma.controlPlane.serviceName" . }}
+- name: KUMA_GENERAL_TLS_CERT_FILE
+  value: /var/run/secrets/kuma.io/tls-cert/tls.crt
+- name: KUMA_GENERAL_TLS_KEY_FILE
+  value: /var/run/secrets/kuma.io/tls-cert/tls.key
+{{- if eq .Values.controlPlane.mode "zone" }}
+- name: KUMA_MULTIZONE_ZONE_GLOBAL_ADDRESS
+  value: {{ .Values.controlPlane.kdsGlobalAddress }}
+{{- end }}
+- name: KUMA_DP_SERVER_HDS_ENABLED
+  value: "false"
+- name: KUMA_API_SERVER_READ_ONLY
+  value: "true"
+- name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_PORT
+  value: {{ .Values.controlPlane.admissionServerPort | default "5443" | quote }}
+- name: KUMA_RUNTIME_KUBERNETES_ADMISSION_SERVER_CERT_DIR
+  value: /var/run/secrets/kuma.io/tls-cert
+- name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CNI_ENABLED
+  value: {{ .Values.cni.enabled | quote }}
+- name: KUMA_RUNTIME_KUBERNETES_INJECTOR_SIDECAR_CONTAINER_IMAGE
+  value: {{ include "kuma.formatImage" (dict "image" .Values.dataPlane.image "root" $) | quote }}
+- name: KUMA_INJECTOR_INIT_CONTAINER_IMAGE
+  value: {{ include "kuma.formatImage" (dict "image" .Values.dataPlane.initImage "root" $) | quote }}
+{{- if .Values.dataPlane.dnsLogging }}
+- name: KUMA_RUNTIME_KUBERNETES_INJECTOR_BUILTIN_DNS_LOGGING
+  value: "true"
+{{- end }}
+{{- if and .Values.transparentProxy.configMap.enabled .Values.transparentProxy.configMap.config }}
+- name: KUMA_RUNTIME_KUBERNETES_INJECTOR_TRANSPARENT_PROXY_CONFIGMAP_NAME
+  value: {{ include "kuma.transparentProxyConfigMapName" . | quote }}
+{{- end }}
+- name: KUMA_RUNTIME_KUBERNETES_INJECTOR_CA_CERT_FILE
+  value: /var/run/secrets/kuma.io/tls-cert/ca.crt
+- name: KUMA_DEFAULTS_SKIP_MESH_CREATION
+  value: {{ .Values.controlPlane.defaults.skipMeshCreation | quote }}
+- name: KUMA_MODE
+  value: {{ .Values.controlPlane.mode | quote }}
+{{- if .Values.controlPlane.zone }}
+- name: KUMA_MULTIZONE_ZONE_NAME
+  value: {{ .Values.controlPlane.zone | quote }}
+{{- end }}
+{{- if .Values.controlPlane.tls.apiServer.secretName }}
+- name: KUMA_API_SERVER_HTTPS_TLS_CERT_FILE
+  value: /var/run/secrets/kuma.io/api-server-tls-cert/tls.crt
+- name: KUMA_API_SERVER_HTTPS_TLS_KEY_FILE
+  value: /var/run/secrets/kuma.io/api-server-tls-cert/tls.key
+{{- end }}
+{{- if .Values.controlPlane.tls.apiServer.clientCertsSecretName }}
+- name: KUMA_API_SERVER_AUTH_CLIENT_CERTS_DIR
+  value: /var/run/secrets/kuma.io/api-server-client-certs/
+{{- end }}
+{{- if and (eq .Values.controlPlane.mode "global") (or .Values.controlPlane.tls.kdsGlobalServer.secretName .Values.controlPlane.tls.kdsGlobalServer.create) }}
+- name: KUMA_MULTIZONE_GLOBAL_KDS_TLS_CERT_FILE
+  value: /var/run/secrets/kuma.io/kds-server-tls-cert/tls.crt
+- name: KUMA_MULTIZONE_GLOBAL_KDS_TLS_KEY_FILE
+  value: /var/run/secrets/kuma.io/kds-server-tls-cert/tls.key
+{{- end }}
+{{- if and (eq .Values.controlPlane.mode "zone") (or .Values.controlPlane.tls.kdsZoneClient.secretName .Values.controlPlane.tls.kdsZoneClient.create) }}
+- name: KUMA_MULTIZONE_ZONE_KDS_ROOT_CA_FILE
+  value: /var/run/secrets/kuma.io/kds-client-tls-cert/ca.crt
+{{- end }}
+- name: KUMA_API_SERVER_AUTHN_LOCALHOST_IS_ADMIN
+  value: "false"
+- name: KUMA_RUNTIME_KUBERNETES_ALLOWED_USERS
+  value: "system:serviceaccount:{{ .Release.Namespace }}:{{ include "kuma.name" . }}-control-plane"
+{{- if .Values.experimental.sidecarContainers }}
+- name: KUMA_EXPERIMENTAL_SIDECAR_CONTAINERS
+  value: "true"
+{{- end }}
+{{- if .Values.cni.enabled }}
+- name: KUMA_RUNTIME_KUBERNETES_NODE_TAINT_CONTROLLER_ENABLED
+  value: "true"
+- name: KUMA_RUNTIME_KUBERNETES_NODE_TAINT_CONTROLLER_CNI_APP
+  value: "{{ include "kuma.name" . }}-cni"
+- name: KUMA_RUNTIME_KUBERNETES_NODE_TAINT_CONTROLLER_CNI_NAMESPACE
+  value: {{ .Values.cni.namespace }}
+{{- end }}
+{{- if .Values.experimental.ebpf.enabled }}
+- name: KUMA_RUNTIME_KUBERNETES_INJECTOR_EBPF_ENABLED
+  value: "true"
+- name: KUMA_RUNTIME_KUBERNETES_INJECTOR_EBPF_INSTANCE_IP_ENV_VAR_NAME
+  value: {{ .Values.experimental.ebpf.instanceIPEnvVarName }}
+- name: KUMA_RUNTIME_KUBERNETES_INJECTOR_EBPF_BPFFS_PATH
+  value: {{ .Values.experimental.ebpf.bpffsPath }}
+- name: KUMA_RUNTIME_KUBERNETES_INJECTOR_EBPF_CGROUP_PATH
+  value: {{ .Values.experimental.ebpf.cgroupPath }}
+- name: KUMA_RUNTIME_KUBERNETES_INJECTOR_EBPF_TC_ATTACH_IFACE
+  value: {{ .Values.experimental.ebpf.tcAttachIface }}
+- name: KUMA_RUNTIME_KUBERNETES_INJECTOR_EBPF_PROGRAMS_SOURCE_PATH
+  value: {{ .Values.experimental.ebpf.programsSourcePath }}
+{{- end }}
+{{- if .Values.controlPlane.tls.kdsZoneClient.skipVerify }}
+- name: KUMA_MULTIZONE_ZONE_KDS_TLS_SKIP_VERIFY
+  value: "true"
+{{- end }}
+- name: KUMA_PLUGIN_POLICIES_ENABLED
+  value: {{ include "kuma.pluginPoliciesEnabled" . | quote }}
+{{- if .Values.controlPlane.supportGatewaySecretsInAllNamespaces }}
+- name: KUMA_RUNTIME_KUBERNETES_SUPPORT_GATEWAY_SECRETS_IN_ALL_NAMESPACES
+  value: true
+{{- end }}
+{{- end }}
+
+{{- define "kuma.controlPlane.tls.general.caSecretName" -}}
+{{ .Values.controlPlane.tls.general.caSecretName | default .Values.controlPlane.tls.general.secretName | default (printf "%s-tls-cert" (include "kuma.name" .)) | quote }}
+{{- end }}
+
+{{- define "kuma.universal.defaultEnv" -}}
+{{ if eq .Values.controlPlane.mode "zone" }}
+  {{ if .Values.ingress.enabled }}
+    {{ fail "Can't have ingress.enabled when running controlPlane.mode=='universal'" }}
+  {{ end }}
+  {{ if .Values.egress.enabled }}
+    {{ fail "Can't have egress.enabled when running controlPlane.mode=='universal'" }}
+  {{ end }}
+{{ end }}
+
+env:
+- name: KUMA_PLUGIN_POLICIES_ENABLED
+  value: {{ include "kuma.pluginPoliciesEnabled" . | quote }}
+- name: KUMA_GENERAL_WORK_DIR
+  value: "/tmp/kuma"
+- name: KUMA_ENVIRONMENT
+  value: "universal"
+- name: KUMA_STORE_TYPE
+  value: "postgres"
+- name: KUMA_STORE_POSTGRES_PORT
+  value: "{{ .Values.postgres.port }}"
+- name: KUMA_DEFAULTS_SKIP_MESH_CREATION
+  value: {{ .Values.controlPlane.defaults.skipMeshCreation | quote }}
+{{ if and (eq .Values.controlPlane.mode "zone") .Values.controlPlane.tls.general.secretName }}
+- name: KUMA_GENERAL_TLS_CERT_FILE
+  value: /var/run/secrets/kuma.io/tls-cert/tls.crt
+- name: KUMA_GENERAL_TLS_KEY_FILE
+  value: /var/run/secrets/kuma.io/tls-cert/tls.key
+{{ end }}
+- name: KUMA_MODE
+  value: {{ .Values.controlPlane.mode | quote }}
+{{- if eq .Values.controlPlane.mode "zone" }}
+- name: KUMA_MULTIZONE_ZONE_GLOBAL_ADDRESS
+  value: {{ .Values.controlPlane.kdsGlobalAddress }}
+{{- end }}
+{{- if .Values.controlPlane.zone }}
+- name: KUMA_MULTIZONE_ZONE_NAME
+  value: {{ .Values.controlPlane.zone | quote }}
+{{- end }}
+{{- if and (eq .Values.controlPlane.mode "zone") (or .Values.controlPlane.tls.kdsZoneClient.secretName .Values.controlPlane.tls.kdsZoneClient.create) }}
+- name: KUMA_MULTIZONE_ZONE_KDS_ROOT_CA_FILE
+  value: /var/run/secrets/kuma.io/kds-client-tls-cert/ca.crt
+{{- end }}
+{{- if .Values.controlPlane.tls.kdsZoneClient.skipVerify }}
+- name: KUMA_MULTIZONE_ZONE_KDS_TLS_SKIP_VERIFY
+  value: "true"
+{{- end }}
+{{- if .Values.controlPlane.tls.apiServer.secretName }}
+- name: KUMA_API_SERVER_HTTPS_TLS_CERT_FILE
+  value: /var/run/secrets/kuma.io/api-server-tls-cert/tls.crt
+- name: KUMA_API_SERVER_HTTPS_TLS_KEY_FILE
+  value: /var/run/secrets/kuma.io/api-server-tls-cert/tls.key
+{{- end }}
+{{- if .Values.controlPlane.tls.apiServer.clientCertsSecretName }}
+- name: KUMA_API_SERVER_AUTH_CLIENT_CERTS_DIR
+  value: /var/run/secrets/kuma.io/api-server-client-certs/
+{{- end }}
+{{- if .Values.controlPlane.tls.kdsGlobalServer.secretName }}
+- name: KUMA_MULTIZONE_GLOBAL_KDS_TLS_CERT_FILE
+  value: /var/run/secrets/kuma.io/kds-server-tls-cert/tls.crt
+- name: KUMA_MULTIZONE_GLOBAL_KDS_TLS_KEY_FILE
+  value: /var/run/secrets/kuma.io/kds-server-tls-cert/tls.key
+{{- end }}
+- name: KUMA_STORE_POSTGRES_TLS_MODE
+  value: {{ .Values.postgres.tls.mode }}
+{{- if or (eq .Values.postgres.tls.mode "verifyCa") (eq .Values.postgres.tls.mode "verifyFull") }}
+{{- if empty .Values.postgres.tls.caSecretName }}
+{{ fail "if mode is 'verifyCa' or 'verifyFull' then you must provide .Values.postgres.tls.caSecretName" }}
+{{- end }}
+{{- if .Values.postgres.tls.secretName }}
+- name: KUMA_STORE_POSTGRES_TLS_CERT_PATH
+  value: /var/run/secrets/kuma.io/postgres-tls-cert/tls.crt
+- name: KUMA_STORE_POSTGRES_TLS_KEY_PATH
+  value: /var/run/secrets/kuma.io/postgres-tls-cert/tls.key
+{{- end }}
+{{- if .Values.postgres.tls.caSecretName }}
+- name: KUMA_STORE_POSTGRES_TLS_CA_PATH
+  value: /var/run/secrets/kuma.io/postgres-tls-cert/ca.crt
+{{- end }}
+{{- if .Values.postgres.tls.disableSSLSNI }}
+- name: KUMA_STORE_POSTGRES_TLS_DISABLE_SSLSNI
+  value: {{ .Values.postgres.tls.disableSSLSNI }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/cni-configmap.yaml b/charts/kuma/kuma/2.9.3/templates/cni-configmap.yaml
new file mode 100644
index 000000000..8d27de9ef
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/cni-configmap.yaml
@@ -0,0 +1,22 @@
+{{- if and .Values.cni.enabled (not .Values.experimental.ebpf.enabled) }}
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ include "kuma.name" . }}-cni-config
+  namespace: {{ .Values.cni.namespace }}
+  labels: {{ include "kuma.cniLabels" . | nindent 4 }}
+data:
+  # The CNI network configuration to add to the plugin chain on each node.
+  cni_network_config: |-
+    {
+      "cniVersion": "0.3.1",
+      "name": "kuma-cni",
+      "type": "kuma-cni",
+      "log_level": "{{ .Values.cni.logLevel }}",
+      "kubernetes": {
+          "kubeconfig": "__KUBECONFIG_FILEPATH__",
+          "cni_bin_dir": "{{ .Values.cni.binDir }}",
+          "exclude_namespaces": [ "kube-system" ]
+      }
+    }
+    {{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/cni-daemonset.yaml b/charts/kuma/kuma/2.9.3/templates/cni-daemonset.yaml
new file mode 100644
index 000000000..b5d8db761
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/cni-daemonset.yaml
@@ -0,0 +1,152 @@
+{{- if .Values.cni.enabled }}
+kind: DaemonSet
+apiVersion: apps/v1
+metadata:
+  name: {{ include "kuma.name" . }}-cni-node
+  namespace: {{ .Values.cni.namespace }}
+  annotations:
+    ignore-check.kube-linter.io/run-as-non-root: "The container installs a CNI plugin"
+  labels: {{- include "kuma.cniLabels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+  {{- include "kuma.cniSelectorLabels" . | nindent 6 }}
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1
+  template:
+    metadata:
+      labels:
+      {{- include "kuma.cniSelectorLabels" . | nindent 8 }}
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/cni-configmap.yaml") . | sha256sum }}
+        {{- range $key, $value := .Values.cni.podAnnotations }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+    spec:
+      # This, along with the CriticalAddonsOnly toleration below,
+      # marks the pod as a critical add-on, ensuring it gets
+      # priority scheduling and that its resources are reserved
+      # if it ever gets evicted.
+      priorityClassName: system-node-critical
+      {{- with .Values.cni.nodeSelector }}
+      nodeSelector:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.cni.tolerations }}
+      tolerations:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      tolerations:
+        # Make sure kuma-cni-node gets scheduled on all nodes.
+        - effect: NoSchedule
+          operator: Exists
+        # Mark the pod as a critical add-on for rescheduling.
+        - key: CriticalAddonsOnly
+          operator: Exists
+        - effect: NoExecute
+          operator: Exists
+      serviceAccountName: {{ include "kuma.name" . }}-cni
+      # Minimize downtime during a rolling upgrade or deletion; tell Kubernetes to do a "force
+      # deletion": https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods.
+      terminationGracePeriodSeconds: 5
+      securityContext:
+      {{- toYaml .Values.cni.podSecurityContext | trim | nindent 8 }}
+      containers:
+        - name: install-cni
+          imagePullPolicy: {{ .Values.cni.image.imagePullPolicy }}
+          {{- if not  .Values.experimental.ebpf.enabled  }}
+          image: {{ include "kuma.formatImage" (dict "image" .Values.cni.image "root" $) | quote }}
+          readinessProbe:
+            initialDelaySeconds: {{ .Values.cni.delayStartupSeconds }}
+            exec:
+              command:
+                - cat
+                - /tmp/ready
+          command: [ "sh", "-c", "--" ]
+          args: [ "sleep {{.Values.cni.delayStartupSeconds}} && exec /install-cni" ]
+          {{- else }}
+          {{- with .Values.cni.experimental.imageEbpf }}
+          image: {{ printf "%s/%s:%s" .registry .repository .tag | quote }}
+          {{- end }}
+          args:
+          - /app/mbctl
+          - --mode=kuma
+          - --use-reconnect=true
+          - --cni-mode=true
+          {{- if eq .Values.cni.logLevel "debug" }}
+          - --debug=true
+          {{- end }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                - make
+                - --keep-going
+                - clean
+          {{- end }}
+          securityContext:
+          {{- toYaml .Values.cni.containerSecurityContext | trim | nindent 12 }}
+          {{- if .Values.experimental.ebpf.enabled }}
+            privileged: true
+          {{- end }}
+          {{- if not .Values.experimental.ebpf.enabled }}
+          env:
+            # Name of the CNI config file to create.
+            - name: CNI_CONF_NAME
+              value: "{{ .Values.cni.confName }}"
+            # The CNI network config to install on each node.
+            - name: CNI_NETWORK_CONFIG
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ include "kuma.name" . }}-cni-config
+                  key: cni_network_config
+            - name: CNI_NET_DIR
+              value: "{{ .Values.cni.netDir }}"
+            # If true, deploy as a chained CNI plugin, otherwise deploy as a standalone CNI
+            - name: CHAINED_CNI_PLUGIN
+              value: "{{ .Values.cni.chained }}"
+            - name: CNI_LOG_LEVEL
+              value: "{{ .Values.cni.logLevel }}"
+          {{- end }}
+          resources:
+          {{- toYaml .Values.cni.resources | trim | nindent 12 }}
+          volumeMounts:
+            - mountPath: /host/opt/cni/bin
+              name: cni-bin-dir
+            - mountPath: /host/etc/cni/net.d
+              name: cni-net-dir
+            {{- if .Values.experimental.ebpf.enabled }}
+            - mountPath: /sys/fs/cgroup
+              name: sys-fs-cgroup
+            - mountPath: /host/proc
+              name: host-proc
+            - mountPath: /host/var/run
+              name: host-var-run
+              mountPropagation: Bidirectional
+            {{- end }}
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        # Used to install CNI.
+        - name: cni-bin-dir
+          hostPath:
+            path: {{ .Values.cni.binDir }}
+        - name: cni-net-dir
+          hostPath:
+            path: {{ .Values.cni.netDir }}
+        {{- if .Values.experimental.ebpf.enabled }}
+        - hostPath:
+            path: /var/run
+          name: host-var-run
+        - hostPath:
+            path: /sys/fs/cgroup
+          name: sys-fs-cgroup
+        - hostPath:
+            path: /proc
+          name: host-proc
+        {{- end }}
+        - name: tmp
+          emptyDir: {}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/cni-rbac.yaml b/charts/kuma/kuma/2.9.3/templates/cni-rbac.yaml
new file mode 100644
index 000000000..07af2b215
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/cni-rbac.yaml
@@ -0,0 +1,51 @@
+{{- if .Values.cni.enabled }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "kuma.name" . }}-cni
+  namespace: {{ .Values.cni.namespace }}
+  labels: {{ include "kuma.cniLabels" . | nindent 4 }}
+{{- with .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- range . }}
+  - name: {{ . | quote }}
+  {{- end }}
+{{- end }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "kuma.name" . }}-cni
+  labels:
+  {{ include "kuma.cniLabels" . | nindent 4 }}
+rules:
+  - apiGroups: [""]
+    resources:
+      - nodes
+    verbs:
+      - get
+  - apiGroups: [""]
+    resources:
+      - pods
+    verbs:
+      - get
+      {{- if .Values.experimental.ebpf.enabled }}
+      - list
+      - watch
+      {{- end }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "kuma.name" . }}-cni
+  labels:
+  {{ include "kuma.cniLabels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "kuma.name" . }}-cni
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "kuma.name" . }}-cni
+    namespace: {{ .Values.cni.namespace }}
+  {{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/cp-configmap.yaml b/charts/kuma/kuma/2.9.3/templates/cp-configmap.yaml
new file mode 100644
index 000000000..b2c94ed4d
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/cp-configmap.yaml
@@ -0,0 +1,46 @@
+{{ $kumaCpLabels := include "kuma.cpLabels" . }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "kuma.name" . }}-control-plane-config
+  namespace: {{ .Release.Namespace }}
+  labels: {{ $kumaCpLabels | nindent 4 }}
+data:
+  config.yaml: |
+    # use this file to override default configuration of `kuma-cp`
+    #
+    # see conf/kuma-cp.conf.yml for available settings
+    {{ if .Values.controlPlane.config }}
+    {{ .Values.controlPlane.config | nindent 4 }}
+    {{ end }}
+
+{{- $releaseNamespace := .Release.Namespace}}
+{{- range $extraConfigMap := .Values.controlPlane.extraConfigMaps }}
+{{- if $extraConfigMap.values }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $extraConfigMap.name }}
+  namespace: {{ $releaseNamespace }}
+  labels: {{ $kumaCpLabels | nindent 4 }}
+data:
+  {{- range $fileName, $fileContents := $extraConfigMap.values }}
+  {{- $fileName | nindent 2 }}: |
+  {{- $fileContents | nindent 4 }}
+  {{- end }}
+{{- end }}
+{{- end }}
+{{- if and .Values.transparentProxy.configMap.enabled .Values.transparentProxy.configMap.config }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "kuma.transparentProxyConfigMapName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- $kumaCpLabels | nindent 4 }}
+data:
+  config.yaml: |
+    {{- .Values.transparentProxy.configMap.config | toYaml | nindent 4 }}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/cp-deployment.yaml b/charts/kuma/kuma/2.9.3/templates/cp-deployment.yaml
new file mode 100644
index 000000000..1111b149b
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/cp-deployment.yaml
@@ -0,0 +1,412 @@
+{{ $kdsGlobalServerTLSSecretName := "" }}
+{{ if eq .Values.controlPlane.mode "global" }}
+  {{ $kdsGlobalServerTLSSecretName = .Values.controlPlane.tls.kdsGlobalServer.secretName }}
+  {{ if and .Values.controlPlane.tls.kdsGlobalServer.create (not $kdsGlobalServerTLSSecretName) }}
+    {{ $kdsGlobalServerTLSSecretName = print (include "kuma.name" .) "-kds-global-server-tls" }}
+  {{ end }}
+{{ end }}
+
+{{ $kdsZoneClientTLSSecretName := "" }}
+{{ if eq .Values.controlPlane.mode "zone" }}
+  {{ $kdsZoneClientTLSSecretName = .Values.controlPlane.tls.kdsZoneClient.secretName }}
+  {{ if and .Values.controlPlane.tls.kdsZoneClient.create (not $kdsZoneClientTLSSecretName) }}
+    {{ $kdsZoneClientTLSSecretName = print (include "kuma.name" .) "-kds-zone-client-tls" }}
+  {{ end }}
+{{ end }}
+
+{{ if not (or (eq .Values.controlPlane.mode "zone") (eq .Values.controlPlane.mode "global") (eq .Values.controlPlane.mode "standalone")) }}
+  {{ $msg := printf "controlPlane.mode invalid got:'%s' supported values: global,zone,standalone" .Values.controlPlane.mode }}
+  {{ fail $msg }}
+{{ end }}
+{{ if eq .Values.controlPlane.mode "zone" }}
+  {{ if not (empty .Values.controlPlane.zone) }}
+    {{ if gt (len .Values.controlPlane.zone) 253 }}
+      {{ fail "controlPlane.zone must be no more than 253 characters" }}
+    {{ else }}
+      {{ if not (regexMatch "^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$" .Values.controlPlane.zone) }}
+        {{ fail "controlPlane.zone must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character" }}
+      {{ end }}
+    {{ end }}
+  {{ end }}
+  {{ if not (empty .Values.controlPlane.kdsGlobalAddress) }}
+    {{ $url := urlParse .Values.controlPlane.kdsGlobalAddress }}
+    {{ if not (or (eq $url.scheme "grpcs") (eq $url.scheme "grpc")) }}
+      {{ $msg := printf "controlPlane.kdsGlobalAddress must be a url with scheme grpcs:// or grpc:// got:'%s'" .Values.controlPlane.kdsGlobalAddress }}
+      {{ fail $msg }}
+    {{ end }}
+  {{ end }}
+{{ else }}
+  {{ if not (empty .Values.controlPlane.zone) }}
+    {{ fail "Can't specify a controlPlane.zone when controlPlane.mode!='zone'" }}
+  {{ end }}
+  {{ if not (empty .Values.controlPlane.kdsGlobalAddress) }}
+    {{ fail "Can't specify a controlPlane.kdsGlobalAddress when controlPlane.mode!='zone'" }}
+  {{ end }}
+{{ end }}
+
+{{- $defaultEnv := include "kuma.defaultEnv" . | fromYaml | pluck "env" | first }}
+{{- if eq .Values.controlPlane.environment "universal" }}
+{{- $defaultEnv = include "kuma.universal.defaultEnv" . | fromYaml | pluck "env" | first }}
+{{- end }}
+{{- $defaultEnvDict := dict }}
+{{- range $index, $item := $defaultEnv }}
+{{- $name := $item.name | upper }}
+{{- $defaultEnvDict := set $defaultEnvDict $name $item.value }}
+{{- end }}
+{{- $envVarsCopy := deepCopy .Values.controlPlane.envVars }}
+{{- $mergedEnv := merge $envVarsCopy $defaultEnvDict }}
+{{- $defaultSecrets := include "kuma.parentSecrets" . | fromYaml }}
+{{- $extraSecrets := .Values.controlPlane.extraSecrets }}
+{{- $mergedSecrets := merge $extraSecrets $defaultSecrets }}
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "kuma.name" . }}-control-plane
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+  annotations: {{ include "kuma.cpDeploymentAnnotations" . | nindent 4 }}
+spec:
+  {{- if not .Values.controlPlane.autoscaling.enabled }}
+  replicas: {{ .Values.controlPlane.replicas }}
+  {{- end }}
+  minReadySeconds: {{ .Values.controlPlane.minReadySeconds }}
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+  selector:
+    matchLabels:
+      {{- include "kuma.selectorLabels" . | nindent 6 }}
+      app: {{ include "kuma.name" . }}-control-plane
+  template:
+    metadata:
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/cp-configmap.yaml") . | sha256sum }}
+        {{- if .Values.restartOnSecretChange }}
+        checksum/tls-secrets: {{ include (print $.Template.BasePath "/cp-webhooks-and-secrets.yaml") . | sha256sum }}
+        {{- end }}
+        {{- range $key, $value := $.Values.controlPlane.podAnnotations }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+      labels: {{ include "kuma.cpLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.controlPlane.affinity }}
+      affinity: {{ tpl (toYaml . | nindent 8) $ }}
+      {{- end }}
+      {{- with .Values.controlPlane.topologySpreadConstraints }}
+      topologySpreadConstraints: {{ tpl (toYaml . | nindent 8) $ }}
+      {{- end }}
+      securityContext:
+      {{- toYaml .Values.controlPlane.podSecurityContext | trim | nindent 8 }}
+      serviceAccountName: {{ include "kuma.name" . }}-control-plane
+      automountServiceAccountToken: {{ .Values.controlPlane.automountServiceAccountToken }}
+      {{- with .Values.controlPlane.nodeSelector }}
+      nodeSelector:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.controlPlane.tolerations }}
+      tolerations:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      hostNetwork: {{ .Values.controlPlane.hostNetwork }}
+      terminationGracePeriodSeconds: {{ .Values.controlPlane.terminationGracePeriodSeconds }}
+      {{ include "kuma.dnsConfig" (dict "dns" .Values.controlPlane.dns) | nindent 6 | trim }}
+      {{- if (eq .Values.controlPlane.environment "universal") }}
+      initContainers:
+        - name: migration
+          image: {{ include "kuma.formatImage" (dict "image" .Values.controlPlane.image "root" $) | quote }}
+          imagePullPolicy: {{ .Values.controlPlane.image.pullPolicy }}
+          securityContext:
+          {{- toYaml .Values.controlPlane.containerSecurityContext | trim | nindent 12 }}
+          env:
+            {{- range $key, $value := $mergedEnv }}
+            - name: {{ $key }}
+              value: {{ $value | quote }}
+            {{- end }}
+            {{- range $element := .Values.controlPlane.secrets }}
+            - name: {{ $element.Env }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $element.Secret }}
+                  key: {{ $element.Key }}
+          {{- end }}
+          args:
+            - migrate
+            - up
+            - --log-level=info
+            - --config-file=/etc/kuma.io/kuma-control-plane/config.yaml
+          resources:
+            {{- if .Values.controlPlane.resources }}
+            {{- .Values.controlPlane.resources | toYaml | nindent 12 }}
+            {{- end }}
+          volumeMounts:
+          {{- if .Values.postgres.tls.caSecretName }}
+            - name: postgres-tls-cert-ca
+              subPath: ca.crt
+              mountPath: /var/run/secrets/kuma.io/postgres-tls-cert/ca.crt
+              readOnly: true
+          {{- end }}
+          {{- if .Values.postgres.tls.secretName }}
+            - name: postgres-tls-cert
+              subPath: tls.crt
+              mountPath: /var/run/secrets/kuma.io/postgres-tls-cert/tls.crt
+              readOnly: true
+            - name: postgres-tls-cert
+              subPath: tls.key
+              mountPath: /var/run/secrets/kuma.io/postgres-tls-cert/tls.key
+              readOnly: true
+          {{- end }}
+            - name: {{ include "kuma.name" . }}-control-plane-config
+              mountPath: /etc/kuma.io/kuma-control-plane
+              readOnly: true
+      {{- end }}
+      containers:
+        - name: control-plane
+          image: {{ include "kuma.formatImage" (dict "image" .Values.controlPlane.image "root" $) | quote }}
+          imagePullPolicy: {{ .Values.controlPlane.image.pullPolicy }}
+          securityContext:
+          {{- toYaml .Values.controlPlane.containerSecurityContext | trim | nindent 12 }}
+          env:
+          {{- if .Values.controlPlane.envVarEntries }}
+            {{- .Values.controlPlane.envVarEntries | toYaml | nindent 12 }}
+          {{- end }}
+          {{- range $key, $value := $mergedEnv }}
+            - name: {{ $key }}
+              value: {{ $value | quote }}
+          {{- end }}
+          {{- range $element := .Values.controlPlane.secrets }}
+            - name: {{ $element.Env }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $element.Secret }}
+                  key: {{ $element.Key }}
+          {{- end }}
+            - name: KUMA_INTER_CP_CATALOG_INSTANCE_ADDRESS
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: GOMEMLIMIT
+              valueFrom:
+                resourceFieldRef:
+                  containerName: control-plane
+                  resource: limits.memory
+            - name: GOMAXPROCS
+              valueFrom:
+                resourceFieldRef:
+                  containerName: control-plane
+                  resource: limits.cpu
+          args:
+            - run
+            - --log-level={{ .Values.controlPlane.logLevel }}
+            - --log-output-path={{ .Values.controlPlane.logOutputPath }}
+            - --config-file=/etc/kuma.io/kuma-control-plane/config.yaml
+          ports:
+            - containerPort: 5680
+              name: diagnostics
+              protocol: TCP
+            - containerPort: 5681
+            - containerPort: 5682
+            - containerPort: {{ .Values.controlPlane.admissionServerPort | default "5443" }}
+            {{- if ne .Values.controlPlane.mode "global" }}
+            - containerPort: 5678
+            {{- end }}
+          livenessProbe:
+            timeoutSeconds: 10
+            httpGet:
+              path: /healthy
+              port: 5680
+          readinessProbe:
+            timeoutSeconds: 10
+            httpGet:
+              path: /ready
+              port: 5680
+          resources:
+            {{- if .Values.controlPlane.resources }}
+            {{- .Values.controlPlane.resources | toYaml | nindent 12 }}
+            {{- end }}
+          {{ with .Values.controlPlane.lifecycle }}
+          lifecycle: {{ . | toYaml | nindent 14 }}
+          {{ end }}
+          volumeMounts:
+          {{- if eq .Values.controlPlane.environment "kubernetes" }}
+          {{- if not .Values.controlPlane.automountServiceAccountToken }}
+            - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
+              name: serviceaccount-token
+              readOnly: true
+          {{- end }}
+            - name: general-tls-cert
+              mountPath: /var/run/secrets/kuma.io/tls-cert/tls.crt
+              subPath: tls.crt
+              readOnly: true
+            - name: general-tls-cert
+              mountPath: /var/run/secrets/kuma.io/tls-cert/tls.key
+              subPath: tls.key
+              readOnly: true
+            - name: general-tls-cert{{- if .Values.controlPlane.tls.general.caSecretName }}-ca{{- end }}
+              mountPath: /var/run/secrets/kuma.io/tls-cert/ca.crt
+              subPath: ca.crt
+              readOnly: true
+          {{- end }}
+          {{- if and (eq .Values.controlPlane.environment "universal") (eq .Values.controlPlane.mode "zone") }}
+            {{- if .Values.controlPlane.tls.general.secretName }}
+            - name: general-tls-cert
+              mountPath: /var/run/secrets/kuma.io/tls-cert/tls.crt
+              subPath: tls.crt
+              readOnly: true
+            - name: general-tls-cert
+              mountPath: /var/run/secrets/kuma.io/tls-cert/tls.key
+              subPath: tls.key
+              readOnly: true
+            - name: general-tls-cert{{- if .Values.controlPlane.tls.general.caSecretName }}-ca{{- end }}
+              mountPath: /var/run/secrets/kuma.io/tls-cert/ca.crt
+              subPath: ca.crt
+              readOnly: true
+            {{- end }}
+          {{- end }}
+            - name: {{ include "kuma.name" . }}-control-plane-config
+              mountPath: /etc/kuma.io/kuma-control-plane
+              readOnly: true
+          {{- if .Values.controlPlane.tls.apiServer.secretName }}
+            - name: api-server-tls-cert
+              mountPath: /var/run/secrets/kuma.io/api-server-tls-cert
+              readOnly: true
+          {{- end }}
+          {{- if .Values.postgres.tls.caSecretName }}
+            - name: postgres-tls-cert-ca
+              subPath: ca.crt
+              mountPath: /var/run/secrets/kuma.io/postgres-tls-cert/ca.crt
+              readOnly: true
+          {{- end }}
+          {{- if .Values.postgres.tls.secretName }}
+            - name: postgres-tls-cert
+              subPath: tls.crt
+              mountPath: /var/run/secrets/kuma.io/postgres-tls-cert/tls.crt
+              readOnly: true
+            - name: postgres-tls-cert
+              subPath: tls.key
+              mountPath: /var/run/secrets/kuma.io/postgres-tls-cert/tls.key
+              readOnly: true
+          {{- end }}
+          {{- if .Values.controlPlane.tls.apiServer.clientCertsSecretName }}
+            - name: api-server-client-certs
+              mountPath: /var/run/secrets/kuma.io/api-server-client-certs
+              readOnly: true
+          {{- end }}
+          {{- if $kdsGlobalServerTLSSecretName }}
+            - name: kds-server-tls-cert
+              mountPath: /var/run/secrets/kuma.io/kds-server-tls-cert
+              readOnly: true
+          {{- end }}
+          {{- if $kdsZoneClientTLSSecretName }}
+            - name: kds-client-tls-cert
+              mountPath: /var/run/secrets/kuma.io/kds-client-tls-cert
+              readOnly: true
+          {{- end }}
+          {{- range $extraConfigMap := .Values.controlPlane.extraConfigMaps }}
+            - name: {{ $extraConfigMap.name }}
+              mountPath: {{ $extraConfigMap.mountPath }}
+              readOnly: {{ $extraConfigMap.readOnly }}
+          {{- end }}
+          {{- range $mergedSecret := $mergedSecrets }}
+            - name: {{ $mergedSecret.name }}
+              mountPath: {{ $mergedSecret.mountPath }}
+              subPath: {{ $mergedSecret.subPath }}
+              readOnly: {{ $mergedSecret.readOnly }}
+          {{- end }}
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+      {{- if eq .Values.controlPlane.environment "kubernetes" }}
+        {{- if not .Values.controlPlane.automountServiceAccountToken }}
+        - name: serviceaccount-token
+          projected:
+            defaultMode: 420
+            sources:
+            - serviceAccountToken:
+                 expirationSeconds: 3600
+                 path: token
+            - configMap:
+                 name: kube-root-ca.crt
+                 items:
+                   - key: ca.crt
+                     path: ca.crt
+            - downwardAPI:
+                 items:
+                   - fieldRef:
+                        apiVersion: v1
+                        fieldPath: metadata.namespace
+                     path: namespace
+        {{- end }}
+        {{- if .Values.controlPlane.tls.general.secretName }}
+        - name: general-tls-cert
+          secret:
+            secretName: {{ .Values.controlPlane.tls.general.secretName }}
+        {{- else }}
+        - name: general-tls-cert
+          secret:
+            secretName: {{ include "kuma.name" . }}-tls-cert
+        {{- end }}
+        {{- if .Values.controlPlane.tls.general.caSecretName }}
+        - name: general-tls-cert-ca
+          secret:
+            secretName: {{ .Values.controlPlane.tls.general.caSecretName }}
+        {{- end }}
+      {{- end }}
+      {{- if and (eq .Values.controlPlane.environment "universal") (eq .Values.controlPlane.mode "zone") }}
+        {{- if .Values.controlPlane.tls.general.secretName }}
+        - name: general-tls-cert
+          secret:
+            secretName: {{ .Values.controlPlane.tls.general.secretName }}
+        {{- end }}
+        {{- if .Values.controlPlane.tls.general.caSecretName }}
+        - name: general-tls-cert-ca
+          secret:
+            secretName: {{ .Values.controlPlane.tls.general.caSecretName }}
+        {{- end }}
+      {{- end }}
+        {{- if .Values.controlPlane.tls.apiServer.secretName }}
+        - name: api-server-tls-cert
+          secret:
+            secretName: {{ .Values.controlPlane.tls.apiServer.secretName }}
+        {{- end }}
+        {{- if .Values.postgres.tls.caSecretName }}
+        - name: postgres-tls-cert-ca
+          secret:
+            secretName: {{ .Values.postgres.tls.caSecretName }}
+        {{- end }}
+        {{- if .Values.postgres.tls.secretName }}
+        - name: postgres-tls-cert
+          secret:
+            secretName: {{ .Values.postgres.tls.secretName }}
+        {{- end }}
+        {{- if .Values.controlPlane.tls.apiServer.clientCertsSecretName }}
+        - name: api-server-client-certs
+          secret:
+            secretName: {{ .Values.controlPlane.tls.apiServer.clientCertsSecretName }}
+        {{- end }}
+        {{- if $kdsGlobalServerTLSSecretName }}
+        - name: kds-server-tls-cert
+          secret:
+            secretName: {{ $kdsGlobalServerTLSSecretName }}
+        {{- end }}
+        {{- if $kdsZoneClientTLSSecretName }}
+        - name: kds-client-tls-cert
+          secret:
+            secretName: {{ $kdsZoneClientTLSSecretName }}
+        {{- end }}
+        - name: {{ include "kuma.name" . }}-control-plane-config
+          configMap:
+            name: {{ include "kuma.name" . }}-control-plane-config
+        {{- range $extraConfigMap := .Values.controlPlane.extraConfigMaps }}
+        - name: {{ $extraConfigMap.name }}
+          configMap:
+            name: {{ $extraConfigMap.name }}
+        {{- end }}
+        {{- range $mergedSecret := $mergedSecrets }}
+        - name: {{ $mergedSecret.name }}
+          secret:
+            secretName: {{ $mergedSecret.name }}
+        {{- end }}
+        - name: tmp
+          emptyDir: {}
diff --git a/charts/kuma/kuma/2.9.3/templates/cp-global-sync-service.yaml b/charts/kuma/kuma/2.9.3/templates/cp-global-sync-service.yaml
new file mode 100644
index 000000000..c5b3555a8
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/cp-global-sync-service.yaml
@@ -0,0 +1,33 @@
+{{- if and (eq .Values.controlPlane.mode "global") .Values.controlPlane.globalZoneSyncService.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "kuma.controlPlane.globalZoneSync.serviceName" . }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    {{- range $key, $value := .Values.controlPlane.globalZoneSyncService.annotations }}
+      {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+spec:
+  type: {{ .Values.controlPlane.globalZoneSyncService.type }}
+  {{- if .Values.controlPlane.globalZoneSyncService.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.controlPlane.globalZoneSyncService.loadBalancerIP }}
+  {{- end }}
+  {{- if .Values.controlPlane.globalZoneSyncService.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- range .Values.controlPlane.globalZoneSyncService.loadBalancerSourceRanges }}
+    - {{.}}
+  {{- end }}
+  {{- end }}
+  ports:
+    - port: {{ .Values.controlPlane.globalZoneSyncService.port }}
+      appProtocol: {{ .Values.controlPlane.globalZoneSyncService.protocol }}
+      {{- if and (eq .Values.controlPlane.globalZoneSyncService.type "NodePort") .Values.controlPlane.globalZoneSyncService.nodePort }}
+      nodePort: {{ .Values.controlPlane.globalZoneSyncService.nodePort }}
+      {{- end }}
+      name: global-zone-sync
+  selector:
+    app: {{ include "kuma.name" . }}-control-plane
+  {{ include "kuma.selectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/cp-hpa.yaml b/charts/kuma/kuma/2.9.3/templates/cp-hpa.yaml
new file mode 100644
index 000000000..dc4981020
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/cp-hpa.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.controlPlane.autoscaling.enabled }}
+{{ if .Capabilities.APIVersions.Has "autoscaling/v2" }}
+apiVersion: "autoscaling/v2"
+{{ else }}
+apiVersion: "autoscaling/v1"
+{{ end }}
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "kuma.name" . }}-control-plane
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "kuma.name" . }}-control-plane
+  minReplicas: {{ .Values.controlPlane.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.controlPlane.autoscaling.maxReplicas }}
+  {{ if .Capabilities.APIVersions.Has "autoscaling/v2" }}
+  metrics: {{- toYaml .Values.controlPlane.autoscaling.metrics | nindent 4 }}
+  {{ else }}
+  targetCPUUtilizationPercentage: {{ .Values.controlPlane.autoscaling.targetCPUUtilizationPercentage }}
+  {{- end }}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/cp-ingress.yaml b/charts/kuma/kuma/2.9.3/templates/cp-ingress.yaml
new file mode 100644
index 000000000..8ceae01f8
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/cp-ingress.yaml
@@ -0,0 +1,25 @@
+{{- if .Values.controlPlane.ingress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "kuma.controlPlane.serviceName" . }}
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.controlPlane.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+spec:
+  ingressClassName: {{ .Values.controlPlane.ingress.ingressClassName }}
+  rules:
+  - host: {{ .Values.controlPlane.ingress.hostname }}
+    http:
+      paths:
+      - path: {{ .Values.controlPlane.ingress.path }}
+        pathType: {{ .Values.controlPlane.ingress.pathType }}
+        backend:
+          service:
+            name: {{ include "kuma.controlPlane.serviceName" . }}
+            port:
+              number: {{ .Values.controlPlane.ingress.servicePort }}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/cp-kds-global-server-secret.yaml b/charts/kuma/kuma/2.9.3/templates/cp-kds-global-server-secret.yaml
new file mode 100644
index 000000000..5ea3314a3
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/cp-kds-global-server-secret.yaml
@@ -0,0 +1,15 @@
+{{ if and (eq .Values.controlPlane.mode "global") .Values.controlPlane.tls.kdsGlobalServer.create }}
+apiVersion: v1
+kind: Secret
+metadata:
+{{ with .Values.controlPlane.tls.kdsGlobalServer.secretName }}
+  name: {{ . }}
+{{ else }}
+  name: {{ include "kuma.name" . }}-kds-global-server-tls
+{{ end }}
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+type: kubernetes.io/tls
+stringData:
+  tls.crt: {{ required "you must provide a kds tls cert" .Values.controlPlane.tls.kdsGlobalServer.cert | quote }}
+  tls.key: {{ required "you must provide a kds tls key" .Values.controlPlane.tls.kdsGlobalServer.key | quote }}
+{{ end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/cp-kds-zone-client-tls-secret.yaml b/charts/kuma/kuma/2.9.3/templates/cp-kds-zone-client-tls-secret.yaml
new file mode 100644
index 000000000..99b15c5bd
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/cp-kds-zone-client-tls-secret.yaml
@@ -0,0 +1,13 @@
+{{ if and (eq .Values.controlPlane.mode "zone") .Values.controlPlane.tls.kdsZoneClient.create }}
+apiVersion: v1
+kind: Secret
+metadata:
+{{ with .Values.controlPlane.tls.kdsZoneClient.secretName }}
+  name: {{ . }}
+{{ else }}
+  name: {{ include "kuma.name" . }}-kds-zone-client-tls
+{{ end }}
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+stringData:
+  ca.crt: {{ required "you must provide a kds cert" .Values.controlPlane.tls.kdsZoneClient.cert | quote }}
+{{ end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/cp-pdb.yaml b/charts/kuma/kuma/2.9.3/templates/cp-pdb.yaml
new file mode 100644
index 000000000..bb29bfd20
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/cp-pdb.yaml
@@ -0,0 +1,20 @@
+{{ if $.Values.controlPlane.podDisruptionBudget.enabled }}
+{{ if .Capabilities.APIVersions.Has "policy/v1" }}
+apiVersion: policy/v1
+{{ else if .Capabilities.APIVersions.Has "policy/v1beta1" }}
+apiVersion: policy/v1beta1
+{{ else }}
+{{ fail "pod disruption budgets are not supported by this version of kubernetes" }}
+{{ end }}
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "kuma.name" . }}-control-plane
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+spec:
+  maxUnavailable: {{ .Values.controlPlane.podDisruptionBudget.maxUnavailable }}
+  selector:
+    matchLabels:
+      {{- include "kuma.selectorLabels" . | nindent 6 }}
+      app: {{ include "kuma.name" . }}-control-plane
+{{ end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/cp-rbac.yaml b/charts/kuma/kuma/2.9.3/templates/cp-rbac.yaml
new file mode 100644
index 000000000..52ce1bfa8
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/cp-rbac.yaml
@@ -0,0 +1,320 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "kuma.name" . }}-control-plane
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+{{- with .Values.controlPlane.serviceAccountAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+{{- end }}
+{{- with .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- range . }}
+  - name: {{ . | quote }}
+  {{- end }}
+{{- end }}
+{{- if (eq .Values.controlPlane.environment "kubernetes") }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "kuma.name" . }}-control-plane
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - namespaces
+      - pods
+{{- if not (and .Values.transparentProxy.configMap.enabled .Values.transparentProxy.configMap.config) }}
+      - configmaps
+{{- end }}
+      - nodes
+{{- if .Values.controlPlane.supportGatewaySecretsInAllNamespaces }}
+      - secrets
+{{- end }}
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+    - ""
+    resources:
+      - secrets
+    verbs:
+    - list
+    - watch
+  - apiGroups:
+    - "discovery.k8s.io"
+    resources:
+      - endpointslices
+    verbs:
+    - get
+    - list
+    - watch
+  - apiGroups:
+      - "apps"
+    resources:
+      - deployments
+      - replicasets
+    verbs:
+      - create
+      - delete
+      - get
+      - list
+      - patch
+      - update
+      - watch
+  - apiGroups:
+      - "batch"
+    resources:
+      - jobs
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - gateway.networking.k8s.io
+    resources:
+      - gatewayclasses
+      - gateways
+      - referencegrants
+      - httproutes
+    verbs:
+      - create
+      - delete
+      - get
+      - list
+      - patch
+      - update
+      - watch
+  - apiGroups:
+      - gateway.networking.k8s.io
+    resources:
+      - gatewayclasses/status
+      - gateways/status
+      - httproutes/status
+    verbs:
+      - get
+      - patch
+      - update
+  - apiGroups:
+      - coordination.k8s.io
+    resources:
+      - leases
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
+  - apiGroups:
+      - ""
+    resources:
+      - events
+    verbs:
+      - create
+      - patch
+  - apiGroups:
+      - ""
+    resources:
+      - services
+{{- if and .Values.transparentProxy.configMap.enabled .Values.transparentProxy.configMap.config }}
+      - configmaps
+{{- end }}
+    verbs:
+      - get
+      - delete
+      - list
+      - watch
+      - create
+      - update
+      - patch
+  - apiGroups:
+    - "discovery.k8s.io"
+    resources:
+    - endpointslices
+    verbs:
+    - get
+    - list
+    - watch
+  - apiGroups:
+      - kuma.io
+    resources:
+      - dataplanes
+      - dataplaneinsights
+      - meshes
+      - zones
+      - zoneinsights
+      - zoneingresses
+      - zoneingressinsights
+      - zoneegresses
+      - zoneegressinsights
+      - meshinsights
+      - serviceinsights
+      - proxytemplates
+      - ratelimits
+      - trafficpermissions
+      - trafficroutes
+      - timeouts
+      - retries
+      - circuitbreakers
+      - virtualoutbounds
+      - containerpatches
+      - externalservices
+      - faultinjections
+      - healthchecks
+      - trafficlogs
+      - traffictraces
+      - meshgateways
+      - meshgatewayroutes
+      - meshgatewayinstances
+      - meshgatewayconfigs
+  {{- range $policy, $v := .Values.plugins.policies }}
+  {{- if $v }}
+      - {{ $policy }}
+  {{- end}}
+  {{- end}}
+  {{- range $policy, $v := .Values.plugins.resources }}
+  {{- if $v }}
+      - {{ $policy }}
+  {{- end}}
+  {{- end}}
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
+  - apiGroups:
+      - kuma.io
+    resources:
+      - meshgatewayinstances/status
+      - meshgatewayinstances/finalizers
+      - meshes/finalizers
+      - dataplanes/finalizers
+    verbs:
+      - get
+      - patch
+      - update
+  - apiGroups:
+      - ""
+    resources:
+      - pods/finalizers
+    verbs:
+      - get
+      - patch
+      - update
+  {{- if .Values.cni.enabled }}
+  - apiGroups:
+      - k8s.cni.cncf.io
+    resources:
+      - network-attachment-definitions
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - delete
+  - apiGroups:
+      - apiextensions.k8s.io
+    resources:
+      - customresourcedefinitions
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+    verbs:
+      - update
+  - apiGroups:
+      - "pods"
+    resources:
+      - pods
+    verbs:
+      - list
+  {{- end }}
+  # validate k8s token before issuing mTLS cert
+  - apiGroups:
+      - authentication.k8s.io
+    resources:
+      - tokenreviews
+    verbs:
+      - create
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "kuma.name" . }}-control-plane
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "kuma.name" . }}-control-plane
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "kuma.name" . }}-control-plane
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "kuma.name" . }}-control-plane
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
+  # leader-for-life election deletes Pods in some circumstances
+  - apiGroups:
+      - ""
+    resources:
+      - pods
+    verbs:
+      - delete
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "kuma.name" . }}-control-plane
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "kuma.name" . }}-control-plane
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "kuma.name" . }}-control-plane
+    namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/cp-service.yaml b/charts/kuma/kuma/2.9.3/templates/cp-service.yaml
new file mode 100644
index 000000000..3b9c3e31f
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/cp-service.yaml
@@ -0,0 +1,49 @@
+{{ if .Values.controlPlane.service.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "kuma.controlPlane.serviceName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+  annotations:
+    {{- range $key, $value := .Values.controlPlane.service.annotations }}
+    {{- if $value }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+    {{- end }}
+spec:
+  type: {{ .Values.controlPlane.service.type }}
+  ports:
+    - port: 5680
+      name: diagnostics
+      appProtocol: http
+    - port: 5681
+      name: http-api-server
+      appProtocol: http
+      {{- if and (eq .Values.controlPlane.service.type "NodePort") .Values.controlPlane.service.apiServer.http.nodePort }}
+      nodePort: {{ .Values.controlPlane.service.apiServer.http.nodePort }}
+      {{- end }}
+    - port: 5682
+      name: https-api-server
+      appProtocol: https
+      {{- if and (eq .Values.controlPlane.service.type "NodePort") .Values.controlPlane.service.apiServer.https.nodePort }}
+      nodePort: {{ .Values.controlPlane.service.apiServer.https.nodePort }}
+      {{- end }}
+    {{- if ne .Values.controlPlane.environment "universal" }}
+    - port: 443
+      name: https-admission-server
+      targetPort: {{ .Values.controlPlane.admissionServerPort | default "5443" }}
+      appProtocol: https
+    {{- end }}
+    {{- if ne .Values.controlPlane.mode "global" }}
+    - port: 5676
+      name: mads-server
+      appProtocol: https
+    - port: 5678
+      name: dp-server
+      appProtocol: https
+    {{- end }}
+  selector:
+    app: {{ include "kuma.name" . }}-control-plane
+  {{- include "kuma.selectorLabels" . | nindent 4 }}
+{{ end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/cp-webhooks-and-secrets.yaml b/charts/kuma/kuma/2.9.3/templates/cp-webhooks-and-secrets.yaml
new file mode 100644
index 000000000..15b38e0fd
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/cp-webhooks-and-secrets.yaml
@@ -0,0 +1,346 @@
+{{- if not (eq (empty .Values.controlPlane.tls.general.caBundle) (empty .Values.controlPlane.tls.general.secretName)) }}
+  {{ fail "You need to send both or neither of controlPlane.tls.general.caBundle and controlPlane.tls.general.secretName"}}
+{{- end }}
+{{- $caBundle := .Values.controlPlane.tls.general.caBundle }}
+{{/*
+Generate certificates
+see: https://masterminds.github.io/sprig/crypto.html
+see: https://medium.com/nuvo-group-tech/move-your-certs-to-helm-4f5f61338aca
+see: https://github.com/networkservicemesh/networkservicemesh/blob/804ad5026bb5dbd285c220f15395fe25e46f5edb/deployments/helm/nsm/charts/admission-webhook/templates/admission-webhook-secret.tpl
+
+We only autogenerate certs if user did not chose their own secret.
+We only autogenerate certs if the cert is not yet generated. This way we keep the secrets between HELM upgrades.
+*/}}
+
+{{- if eq .Values.controlPlane.tls.general.secretName "" -}}
+{{- $cert := "" }}
+{{- $key := "" }}
+{{- $secretName := print (include "kuma.name" .) "-tls-cert" }}
+
+{{- $secret := (lookup "v1" "Secret" .Release.Namespace $secretName) -}}
+{{- if $secret -}}
+  {{- $cert = index $secret.data "tls.crt" -}}
+  {{- $key = index $secret.data "tls.key" -}}
+  {{- $caBundle = index $secret.data "ca.crt" -}}
+{{- else -}}
+  {{- $commonName := (include "kuma.controlPlane.serviceName" .) -}}
+  {{- $altNames := list (printf "%s.%s" $commonName .Release.Namespace) (printf "%s.%s.svc" $commonName .Release.Namespace) -}}
+  {{- $certTTL := 3650 -}}
+  {{- $ca := genCA "kuma-ca" $certTTL -}}
+
+  {{- $genCert := genSignedCert $commonName nil $altNames $certTTL $ca -}}
+  {{- $cert = $genCert.Cert | b64enc -}}
+  {{- $key = $genCert.Key | b64enc -}}
+  {{ $caBundle = $ca.Cert | b64enc }}
+{{- end -}}
+---
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/tls
+metadata:
+  name: {{ $secretName }}
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+data:
+  tls.crt: {{ $cert }}
+  tls.key: {{ $key }}
+  ca.crt: {{ $caBundle }}
+{{- end }}
+{{- if (eq .Values.controlPlane.environment "kubernetes") }}
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: {{ include "kuma.name" . }}-admission-mutating-webhook-configuration
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+webhooks:
+  - name: mesh.defaulter.kuma-admission.kuma.io
+    admissionReviewVersions: ["v1"]
+    failurePolicy: Fail
+    namespaceSelector:
+      matchExpressions:
+        - key: kubernetes.io/metadata.name
+          operator: NotIn
+          values: ["kube-system"]
+    clientConfig:
+      caBundle: {{ $caBundle }}
+      service:
+        namespace: {{ .Release.Namespace }}
+        name: {{ include "kuma.controlPlane.serviceName" . }}
+        path: /default-kuma-io-v1alpha1-mesh
+    rules:
+      - apiGroups:
+          - kuma.io
+        apiVersions:
+          - v1alpha1
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - meshes
+          - dataplanes
+          - dataplaneinsights
+          - meshgateways
+          - zoneingresses
+          - zoneingressinsights
+          - zoneegresses
+          - zoneegressinsights
+          - serviceinsights
+          - zone
+          - zoneinsights
+        {{- range $policy, $v := .Values.plugins.policies }}
+        {{- if $v }}
+          - {{ $policy }}
+        {{- end}}
+        {{- end}}
+        {{- range $policy, $v := .Values.plugins.resources }}
+        {{- if $v }}
+          - {{ $policy }}
+        {{- end}}
+        {{- end}}
+    sideEffects: None
+  - name: owner-reference.kuma-admission.kuma.io
+    admissionReviewVersions: ["v1"]
+    failurePolicy: Fail
+    namespaceSelector:
+      matchExpressions:
+        - key: kubernetes.io/metadata.name
+          operator: NotIn
+          values: ["kube-system"]
+    clientConfig:
+      caBundle: {{ $caBundle }}
+      service:
+        namespace: {{ .Release.Namespace }}
+        name: {{ include "kuma.controlPlane.serviceName" . }}
+        path: /owner-reference-kuma-io-v1alpha1
+    rules:
+      - apiGroups:
+          - kuma.io
+        apiVersions:
+          - v1alpha1
+        operations:
+          - CREATE
+        resources:
+          - circuitbreakers
+          - externalservices
+          - faultinjections
+          - healthchecks
+          - meshgateways
+          - meshgatewayroutes
+          - proxytemplates
+          - ratelimits
+          - retries
+          - timeouts
+          - trafficlogs
+          - trafficpermissions
+          - trafficroutes
+          - traffictraces
+          - virtualoutbounds
+        {{- range $policy, $v := .Values.plugins.policies }}
+        {{- if $v }}
+          - {{ $policy }}
+        {{- end}}
+        {{- end}}
+        {{- range $policy, $v := .Values.plugins.resources }}
+        {{- if $v }}
+          - {{ $policy }}
+        {{- end}}
+        {{- end}}
+  {{ .Values.controlPlane.webhooks.ownerReference.additionalRules | nindent 6 }}
+    sideEffects: None
+  {{- if ne .Values.controlPlane.mode "global" }}
+  - name: namespace-kuma-injector.kuma.io
+    admissionReviewVersions: ["v1"]
+    failurePolicy: {{ .Values.controlPlane.injectorFailurePolicy }}
+    namespaceSelector:
+      matchExpressions:
+        - key: kubernetes.io/metadata.name
+          operator: NotIn
+          values: ["kube-system"]
+        - key: kuma.io/sidecar-injection
+          operator: In
+          values: ["enabled", "true"]
+    clientConfig:
+      caBundle: {{ $caBundle }}
+      service:
+        namespace: {{ .Release.Namespace }}
+        name: {{ include "kuma.controlPlane.serviceName" . }}
+        path: /inject-sidecar
+    rules:
+      - apiGroups:
+          - ""
+        apiVersions:
+          - v1
+        operations:
+          - CREATE
+        resources:
+          - pods
+    sideEffects: None
+  - name: pods-kuma-injector.kuma.io
+    admissionReviewVersions: ["v1"]
+    failurePolicy: {{ .Values.controlPlane.injectorFailurePolicy }}
+    namespaceSelector:
+      matchExpressions:
+        - key: kubernetes.io/metadata.name
+          operator: NotIn
+          values: ["kube-system"]
+    objectSelector:
+      matchLabels:
+        kuma.io/sidecar-injection: enabled
+    clientConfig:
+      caBundle: {{ $caBundle }}
+      service:
+        namespace: {{ .Release.Namespace }}
+        name: {{ include "kuma.controlPlane.serviceName" . }}
+        path: /inject-sidecar
+    rules:
+      - apiGroups:
+          - ""
+        apiVersions:
+          - v1
+        operations:
+          - CREATE
+        resources:
+          - pods
+    sideEffects: None
+  {{- end }}
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  name: {{ include "kuma.name" . }}-validating-webhook-configuration
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.cpLabels" . | nindent 4 }}
+webhooks:
+  - name: validator.kuma-admission.kuma.io
+    admissionReviewVersions: ["v1"]
+    failurePolicy: Fail
+    namespaceSelector:
+      matchExpressions:
+        - key: kubernetes.io/metadata.name
+          operator: NotIn
+          values: ["kube-system"]
+    clientConfig:
+      caBundle: {{ $caBundle }}
+      service:
+        namespace: {{ .Release.Namespace }}
+        name: {{ include "kuma.controlPlane.serviceName" . }}
+        path: /validate-kuma-io-v1alpha1
+    rules:
+      - apiGroups:
+          - kuma.io
+        apiVersions:
+          - v1alpha1
+        operations:
+          - CREATE
+          - UPDATE
+          - DELETE
+        resources:
+          - circuitbreakers
+          - dataplanes
+          - externalservices
+          - faultinjections
+          - meshgatewayinstances
+          - healthchecks
+          - meshes
+          - meshgateways
+          - meshgatewayroutes
+          - proxytemplates
+          - ratelimits
+          - retries
+          - trafficlogs
+          - trafficpermissions
+          - trafficroutes
+          - traffictraces
+          - virtualoutbounds
+          - zones
+          - containerpatches
+        {{- range $policy, $v := .Values.plugins.policies }}
+        {{- if $v }}
+          - {{ $policy }}
+        {{- end}}
+        {{- end}}
+        {{- range $policy, $v := .Values.plugins.resources }}
+        {{- if $v }}
+          - {{ $policy }}
+        {{- end}}
+        {{- end}}
+    {{ .Values.controlPlane.webhooks.validator.additionalRules | nindent 6 }}
+    sideEffects: None
+  {{- if ne .Values.controlPlane.mode "global" }}
+  - name: service.validator.kuma-admission.kuma.io
+    admissionReviewVersions: ["v1"]
+    failurePolicy: Ignore
+    namespaceSelector:
+      matchExpressions:
+        - key: kubernetes.io/metadata.name
+          operator: NotIn
+          values: ["kube-system"]
+    clientConfig:
+      caBundle: {{ $caBundle }}
+      service:
+        namespace: {{ .Release.Namespace }}
+        name: {{ include "kuma.controlPlane.serviceName" . }}
+        path: /validate-v1-service
+    rules:
+      - apiGroups:
+          - ""
+        apiVersions:
+          - v1
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - services
+    sideEffects: None
+  {{- end }}
+  - name: secret.validator.kuma-admission.kuma.io
+    admissionReviewVersions: ["v1"]
+    namespaceSelector:
+      matchLabels:
+        kuma.io/system-namespace: "true"
+    failurePolicy: Ignore
+    clientConfig:
+      caBundle: {{ $caBundle }}
+      service:
+        namespace: {{ .Release.Namespace }}
+        name: {{ include "kuma.controlPlane.serviceName" .  }}
+        path: /validate-v1-secret
+    rules:
+      - apiGroups:
+          - ""
+        apiVersions:
+          - v1
+        operations:
+          - CREATE
+          - UPDATE
+          - DELETE
+        resources:
+          - secrets
+    sideEffects: None
+  - name: gateway.validator.kuma-admission.kuma.io
+    admissionReviewVersions: ["v1"]
+    failurePolicy: Ignore
+    namespaceSelector:
+      matchExpressions:
+        - key: kubernetes.io/metadata.name
+          operator: NotIn
+          values: ["kube-system"]
+    clientConfig:
+      caBundle: {{ $caBundle }}
+      service:
+        namespace: {{ .Release.Namespace }}
+        name: {{ include "kuma.controlPlane.serviceName" .  }}
+        path: /validate-gatewayclass
+    rules:
+      - apiGroups:
+          - "gateway.networking.k8s.io"
+        apiVersions:
+          - v1beta1
+        operations:
+          - CREATE
+        resources:
+          - gatewayclasses
+    sideEffects: None
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/egress-deployment.yaml b/charts/kuma/kuma/2.9.3/templates/egress-deployment.yaml
new file mode 100644
index 000000000..3b6617eee
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/egress-deployment.yaml
@@ -0,0 +1,138 @@
+{{- if .Values.egress.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "kuma.name" . }}-egress
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.egressLabels" . | nindent 4 }}
+spec:
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+  {{- if not .Values.egress.autoscaling.enabled }}
+  replicas: {{ .Values.egress.replicas }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "kuma.selectorLabels" . | nindent 6 }}
+      app: {{ include "kuma.name" . }}-egress
+  template:
+    metadata:
+      annotations:
+        kuma.io/egress: enabled
+        {{- range $key, $value := merge .Values.egress.podAnnotations .Values.egress.annotations }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+      labels:
+        {{- include "kuma.egressLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.egress.affinity }}
+      affinity: {{ tpl (toYaml . | nindent 8) $ }}
+      {{- end }}
+      {{- with .Values.egress.topologySpreadConstraints }}
+      topologySpreadConstraints: {{ tpl (toYaml . | nindent 8) $ }}
+      {{- end }}
+      securityContext:
+      {{- toYaml .Values.egress.podSecurityContext | trim | nindent 8 }}
+      serviceAccountName: {{ include "kuma.name" . }}-egress
+      automountServiceAccountToken: {{ .Values.egress.automountServiceAccountToken }}
+      {{- with .Values.egress.nodeSelector }}
+      nodeSelector:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.egress.tolerations }}
+      tolerations:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{ include "kuma.dnsConfig" (dict "dns" .Values.egress.dns) | nindent 6 | trim }}
+      containers:
+        - name: egress
+          image: {{ include "kuma.formatImage" (dict "image" .Values.dataPlane.image "root" $) | quote }}
+          imagePullPolicy: {{ .Values.dataPlane.image.pullPolicy }}
+          securityContext:
+          {{- toYaml .Values.egress.containerSecurityContext | trim | nindent 12 }}
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: KUMA_CONTROL_PLANE_URL
+              value: "https://{{ include "kuma.controlPlane.serviceName" . }}.{{ .Release.Namespace }}:5678"
+            - name: KUMA_CONTROL_PLANE_CA_CERT_FILE
+              value: /var/run/secrets/kuma.io/cp-ca/ca.crt
+            - name: KUMA_DATAPLANE_DRAIN_TIME
+              value: {{ .Values.egress.drainTime }}
+            - name: KUMA_DATAPLANE_RUNTIME_TOKEN_PATH
+              value: /var/run/secrets/kubernetes.io/serviceaccount/token
+            - name: KUMA_DATAPLANE_PROXY_TYPE
+              value: "egress"
+          args:
+            - run
+            - --log-level={{ .Values.egress.logLevel | default "info" }}
+          ports:
+            - containerPort: 10002
+          livenessProbe:
+            httpGet:
+              path: "/ready"
+              port: 9901
+            failureThreshold: 12
+            initialDelaySeconds: 60
+            periodSeconds: 5
+            successThreshold: 1
+            timeoutSeconds: 3
+          readinessProbe:
+            httpGet:
+              path: "/ready"
+              port: 9901
+            failureThreshold: 12
+            initialDelaySeconds: 1
+            periodSeconds: 5
+            successThreshold: 1
+            timeoutSeconds: 3
+          resources: {{ toYaml .Values.egress.resources | nindent 12 }}
+          volumeMounts:
+{{- if not .Values.egress.automountServiceAccountToken }}
+            - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
+              name: serviceaccount-token
+              readOnly: true
+{{- end }}
+            - name: control-plane-ca
+              mountPath: /var/run/secrets/kuma.io/cp-ca
+              readOnly: true
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+{{- if not .Values.egress.automountServiceAccountToken }}
+        - name: serviceaccount-token
+          projected:
+            defaultMode: 420
+            sources:
+              - serviceAccountToken:
+                  expirationSeconds: 3600
+                  path: token
+              - configMap:
+                  name: kube-root-ca.crt
+                  items:
+                    - key: ca.crt
+                      path: ca.crt
+              - downwardAPI:
+                  items:
+                    - fieldRef:
+                        apiVersion: v1
+                        fieldPath: metadata.namespace
+                      path: namespace
+{{- end }}
+        - name: control-plane-ca
+          secret:
+            secretName: {{ include "kuma.controlPlane.tls.general.caSecretName" . }}
+            items:
+              - key: ca.crt
+                path: ca.crt
+        - name: tmp
+          emptyDir: {}
+  {{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/egress-hpa.yaml b/charts/kuma/kuma/2.9.3/templates/egress-hpa.yaml
new file mode 100644
index 000000000..8d4284f41
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/egress-hpa.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.egress.autoscaling.enabled }}
+{{ if .Capabilities.APIVersions.Has "autoscaling/v2" }}
+apiVersion: "autoscaling/v2"
+{{ else }}
+apiVersion: "autoscaling/v1"
+{{ end }}
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "kuma.name" . }}-egress
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.egressLabels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "kuma.name" . }}-egress
+  minReplicas: {{ .Values.egress.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.egress.autoscaling.maxReplicas }}
+  {{ if .Capabilities.APIVersions.Has "autoscaling/v2" }}
+  metrics: {{- toYaml .Values.egress.autoscaling.metrics | nindent 4 }}
+  {{ else }}
+  targetCPUUtilizationPercentage: {{ .Values.egress.autoscaling.targetCPUUtilizationPercentage }}
+  {{- end }}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/egress-pdb.yaml b/charts/kuma/kuma/2.9.3/templates/egress-pdb.yaml
new file mode 100644
index 000000000..ee599003b
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/egress-pdb.yaml
@@ -0,0 +1,20 @@
+{{ if $.Values.egress.podDisruptionBudget.enabled }}
+{{ if .Capabilities.APIVersions.Has "policy/v1" }}
+apiVersion: policy/v1
+{{ else if .Capabilities.APIVersions.Has "policy/v1beta1" }}
+apiVersion: policy/v1beta1
+{{ else }}
+{{ fail "pod disruption budgets are not supported by this version of kubernetes" }}
+{{ end }}
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "kuma.name" . }}-egress
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.egressLabels" . | nindent 4 }}
+spec:
+  maxUnavailable: {{ .Values.egress.podDisruptionBudget.maxUnavailable }}
+  selector:
+    matchLabels:
+      {{- include "kuma.selectorLabels" . | nindent 6 }}
+      app: {{ include "kuma.name" . }}-egress
+{{ end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/egress-rbac.yaml b/charts/kuma/kuma/2.9.3/templates/egress-rbac.yaml
new file mode 100644
index 000000000..1b4326fdb
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/egress-rbac.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.egress.enabled }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "kuma.name" . }}-egress
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.egressLabels" . | nindent 4 }}
+{{- with .Values.egress.serviceAccountAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+{{- end }}
+{{- with .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- range . }}
+  - name: {{ . | quote }}
+  {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/egress-service.yaml b/charts/kuma/kuma/2.9.3/templates/egress-service.yaml
new file mode 100644
index 000000000..2127811fe
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/egress-service.yaml
@@ -0,0 +1,32 @@
+{{- if .Values.egress.enabled }}
+{{- if eq .Values.controlPlane.mode "global" }}
+{{ fail "You shouldn't run zoneEgress when running the CP in global" }}
+{{- end }}
+{{- end }}
+{{- if and .Values.egress.enabled .Values.egress.service.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "kuma.egress.serviceName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.egressLabels" . | nindent 4 }}
+  annotations:
+    {{- range $key, $value := .Values.egress.service.annotations }}
+      {{ $key }}: {{ $value | quote }}
+    {{- end }}
+spec:
+  type: {{ .Values.egress.service.type }}
+  {{- if .Values.egress.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.egress.service.loadBalancerIP }}
+  {{- end }}
+  ports:
+    - port: {{ .Values.egress.service.port }}
+      protocol: TCP
+      targetPort: 10002
+    {{- if and (eq .Values.egress.service.type "NodePort")  .Values.egress.service.nodePort }}
+      nodePort: {{ .Values.egress.service.nodePort }}
+    {{- end }}
+  selector:
+    app: {{ include "kuma.name" . }}-egress
+  {{- include "kuma.selectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/gateway-class.yaml b/charts/kuma/kuma/2.9.3/templates/gateway-class.yaml
new file mode 100644
index 000000000..cf1ae305d
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/gateway-class.yaml
@@ -0,0 +1,19 @@
+{{- if and (eq .Values.controlPlane.environment "kubernetes") (eq .Values.controlPlane.mode "zone") }}
+{{- if .Capabilities.APIVersions.Has "gateway.networking.k8s.io/v1/GatewayClass" }}
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: GatewayClass
+metadata:
+ name: kuma
+spec:
+ controllerName: "gateways.kuma.io/controller"
+{{- else if .Capabilities.APIVersions.Has "gateway.networking.k8s.io/v1beta1/GatewayClass" }}
+---
+apiVersion: gateway.networking.k8s.io/v1beta1
+kind: GatewayClass
+metadata:
+ name: kuma
+spec:
+ controllerName: "gateways.kuma.io/controller"
+{{- end }}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/ingress-deployment.yaml b/charts/kuma/kuma/2.9.3/templates/ingress-deployment.yaml
new file mode 100644
index 000000000..fcefeaac6
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/ingress-deployment.yaml
@@ -0,0 +1,142 @@
+{{- if .Values.ingress.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "kuma.name" . }}-ingress
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.ingressLabels" . | nindent 4 }}
+spec:
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+  {{- if not .Values.ingress.autoscaling.enabled }}
+  replicas: {{ .Values.ingress.replicas }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "kuma.selectorLabels" . | nindent 6 }}
+      app: {{ include "kuma.name" . }}-ingress
+  template:
+    metadata:
+      annotations:
+        kuma.io/ingress: enabled
+        {{- range $key, $value := merge .Values.ingress.podAnnotations .Values.ingress.annotations }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+      labels:
+        {{- include "kuma.ingressLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.ingress.affinity }}
+      affinity: {{ tpl (toYaml . | nindent 8) $ }}
+      {{- end }}
+      {{- with .Values.ingress.topologySpreadConstraints }}
+      topologySpreadConstraints: {{ tpl (toYaml . | nindent 8) $ }}
+      {{- end }}
+      securityContext:
+      {{- toYaml .Values.ingress.podSecurityContext | trim | nindent 8 }}
+      serviceAccountName: {{ include "kuma.name" . }}-ingress
+      automountServiceAccountToken: {{ .Values.ingress.automountServiceAccountToken }}
+      {{- with .Values.ingress.nodeSelector }}
+      nodeSelector:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.ingress.tolerations }}
+      tolerations:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      terminationGracePeriodSeconds: {{ .Values.ingress.terminationGracePeriodSeconds }}
+      {{ include "kuma.dnsConfig" (dict "dns" .Values.ingress.dns) | nindent 6 | trim }}
+      containers:
+        - name: ingress
+          image: {{ include "kuma.formatImage" (dict "image" .Values.dataPlane.image "root" $) | quote }}
+          imagePullPolicy: {{ .Values.dataPlane.image.pullPolicy }}
+          securityContext:
+          {{- toYaml .Values.ingress.containerSecurityContext | trim | nindent 12 }}
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: KUMA_CONTROL_PLANE_URL
+              value: "https://{{ include "kuma.controlPlane.serviceName" . }}.{{ .Release.Namespace }}:5678"
+            - name: KUMA_CONTROL_PLANE_CA_CERT_FILE
+              value: /var/run/secrets/kuma.io/cp-ca/ca.crt
+            - name: KUMA_DATAPLANE_DRAIN_TIME
+              value: {{ .Values.ingress.drainTime }}
+            - name: KUMA_DATAPLANE_RUNTIME_TOKEN_PATH
+              value: /var/run/secrets/kubernetes.io/serviceaccount/token
+            - name: KUMA_DATAPLANE_PROXY_TYPE
+              value: "ingress"
+          args:
+            - run
+            - --log-level={{ .Values.ingress.logLevel | default "info" }}
+          ports:
+            - containerPort: 10001
+          livenessProbe:
+            httpGet:
+              path: "/ready"
+              port: 9901
+            failureThreshold: 12
+            initialDelaySeconds: 60
+            periodSeconds: 5
+            successThreshold: 1
+            timeoutSeconds: 3
+          readinessProbe:
+            httpGet:
+              path: "/ready"
+              port: 9901
+            failureThreshold: 12
+            initialDelaySeconds: 1
+            periodSeconds: 5
+            successThreshold: 1
+            timeoutSeconds: 3
+          resources: {{ toYaml .Values.ingress.resources | nindent 12 }}
+          {{ with .Values.ingress.lifecycle}}
+          lifecycle: {{ . | toYaml | nindent 12 }}
+          {{ end }}
+          volumeMounts:
+{{- if not .Values.ingress.automountServiceAccountToken }}
+            - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
+              name: serviceaccount-token
+              readOnly: true
+{{- end }}
+            - name: control-plane-ca
+              mountPath: /var/run/secrets/kuma.io/cp-ca
+              readOnly: true
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+{{- if not .Values.ingress.automountServiceAccountToken }}
+        - name: serviceaccount-token
+          projected:
+            defaultMode: 420
+            sources:
+              - serviceAccountToken:
+                  expirationSeconds: 3600
+                  path: token
+              - configMap:
+                  name: kube-root-ca.crt
+                  items:
+                    - key: ca.crt
+                      path: ca.crt
+              - downwardAPI:
+                  items:
+                    - fieldRef:
+                        apiVersion: v1
+                        fieldPath: metadata.namespace
+                      path: namespace
+{{- end }}
+        - name: control-plane-ca
+          secret:
+            secretName: {{ include "kuma.controlPlane.tls.general.caSecretName" . }}
+            items:
+              - key: ca.crt
+                path: ca.crt
+        - name: tmp
+          emptyDir: {}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/ingress-hpa.yaml b/charts/kuma/kuma/2.9.3/templates/ingress-hpa.yaml
new file mode 100644
index 000000000..4aaeabe67
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/ingress-hpa.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.ingress.autoscaling.enabled }}
+{{ if .Capabilities.APIVersions.Has "autoscaling/v2" }}
+apiVersion: "autoscaling/v2"
+{{ else }}
+apiVersion: "autoscaling/v1"
+{{ end }}
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "kuma.name" . }}-ingress
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.ingressLabels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "kuma.name" . }}-ingress
+  minReplicas: {{ .Values.ingress.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.ingress.autoscaling.maxReplicas }}
+  {{ if .Capabilities.APIVersions.Has "autoscaling/v2" }}
+  metrics: {{- toYaml .Values.ingress.autoscaling.metrics | nindent 4 }}
+  {{ else }}
+  targetCPUUtilizationPercentage: {{ .Values.ingress.autoscaling.targetCPUUtilizationPercentage }}
+  {{- end }}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/ingress-pdb.yaml b/charts/kuma/kuma/2.9.3/templates/ingress-pdb.yaml
new file mode 100644
index 000000000..639d1b574
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/ingress-pdb.yaml
@@ -0,0 +1,20 @@
+{{ if $.Values.ingress.podDisruptionBudget.enabled }}
+{{ if .Capabilities.APIVersions.Has "policy/v1" }}
+apiVersion: policy/v1
+{{ else if .Capabilities.APIVersions.Has "policy/v1beta1" }}
+apiVersion: policy/v1beta1
+{{ else }}
+{{ fail "pod disruption budgets are not supported by this version of kubernetes" }}
+{{ end }}
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "kuma.name" . }}-ingress
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.ingressLabels" . | nindent 4 }}
+spec:
+  maxUnavailable: {{ .Values.ingress.podDisruptionBudget.maxUnavailable }}
+  selector:
+    matchLabels:
+      {{- include "kuma.selectorLabels" . | nindent 6 }}
+      app: {{ include "kuma.name" . }}-ingress
+{{ end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/ingress-rbac.yaml b/charts/kuma/kuma/2.9.3/templates/ingress-rbac.yaml
new file mode 100644
index 000000000..e4e1d61ce
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/ingress-rbac.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.ingress.enabled }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "kuma.name" . }}-ingress
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.ingressLabels" . | nindent 4 }}
+{{- with .Values.ingress.serviceAccountAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+{{- end }}
+{{- with .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- range . }}
+  - name: {{ . | quote }}
+  {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/ingress-service.yaml b/charts/kuma/kuma/2.9.3/templates/ingress-service.yaml
new file mode 100644
index 000000000..74a4dde90
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/ingress-service.yaml
@@ -0,0 +1,32 @@
+{{- if .Values.ingress.enabled }}
+{{- if or (eq .Values.controlPlane.mode "global") (eq .Values.controlPlane.mode "standalone") }}
+{{ fail "You shouldn't run zoneIngress when running the CP in global or standalone" }}
+{{- end }}
+{{- end }}
+{{- if and .Values.ingress.enabled .Values.ingress.service.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "kuma.ingress.serviceName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "kuma.ingressLabels" . | nindent 4 }}
+  annotations:
+    {{- range $key, $value := .Values.ingress.service.annotations }}
+      {{ $key }}: {{ $value | quote }}
+    {{- end }}
+spec:
+  type: {{ .Values.ingress.service.type }}
+  {{- if .Values.ingress.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.ingress.service.loadBalancerIP }}
+  {{- end }}
+  ports:
+    - port: {{ .Values.ingress.service.port }}
+      protocol: TCP
+      targetPort: 10001
+    {{- if and (eq .Values.ingress.service.type "NodePort")  .Values.ingress.service.nodePort }}
+      nodePort: {{ .Values.ingress.service.nodePort }}
+    {{- end }}
+  selector:
+    app: {{ include "kuma.name" . }}-ingress
+  {{- include "kuma.selectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/post-delete-cleanup-ebpf-job.yaml b/charts/kuma/kuma/2.9.3/templates/post-delete-cleanup-ebpf-job.yaml
new file mode 100644
index 000000000..aaa3166ff
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/post-delete-cleanup-ebpf-job.yaml
@@ -0,0 +1,126 @@
+{{- if and (.Values.experimental.ebpf.enabled) (and (not .Values.cni.enabled) (not .Values.noHelmHooks) (eq .Values.controlPlane.environment "kubernetes")) }}
+  {{- $serviceAccountName := printf "%s-cleanup-node-ebpf-job" (include "kuma.name" .) }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ $serviceAccountName }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": "post-delete"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+  labels:
+  {{- include "kuma.labels" . | nindent 4 }}
+{{- with .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- range . }}
+  - name: {{ . | quote }}
+  {{- end }}
+{{- end }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "kuma.name" . }}-cleanup-node-ebpf-job
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": "post-delete"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+  labels:
+  {{- include "kuma.labels" . | nindent 4 }}
+rules:
+  - apiGroups: [""]
+    resources:
+      - nodes
+    verbs:
+      - list
+  - apiGroups: [""]
+    resources:
+      - pods
+    verbs:
+      - watch
+      - delete
+      - deletecollection
+  - apiGroups: ["batch"]
+    resources:
+      - jobs
+    verbs:
+      - watch
+      - create
+      - delete
+      - deletecollection
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "kuma.name" . }}-cleanup-node-ebpf-job
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": "post-delete"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+  labels:
+  {{- include "kuma.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "kuma.name" . }}-cleanup-node-ebpf-job
+subjects:
+  - kind: ServiceAccount
+    name: {{ $serviceAccountName }}
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ template "kuma.name" . }}-cleanup-node-ebpf-job
+  namespace: {{ .Release.Namespace }}
+  labels:
+  {{ include "kuma.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": "post-delete"
+    {{/* Ensure the job is created after the RBAC resources */}}
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+spec:
+  template:
+    metadata:
+      name: {{ template "kuma.name" . }}-cleanup-node-ebpf-job
+      labels:
+    {{ include "kuma.labels" . | nindent 8 }}
+    spec:
+      serviceAccountName: {{ $serviceAccountName }}
+      {{- with .Values.hooks.nodeSelector }}
+      nodeSelector:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.hooks.tolerations }}
+      tolerations:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      restartPolicy: OnFailure
+      {{- if .Values.hooks.ebpfCleanup.podSecurityContext }}
+      securityContext:
+      {{ toYaml .Values.hooks.ebpfCleanup.podSecurityContext | trim | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: post-delete-job
+          image: {{ include "kuma.formatImage" (dict "image" .Values.dataPlane.initImage "root" $) | quote }}
+          {{- if .Values.hooks.ebpfCleanup.containerSecurityContext }}
+          securityContext:
+          {{ toYaml .Values.hooks.ebpfCleanup.containerSecurityContext | trim | nindent 12 }}
+          {{- end }}
+          resources:
+             requests:
+               cpu: "20m"
+               memory: "20Mi"
+             limits:
+               cpu: "40m"
+               memory: "40Mi"
+          command:
+            - 'kumactl'
+            - 'uninstall'
+            - 'ebpf'
+            - '--cleanup-image-registry'
+            - {{ .Values.global.image.registry }}
+            - '--cleanup-image-repository'
+            - {{ .Values.dataPlane.initImage.repository }}
+  {{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/pre-delete-webhooks.yaml b/charts/kuma/kuma/2.9.3/templates/pre-delete-webhooks.yaml
new file mode 100644
index 000000000..e6948af2f
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/pre-delete-webhooks.yaml
@@ -0,0 +1,109 @@
+{{- if and (eq .Values.controlPlane.environment "kubernetes") (not .Values.noHelmHooks) }}
+# HELM first deletes RBAC of Kuma, then it tries to delete Secrets. We've got validating webhook on Secrets.
+# But even that the policy of this webhook is Ignore, it fails because Kuma does not have permission to access Secrets anymore.
+# Therefore we first need to delete webhook so we can delete the rest of the deployment
+{{- $serviceAccountName := printf "%s-pre-delete-job" (include "kuma.name" .) }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ $serviceAccountName }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": "pre-delete"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+  labels:
+  {{- include "kuma.labels" . | nindent 4 }}
+{{- with .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- range . }}
+  - name: {{ . | quote }}
+  {{- end }}
+{{- end }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "kuma.name" . }}-pre-delete-job
+  annotations:
+    "helm.sh/hook": "pre-delete"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+  labels:
+  {{- include "kuma.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - admissionregistration.k8s.io
+    resources:
+      - validatingwebhookconfigurations
+    resourceNames:
+      - {{ include "kuma.name" . }}-validating-webhook-configuration
+    verbs:
+      - delete
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "kuma.name" . }}-pre-delete-job
+  annotations:
+    "helm.sh/hook": "pre-delete"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+  labels:
+  {{- include "kuma.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "kuma.name" . }}-pre-delete-job
+subjects:
+  - kind: ServiceAccount
+    name: {{ $serviceAccountName }}
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ template "kuma.name" . }}-delete-webhook
+  namespace: {{ .Release.Namespace }}
+  labels:
+  {{ include "kuma.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": "pre-delete"
+    {{/* Ensure the job is created after the RBAC resources */}}
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+spec:
+  template:
+    metadata:
+      name: {{ template "kuma.name" . }}-delete-webhook
+      labels:
+    {{ include "kuma.labels" . | nindent 8 }}
+    spec:
+      serviceAccountName: {{ $serviceAccountName }}
+      {{- with .Values.hooks.nodeSelector }}
+      nodeSelector:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.hooks.tolerations }}
+      tolerations:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      restartPolicy: OnFailure
+      securityContext:
+      {{- toYaml .Values.hooks.podSecurityContext | trim | nindent 8 }}
+      containers:
+        - name: pre-delete-job
+          image: "{{ .Values.kubectl.image.registry }}/{{ .Values.kubectl.image.repository }}:{{ .Values.kubectl.image.tag }}"
+          command:
+            - 'kubectl'
+            - 'delete'
+            - 'ValidatingWebhookConfiguration'
+            - '--ignore-not-found'
+            - {{ include "kuma.name" . }}-validating-webhook-configuration
+          securityContext:
+          {{- toYaml (mergeOverwrite (dict "runAsUser" 65534) .Values.hooks.containerSecurityContext) | trim | nindent 12 }}
+          resources:
+             requests:
+               cpu: "100m"
+               memory: "256Mi"
+             limits:
+               cpu: "100m"
+               memory: "256Mi"
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/pre-install-patch-namespace-job.yaml b/charts/kuma/kuma/2.9.3/templates/pre-install-patch-namespace-job.yaml
new file mode 100644
index 000000000..a84d7accf
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/pre-install-patch-namespace-job.yaml
@@ -0,0 +1,124 @@
+{{- if and ( .Values.noHelmHooks ) (eq .Values.controlPlane.environment "kubernetes") }}
+  {{- $errorMessage := ".Values.noHelmHooks is set. You must manually create and label the system namespace with kuma.io/system-namespace: \"true\" before installing or upgrading the chart" }}
+  {{- $systemNamespace := (lookup "v1" "Namespace" "" .Release.Namespace) }}
+  {{- if not $systemNamespace }}
+      {{- fail $errorMessage }}
+    {{- end }}
+  {{- $systemNamespaceLabels := ($systemNamespace).metadata.labels }}
+  {{- if ne (get $systemNamespaceLabels "kuma.io/system-namespace") "true" }}
+    {{- fail $errorMessage }}
+  {{- end }}
+{{- else}}
+  {{- if .Values.patchSystemNamespace }}
+    {{- $serviceAccountName := printf "%s-patch-ns-job" (include "kuma.name" .) }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ $serviceAccountName }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": "pre-install"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+  labels:
+  {{- include "kuma.labels" . | nindent 4 }}
+{{- with .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- range . }}
+  - name: {{ . | quote }}
+  {{- end }}
+{{- end }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "kuma.name" . }}-patch-ns-job
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": "pre-install"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+  labels:
+  {{- include "kuma.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - namespaces
+    resourceNames:
+      - {{ .Release.Namespace }}
+    verbs:
+      - get
+      - patch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "kuma.name" . }}-patch-ns-job
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": "pre-install"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+  labels:
+  {{- include "kuma.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "kuma.name" . }}-patch-ns-job
+subjects:
+  - kind: ServiceAccount
+    name: {{ $serviceAccountName }}
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ template "kuma.name" . }}-patch-ns
+  namespace: {{ .Release.Namespace }}
+  labels:
+  {{ include "kuma.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": "pre-install"
+    {{/* Ensure the job is created after the RBAC resources */}}
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+spec:
+  template:
+    metadata:
+      name: {{ template "kuma.name" . }}-patch-ns-script
+      labels:
+    {{ include "kuma.labels" . | nindent 8 }}
+    spec:
+      serviceAccountName: {{ $serviceAccountName }}
+      {{- with .Values.hooks.nodeSelector }}
+      nodeSelector:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.hooks.tolerations }}
+      tolerations:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      restartPolicy: OnFailure
+      securityContext:
+      {{- toYaml .Values.hooks.podSecurityContext | trim | nindent 8 }}
+      containers:
+        - name: pre-install-job
+          image: "{{ .Values.kubectl.image.registry }}/{{ .Values.kubectl.image.repository }}:{{ .Values.kubectl.image.tag }}"
+          securityContext:
+          {{- toYaml (mergeOverwrite (dict "runAsUser" 65534) .Values.hooks.containerSecurityContext) | trim | nindent 12 }}
+          resources:
+             requests:
+               cpu: "100m"
+               memory: "256Mi"
+             limits:
+               cpu: "100m"
+               memory: "256Mi"
+          command:
+            - 'kubectl'
+            - 'patch'
+            - 'namespace'
+            - {{ .Release.Namespace | quote }}
+            - '--type'
+            - 'merge'
+            - '--patch'
+            - '{ "metadata": { "labels": { "kuma.io/system-namespace": "true" } } }'
+  {{- end }}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/templates/pre-upgrade-install-crds-job.yaml b/charts/kuma/kuma/2.9.3/templates/pre-upgrade-install-crds-job.yaml
new file mode 100644
index 000000000..8fadf1722
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/templates/pre-upgrade-install-crds-job.yaml
@@ -0,0 +1,171 @@
+{{- if (and .Values.installCrdsOnUpgrade.enabled (and (not .Values.noHelmHooks) (eq .Values.controlPlane.environment "kubernetes"))) }}
+  {{ $hook := "pre-upgrade,pre-install" }}
+  {{- $serviceAccountName := printf "%s-install-crds" (include "kuma.name" .) }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ $serviceAccountName }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": "{{ $hook }}"
+    "helm.sh/hook-weight": "-1"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+  labels:
+  {{- include "kuma.labels" . | nindent 4 }}
+{{- with concat .Values.installCrdsOnUpgrade.imagePullSecrets .Values.global.imagePullSecrets | uniq }}
+imagePullSecrets:
+  {{- range . }}
+  - name: {{ . | quote }}
+  {{- end }}
+{{- end }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "kuma.name" . }}-install-crds
+  annotations:
+    "helm.sh/hook": "{{ $hook }}"
+    "helm.sh/hook-weight": "-1"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+  labels:
+  {{- include "kuma.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+    - "apiextensions.k8s.io"
+    resources:
+      - customresourcedefinitions
+    verbs:
+      - create
+      - patch
+      - update
+      - list
+      - get
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "kuma.name" . }}-install-crds
+  annotations:
+    "helm.sh/hook": "{{ $hook }}"
+    "helm.sh/hook-weight": "-1"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
+  labels:
+  {{- include "kuma.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "kuma.name" . }}-install-crds
+subjects:
+  - kind: ServiceAccount
+    name: {{ $serviceAccountName }}
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "kuma.name" . }}-install-crds-scripts
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": "{{ $hook }}"
+    "helm.sh/hook-weight": "-1"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
+  labels:
+  {{- include "kuma.labels" . | nindent 4 }}
+data:
+  install_crds.sh: |
+    #!/usr/bin/env sh
+    set -e
+
+    if [ -s /kuma/crds/crds.yaml ]; then
+      echo "/kuma/crds/crds.yaml found and is not empty, adding crds"
+      kubectl apply -f /kuma/crds/crds.yaml
+    else
+      echo "/kuma/crds/crds.yaml not found or empty, it looks like there is no crds to install"
+    fi
+  save_crds.sh: |
+    set -e
+
+    crds="$(kumactl install crds --no-config)"
+
+    if [ -n "${crds}" ]; then
+      echo "found crds - saving to /kuma/crds/crds.yaml"
+      echo "${crds}" > /kuma/crds/crds.yaml
+    fi
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ template "kuma.name" . }}-install-crds
+  namespace: {{ .Release.Namespace }}
+  labels:
+  {{ include "kuma.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": "{{ $hook }}"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
+spec:
+  template:
+    metadata:
+      name: {{ template "kuma.name" . }}-install-crds-job
+      labels:
+    {{ include "kuma.labels" . | nindent 8 }}
+    spec:
+      serviceAccountName: {{ $serviceAccountName }}
+      {{- with .Values.hooks.nodeSelector }}
+      nodeSelector:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.hooks.tolerations }}
+      tolerations:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      restartPolicy: OnFailure
+      securityContext:
+      {{- toYaml .Values.hooks.podSecurityContext | trim | nindent 8 }}
+      containers:
+        - name: pre-upgrade-job
+          image: "{{ .Values.kubectl.image.registry }}/{{ .Values.kubectl.image.repository }}:{{ .Values.kubectl.image.tag }}"
+          securityContext:
+          {{- toYaml (mergeOverwrite (dict "runAsUser" 65534) .Values.hooks.containerSecurityContext) | trim | nindent 12 }}
+          resources:
+             requests:
+               cpu: "100m"
+               memory: "256Mi"
+             limits:
+               cpu: "100m"
+               memory: "256Mi"
+          command: ["/kuma/scripts/install_crds.sh"]
+          volumeMounts:
+            - mountPath: /kuma/crds
+              name: crds
+              readOnly: true
+            - mountPath: /kuma/scripts
+              name: scripts
+              readOnly: true
+      initContainers:
+        - name: pre-upgrade-job-init
+          image: {{ include "kuma.formatImage" (dict "image" .Values.kumactl.image "root" $) | quote }}
+          securityContext:
+          {{- toYaml .Values.hooks.containerSecurityContext | trim | nindent 12 }}
+          resources:
+             requests:
+               cpu: "100m"
+               memory: "256Mi"
+             limits:
+               cpu: "100m"
+               memory: "256Mi"
+          volumeMounts:
+          - mountPath: /kuma/crds
+            name: crds
+          - mountPath: /kuma/scripts
+            name: scripts
+            readOnly: true
+          command: ["sh", "-c"]
+          args: ["/kuma/scripts/save_crds.sh"]
+      volumes:
+        - name: scripts
+          configMap:
+            name: {{ include "kuma.name" . }}-install-crds-scripts
+            defaultMode: 0755
+        - name: crds
+          emptyDir: {}
+{{- end }}
diff --git a/charts/kuma/kuma/2.9.3/values.yaml b/charts/kuma/kuma/2.9.3/values.yaml
new file mode 100644
index 000000000..766792e5b
--- /dev/null
+++ b/charts/kuma/kuma/2.9.3/values.yaml
@@ -0,0 +1,903 @@
+global:
+  image:
+    # -- Default registry for all Kuma Images
+    registry: "docker.io/kumahq"
+    # -- The default tag for all Kuma images, which itself defaults to .Chart.AppVersion
+    tag:
+  # -- Add `imagePullSecrets` to all the service accounts used for Kuma components
+  imagePullSecrets: []
+
+# -- Whether to patch the target namespace with the system label
+patchSystemNamespace: true
+
+installCrdsOnUpgrade:
+  # -- Whether install new CRDs before upgrade (if any were introduced with the new version of Kuma)
+  enabled: true
+  # -- The `imagePullSecrets` to attach to the Service Account running CRD installation.
+  # This field will be deprecated in a future release, please use .global.imagePullSecrets
+  imagePullSecrets: []
+
+# -- Whether to disable all helm hooks
+noHelmHooks: false
+
+# -- Whether to restart control-plane by calculating a new checksum for the secret
+restartOnSecretChange: true
+
+controlPlane:
+  # -- Environment that control plane is run in, useful when running universal global control plane on k8s
+  environment: "kubernetes"
+
+  # -- Labels to add to resources in addition to default labels
+  extraLabels: {}
+
+  # -- Kuma CP log level: one of off,info,debug
+  logLevel: "info"
+
+  # -- Kuma CP log output path: Defaults to /dev/stdout
+  logOutputPath: ""
+
+  # -- Kuma CP modes: one of zone,global
+  mode: "zone"
+
+  # -- (string) Kuma CP zone, if running multizone
+  zone:
+
+  # -- Only used in `zone` mode
+  kdsGlobalAddress: ""
+
+  # -- Number of replicas of the Kuma CP. Ignored when autoscaling is enabled
+  replicas: 1
+
+  # -- Minimum number of seconds for which a newly created pod should be ready for it to be considered available.
+  minReadySeconds: 0
+
+  # -- Annotations applied only to the `Deployment` resource
+  deploymentAnnotations: {}
+
+  # -- Annotations applied only to the `Pod` resource
+  podAnnotations: {}
+
+  # Horizontal Pod Autoscaling configuration
+  autoscaling:
+    # -- Whether to enable Horizontal Pod Autoscaling, which requires the [Metrics Server](https://github.com/kubernetes-sigs/metrics-server) in the cluster
+    enabled: false
+
+    # -- The minimum CP pods to allow
+    minReplicas: 2
+    # -- The max CP pods to scale to
+    maxReplicas: 5
+
+    # -- For clusters that don't support autoscaling/v2, autoscaling/v1 is used
+    targetCPUUtilizationPercentage: 80
+    # -- For clusters that do support autoscaling/v2, use metrics
+    metrics:
+      - type: Resource
+        resource:
+          name: cpu
+          target:
+            type: Utilization
+            averageUtilization: 80
+
+  # -- Node selector for the Kuma Control Plane pods
+  nodeSelector:
+    kubernetes.io/os: linux
+
+  # -- Tolerations for the Kuma Control Plane pods
+  tolerations: []
+
+  podDisruptionBudget:
+    # -- Whether to create a pod disruption budget
+    enabled: false
+    # -- The maximum number of unavailable pods allowed by the budget
+    maxUnavailable: 1
+
+  # -- Affinity placement rule for the Kuma Control Plane pods.
+  # This is rendered as a template, so you can reference other helm variables or includes.
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+      - weight: 100
+        podAffinityTerm:
+          labelSelector:
+            # These match the selector labels used on the deployment.
+            matchExpressions:
+              - key: app.kubernetes.io/name
+                operator: In
+                values:
+                  - '{{ include "kuma.name" . }}'
+              - key: app.kubernetes.io/instance
+                operator: In
+                values:
+                  - '{{ .Release.Name }}'
+              - key: app
+                operator: In
+                values:
+                  - '{{ include "kuma.name" . }}-control-plane'
+          topologyKey: kubernetes.io/hostname
+
+  # -- Topology spread constraints rule for the Kuma Control Plane pods.
+  # This is rendered as a template, so you can use variables to generate match labels.
+  topologySpreadConstraints:
+
+  # -- Failure policy of the mutating webhook implemented by the Kuma Injector component
+  injectorFailurePolicy: Fail
+
+  service:
+    apiServer:
+      http:
+        # -- Port on which Http api server Service is exposed on Node for service of type NodePort
+        nodePort: 30681
+      https:
+        # -- Port on which Https api server Service is exposed on Node for service of type NodePort
+        nodePort: 30682
+
+    # -- Whether to create a service resource.
+    enabled: true
+
+    # -- (string) Optionally override of the Kuma Control Plane Service's name
+    name:
+
+    # -- Service type of the Kuma Control Plane
+    type: ClusterIP
+
+    # -- Annotations to put on the Kuma Control Plane
+    annotations:
+      prometheus.io/scrape: "true"
+      prometheus.io/port: "5680"
+
+  # Kuma API and GUI ingress settings. Useful if you want to expose the
+  # API and GUI of Kuma outside the k8s cluster.
+  ingress:
+    # -- Install K8s Ingress resource that exposes GUI and API
+    enabled: false
+    # -- IngressClass defines which controller will implement the resource
+    ingressClassName:
+    # -- Ingress hostname
+    hostname:
+    # -- Map of ingress annotations.
+    annotations: {}
+    # -- Ingress path.
+    path: /
+    # -- Each path in an Ingress is required to have a corresponding path type. (ImplementationSpecific/Exact/Prefix)
+    pathType: ImplementationSpecific
+    # -- Port from kuma-cp to use to expose API and GUI. Switch to 5682 to expose TLS port
+    servicePort: 5681
+
+  globalZoneSyncService:
+    # -- Whether to create a k8s service for the global zone sync
+    # service. It will only be created when enabled and deploying the global
+    # control plane.
+    enabled: true
+    # -- Service type of the Global-zone sync
+    type: LoadBalancer
+    # -- (string) Optionally specify IP to be used by cloud provider when configuring load balancer
+    loadBalancerIP:
+    # -- Optionally specify allowed source ranges that can access the load balancer
+    loadBalancerSourceRanges: []
+    # -- Additional annotations to put on the Global Zone Sync Service
+    annotations: { }
+    # -- Port on which Global Zone Sync Service is exposed on Node for service of type NodePort
+    nodePort: 30685
+    # -- Port on which Global Zone Sync Service is exposed
+    port: 5685
+    # -- Protocol of the Global Zone Sync service port
+    protocol: grpc
+
+  defaults:
+    # -- Whether to skip creating the default Mesh
+    skipMeshCreation: false
+
+  # -- Whether to automountServiceAccountToken for cp. Optionally set to false
+  automountServiceAccountToken: true
+
+  # -- Optionally override the resource spec
+  resources:
+    requests:
+       cpu: 500m
+       memory: 256Mi
+    limits:
+       memory: 256Mi
+
+  # -- Pod lifecycle settings (useful for adding a preStop hook, when
+  # using AWS ALB or NLB)
+  lifecycle: {}
+
+  # -- Number of seconds to wait before force killing the pod. Make sure to
+  # update this if you add a preStop hook.
+  terminationGracePeriodSeconds: 30
+
+  # TLS for various servers
+  tls:
+    general:
+      # -- Secret that contains tls.crt, tls.key [and ca.crt when no
+      # controlPlane.tls.general.caSecretName specified] for protecting
+      # Kuma in-cluster communication
+      secretName: ""
+      # -- Secret that contains ca.crt that was used to sign cert for protecting
+      # Kuma in-cluster communication (ca.crt present in this secret
+      # have precedence over the one provided in the controlPlane.tls.general.secretName)
+      caSecretName: ""
+      # -- Base64 encoded CA certificate (the same as in controlPlane.tls.general.secret#ca.crt)
+      caBundle: ""
+    apiServer:
+      # -- Secret that contains tls.crt, tls.key for protecting Kuma API on HTTPS
+      secretName: ""
+      # -- Secret that contains list of .pem certificates that can access admin endpoints of Kuma API on HTTPS
+      clientCertsSecretName: ""
+    # - if not creating the global control plane, then do nothing
+    # - if secretName is empty and create is false, then do nothing
+    # - if secretName is non-empty and create is false, then use the secret made outside of helm with the name secretName
+    # - if secretName is empty and create is true, then create a secret with a default name and use it
+    # - if secretName is non-empty and create is true, then create the secret using the provided name
+    kdsGlobalServer:
+      # -- Name of the K8s TLS Secret resource. If you set this and don't set
+      # create=true, you have to create the secret manually.
+      secretName: ""
+      # -- Whether to create the TLS secret in helm.
+      create: false
+      # -- The TLS certificate to offer.
+      cert: ""
+      # -- The TLS key to use.
+      key: ""
+    # - if not creating the zonal control plane, then do nothing
+    # - if secretName is empty and create is false, then do nothing
+    # - if secretName is non-empty and create is false, then use the secret made outside of helm with the name secretName
+    # - if secretName is empty and create is true, then create a secret with a default name and use it
+    # - if secretName is non-empty and create is true, then create the secret using the provided name
+    kdsZoneClient:
+      # -- Name of the K8s Secret resource that contains ca.crt which was
+      # used to sign the certificate of KDS Global Server. If you set this
+      # and don't set create=true, you have to create the secret manually.
+      secretName: ""
+      # -- Whether to create the TLS secret in helm.
+      create: false
+      # -- CA bundle that was used to sign the certificate of KDS Global Server.
+      cert: ""
+      # -- If true, TLS cert of the server is not verified.
+      skipVerify: false
+
+  # -- Annotations to add for Control Plane's Service Account
+  serviceAccountAnnotations: { }
+
+  image:
+    # -- Kuma CP ImagePullPolicy
+    pullPolicy: IfNotPresent
+    # -- Kuma CP image repository
+    repository: "kuma-cp"
+    # -- Kuma CP Image tag. When not specified, the value is copied from global.tag
+    tag:
+
+  # -- (object with { Env: string, Secret: string, Key: string }) Secrets to add as environment variables,
+  # where `Env` is the name of the env variable,
+  # `Secret` is the name of the Secret,
+  # and `Key` is the key of the Secret value to use
+  secrets:
+  #  someSecret:
+  #    Secret: some-secret
+  #    Key: secret_key
+  #    Env: SOME_SECRET
+
+  # -- Additional environment variables that will be passed to the control plane
+  envVars: { }
+
+  # -- Additional environment variables that will be passed to the control plane. Can be used with Kubernetes downward API
+  envVarEntries:
+  # - name: MY_NODE_NAME
+  #   valueFrom:
+  #     fieldRef:
+  #      fieldPath: spec.nodeName
+
+  # -- Additional config maps to mount into the control plane, with optional inline values
+  extraConfigMaps: [ ]
+#    - name: extra-config
+#      mountPath: /etc/extra-config
+#      readOnly: true
+#      values:
+#        extra-config-key: |
+#          extra-config-value
+
+  # -- (object with { name: string, mountPath: string, readOnly: string }) Additional secrets to mount into the control plane,
+  # where `Env` is the name of the env variable,
+  # `Secret` is the name of the Secret,
+  # and `Key` is the key of the Secret value to use
+  extraSecrets:
+  #  extraConfig:
+  #    name: extra-config
+  #    mountPath: /etc/extra-config
+  #    readOnly: true
+
+  webhooks:
+    validator:
+      # -- Additional rules to apply on Kuma validator webhook. Useful when building custom policy on top of Kuma.
+      additionalRules: ""
+    ownerReference:
+      # -- Additional rules to apply on Kuma owner reference webhook. Useful when building custom policy on top of Kuma.
+      additionalRules: ""
+
+  # -- Specifies if the deployment should be started in hostNetwork mode.
+  hostNetwork: false
+  # -- Define a new server port for the admission controller. Recommended to set in combination with
+  # hostNetwork to prevent multiple port bindings on the same port (like Calico in AWS EKS).
+  admissionServerPort: 5443
+
+  # -- Security context at the pod level for control plane.
+  podSecurityContext:
+    runAsNonRoot: true
+
+  # -- Security context at the container level for control plane.
+  containerSecurityContext:
+    readOnlyRootFilesystem: true
+
+  # -- If true, then control plane can support TLS secrets for builtin gateway outside of mesh system namespace.
+  # The downside is that control plane requires permission to read Secrets in all namespaces.
+  supportGatewaySecretsInAllNamespaces: false
+  # -- DNS configuration for the control-plane pod.
+  # This is equivalent to the [Kubernetes DNS policy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy).
+  dns:
+    # -- Defines how DNS resolution is configured for that Pod.
+    policy: ""
+    # -- Optional dns configuration, required when policy is 'None'
+    config:
+      # -- A list of IP addresses that will be used as DNS servers for the Pod. There can be at most 3 IP addresses specified.
+      nameservers: []
+      # -- A list of DNS search domains for hostname lookup in the Pod.
+      searches: []
+
+cni:
+  # -- Install Kuma with CNI instead of proxy init container
+  enabled: false
+  # -- Install CNI in chained mode
+  chained: false
+  # -- Set the CNI install directory
+  netDir: /etc/cni/multus/net.d
+  # -- Set the CNI bin directory
+  binDir: /var/lib/cni/bin
+  # -- Set the CNI configuration name
+  confName: kuma-cni.conf
+  # -- CNI log level: one of off,info,debug
+  logLevel: info
+  # -- Node Selector for the CNI pods
+  nodeSelector:
+    kubernetes.io/os: linux
+  # -- Tolerations for the CNI pods
+  tolerations: []
+  # -- Additional pod annotations
+  podAnnotations: { }
+  # -- Set the CNI namespace
+  namespace: kube-system
+
+  image:
+    # -- CNI image repository
+    repository: "kuma-cni"
+    # -- CNI image tag - defaults to .Chart.AppVersion
+    tag:
+    # -- CNI image pull policy
+    imagePullPolicy: IfNotPresent
+
+  # -- it's only useful in tests to trigger a possible race condition
+  delayStartupSeconds: 0
+
+  # -- use new CNI (experimental)
+  experimental:
+    imageEbpf:
+      # -- CNI experimental eBPF image registry
+      registry: "docker.io/kumahq"
+      # -- CNI experimental eBPF image repository
+      repository: "merbridge"
+      # -- CNI experimental eBPF image tag
+      tag: "0.8.5"
+
+  resources:
+    requests:
+      cpu: 100m
+      memory: 100Mi
+    limits:
+      memory: 100Mi
+
+  # -- Security context at the pod level for cni
+  podSecurityContext: {}
+
+  # -- Security context at the container level for cni
+  containerSecurityContext:
+    readOnlyRootFilesystem: true
+    runAsNonRoot: false
+    runAsUser: 0
+    runAsGroup: 0
+
+dataPlane:
+  # -- If true, then turn on CoreDNS query logging
+  dnsLogging: false
+  image:
+    # -- The Kuma DP image repository
+    repository: "kuma-dp"
+    # -- Kuma DP ImagePullPolicy
+    pullPolicy: IfNotPresent
+    # -- Kuma DP Image Tag. When not specified, the value is copied from global.tag
+    tag:
+
+  initImage:
+    # -- The Kuma DP init image repository
+    repository: "kuma-init"
+    # -- Kuma DP init image tag When not specified, the value is copied from global.tag
+    tag:
+
+ingress:
+  # -- If true, it deploys Ingress for cross cluster communication
+  enabled: false
+
+  # -- Labels to add to resources, in addition to default labels
+  extraLabels: {}
+
+  # -- Time for which old listener will still be active as draining
+  drainTime: 30s
+
+  # -- Number of replicas of the Ingress. Ignored when autoscaling is enabled.
+  replicas: 1
+
+  # -- Log level for ingress (available values: off|info|debug)
+  logLevel: info
+
+  # -- Define the resources to allocate to mesh ingress
+  resources:
+    requests:
+      cpu: 50m
+      memory: 64Mi
+    limits:
+      cpu: 1000m
+      memory: 512Mi
+
+  # -- Pod lifecycle settings (useful for adding a preStop hook, when
+  # using AWS ALB or NLB)
+  lifecycle: {}
+
+  # -- Number of seconds to wait before force killing the pod. Make sure to
+  # update this if you add a preStop hook.
+  terminationGracePeriodSeconds: 40
+
+  # Horizontal Pod Autoscaling configuration
+  autoscaling:
+    # -- Whether to enable Horizontal Pod Autoscaling, which requires the [Metrics Server](https://github.com/kubernetes-sigs/metrics-server) in the cluster
+    enabled: false
+
+    # -- The minimum CP pods to allow
+    minReplicas: 2
+    # -- The max CP pods to scale to
+    maxReplicas: 5
+
+    # -- For clusters that don't support autoscaling/v2, autoscaling/v1 is used
+    targetCPUUtilizationPercentage: 80
+    # -- For clusters that do support autoscaling/v2, use metrics
+    metrics:
+      - type: Resource
+        resource:
+          name: cpu
+          target:
+            type: Utilization
+            averageUtilization: 80
+
+  service:
+    # -- Whether to create a Service resource.
+    enabled: true
+    # -- Service type of the Ingress
+    type: LoadBalancer
+    # -- (string) Optionally specify IP to be used by cloud provider when configuring load balancer
+    loadBalancerIP:
+    # -- Additional annotations to put on the Ingress service
+    annotations: { }
+    # -- Port on which Ingress is exposed
+    port: 10001
+    # -- Port on which service is exposed on Node for service of type NodePort
+    nodePort:
+  # -- Additional pod annotations (deprecated favor `podAnnotations`)
+  annotations: { }
+  # -- Additional pod annotations
+  podAnnotations: { }
+  # -- Node Selector for the Ingress pods
+  nodeSelector:
+    kubernetes.io/os: linux
+  # -- Tolerations for the Ingress pods
+  tolerations: []
+  podDisruptionBudget:
+    # -- Whether to create a pod disruption budget
+    enabled: false
+    # -- The maximum number of unavailable pods allowed by the budget
+    maxUnavailable: 1
+
+  # -- Affinity placement rule for the Kuma Ingress pods
+  # This is rendered as a template, so you can reference other helm variables
+  # or includes.
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+      - weight: 100
+        podAffinityTerm:
+          labelSelector:
+            # These match the selector labels used on the deployment.
+            matchExpressions:
+              - key: app.kubernetes.io/name
+                operator: In
+                values:
+                  - '{{ include "kuma.name" . }}'
+              - key: app.kubernetes.io/instance
+                operator: In
+                values:
+                  - '{{ .Release.Name }}'
+              - key: app
+                operator: In
+                values:
+                  - kuma-ingress
+          topologyKey: kubernetes.io/hostname
+
+  # -- Topology spread constraints rule for the Kuma Mesh Ingress pods.
+  # This is rendered as a template, so you can use variables to generate match labels.
+  topologySpreadConstraints:
+
+  # -- Security context at the pod level for ingress
+  podSecurityContext:
+    runAsNonRoot: true
+    runAsUser: 5678
+    runAsGroup: 5678
+
+  # -- Security context at the container level for ingress
+  containerSecurityContext:
+    readOnlyRootFilesystem: true
+
+  # -- Annotations to add for Control Plane's Service Account
+  serviceAccountAnnotations: { }
+  # -- Whether to automountServiceAccountToken for cp. Optionally set to false
+  automountServiceAccountToken: true
+  # -- DNS configuration for the ingress pod.
+  # This is equivalent to the [Kubernetes DNS policy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy).
+  dns:
+    # -- Defines how DNS resolution is configured for that Pod.
+    policy: ""
+    # -- Optional dns configuration, required when policy is 'None'
+    config:
+      # -- A list of IP addresses that will be used as DNS servers for the Pod. There can be at most 3 IP addresses specified.
+      nameservers: []
+      # -- A list of DNS search domains for hostname lookup in the Pod.
+      searches: []
+
+egress:
+  # -- If true, it deploys Egress for cross cluster communication
+  enabled: false
+  # -- Labels to add to resources, in addition to the default labels.
+  extraLabels: {}
+  # -- Time for which old listener will still be active as draining
+  drainTime: 30s
+  # -- Number of replicas of the Egress. Ignored when autoscaling is enabled.
+  replicas: 1
+
+  # -- Log level for egress (available values: off|info|debug)
+  logLevel: info
+
+  # Horizontal Pod Autoscaling configuration
+  autoscaling:
+    # -- Whether to enable Horizontal Pod Autoscaling, which requires the [Metrics Server](https://github.com/kubernetes-sigs/metrics-server) in the cluster
+    enabled: false
+
+    # -- The minimum CP pods to allow
+    minReplicas: 2
+    # -- The max CP pods to scale to
+    maxReplicas: 5
+
+    # -- For clusters that don't support autoscaling/v2, autoscaling/v1 is used
+    targetCPUUtilizationPercentage: 80
+    # -- For clusters that do support autoscaling/v2, use metrics
+    metrics:
+      - type: Resource
+        resource:
+          name: cpu
+          target:
+            type: Utilization
+            averageUtilization: 80
+  resources:
+    requests:
+      cpu: 50m
+      memory: 64Mi
+    limits:
+      cpu: 1000m
+      memory: 512Mi
+
+  service:
+    # -- Whether to create the service object
+    enabled: true
+    # -- Service type of the Egress
+    type: ClusterIP
+    # -- (string) Optionally specify IP to be used by cloud provider when configuring load balancer
+    loadBalancerIP:
+    # -- Additional annotations to put on the Egress service
+    annotations: { }
+    # -- Port on which Egress is exposed
+    port: 10002
+    # -- Port on which service is exposed on Node for service of type NodePort
+    nodePort:
+  # -- Additional pod annotations (deprecated favor `podAnnotations`)
+  annotations: { }
+  # -- Additional pod annotations
+  podAnnotations: { }
+  # -- Node Selector for the Egress pods
+  nodeSelector:
+    kubernetes.io/os: linux
+  # -- Tolerations for the Egress pods
+  tolerations: []
+  podDisruptionBudget:
+    # -- Whether to create a pod disruption budget
+    enabled: false
+    # -- The maximum number of unavailable pods allowed by the budget
+    maxUnavailable: 1
+
+  # -- Affinity placement rule for the Kuma Egress pods.
+  # This is rendered as a template, so you can reference other helm variables or includes.
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+      - weight: 100
+        podAffinityTerm:
+          labelSelector:
+            # These match the selector labels used on the deployment.
+            matchExpressions:
+              - key: app.kubernetes.io/name
+                operator: In
+                values:
+                  - '{{ include "kuma.name" . }}'
+              - key: app.kubernetes.io/instance
+                operator: In
+                values:
+                  - '{{ .Release.Name }}'
+              - key: app
+                operator: In
+                values:
+                  - kuma-egress
+          topologyKey: kubernetes.io/hostname
+
+  # -- Topology spread constraints rule for the Kuma Egress pods.
+  # This is rendered as a template, so you can use variables to generate match labels.
+  topologySpreadConstraints:
+
+  # -- Security context at the pod level for egress
+  podSecurityContext:
+    runAsNonRoot: true
+    runAsUser: 5678
+    runAsGroup: 5678
+
+  # -- Security context at the container level for egress
+  containerSecurityContext:
+    readOnlyRootFilesystem: true
+
+  # -- Annotations to add for Control Plane's Service Account
+  serviceAccountAnnotations: { }
+  # -- Whether to automountServiceAccountToken for cp. Optionally set to false
+  automountServiceAccountToken: true
+  # -- DNS configuration for the egress pod.
+  # This is equivalent to the [Kubernetes DNS policy](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy).
+  dns:
+    # -- Defines how DNS resolution is configured for that Pod.
+    policy: ""
+    # -- Optional dns configuration, required when policy is 'None'
+    config:
+      # -- A list of IP addresses that will be used as DNS servers for the Pod. There can be at most 3 IP addresses specified.
+      nameservers: []
+      # -- A list of DNS search domains for hostname lookup in the Pod.
+      searches: []
+
+kumactl:
+  image:
+    # -- The kumactl image repository
+    repository: kumactl
+    # -- The kumactl image tag. When not specified, the value is copied from global.tag
+    tag:
+
+kubectl:
+  image:
+    # -- The kubectl image registry
+    registry: docker.io
+    # -- The kubectl image repository
+    repository: bitnami/kubectl
+    # -- The kubectl image tag
+    tag: "1.27.5"
+hooks:
+  # -- Node selector for the HELM hooks
+  nodeSelector:
+    kubernetes.io/os: linux
+  # -- Tolerations for the HELM hooks
+  tolerations: []
+  # -- Security context at the pod level for crd/webhook/ns
+  podSecurityContext:
+    runAsNonRoot: true
+
+  # -- Security context at the container level for crd/webhook/ns
+  containerSecurityContext:
+    readOnlyRootFilesystem: true
+
+  # -- ebpf-cleanup hook needs write access to the root filesystem to clean ebpf programs
+  # Changing below values will potentially break ebpf cleanup completely,
+  # so be cautious when doing so.
+  ebpfCleanup:
+    # -- Security context at the pod level for crd/webhook/cleanup-ebpf
+    podSecurityContext:
+      runAsNonRoot: false
+    # -- Security context at the container level for crd/webhook/cleanup-ebpf
+    containerSecurityContext:
+      readOnlyRootFilesystem: false
+
+transparentProxy:
+  configMap:
+    # -- If true, enables the use of a ConfigMap to manage transparent proxy configuration
+    # instead of directly configuring it within the Kuma system
+    enabled: false
+    # -- The name of the ConfigMap used to store the transparent proxy configuration
+    name: kuma-transparent-proxy-config
+    config:
+      # -- The username or UID of the user that will run kuma-dp. If not provided, the system will
+      # use the default UID ("5678") or the default username ("kuma-dp")
+      kumaDPUser: "5678"
+      # -- The IP family mode used for configuring traffic redirection in the transparent proxy
+      # Supports "dualstack" (for both IPv4 and IPv6) and "ipv4" modes
+      ipFamilyMode: dualstack
+      redirect:
+        dns:
+          # -- Enables DNS redirection in the transparent proxy
+          enabled: true
+          # -- Redirect all DNS queries
+          captureAll: true
+          # -- The port on which the DNS server listens
+          port: 15053
+          # -- Path to the system's resolv.conf file
+          resolvConfigPath: /etc/resolv.conf
+          # -- Disables conntrack zone splitting, which can prevent potential DNS issues
+          skipConntrackZoneSplit: false
+        inbound:
+          # -- Enables inbound traffic redirection
+          enabled: true
+          # -- Port used for redirecting inbound traffic
+          port: 15006
+          # -- List of ports to exclude from inbound traffic redirection
+          excludePorts: []
+          # -- List of IP addresses to exclude from inbound traffic redirection for specific ports
+          excludePortsForIPs: []
+          # -- List of UIDs to exclude from inbound traffic redirection for specific ports
+          excludePortsForUIDs: []
+          # -- List of ports to include in inbound traffic redirection
+          includePorts: []
+          # -- Inserts the redirection rule at the beginning of the chain instead of appending it
+          insertRedirectInsteadOfAppend: false
+        outbound:
+          # -- Enables outbound traffic redirection
+          enabled: true
+          # -- Port used for redirecting outbound traffic
+          port: 15001
+          # -- List of ports to exclude from outbound traffic redirection
+          excludePorts: []
+          # -- List of IP addresses to exclude from outbound traffic redirection for specific ports
+          excludePortsForIPs: []
+          # -- List of UIDs to exclude from outbound traffic redirection for specific ports
+          excludePortsForUIDs: []
+          # -- List of ports to include in outbound traffic redirection
+          includePorts: []
+          # -- Inserts the redirection rule at the beginning of the chain instead of appending it
+          insertRedirectInsteadOfAppend: false
+        vnet:
+          # -- Specifies virtual networks using the format interfaceName:CIDR
+          # Allows matching traffic on specific network interfaces
+          # Examples:
+          # - "docker0:172.17.0.0/16"
+          # - "br+:172.18.0.0/16" (matches any interface starting with "br")
+          # - "iface:::1/64" (for IPv6)
+          networks: []
+      ebpf:
+        # -- Enables eBPF support for handling traffic redirection in the transparent proxy
+        enabled: false
+        # -- The path of the BPF filesystem
+        bpffsPath: /run/kuma/bpf
+        # -- The path of cgroup2
+        cgroupPath: /sys/fs/cgroup
+        # -- The name of the environment variable containing the IP address of the instance (pod/vm)
+        # where transparent proxy will be installed
+        instanceIPEnvVarName: ""
+        # -- Path where compiled eBPF programs and other necessary files for eBPF mode can be found
+        programsSourcePath: /tmp/kuma-ebpf
+        # -- The network interface for TC eBPF programs to bind to. If not provided, it will be
+        # automatically determined
+        tcAttachIface: ""
+      retry:
+        # -- The maximum number of retry attempts for operations
+        maxRetries: 4
+        # -- The time duration to wait between retry attempts
+        sleepBetweenRetries: 2s
+      iptablesExecutables:
+        # -- Custom path for the iptables executable (IPv4)
+        iptables: ""
+        # -- Custom path for the iptables-save executable (IPv4)
+        iptables-save: ""
+        # -- Custom path for the iptables-restore executable (IPv4)
+        iptables-restore: ""
+        # -- Custom path for the ip6tables executable (IPv6)
+        ip6tables: ""
+        # -- Custom path for the ip6tables-save executable (IPv6)
+        ip6tables-save: ""
+        # -- Custom path for the ip6tables-restore executable (IPv6)
+        ip6tables-restore: ""
+      log:
+        # -- Enables logging of iptables rules for diagnostics and monitoring
+        enabled: false
+      comments:
+        # -- Disables comments in the generated iptables rules
+        disabled: false
+      # -- Time in seconds to wait for acquiring the xtables lock before failing
+      # Value 0 means wait indefinitely
+      wait: 5
+      # -- Time interval between retries to acquire the xtables lock in seconds
+      waitInterval: 0
+      # -- Drops invalid packets to avoid connection resets in high-throughput scenarios
+      dropInvalidPackets: false
+      # -- Enables firewalld support to store iptables rules
+      storeFirewalld: false
+      # -- Enables verbose mode with longer argument/flag names and additional comments
+      verbose: false
+
+experimental:
+  # Configuration for the experimental ebpf mode for transparent proxy
+  ebpf:
+    # -- If true, ebpf will be used instead of using iptables to install/configure transparent proxy
+    enabled: false
+    # -- Name of the environmental variable which will contain the IP address of a pod
+    instanceIPEnvVarName: INSTANCE_IP
+    # -- Path where BPF file system should be mounted
+    bpffsPath: /sys/fs/bpf
+    # -- Host's cgroup2 path
+    cgroupPath: /sys/fs/cgroup
+    # -- Name of the network interface which TC programs should be attached to, we'll try to automatically determine it if empty
+    tcAttachIface: ""
+    # -- Path where compiled eBPF programs which will be installed can be found
+    programsSourcePath: /tmp/kuma-ebpf
+  # -- If true, enable native Kubernetes sidecars. This requires at least
+  # Kubernetes v1.29
+  sidecarContainers: false
+
+# Postgres' settings for universal control plane on k8s
+postgres:
+  # -- Postgres port, password should be provided as a secret reference in "controlPlane.secrets"
+  # with the Env value "KUMA_STORE_POSTGRES_PASSWORD".
+  # Example:
+  # controlPlane:
+  #   secrets:
+  #     - Secret: postgres-postgresql
+  #       Key: postgresql-password
+  #       Env: KUMA_STORE_POSTGRES_PASSWORD
+  port: "5432"
+  # TLS settings
+  tls:
+    # -- Mode of TLS connection. Available values are: "disable", "verifyNone", "verifyCa", "verifyFull"
+    mode: disable # ENV: KUMA_STORE_POSTGRES_TLS_MODE
+    # -- Whether to disable SNI the postgres `sslsni` option.
+    disableSSLSNI: false # ENV: KUMA_STORE_POSTGRES_TLS_DISABLE_SSLSNI
+    # -- Secret name that contains the ca.crt
+    caSecretName:
+    # -- Secret name that contains the client tls.crt, tls.key
+    secretName:
+
+# @ignored for helm-docs
+plugins:
+  resources:
+    hostnamegenerators: true
+    meshexternalservices: true
+    meshmultizoneservices: true
+    meshservices: true
+  policies:
+    meshaccesslogs: true
+    meshcircuitbreakers: true
+    meshfaultinjections: true
+    meshhealthchecks: true
+    meshhttproutes: true
+    meshloadbalancingstrategies: true
+    meshmetrics: true
+    meshpassthroughs: true
+    meshproxypatches: true
+    meshratelimits: true
+    meshretries: true
+    meshtcproutes: true
+    meshtimeouts: true
+    meshtlses: true
+    meshtraces: true
+    meshtrafficpermissions: true
diff --git a/charts/new-relic/nri-bundle/5.0.107/.helmignore b/charts/new-relic/nri-bundle/5.0.107/.helmignore
new file mode 100644
index 000000000..50af03172
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/new-relic/nri-bundle/5.0.107/Chart.lock b/charts/new-relic/nri-bundle/5.0.107/Chart.lock
new file mode 100644
index 000000000..c32c6bd4d
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/Chart.lock
@@ -0,0 +1,39 @@
+dependencies:
+- name: newrelic-infrastructure
+  repository: https://newrelic.github.io/nri-kubernetes
+  version: 3.38.0
+- name: nri-prometheus
+  repository: https://newrelic.github.io/nri-prometheus
+  version: 2.1.19
+- name: newrelic-prometheus-agent
+  repository: https://newrelic.github.io/newrelic-prometheus-configurator
+  version: 1.16.0
+- name: nri-metadata-injection
+  repository: https://newrelic.github.io/k8s-metadata-injection
+  version: 4.23.0
+- name: newrelic-k8s-metrics-adapter
+  repository: https://newrelic.github.io/newrelic-k8s-metrics-adapter
+  version: 1.13.5
+- name: kube-state-metrics
+  repository: https://prometheus-community.github.io/helm-charts
+  version: 5.26.0
+- name: nri-kube-events
+  repository: https://newrelic.github.io/nri-kube-events
+  version: 3.11.6
+- name: newrelic-logging
+  repository: https://newrelic.github.io/helm-charts
+  version: 1.23.5
+- name: newrelic-pixie
+  repository: https://newrelic.github.io/helm-charts
+  version: 2.1.6
+- name: k8s-agents-operator
+  repository: https://newrelic.github.io/k8s-agents-operator
+  version: 0.19.0
+- name: pixie-operator-chart
+  repository: https://pixie-operator-charts.storage.googleapis.com
+  version: 0.1.7
+- name: newrelic-infra-operator
+  repository: https://newrelic.github.io/newrelic-infra-operator
+  version: 2.13.5
+digest: sha256:a91d6bbefb60dbd731cadd17dd5f3a06481ddaef0720b59213459abc6d2bd907
+generated: "2025-01-20T13:46:06.728024201Z"
diff --git a/charts/new-relic/nri-bundle/5.0.107/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/Chart.yaml
new file mode 100644
index 000000000..c813f98cb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/Chart.yaml
@@ -0,0 +1,85 @@
+annotations:
+  catalog.cattle.io/certified: partner
+  catalog.cattle.io/display-name: New Relic
+  catalog.cattle.io/release-name: nri-bundle
+apiVersion: v2
+dependencies:
+- condition: infrastructure.enabled,newrelic-infrastructure.enabled
+  name: newrelic-infrastructure
+  repository: https://newrelic.github.io/nri-kubernetes
+  version: 3.38.0
+- condition: prometheus.enabled,nri-prometheus.enabled
+  name: nri-prometheus
+  repository: https://newrelic.github.io/nri-prometheus
+  version: 2.1.19
+- condition: newrelic-prometheus-agent.enabled
+  name: newrelic-prometheus-agent
+  repository: https://newrelic.github.io/newrelic-prometheus-configurator
+  version: 1.16.0
+- condition: webhook.enabled,nri-metadata-injection.enabled
+  name: nri-metadata-injection
+  repository: https://newrelic.github.io/k8s-metadata-injection
+  version: 4.23.0
+- condition: metrics-adapter.enabled,newrelic-k8s-metrics-adapter.enabled
+  name: newrelic-k8s-metrics-adapter
+  repository: https://newrelic.github.io/newrelic-k8s-metrics-adapter
+  version: 1.13.5
+- condition: ksm.enabled,kube-state-metrics.enabled
+  name: kube-state-metrics
+  repository: https://prometheus-community.github.io/helm-charts
+  version: 5.26.0
+- condition: kubeEvents.enabled,nri-kube-events.enabled
+  name: nri-kube-events
+  repository: https://newrelic.github.io/nri-kube-events
+  version: 3.11.6
+- condition: logging.enabled,newrelic-logging.enabled
+  name: newrelic-logging
+  repository: https://newrelic.github.io/helm-charts
+  version: 1.23.5
+- condition: newrelic-pixie.enabled
+  name: newrelic-pixie
+  repository: https://newrelic.github.io/helm-charts
+  version: 2.1.6
+- condition: k8s-agents-operator.enabled
+  name: k8s-agents-operator
+  repository: https://newrelic.github.io/k8s-agents-operator
+  version: 0.19.0
+- alias: pixie-chart
+  condition: pixie-chart.enabled
+  name: pixie-operator-chart
+  repository: https://pixie-operator-charts.storage.googleapis.com
+  version: 0.1.7
+- condition: newrelic-infra-operator.enabled
+  name: newrelic-infra-operator
+  repository: https://newrelic.github.io/newrelic-infra-operator
+  version: 2.13.5
+description: Groups together the individual charts for the New Relic Kubernetes solution
+  for a more comfortable deployment.
+home: https://github.com/newrelic/helm-charts
+icon: file://assets/icons/nri-bundle.svg
+keywords:
+- infrastructure
+- newrelic
+- monitoring
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+name: nri-bundle
+sources:
+- https://github.com/newrelic/nri-bundle/
+- https://github.com/newrelic/nri-bundle/tree/master/charts/nri-bundle
+- https://github.com/newrelic/nri-kubernetes/tree/master/charts/newrelic-infrastructure
+- https://github.com/newrelic/nri-prometheus/tree/master/charts/nri-prometheus
+- https://github.com/newrelic/newrelic-prometheus-configurator/tree/master/charts/newrelic-prometheus-agent
+- https://github.com/newrelic/k8s-metadata-injection/tree/master/charts/nri-metadata-injection
+- https://github.com/newrelic/newrelic-k8s-metrics-adapter/tree/master/charts/newrelic-k8s-metrics-adapter
+- https://github.com/newrelic/nri-kube-events/tree/master/charts/nri-kube-events
+- https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging
+- https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie
+- https://github.com/newrelic/newrelic-infra-operator/tree/master/charts/newrelic-infra-operator
+- https://github.com/newrelic/k8s-agents-operator/tree/master/charts/k8s-agents-operator
+version: 5.0.107
diff --git a/charts/new-relic/nri-bundle/5.0.107/README.md b/charts/new-relic/nri-bundle/5.0.107/README.md
new file mode 100644
index 000000000..3fcc97d2b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/README.md
@@ -0,0 +1,200 @@
+# nri-bundle
+
+Groups together the individual charts for the New Relic Kubernetes solution for a more comfortable deployment.
+
+**Homepage:** <https://github.com/newrelic/helm-charts>
+
+## Bundled charts
+
+This chart does not deploy anything by itself but has many charts as dependencies. This allows you to easily install and upgrade the New Relic
+Kubernetes Integration using only one chart.
+
+In case you need more information about each component this chart installs, or you are an advanced user that want to install each component separately,
+here is a list of components that this chart installs and where you can find more information about them:
+
+| Component                    | Installed by default? | Description |
+|------------------------------|-----------------------|-------------|
+| [newrelic-infrastructure](https://github.com/newrelic/nri-kubernetes/tree/main/charts/newrelic-infrastructure) | Yes | Sends metrics about nodes, cluster objects (e.g. Deployments, Pods), and the control plane to New Relic. |
+| [nri-metadata-injection](https://github.com/newrelic/k8s-metadata-injection/tree/main/charts/nri-metadata-injection) | Yes | Enriches New Relic-instrumented applications (APM) with Kubernetes information. |
+| [kube-state-metrics](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics) | | Required for `newrelic-infrastructure` to gather cluster-level metrics. |
+| [nri-kube-events](https://github.com/newrelic/nri-kube-events/tree/main/charts/nri-kube-events) | | Reports Kubernetes events to New Relic. |
+| [newrelic-infra-operator](https://github.com/newrelic/newrelic-infra-operator/tree/main/charts/newrelic-infra-operator) | | (Beta) Used with Fargate or serverless environments to inject `newrelic-infrastructure` as a sidecar instead of the usual DaemonSet. |
+| [newrelic-k8s-metrics-adapter](https://github.com/newrelic/newrelic-k8s-metrics-adapter/tree/main/charts/newrelic-k8s-metrics-adapter) |  | (Beta) Provides a source of data for Horizontal Pod Autoscalers (HPA) based on a NRQL query from New Relic. |
+| [newrelic-logging](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging) |  | Sends logs for Kubernetes components and workloads running on the cluster to New Relic. |
+| [nri-prometheus](https://github.com/newrelic/nri-prometheus/tree/main/charts/nri-prometheus) |  | Sends metrics from applications exposing Prometheus metrics to New Relic. |
+| [newrelic-prometheus-configurator](https://github.com/newrelic/newrelic-prometheus-configurator/tree/master/charts/newrelic-prometheus-agent) |  | Configures instances of Prometheus in Agent mode to send metrics to the New Relic Prometheus endpoint. |
+| [newrelic-pixie](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie) |  | Connects to the Pixie API and enables the New Relic plugin in Pixie. The plugin allows you to export data from Pixie to New Relic for long-term data retention. |
+| [Pixie](https://docs.pixielabs.ai/installing-pixie/install-schemes/helm/#3.-deploy) |  | Is an open source observability tool for Kubernetes applications that uses eBPF to automatically capture telemetry data without the need for manual instrumentation. |
+| [k8s-agents-operator](https://github.com/newrelic/k8s-agents-operator/tree/main/charts/k8s-agents-operator) | | (Preview) Streamlines full-stack observability for Kubernetes environments by automating APM instrumentation alongside Kubernetes agent deployment. |
+
+## Configure components
+
+It is possible to configure settings for the individual charts this chart groups by specifying values for them under a key using the name of the chart,
+as specified in [helm documentation](https://helm.sh/docs/chart_template_guide/subcharts_and_globals).
+
+For example, by adding the following to the `values.yml` file:
+
+```yaml
+# Configuration settings for the newrelic-infrastructure chart
+newrelic-infrastructure:
+  # Any key defined in the values.yml file for the newrelic-infrastructure chart can be configured here:
+  # https://github.com/newrelic/nri-kubernetes/blob/main/charts/newrelic-infrastructure/values.yaml
+
+  verboseLog: false
+
+  resources:
+    limits:
+      memory: 512M
+```
+
+It is possible to override any entry of the [`newrelic-infrastructure`](https://github.com/newrelic/nri-kubernetes/tree/main/charts/newrelic-infrastructure)
+chart, as defined in their [`values.yml` file](https://github.com/newrelic/nri-kubernetes/blob/main/charts/newrelic-infrastructure/values.yaml).
+
+The same approach can be followed to update any of the subcharts.
+
+After making these changes to the `values.yml` file, or a custom values file, make sure to apply them using:
+
+```
+$ helm upgrade --reuse-values -f values.yaml [RELEASE] newrelic/nri-bundle
+```
+
+Where `[RELEASE]` is the name of the helm release, e.g. `newrelic-bundle`.
+
+## Monitor on host integrations
+
+If you wish to monitor services running on Kubernetes you can provide integrations
+configuration under `integrations_config` that it will passed down to the `newrelic-infrastructure` chart.
+
+You just need to create a new entry where the "name" is the filename of the configuration file and the data is the content of
+the integration configuration. The name must end in ".yaml" as this will be the
+filename generated and the Infrastructure agent only looks for YAML files.
+
+The data part is the actual integration configuration as described in the spec here:
+https://docs.newrelic.com/docs/integrations/integrations-sdk/file-specifications/integration-configuration-file-specifications-agent-v180
+
+In the following example you can see how to monitor a Redis integration with autodiscovery
+
+```yaml
+newrelic-infrastructure:
+  integrations:
+    nri-redis-sampleapp:
+      discovery:
+        command:
+          exec: /var/db/newrelic-infra/nri-discovery-kubernetes --tls --port 10250
+          match:
+            label.app: sampleapp
+      integrations:
+        - name: nri-redis
+          env:
+            # using the discovered IP as the hostname address
+            HOSTNAME: ${discovery.ip}
+            PORT: 6379
+          labels:
+            env: test
+```
+
+## Bring your own KSM
+
+New Relic Kubernetes Integration requires an instance of kube-state-metrics (KSM) to be running in the cluster, which this chart pulls as a dependency. If you are already running or want to run your own KSM instance, you will need to make some small adjustments as described below.
+
+### Bring your own KSM
+
+If you already have one KSM instance running, you can point `nri-kubernetes` to your instance:
+
+```yaml
+kube-state-metrics:
+  # Disable bundled KSM.
+  enabled: false
+newrelic-infrastructure:
+  ksm:
+    config:
+      # Selector for your pre-installed KSM Service. You may need to adjust this to fit your existing installation.
+      selector: "app.kubernetes.io/name=kube-state-metrics"
+      # Alternatively, you can specify a fixed URL where KSM is available. Doing so will bypass autodiscovery.
+      #staticUrl: http://ksm.ksm.svc.cluster.local:8080/metrics
+```
+
+### <span id="ksm-different-version">Run KSM alongside a different version</span>
+
+If you need to run a different instance of KSM in your cluster, you can still run a separate instance for the Kubernetes Integration to work as intended:
+
+```yaml
+kube-state-metrics:
+  # Enable bundled KSM.
+  enabled: true
+  prometheusScrape: false
+  customLabels:
+    # Label unique to this KSM instance.
+    newrelic.com/custom-ksm: "true"
+newrelic-infrastructure:
+  ksm:
+    config:
+      # Use label above as a selector.
+      selector: "newrelic.com/custom-ksm=true"
+```
+
+For more information on supported KSM version visit the [requirements documentation](https://docs.newrelic.com/docs/kubernetes-pixie/kubernetes-integration/get-started/kubernetes-integration-compatibility-requirements#reqs)
+
+## Values managed globally
+
+Some of the subchart implement the [New Relic's common Helm library](https://github.com/newrelic/helm-charts/tree/master/library/common-library) which
+means that it honors a wide range of defaults and globals common to most New Relic Helm charts.
+
+Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
+[user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
+
+At the time of writing this document, all the charts from `nri-bundle` except `newrelic-logging` and `synthetics-minion` implements this library and
+honors global options as described below.
+
+Note, the value table below is automatically generated from `values.yaml` by `helm-docs`. If you need to add new fields or update existing fields, please update the `values.yaml` and then run `helm-docs` to update this value table.
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| global | object | See [`values.yaml`](values.yaml) | change the behaviour globally to all the supported helm charts. See [user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md) for further information. |
+| global.affinity | object | `{}` | Sets pod/node affinities |
+| global.cluster | string | `""` | The cluster name for the Kubernetes cluster. |
+| global.containerSecurityContext | object | `{}` | Sets security context (at container level) |
+| global.customAttributes | object | `{}` | Adds extra attributes to the cluster and all the metrics emitted to the backend |
+| global.customSecretLicenseKey | string | `""` | Key in the Secret object where the license key is stored |
+| global.customSecretName | string | `""` | Name of the Secret object where the license key is stored |
+| global.dnsConfig | object | `{}` | Sets pod's dnsConfig |
+| global.fargate | bool | false | Must be set to `true` when deploying in an EKS Fargate environment |
+| global.hostNetwork | bool | false | Sets pod's hostNetwork |
+| global.images.pullSecrets | list | `[]` | Set secrets to be able to fetch images |
+| global.images.registry | string | `""` | Changes the registry where to get the images. Useful when there is an internal image cache/proxy |
+| global.insightsKey | string | `""` | The license key for your New Relic Account. This will be preferred configuration option if both `insightsKey` and `customSecret` are specified. |
+| global.labels | object | `{}` | Additional labels for chart objects |
+| global.licenseKey | string | `""` | The license key for your New Relic Account. This will be preferred configuration option if both `licenseKey` and `customSecret` are specified. |
+| global.lowDataMode | bool | false | Reduces number of metrics sent in order to reduce costs |
+| global.nodeSelector | object | `{}` | Sets pod's node selector |
+| global.nrStaging | bool | false | Send the metrics to the staging backend. Requires a valid staging license key |
+| global.podLabels | object | `{}` | Additional labels for chart pods |
+| global.podSecurityContext | object | `{}` | Sets security context (at pod level) |
+| global.priorityClassName | string | `""` | Sets pod's priorityClassName |
+| global.privileged | bool | false | In each integration it has different behavior. See [Further information](#values-managed-globally-3) but all aims to send less metrics to the backend to try to save costs | |
+| global.proxy | string | `""` | Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port` |
+| global.serviceAccount.annotations | object | `{}` | Add these annotations to the service account we create |
+| global.serviceAccount.create | string | `nil` | Configures if the service account should be created or not |
+| global.serviceAccount.name | string | `nil` | Change the name of the service account. This is honored if you disable on this chart the creation of the service account so you can use your own |
+| global.tolerations | list | `[]` | Sets pod's tolerations to node taints |
+| global.verboseLog | bool | false | Sets the debug logs to this integration or all integrations if it is set globally |
+| k8s-agents-operator.enabled | bool | `false` | Install the [`k8s-agents-operator` chart](https://github.com/newrelic/k8s-agents-operator/tree/main/charts/k8s-agents-operator) |
+| kube-state-metrics.enabled | bool | `false` | Install the [`kube-state-metrics` chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics) from the stable helm charts repository. This is mandatory if `infrastructure.enabled` is set to `true` and the user does not provide its own instance of KSM version >=1.8 and <=2.0. Note, kube-state-metrics v2+ disables labels/annotations metrics by default. You can enable the target labels/annotations metrics to be monitored by using the metricLabelsAllowlist/metricAnnotationsAllowList options described [here](https://github.com/prometheus-community/helm-charts/blob/159cd8e4fb89b8b107dcc100287504bb91bf30e0/charts/kube-state-metrics/values.yaml#L274) in your Kubernetes clusters. |
+| newrelic-infra-operator.enabled | bool | `false` | Install the [`newrelic-infra-operator` chart](https://github.com/newrelic/newrelic-infra-operator/tree/main/charts/newrelic-infra-operator) (Beta) |
+| newrelic-infrastructure.enabled | bool | `true` | Install the [`newrelic-infrastructure` chart](https://github.com/newrelic/nri-kubernetes/tree/main/charts/newrelic-infrastructure) |
+| newrelic-k8s-metrics-adapter.enabled | bool | `false` | Install the [`newrelic-k8s-metrics-adapter.` chart](https://github.com/newrelic/newrelic-k8s-metrics-adapter/tree/main/charts/newrelic-k8s-metrics-adapter) (Beta) |
+| newrelic-logging.enabled | bool | `false` | Install the [`newrelic-logging` chart](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging) |
+| newrelic-pixie.enabled | bool | `false` | Install the [`newrelic-pixie`](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie) |
+| newrelic-prometheus-agent.enabled | bool | `false` | Install the [`newrelic-prometheus-agent` chart](https://github.com/newrelic/newrelic-prometheus-configurator/tree/main/charts/newrelic-prometheus-agent) |
+| nri-kube-events.enabled | bool | `false` | Install the [`nri-kube-events` chart](https://github.com/newrelic/nri-kube-events/tree/main/charts/nri-kube-events) |
+| nri-metadata-injection.enabled | bool | `true` | Install the [`nri-metadata-injection` chart](https://github.com/newrelic/k8s-metadata-injection/tree/main/charts/nri-metadata-injection) |
+| nri-prometheus.enabled | bool | `false` | Install the [`nri-prometheus` chart](https://github.com/newrelic/nri-prometheus/tree/main/charts/nri-prometheus) |
+| pixie-chart.enabled | bool | `false` | Install the [`pixie-chart` chart](https://docs.pixielabs.ai/installing-pixie/install-schemes/helm/#3.-deploy) |
+
+## Maintainers
+
+* [juanjjaramillo](https://github.com/juanjjaramillo)
+* [csongnr](https://github.com/csongnr)
+* [dbudziwojskiNR](https://github.com/dbudziwojskiNR)
diff --git a/charts/new-relic/nri-bundle/5.0.107/README.md.gotmpl b/charts/new-relic/nri-bundle/5.0.107/README.md.gotmpl
new file mode 100644
index 000000000..269c4925a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/README.md.gotmpl
@@ -0,0 +1,166 @@
+{{ template "chart.header" . }}
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+## Bundled charts
+
+This chart does not deploy anything by itself but has many charts as dependencies. This allows you to easily install and upgrade the New Relic
+Kubernetes Integration using only one chart.
+
+In case you need more information about each component this chart installs, or you are an advanced user that want to install each component separately,
+here is a list of components that this chart installs and where you can find more information about them:
+
+| Component                    | Installed by default? | Description |
+|------------------------------|-----------------------|-------------|
+| [newrelic-infrastructure](https://github.com/newrelic/nri-kubernetes/tree/main/charts/newrelic-infrastructure) | Yes | Sends metrics about nodes, cluster objects (e.g. Deployments, Pods), and the control plane to New Relic. |
+| [nri-metadata-injection](https://github.com/newrelic/k8s-metadata-injection/tree/main/charts/nri-metadata-injection) | Yes | Enriches New Relic-instrumented applications (APM) with Kubernetes information. |
+| [kube-state-metrics](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics) | | Required for `newrelic-infrastructure` to gather cluster-level metrics. |
+| [nri-kube-events](https://github.com/newrelic/nri-kube-events/tree/main/charts/nri-kube-events) | | Reports Kubernetes events to New Relic. |
+| [newrelic-infra-operator](https://github.com/newrelic/newrelic-infra-operator/tree/main/charts/newrelic-infra-operator) | | (Beta) Used with Fargate or serverless environments to inject `newrelic-infrastructure` as a sidecar instead of the usual DaemonSet. |
+| [newrelic-k8s-metrics-adapter](https://github.com/newrelic/newrelic-k8s-metrics-adapter/tree/main/charts/newrelic-k8s-metrics-adapter) |  | (Beta) Provides a source of data for Horizontal Pod Autoscalers (HPA) based on a NRQL query from New Relic. |
+| [newrelic-logging](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging) |  | Sends logs for Kubernetes components and workloads running on the cluster to New Relic. |
+| [nri-prometheus](https://github.com/newrelic/nri-prometheus/tree/main/charts/nri-prometheus) |  | Sends metrics from applications exposing Prometheus metrics to New Relic. |
+| [newrelic-prometheus-configurator](https://github.com/newrelic/newrelic-prometheus-configurator/tree/master/charts/newrelic-prometheus-agent) |  | Configures instances of Prometheus in Agent mode to send metrics to the New Relic Prometheus endpoint. |
+| [newrelic-pixie](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie) |  | Connects to the Pixie API and enables the New Relic plugin in Pixie. The plugin allows you to export data from Pixie to New Relic for long-term data retention. |
+| [Pixie](https://docs.pixielabs.ai/installing-pixie/install-schemes/helm/#3.-deploy) |  | Is an open source observability tool for Kubernetes applications that uses eBPF to automatically capture telemetry data without the need for manual instrumentation. |
+| [k8s-agents-operator](https://github.com/newrelic/k8s-agents-operator/tree/main/charts/k8s-agents-operator) | | (Preview) Streamlines full-stack observability for Kubernetes environments by automating APM instrumentation alongside Kubernetes agent deployment. |
+
+## Configure components
+
+It is possible to configure settings for the individual charts this chart groups by specifying values for them under a key using the name of the chart,
+as specified in [helm documentation](https://helm.sh/docs/chart_template_guide/subcharts_and_globals).
+
+For example, by adding the following to the `values.yml` file:
+
+```yaml
+# Configuration settings for the newrelic-infrastructure chart
+newrelic-infrastructure:
+  # Any key defined in the values.yml file for the newrelic-infrastructure chart can be configured here:
+  # https://github.com/newrelic/nri-kubernetes/blob/main/charts/newrelic-infrastructure/values.yaml
+
+  verboseLog: false
+
+  resources:
+    limits:
+      memory: 512M
+```
+
+It is possible to override any entry of the [`newrelic-infrastructure`](https://github.com/newrelic/nri-kubernetes/tree/main/charts/newrelic-infrastructure)
+chart, as defined in their [`values.yml` file](https://github.com/newrelic/nri-kubernetes/blob/main/charts/newrelic-infrastructure/values.yaml).
+
+The same approach can be followed to update any of the subcharts.
+
+After making these changes to the `values.yml` file, or a custom values file, make sure to apply them using:
+
+```
+$ helm upgrade --reuse-values -f values.yaml [RELEASE] newrelic/nri-bundle
+```
+
+Where `[RELEASE]` is the name of the helm release, e.g. `newrelic-bundle`.
+
+
+## Monitor on host integrations
+
+If you wish to monitor services running on Kubernetes you can provide integrations
+configuration under `integrations_config` that it will passed down to the `newrelic-infrastructure` chart.
+
+You just need to create a new entry where the "name" is the filename of the configuration file and the data is the content of
+the integration configuration. The name must end in ".yaml" as this will be the
+filename generated and the Infrastructure agent only looks for YAML files.
+
+The data part is the actual integration configuration as described in the spec here:
+https://docs.newrelic.com/docs/integrations/integrations-sdk/file-specifications/integration-configuration-file-specifications-agent-v180
+
+In the following example you can see how to monitor a Redis integration with autodiscovery
+
+```yaml
+newrelic-infrastructure:
+  integrations:
+    nri-redis-sampleapp:
+      discovery:
+        command:
+          exec: /var/db/newrelic-infra/nri-discovery-kubernetes --tls --port 10250
+          match:
+            label.app: sampleapp
+      integrations:
+        - name: nri-redis
+          env:
+            # using the discovered IP as the hostname address
+            HOSTNAME: ${discovery.ip}
+            PORT: 6379
+          labels:
+            env: test
+```
+
+## Bring your own KSM
+
+New Relic Kubernetes Integration requires an instance of kube-state-metrics (KSM) to be running in the cluster, which this chart pulls as a dependency. If you are already running or want to run your own KSM instance, you will need to make some small adjustments as described below.
+
+### Bring your own KSM
+
+If you already have one KSM instance running, you can point `nri-kubernetes` to your instance:
+
+```yaml
+kube-state-metrics:
+  # Disable bundled KSM.
+  enabled: false
+newrelic-infrastructure:
+  ksm:
+    config:
+      # Selector for your pre-installed KSM Service. You may need to adjust this to fit your existing installation.
+      selector: "app.kubernetes.io/name=kube-state-metrics"
+      # Alternatively, you can specify a fixed URL where KSM is available. Doing so will bypass autodiscovery.
+      #staticUrl: http://ksm.ksm.svc.cluster.local:8080/metrics
+```
+
+### <span id="ksm-different-version">Run KSM alongside a different version</span>
+
+If you need to run a different instance of KSM in your cluster, you can still run a separate instance for the Kubernetes Integration to work as intended:
+
+```yaml
+kube-state-metrics:
+  # Enable bundled KSM.
+  enabled: true
+  prometheusScrape: false
+  customLabels:
+    # Label unique to this KSM instance.
+    newrelic.com/custom-ksm: "true"
+newrelic-infrastructure:
+  ksm:
+    config:
+      # Use label above as a selector.
+      selector: "newrelic.com/custom-ksm=true"
+```
+
+For more information on supported KSM version visit the [requirements documentation](https://docs.newrelic.com/docs/kubernetes-pixie/kubernetes-integration/get-started/kubernetes-integration-compatibility-requirements#reqs)
+
+## Values managed globally
+
+Some of the subchart implement the [New Relic's common Helm library](https://github.com/newrelic/helm-charts/tree/master/library/common-library) which
+means that it honors a wide range of defaults and globals common to most New Relic Helm charts.
+
+Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
+[user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
+
+At the time of writing this document, all the charts from `nri-bundle` except `newrelic-logging` and `synthetics-minion` implements this library and
+honors global options as described below.
+
+Note, the value table below is automatically generated from `values.yaml` by `helm-docs`. If you need to add new fields or update existing fields, please update the `values.yaml` and then run `helm-docs` to update this value table.
+
+{{ template "chart.valuesSection" . }}
+
+{{ if .Maintainers }}
+## Maintainers
+{{ range .Maintainers }}
+{{- if .Name }}
+{{- if .Url }}
+* [{{ .Name }}]({{ .Url }})
+{{- else }}
+* {{ .Name }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/app-readme.md b/charts/new-relic/nri-bundle/5.0.107/app-readme.md
new file mode 100644
index 000000000..61e550787
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/app-readme.md
@@ -0,0 +1,5 @@
+# New Relic Kubernetes Integration
+
+New Relic's Kubernetes integration gives you full observability into the health and performance of your environment, no matter whether you run Kubernetes on-premises or in the cloud. With our [cluster explorer](https://docs.newrelic.com/docs/integrations/kubernetes-integration/cluster-explorer/kubernetes-cluster-explorer), you can cut through layers of complexity to see how your cluster is performing, from the heights of the control plane down to applications running on a single pod.
+
+You can see the power of the Kubernetes integration in the [cluster explorer](https://docs.newrelic.com/docs/integrations/kubernetes-integration/cluster-explorer/kubernetes-cluster-explorer), where the full picture of a cluster is made available on a single screen: nodes and pods are visualized according to their health and performance, with pending and alerting nodes in the innermost circles. [Predefined alert conditions](https://docs.newrelic.com/docs/integrations/kubernetes-integration/kubernetes-events/kubernetes-integration-predefined-alert-policy) help you troubleshoot issues right from the start. Clicking each node reveals its status and how each app is performing.
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/Chart.lock b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/Chart.lock
new file mode 100644
index 000000000..1f868abfc
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.0
+digest: sha256:2e1da613fd8a52706bde45af077779c5d69e9e1641bdf5c982eaf6d1ac67a443
+generated: "2024-10-25T18:35:38.878351812Z"
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/Chart.yaml
new file mode 100644
index 000000000..61cadcce7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/Chart.yaml
@@ -0,0 +1,20 @@
+apiVersion: v2
+appVersion: 0.19.0
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.0
+description: A Helm chart for the Kubernetes Agents Operator
+home: https://github.com/newrelic/k8s-agents-operator/blob/main/charts/k8s-agents-operator/README.md
+maintainers:
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+- name: danielstokes
+  url: https://github.com/danielstokes
+name: k8s-agents-operator
+sources:
+- https://github.com/newrelic/k8s-agents-operator
+type: application
+version: 0.19.0
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/README.md
new file mode 100644
index 000000000..107d16895
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/README.md
@@ -0,0 +1,294 @@
+# k8s-agents-operator
+
+![Version: 0.19.0](https://img.shields.io/badge/Version-0.19.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.19.0](https://img.shields.io/badge/AppVersion-0.19.0-informational?style=flat-square)
+
+A Helm chart for the Kubernetes Agents Operator
+
+**Homepage:** <https://github.com/newrelic/k8s-agents-operator/blob/main/charts/k8s-agents-operator/README.md>
+
+## Prerequisites
+
+[Helm](https://helm.sh) must be installed to use the charts.  Please refer to Helm's [documentation](https://helm.sh/docs) to get started.
+
+## Installation
+
+### Requirements
+
+Add the `k8s-agents-operator` Helm chart repository:
+```shell
+helm repo add k8s-agents-operator https://newrelic.github.io/k8s-agents-operator
+```
+
+### Instrumentation
+
+Install the [`k8s-agents-operator`](https://github.com/newrelic/k8s-agents-operator) Helm chart:
+```shell
+helm upgrade --install k8s-agents-operator k8s-agents-operator/k8s-agents-operator \
+  --namespace newrelic \
+  --create-namespace \
+  --values your-custom-values.yaml
+```
+
+### Monitored namespaces
+
+For each namespace you want the operator to be instrumented, a secret will be replicated from the newrelic operator namespace.
+
+For each `Instrumentation` custom resource created, specifying which APM agent you want to instrument for each language. All available APM
+ agent docker images and corresponding tags are listed on DockerHub:
+
+* [.NET](https://hub.docker.com/repository/docker/newrelic/newrelic-dotnet-init/general)
+* [Java](https://hub.docker.com/repository/docker/newrelic/newrelic-java-init/general)
+* [Node](https://hub.docker.com/repository/docker/newrelic/newrelic-node-init/general)
+* [Python](https://hub.docker.com/repository/docker/newrelic/newrelic-python-init/general)
+* [Ruby](https://hub.docker.com/repository/docker/newrelic/newrelic-ruby-init/general)
+
+For .NET
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-dotnet
+spec:
+  agent:
+    language: dotnet
+    image: newrelic/newrelic-dotnet-init:latest # Please ensure you're using a trusted New Relic image
+    # env: ...
+```
+
+For Java
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-java
+  namespace: newrelic
+spec:
+  agent:
+    language: java
+    image: newrelic/newrelic-java-init:latest # Please ensure you're using a trusted New Relic image
+    # env: ...
+```
+
+For NodeJS
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-nodejs
+  namespace: newrelic
+spec:
+  agent:
+    language: nodejs
+    image: newrelic/newrelic-node-init:latest # Please ensure you're using a trusted New Relic image
+    # env: ...
+```
+
+For Python
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-python
+  namespace: newrelic
+spec:
+  agent:
+    language: python
+    image: newrelic/newrelic-python-init:latest # Please ensure you're using a trusted New Relic image
+    # env: ...
+```
+
+For Ruby
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-ruby
+  namespace: newrelic
+spec:
+  agent:
+    language: ruby
+    image: newrelic/newrelic-ruby-init:latest # Please ensure you're using a trusted New Relic image
+    # env: ...
+```
+
+For environment specific configurations
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-lang
+  namespace: newrelic
+spec:
+  agent:
+    env:
+    # Example New Relic agent supported environment variables
+      - name: NEW_RELIC_LABELS
+        value: "environment:auto-injection"
+    # Example setting the pod name based on the metadata
+      - name: NEW_RELIC_POD_NAME
+        valueFrom:
+          fieldRef:
+            fieldPath: metadata.name
+    # Example overriding the appName configuration
+      - name: NEW_RELIC_APP_NAME
+        value: "$(NEW_RELIC_LABELS)-$(NEW_RELIC_POD_NAME)"
+```
+
+Targeting everything in a specific namespace with a label
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-lang
+  namespace: newrelic
+spec:
+  #agent: ...
+  namespaceLabelSelector:
+    matchExpressions:
+      - key: "app.newrelic.instrumentation"
+        operator: "In"
+        values: ["java"]
+```
+
+Targeting a pod with a specific label
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-lang
+  namespace: newrelic
+spec:
+  # agent: ...
+  podLabelSelector:
+    matchExpressions:
+      - key: "app.newrelic.instrumentation"
+        operator: "In"
+        values: ["dotnet"]
+```
+
+Using a secret with a non-default name
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-lang
+  namespace: newrelic
+spec:
+  # agent: ...
+  licenseKeySecret: the-name-of-the-custom-secret
+```
+
+In the example above, we show how you can configure the agent settings globally using environment variables. See each agent's configuration documentation for available configuration options:
+* [Java](https://docs.newrelic.com/docs/apm/agents/java-agent/configuration/java-agent-configuration-config-file/)
+* [Node](https://docs.newrelic.com/docs/apm/agents/nodejs-agent/installation-configuration/nodejs-agent-configuration/)
+* [Python](https://docs.newrelic.com/docs/apm/agents/python-agent/configuration/python-agent-configuration/)
+* [.NET](https://docs.newrelic.com/docs/apm/agents/net-agent/configuration/net-agent-configuration/)
+* [Ruby](https://docs.newrelic.com/docs/apm/agents/ruby-agent/configuration/ruby-agent-configuration/)
+
+### cert-manager
+
+The K8s Agents Operator supports the use of [`cert-manager`](https://github.com/cert-manager/cert-manager) if preferred.
+
+Install the [`cert-manager`](https://github.com/cert-manager/cert-manager) Helm chart:
+```shell
+helm install cert-manager jetstack/cert-manager \
+  --namespace cert-manager \
+  --create-namespace \
+  --set crds.enabled=true
+```
+
+In your `values.yaml` file, set `admissionWebhooks.autoGenerateCert.enabled: false` and `admissionWebhooks.certManager.enabled: true`. Then install the chart as normal.
+
+## Security
+
+This operator requires a privileged environment to run correctly. As with all components that run in a privileged environment, please exercise caution when granting access to the namespace (and other resources) that the K8s Agent Operator is deployed on.
+
+## Available Chart Releases
+
+To see the available charts:
+```shell
+helm search repo k8s-agents-operator
+```
+
+If you want to see a list of all available charts and releases, check [index.yaml](https://newrelic.github.io/k8s-agents-operator/index.yaml).
+
+## Source Code
+
+* <https://github.com/newrelic/k8s-agents-operator>
+
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://helm-charts.newrelic.com | common-library | 1.3.0 |
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| admissionWebhooks | object | `{"autoGenerateCert":{"certPeriodDays":365,"enabled":true,"recreate":true},"caFile":"","certFile":"","certManager":{"enabled":false},"create":true,"keyFile":""}` | Admission webhooks make sure only requests with correctly formatted rules will get into the Operator |
+| admissionWebhooks.autoGenerateCert.certPeriodDays | int | `365` | Cert validity period time in days. |
+| admissionWebhooks.autoGenerateCert.enabled | bool | `true` | If true and certManager.enabled is false, Helm will automatically create a self-signed cert and secret for you. |
+| admissionWebhooks.autoGenerateCert.recreate | bool | `true` | If set to true, new webhook key/certificate is generated on helm upgrade. |
+| admissionWebhooks.caFile | string | `""` | Path to the CA cert. |
+| admissionWebhooks.certFile | string | `""` | Path to your own PEM-encoded certificate. |
+| admissionWebhooks.certManager.enabled | bool | `false` | If true and autoGenerateCert.enabled is false, cert-manager will create a self-signed cert and secret for you. |
+| admissionWebhooks.keyFile | string | `""` | Path to your own PEM-encoded private key. |
+| affinity | object | `{}` | Sets all pods' affinities. Can be configured also with `global.affinity` |
+| containerSecurityContext | object | `{}` | Sets all security context (at container level). Can be configured also with `global.securityContext.container` |
+| controllerManager.kubeRbacProxy.containerSecurityContext | object | `{}` | Sets security context (at container level) for kubeRbacProxy. Overrides `containerSecurityContext` and `global.containerSecurityContext` |
+| controllerManager.kubeRbacProxy.image.repository | string | `"gcr.io/kubebuilder/kube-rbac-proxy"` | Sets the repository and image to use for kube-rbac-proxy. Please ensure you're using a trusted image. |
+| controllerManager.kubeRbacProxy.image.version | string | `"sha256:771a9a173e033a3ad8b46f5c00a7036eaa88c8d8d1fbd89217325168998113ea"` | Sets the kube-rbac-proxy image version to retrieve. Could be a tag i.e. "v0.16.0" or a SHA digest i.e. "sha256:771a9a173e033a3ad8b46f5c00a7036eaa88c8d8d1fbd89217325168998113ea" |
+| controllerManager.kubeRbacProxy.resources.limits.cpu | string | `"500m"` |  |
+| controllerManager.kubeRbacProxy.resources.limits.memory | string | `"128Mi"` |  |
+| controllerManager.kubeRbacProxy.resources.requests.cpu | string | `"5m"` |  |
+| controllerManager.kubeRbacProxy.resources.requests.memory | string | `"64Mi"` |  |
+| controllerManager.manager.containerSecurityContext | object | `{}` | Sets security context (at container level) for the manager. Overrides `containerSecurityContext` and `global.containerSecurityContext` |
+| controllerManager.manager.image.pullPolicy | string | `nil` |  |
+| controllerManager.manager.image.repository | string | `"newrelic/k8s-agents-operator"` | Sets the repository and image to use for the manager. Please ensure you're using trusted New Relic images. |
+| controllerManager.manager.image.version | string | `nil` | Sets the manager image version to retrieve. Could be a tag i.e. "v0.17.0" or a SHA digest i.e. "sha256:e2399e70e99ac370ca6a3c7e5affa9655da3b246d0ada77c40ed155b3726ee2e" |
+| controllerManager.manager.leaderElection | object | `{"enabled":true}` | Enable leader election mechanism for protecting against split brain if multiple operator pods/replicas are started |
+| controllerManager.manager.resources.requests.cpu | string | `"100m"` |  |
+| controllerManager.manager.resources.requests.memory | string | `"64Mi"` |  |
+| controllerManager.replicas | int | `1` |  |
+| dnsConfig | object | `{}` | Sets pod's dnsConfig. Can be configured also with `global.dnsConfig` |
+| kubernetesClusterDomain | string | `"cluster.local"` |  |
+| labels | object | `{}` | Additional labels for chart objects |
+| licenseKey | string | `""` | This set this license key to use. Can be configured also with `global.licenseKey` |
+| metricsService.ports[0].name | string | `"https"` |  |
+| metricsService.ports[0].port | int | `8443` |  |
+| metricsService.ports[0].protocol | string | `"TCP"` |  |
+| metricsService.ports[0].targetPort | string | `"https"` |  |
+| metricsService.type | string | `"ClusterIP"` |  |
+| nodeSelector | object | `{}` | Sets all pods' node selector. Can be configured also with `global.nodeSelector` |
+| podAnnotations | object | `{}` | Annotations to be added to the deployment. |
+| podLabels | object | `{}` | Additional labels for chart pods |
+| podSecurityContext | object | `{"fsGroup":65532,"runAsGroup":65532,"runAsNonRoot":true,"runAsUser":65532}` | SecurityContext holds pod-level security attributes and common container settings |
+| priorityClassName | string | `""` | Sets pod's priorityClassName. Can be configured also with `global.priorityClassName` |
+| serviceAccount | object | See `values.yaml` | Settings controlling ServiceAccount creation |
+| serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created |
+| tolerations | list | `[]` | Sets all pods' tolerations to node taints. Can be configured also with `global.tolerations` |
+| webhookService.ports[0].port | int | `443` |  |
+| webhookService.ports[0].protocol | string | `"TCP"` |  |
+| webhookService.ports[0].targetPort | int | `9443` |  |
+| webhookService.type | string | `"ClusterIP"` |  |
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| csongnr |  | <https://github.com/csongnr> |
+| dbudziwojskiNR |  | <https://github.com/dbudziwojskiNR> |
+| danielstokes |  | <https://github.com/danielstokes> |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/README.md.gotmpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/README.md.gotmpl
new file mode 100644
index 000000000..1e77fa838
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/README.md.gotmpl
@@ -0,0 +1,234 @@
+{{ template "chart.header" . }}
+
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+## Prerequisites
+
+[Helm](https://helm.sh) must be installed to use the charts.  Please refer to Helm's [documentation](https://helm.sh/docs) to get started.
+
+## Installation
+
+### Requirements
+
+Add the `k8s-agents-operator` Helm chart repository:
+```shell
+helm repo add k8s-agents-operator https://newrelic.github.io/k8s-agents-operator
+```
+
+### Instrumentation
+
+Install the [`k8s-agents-operator`](https://github.com/newrelic/k8s-agents-operator) Helm chart:
+```shell
+helm upgrade --install k8s-agents-operator k8s-agents-operator/k8s-agents-operator \
+  --namespace newrelic \
+  --create-namespace \
+  --values your-custom-values.yaml
+```
+
+### Monitored namespaces
+
+For each namespace you want the operator to be instrumented, a secret will be replicated from the newrelic operator namespace.
+
+For each `Instrumentation` custom resource created, specifying which APM agent you want to instrument for each language. All available APM
+ agent docker images and corresponding tags are listed on DockerHub:
+
+* [.NET](https://hub.docker.com/repository/docker/newrelic/newrelic-dotnet-init/general)
+* [Java](https://hub.docker.com/repository/docker/newrelic/newrelic-java-init/general)
+* [Node](https://hub.docker.com/repository/docker/newrelic/newrelic-node-init/general)
+* [Python](https://hub.docker.com/repository/docker/newrelic/newrelic-python-init/general)
+* [Ruby](https://hub.docker.com/repository/docker/newrelic/newrelic-ruby-init/general)
+
+For .NET
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-dotnet
+spec:
+  agent:
+    language: dotnet
+    image: newrelic/newrelic-dotnet-init:latest # Please ensure you're using a trusted New Relic image
+    # env: ...
+```
+
+For Java
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-java
+  namespace: newrelic
+spec:
+  agent:
+    language: java
+    image: newrelic/newrelic-java-init:latest # Please ensure you're using a trusted New Relic image
+    # env: ...
+```
+
+For NodeJS
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-nodejs
+  namespace: newrelic
+spec:
+  agent:
+    language: nodejs
+    image: newrelic/newrelic-node-init:latest # Please ensure you're using a trusted New Relic image
+    # env: ...
+```
+
+For Python
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-python
+  namespace: newrelic
+spec:
+  agent:
+    language: python
+    image: newrelic/newrelic-python-init:latest # Please ensure you're using a trusted New Relic image
+    # env: ...
+```
+
+For Ruby
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-ruby
+  namespace: newrelic
+spec:
+  agent:
+    language: ruby
+    image: newrelic/newrelic-ruby-init:latest # Please ensure you're using a trusted New Relic image
+    # env: ...
+```
+
+For environment specific configurations
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-lang
+  namespace: newrelic
+spec:
+  agent:
+    env:
+    # Example New Relic agent supported environment variables
+      - name: NEW_RELIC_LABELS
+        value: "environment:auto-injection"
+    # Example setting the pod name based on the metadata
+      - name: NEW_RELIC_POD_NAME
+        valueFrom:
+          fieldRef:
+            fieldPath: metadata.name
+    # Example overriding the appName configuration
+      - name: NEW_RELIC_APP_NAME
+        value: "$(NEW_RELIC_LABELS)-$(NEW_RELIC_POD_NAME)"
+```
+
+Targeting everything in a specific namespace with a label
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-lang
+  namespace: newrelic
+spec:
+  #agent: ...
+  namespaceLabelSelector:
+    matchExpressions:
+      - key: "app.newrelic.instrumentation"
+        operator: "In"
+        values: ["java"]
+```
+
+Targeting a pod with a specific label
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-lang
+  namespace: newrelic
+spec:
+  # agent: ...
+  podLabelSelector:
+    matchExpressions:
+      - key: "app.newrelic.instrumentation"
+        operator: "In"
+        values: ["dotnet"]
+```
+
+Using a secret with a non-default name
+
+```yaml
+apiVersion: newrelic.com/v1alpha2
+kind: Instrumentation
+metadata:
+  name: newrelic-instrumentation-lang
+  namespace: newrelic
+spec:
+  # agent: ...
+  licenseKeySecret: the-name-of-the-custom-secret
+```
+
+In the example above, we show how you can configure the agent settings globally using environment variables. See each agent's configuration documentation for available configuration options:
+* [Java](https://docs.newrelic.com/docs/apm/agents/java-agent/configuration/java-agent-configuration-config-file/)
+* [Node](https://docs.newrelic.com/docs/apm/agents/nodejs-agent/installation-configuration/nodejs-agent-configuration/)
+* [Python](https://docs.newrelic.com/docs/apm/agents/python-agent/configuration/python-agent-configuration/)
+* [.NET](https://docs.newrelic.com/docs/apm/agents/net-agent/configuration/net-agent-configuration/)
+* [Ruby](https://docs.newrelic.com/docs/apm/agents/ruby-agent/configuration/ruby-agent-configuration/)
+
+### cert-manager
+
+The K8s Agents Operator supports the use of [`cert-manager`](https://github.com/cert-manager/cert-manager) if preferred.
+
+Install the [`cert-manager`](https://github.com/cert-manager/cert-manager) Helm chart:
+```shell
+helm install cert-manager jetstack/cert-manager \
+  --namespace cert-manager \
+  --create-namespace \
+  --set crds.enabled=true
+```
+
+In your `values.yaml` file, set `admissionWebhooks.autoGenerateCert.enabled: false` and `admissionWebhooks.certManager.enabled: true`. Then install the chart as normal.
+
+## Security
+
+This operator requires a privileged environment to run correctly. As with all components that run in a privileged environment, please exercise caution when granting access to the namespace (and other resources) that the K8s Agent Operator is deployed on.
+
+## Available Chart Releases
+
+To see the available charts:
+```shell
+helm search repo k8s-agents-operator
+```
+
+If you want to see a list of all available charts and releases, check [index.yaml](https://newrelic.github.io/k8s-agents-operator/index.yaml).
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+{{ template "chart.maintainersSection" . }}
+
+{{ template "helm-docs.versionFooter" . }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/Chart.yaml
new file mode 100644
index 000000000..f2ee5497e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/Chart.yaml
@@ -0,0 +1,17 @@
+apiVersion: v2
+description: Provides helpers to provide consistency on all the charts
+keywords:
+- newrelic
+- chart-library
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+- name: kang-makes
+  url: https://github.com/kang-makes
+name: common-library
+type: library
+version: 1.3.0
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/DEVELOPERS.md b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/DEVELOPERS.md
new file mode 100644
index 000000000..7208c673e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/DEVELOPERS.md
@@ -0,0 +1,747 @@
+# Functions/templates documented for chart writers
+Here is some rough documentation separated by the file that contains the function, the function
+name and how to use it. We are not covering functions that start with `_` (e.g.
+`newrelic.common.license._licenseKey`) because they are used internally by this library for
+other helpers. Helm does not have the concept of "public" or "private" functions/templates so
+this is a convention of ours.
+
+## _naming.tpl
+These functions are used to name objects.
+
+### `newrelic.common.naming.name`
+This is the same as the idiomatic `CHART-NAME.name` that is created when you use `helm create`.
+
+It honors `.Values.nameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.name" . }}
+```
+
+### `newrelic.common.naming.fullname`
+This is the same as the idiomatic `CHART-NAME.fullname` that is created when you use `helm create`
+
+It honors `.Values.fullnameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.fullname" . }}
+```
+
+### `newrelic.common.naming.chart`
+This is the same as the idiomatic `CHART-NAME.chart` that is created when you use `helm create`.
+
+It is mostly useless for chart writers. It is used internally for templating the labels but there
+is no reason to keep it "private".
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.chart" . }}
+```
+
+### `newrelic.common.naming.truncateToDNS`
+This is a useful template that could be used to trim a string to 63 chars and does not end with a dash (`-`).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $truncatedName := include "newrelic.common.naming.truncateToDNS" $nameToTruncate }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-string-that-should-be */ -}}
+```
+
+### `newrelic.common.naming.truncateToDNSWithSuffix`
+This template function is the same as the above but instead of receiving a string you should give a `dict`
+with a `name` and a `suffix`. This function will join them with a dash (`-`) and trim the `name` so the
+result of `name-suffix` is no more than 63 chars
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $suffix := "A-NOT-SO-LONG-SUFFIX" }}
+{{- $truncatedName := include "truncateToDNSWithSuffix" (dict "name" $nameToTruncate "suffix" $suffix) }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-A-NOT-SO-LONG-SUFFIX */ -}}
+```
+
+
+
+## _labels.tpl
+### `newrelic.common.labels`, `newrelic.common.labels.selectorLabels` and `newrelic.common.labels.podLabels`
+These are functions that are used to label objects. They are configured by this `values.yaml`
+```yaml
+global:
+  podLabels: {}  # included in all the pods of all the charts that implement this library
+  labels: {}  # included in all the objects of all the charts that implement this library
+podLabels: {}  # included in all the pods of this chart
+labels: {}  # included in all the objects of this chart
+```
+
+label maps are merged from global to local values.
+
+And chart writer should use them like this:
+```mustache
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+```
+
+`newrelic.common.labels.podLabels` includes `newrelic.common.labels.selectorLabels` automatically.
+
+
+
+## _priority-class-name.tpl
+### `newrelic.common.priorityClassName`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  priorityClassName: ""
+priorityClassName: ""
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `priorityClassName` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.priorityClassName" . }}
+  priorityClassName: {{ . }}
+  {{- end }}
+```
+
+
+
+## _hostnetwork.tpl
+### `newrelic.common.hostNetwork`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  hostNetwork:  # Note that this is empty (nil)
+hostNetwork:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `hostNetwork` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.hostNetwork" . }}
+  hostNetwork: {{ . }}
+  {{- end }}
+```
+
+### `newrelic.common.hostNetwork.value`
+This function is an abstraction of the function above but this returns directly "true" or "false".
+
+Be careful with using this with an `if` as Helm does evaluate "false" (string) as `true`.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+```
+
+
+
+## _dnsconfig.tpl
+### `newrelic.common.dnsConfig`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  dnsConfig: {}
+dnsConfig: {}
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `dnsConfig` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.dnsConfig" . }}
+  dnsConfig:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _images.tpl
+These functions help us to deal with how images are templated. This allows setting `registries`
+where to fetch images globally while being flexible enough to fit in different maps of images
+and deployments with one or more images. This is the example of a complex `values.yaml` that
+we are going to use during the documentation of these functions:
+
+```yaml
+global:
+  images:
+    registry: nexus-3-instance.internal.clients-domain.tld
+jobImage:
+  registry: # defaults to "example.tld" when empty in these examples
+  repository: ingress-nginx/kube-webhook-certgen
+  tag: v1.1.1
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+images:
+  integration:
+    registry:
+    repository: newrelic/nri-kube-events
+    tag: 1.8.0
+    pullPolicy: IfNotPresent
+  agent:
+    registry:
+    repository: newrelic/k8s-events-forwarder
+    tag: 1.22.0
+    pullPolicy: IfNotPresent
+  pullSecrets: []
+```
+
+### `newrelic.common.images.image`
+This will return a string with the image ready to be downloaded that includes the registry, the image and the tag.
+`defaultRegistry` is used to keep `registry` field empty in `values.yaml` so you can override the image using
+`global.images.registry`, your local `jobImage.registry` and be able to fallback to a registry that is not `docker.io`
+(Or the default repository that the client could have set in the CRI).
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.image" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.registry`
+It returns the registry from the global or local values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.registry" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.repository`
+It returns the image from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.tag`
+It returns the image's tag from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.renderPullSecrets`
+If returns a merged map that contains the pull secrets from the global configuration and the local one.  
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.jobImage.pullSecrets "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+```
+
+
+
+## _serviceaccount.tpl
+These functions are used to evaluate if the service account should be created, with which name and add annotations to it.
+
+The functions that the common library has implemented for service accounts are:
+* `newrelic.common.serviceAccount.create`
+* `newrelic.common.serviceAccount.name`
+* `newrelic.common.serviceAccount.annotations`
+
+Usage:
+```mustache
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- with (include "newrelic.common.serviceAccount.annotations" .) }}
+  annotations:
+    {{- . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
+```
+
+
+
+## _affinity.tpl, _nodeselector.tpl and _tolerations.tpl
+These three files are almost the same and they follow the idiomatic way of `helm create`.
+
+Each function also looks if there is a global value like the other helpers.
+```yaml
+global:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+affinity: {}
+nodeSelector: {}
+tolerations: []
+```
+
+The values here are replaced instead of be merged. If a value at root level is found, the global one is ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.nodeSelector" . }}
+  nodeSelector:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.affinity" . }}
+  affinity:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.tolerations" . }}
+  tolerations:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _agent-config.tpl
+### `newrelic.common.agentConfig.defaults`
+This returns a YAML that the agent can use directly as a config that includes other options from the values file like verbose mode,
+custom attributes, FedRAMP and such.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include newrelic.common.naming.truncateToDNSWithSuffix (dict "name" (include "newrelic.common.naming.fullname" .) suffix "agent-config") }}
+  namespace: {{ .Release.Namespace }}
+data:
+  newrelic-infra.yml: |-
+    # This is the configuration file for the infrastructure agent. See:
+    # https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+    {{- include "newrelic.common.agentConfig.defaults" . | nindent 4 }}
+```
+
+
+
+## _cluster.tpl
+### `newrelic.common.cluster`
+Returns the cluster name
+
+Usage:
+```mustache
+{{ include "newrelic.common.cluster" . }}
+```
+
+
+
+## _custom-attributes.tpl
+### `newrelic.common.customAttributes`
+Return custom attributes in YAML format.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example
+data:
+  custom-attributes.yaml: |
+    {{- include "newrelic.common.customAttributes" . | nindent 4 }}
+  custom-attributes.json: |
+    {{- include "newrelic.common.customAttributes" . | fromYaml | toJson | nindent 4 }}
+```
+
+
+
+## _fedramp.tpl
+### `newrelic.common.fedramp.enabled`
+Returns true if FedRAMP is enabled or an empty string if not. It can be safely used in conditionals as an empty string is a Helm falsiness.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled" . }}
+```
+
+### `newrelic.common.fedramp.enabled.value`
+Returns true if FedRAMP is enabled or false if not. This is to have the value of FedRAMP ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled.value" . }}
+```
+
+
+
+## _license.tpl
+### `newrelic.common.license.secretName` and ### `newrelic.common.license.secretKeyName`
+Returns the secret and key inside the secret where to read the license key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the license key.
+
+To create the secret use `newrelic.common.license.secret`.
+
+Usage:
+```mustache
+{{- if and (.Values.controlPlane.enabled) (not (include "newrelic.fargate" .)) }}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+  containers:
+  - name: agent
+    env:
+    - name: "NRIA_LICENSE_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.license.secretName" . }}
+          key: {{ include "newrelic.common.license.secretKeyName" . }}
+```
+
+
+
+## _license_secret.tpl
+### `newrelic.common.license.secret`
+This function templates the secret that is used by agents and integrations with the license Key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any license key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.license.secret" . -}}
+```
+
+
+
+## _insights.tpl
+### `newrelic.common.insightsKey.secretName` and ### `newrelic.common.insightsKey.secretKeyName`
+Returns the secret and key inside the secret where to read the insights key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.insightsKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "INSIGHTS_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.insightsKey.secretName" . }}
+          key: {{ include "newrelic.common.insightsKey.secretKeyName" . }}
+```
+
+
+
+## _insights_secret.tpl
+### `newrelic.common.insightsKey.secret`
+This function templates the secret that is used by agents and integrations with the insights key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any insights key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.insightsKey.secret" . -}}
+```
+
+
+
+## _userkey.tpl
+### `newrelic.common.userKey.secretName` and ### `newrelic.common.userKey.secretKeyName`
+Returns the secret and key inside the secret where to read a user key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.userKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "API_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.userKey.secretName" . }}
+          key: {{ include "newrelic.common.userKey.secretKeyName" . }}
+```
+
+
+
+## _userkey_secret.tpl
+### `newrelic.common.userKey.secret`
+This function templates the secret that is used by agents and integrations with a user key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any API key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.userKey.secret" . -}}
+```
+
+
+
+## _region.tpl
+### `newrelic.common.region.validate`
+Given a string, return a normalized name for the region if valid.
+
+This function does not need the context of the chart, only the value to be validated. The region returned
+honors the region [definition of the newrelic-client-go implementation](https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21)
+so (as of 2024/09/14) it returns the region as "US", "EU", "Staging", or "Local".
+
+In case the region provided does not match these 4, the helper calls `fail` and abort the templating.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region.validate" "us" }}
+```
+
+### `newrelic.common.region`
+It reads global and local variables for `region`:
+```yaml
+global:
+  region:  # Note that this can be empty (nil) or "" (empty string)
+region:  # Note that this can be empty (nil) or "" (empty string)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in your
+values a `region` is defined, the global one is going to be always ignored.
+
+This function gives protection so it enforces users to give the license key as a value in their
+`values.yaml` or specify a global or local `region` value. To understand how the `region` value
+works, read the documentation of `newrelic.common.region.validate`.
+
+The function will change the region from US, EU or Staging based of the license key and the
+`nrStaging` toggle. Whichever region is computed from the license/toggle can be overridden by
+the `region` value.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region" . }}
+```
+
+
+
+## _low-data-mode.tpl
+### `newrelic.common.lowDataMode`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  lowDataMode:  # Note that this is empty (nil)
+lowDataMode:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `lowdataMode` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.lowDataMode" . }}
+```
+
+
+
+## _privileged.tpl
+### `newrelic.common.privileged`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  privileged:  # Note that this is empty (nil)
+privileged:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `privileged` is defined, the global one is going to be always ignored.
+
+Chart writers could override this and put directly a `true` in the `values.yaml` to override the
+default of the common library.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged" . }}
+```
+
+### `newrelic.common.privileged.value`
+Returns true if privileged mode is enabled or false if not. This is to have the value of privileged ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged.value" . }}
+```
+
+
+
+## _proxy.tpl
+### `newrelic.common.proxy`
+Returns the proxy URL configured by the user. 
+
+Usage:
+```mustache
+{{ include "newrelic.common.proxy" . }}
+```
+
+
+
+## _security-context.tpl
+Use these functions to share the security context among all charts. Useful in clusters that have security enforcing not to
+use the root user (like OpenShift) or users that have an admission webhooks.
+
+The functions are:
+* `newrelic.common.securityContext.container`
+* `newrelic.common.securityContext.pod`
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+    spec:
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+
+      containers:
+        - name: example
+          {{- with include "nriKubernetes.securityContext.container" . }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+```
+
+
+
+## _staging.tpl
+### `newrelic.common.nrStaging`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  nrStaging:  # Note that this is empty (nil)
+nrStaging:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `nrStaging` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging" . }}
+```
+
+### `newrelic.common.nrStaging.value`
+Returns true if staging is enabled or false if not. This is to have the staging value ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging.value" . }}
+```
+
+
+
+## _verbose-log.tpl
+### `newrelic.common.verboseLog`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  verboseLog:  # Note that this is empty (nil)
+verboseLog:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `verboseLog` is defined, the global one is going to be always ignored.
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsBoolean`
+Returns true if verbose is enabled or false if not. This is to have the verbose value ready to be templated as a boolean
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsBoolean" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsInt`
+Returns 1 if verbose is enabled or 0 if not. This is to have the verbose value ready to be templated as an integer
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsInt" . }}
+```
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/README.md
new file mode 100644
index 000000000..10f08ca67
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/README.md
@@ -0,0 +1,106 @@
+# Helm Common library
+
+The common library is a way to unify the UX through all the Helm charts that implement it.
+
+The tooling suite that New Relic is huge and growing and this allows to set things globally
+and locally for a single chart.
+
+## Documentation for chart writers
+
+If you are writing a chart that is going to use this library you can check the [developers guide](/library/common-library/DEVELOPERS.md) to see all
+the functions/templates that we have implemented, what they do and how to use them.
+
+## Values managed globally
+
+We want to have a seamless experience through all the charts so we created this library that tries to standardize the behaviour
+of all the charts. Sadly, because of the complexity of all these integrations, not all the charts behave exactly as expected.
+
+An example is `newrelic-infrastructure` that ignores `hostNetwork` in the control plane scraper because most of the users has the
+control plane listening in the node to `localhost`.
+
+For each chart that has a special behavior (or further information of the behavior) there is a "chart particularities" section
+in its README.md that explains which is the expected behavior.
+
+At the time of writing this, all the charts from `nri-bundle` except `newrelic-logging` and `synthetics-minion` implements this
+library and honors global options as described in this document.
+
+Here is a list of global options:
+
+| Global keys | Local keys | Default | Merged[<sup>1</sup>](#values-managed-globally-1) | Description |
+|-------------|------------|---------|--------------------------------------------------|-------------|
+| global.cluster | cluster | `""` |  | Name of the Kubernetes cluster monitored |
+| global.licenseKey | licenseKey | `""` |  | This set this license key to use |
+| global.customSecretName | customSecretName | `""` |  | In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there |
+| global.customSecretLicenseKey | customSecretLicenseKey | `""` |  | In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located |
+| global.podLabels | podLabels | `{}` | yes | Additional labels for chart pods |
+| global.labels | labels | `{}` | yes | Additional labels for chart objects |
+| global.priorityClassName | priorityClassName | `""` |  | Sets pod's priorityClassName |
+| global.hostNetwork | hostNetwork | `false` |  | Sets pod's hostNetwork |
+| global.dnsConfig | dnsConfig | `{}` |  | Sets pod's dnsConfig |
+| global.images.registry | See [Further information](#values-managed-globally-2) | `""` |  | Changes the registry where to get the images. Useful when there is an internal image cache/proxy |
+| global.images.pullSecrets | See [Further information](#values-managed-globally-2) | `[]` | yes | Set secrets to be able to fetch images |
+| global.podSecurityContext | podSecurityContext | `{}` |  | Sets security context (at pod level) |
+| global.containerSecurityContext | containerSecurityContext | `{}` |  | Sets security context (at container level) |
+| global.affinity | affinity | `{}` |  | Sets pod/node affinities |
+| global.nodeSelector | nodeSelector | `{}` |  | Sets pod's node selector |
+| global.tolerations | tolerations | `[]` |  | Sets pod's tolerations to node taints |
+| global.serviceAccount.create | serviceAccount.create | `true` |  | Configures if the service account should be created or not |
+| global.serviceAccount.name | serviceAccount.name | name of the release |  | Change the name of the service account. This is honored if you disable on this cahrt the creation of the service account so you can use your own. |
+| global.serviceAccount.annotations | serviceAccount.annotations | `{}` | yes | Add these annotations to the service account we create |
+| global.customAttributes | customAttributes | `{}` |  | Adds extra attributes to the cluster and all the metrics emitted to the backend |
+| global.fedramp | fedramp | `false` |  | Enables FedRAMP |
+| global.lowDataMode | lowDataMode | `false` |  | Reduces number of metrics sent in order to reduce costs |
+| global.privileged | privileged | Depends on the chart |  | In each integration it has different behavior. See [Further information](#values-managed-globally-3) but all aims to send less metrics to the backend to try to save costs |
+| global.proxy | proxy | `""` |  | Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port` |
+| global.nrStaging | nrStaging | `false` |  | Send the metrics to the staging backend. Requires a valid staging license key |
+| global.verboseLog | verboseLog | `false` |  | Sets the debug/trace logs to this integration or all integrations if it is set globally |
+
+### Further information
+<a name="values-managed-globally-1"></a>
+#### 1. Merged
+
+Merged means that the values from global are not replaced by the local ones. Think in this example:
+```yaml
+global:
+  labels:
+    global: global
+  hostNetwork: true
+  nodeSelector:
+    global: global
+
+labels:
+  local: local
+nodeSelector:
+  local: local
+hostNetwork: false
+```
+
+This values will template `hostNetwork` to `false`, a map of labels `{ "global": "global", "local": "local" }` and a `nodeSelector` with
+`{ "local": "local" }`.
+
+As Helm by default merges all the maps it could be confusing that we have two behaviors (merging `labels` and replacing `nodeSelector`)
+the `values` from global to local. This is the rationale behind this:
+* `hostNetwork` is templated to `false` because is overriding the value defined globally.
+* `labels` are merged because the user may want to label all the New Relic pods at once and label other solution pods differently for
+  clarity' sake.
+* `nodeSelector` does not merge as `labels` because could make it harder to overwrite/delete a selector that comes from global because
+  of the logic that Helm follows merging maps.
+
+<a name="values-managed-globally-2"></a>
+#### 2. Fine grain registries
+
+Some charts only have 1 image while others that can have 2 or more images. The local path for the registry can change depending
+on the chart itself.
+
+As this is mostly unique per helm chart, you should take a look to the chart's values table (or directly to the `values.yaml` file to see all the
+images that you can change.
+
+This should only be needed if you have an advanced setup that forces you to have granularity enough to force a proxy/cache registry per integration.
+
+
+<a name="values-managed-globally-3"></a>
+#### 3. Privileged mode
+
+By default, from the common library, the privileged mode is set to false. But most of the helm charts require this to be true to fetch more
+metrics so could see a true in some charts. The consequences of the privileged mode differ from one chart to another so for each chart that
+honors the privileged mode toggle should be a section in the README explaining which is the behavior with it enabled or disabled.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_affinity.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_affinity.tpl
new file mode 100644
index 000000000..1b2636754
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_affinity.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod affinity */ -}}
+{{- define "newrelic.common.affinity" -}}
+    {{- if .Values.affinity -}}
+        {{- toYaml .Values.affinity -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.affinity -}}
+            {{- toYaml .Values.global.affinity -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_agent-config.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_agent-config.tpl
new file mode 100644
index 000000000..9c32861a0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_agent-config.tpl
@@ -0,0 +1,26 @@
+{{/*
+This helper should return the defaults that all agents should have
+*/}}
+{{- define "newrelic.common.agentConfig.defaults" -}}
+{{- if include "newrelic.common.verboseLog" . }}
+log:
+  level: trace
+{{- end }}
+
+{{- if (include "newrelic.common.nrStaging" . ) }}
+staging: true
+{{- end }}
+
+{{- with include "newrelic.common.proxy" . }}
+proxy: {{ . | quote }}
+{{- end }}
+
+{{- with include "newrelic.common.fedramp.enabled" . }}
+fedramp: {{ . }}
+{{- end }}
+
+{{- with fromYaml ( include "newrelic.common.customAttributes" . ) }}
+custom_attributes:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_cluster.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_cluster.tpl
new file mode 100644
index 000000000..0197dd35a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_cluster.tpl
@@ -0,0 +1,15 @@
+{{/*
+Return the cluster
+*/}}
+{{- define "newrelic.common.cluster" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.cluster -}}
+    {{- .Values.cluster -}}
+{{- else if $global.cluster -}}
+    {{- $global.cluster -}}
+{{- else -}}
+    {{ fail "There is not cluster name definition set neither in `.global.cluster' nor `.cluster' in your values.yaml. Cluster name is required." }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_custom-attributes.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_custom-attributes.tpl
new file mode 100644
index 000000000..92020719c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_custom-attributes.tpl
@@ -0,0 +1,17 @@
+{{/*
+This will render custom attributes as a YAML ready to be templated or be used with `fromYaml`.
+*/}}
+{{- define "newrelic.common.customAttributes" -}}
+{{- $customAttributes := dict -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- if $global.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes $global.customAttributes -}}
+{{- end -}}
+
+{{- if .Values.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes .Values.customAttributes -}}
+{{- end -}}
+
+{{- toYaml $customAttributes -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_dnsconfig.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_dnsconfig.tpl
new file mode 100644
index 000000000..d4e40aa8a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_dnsconfig.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod dnsConfig */ -}}
+{{- define "newrelic.common.dnsConfig" -}}
+    {{- if .Values.dnsConfig -}}
+        {{- toYaml .Values.dnsConfig -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.dnsConfig -}}
+            {{- toYaml .Values.global.dnsConfig -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_fedramp.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_fedramp.tpl
new file mode 100644
index 000000000..9df8d6b5e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_fedramp.tpl
@@ -0,0 +1,25 @@
+{{- /* Defines the fedRAMP flag */ -}}
+{{- define "newrelic.common.fedramp.enabled" -}}
+    {{- if .Values.fedramp -}}
+        {{- if .Values.fedramp.enabled -}}
+            {{- .Values.fedramp.enabled -}}
+        {{- end -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.fedramp -}}
+             {{- if .Values.global.fedramp.enabled -}}
+                {{- .Values.global.fedramp.enabled -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return FedRAMP value directly ready to be templated */ -}}
+{{- define "newrelic.common.fedramp.enabled.value" -}}
+{{- if include "newrelic.common.fedramp.enabled" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_hostnetwork.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_hostnetwork.tpl
new file mode 100644
index 000000000..4cf017ef7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_hostnetwork.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper allows to override the global `.global.hostNetwork` with the value of `.hostNetwork`.
+Returns "true" if `hostNetwork` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.hostNetwork" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- /*
+`get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs
+
+We also want only to return when this is true, returning `false` here will template "false" (string) when doing
+an `(include "newrelic.common.hostNetwork" .)`, which is not an "empty string" so it is `true` if it is used
+as an evaluation somewhere else.
+*/ -}}
+{{- if get .Values "hostNetwork" | kindIs "bool" -}}
+    {{- if .Values.hostNetwork -}}
+        {{- .Values.hostNetwork -}}
+    {{- end -}}
+{{- else if get $global "hostNetwork" | kindIs "bool" -}}
+    {{- if $global.hostNetwork -}}
+        {{- $global.hostNetwork -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper abstracts the function "newrelic.common.hostNetwork" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.hostNetwork.value" -}}
+{{- if include "newrelic.common.hostNetwork" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_images.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_images.tpl
new file mode 100644
index 000000000..d4fb43290
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_images.tpl
@@ -0,0 +1,94 @@
+{{- /*
+Return the proper image name
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.image" -}}
+    {{- $registryName := include "newrelic.common.images.registry" ( dict "imageRoot" .imageRoot "defaultRegistry" .defaultRegistry "context" .context ) -}}
+    {{- $repositoryName := include "newrelic.common.images.repository" .imageRoot -}}
+    {{- $tag := include "newrelic.common.images.tag" ( dict "imageRoot" .imageRoot "context" .context) -}}
+
+    {{- if $registryName -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag | quote -}}
+    {{- else -}}
+        {{- printf "%s:%s" $repositoryName $tag | quote -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image registry
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.registry" -}}
+{{- $globalRegistry := "" -}}
+{{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+        {{- with .context.Values.global.images.registry -}}
+            {{- $globalRegistry = . -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $localRegistry := "" -}}
+{{- if .imageRoot.registry -}}
+    {{- $localRegistry = .imageRoot.registry -}}
+{{- end -}}
+
+{{- $registry := $localRegistry | default $globalRegistry | default .defaultRegistry -}}
+{{- if $registry -}}
+    {{- $registry -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image repository
+{{ include "newrelic.common.images.repository" .Values.path.to.the.image }}
+*/ -}}
+{{- define "newrelic.common.images.repository" -}}
+    {{- .repository -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image tag
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.path.to.the.image "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.tag" -}}
+    {{- .imageRoot.tag | default .context.Chart.AppVersion | toString -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper Image Pull Registry Secret Names evaluating values as templates
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.path.to.the.images.pullSecrets1, .Values.path.to.the.images.pullSecrets2) "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.renderPullSecrets" -}}
+  {{- $flatlist := list }}
+
+  {{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+      {{- if .context.Values.global.images.pullSecrets -}}
+        {{- range .context.Values.global.images.pullSecrets -}}
+          {{- $flatlist = append $flatlist . -}}
+        {{- end -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- range .pullSecrets -}}
+    {{- if not (empty .) -}}
+      {{- range . -}}
+        {{- $flatlist = append $flatlist . -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if $flatlist -}}
+    {{- toYaml $flatlist -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_insights.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_insights.tpl
new file mode 100644
index 000000000..895c37732
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_insights.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the Insights Key.
+*/}}
+{{- define "newrelic.common.insightsKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "insightskey" ) -}}
+{{- include "newrelic.common.insightsKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secretKeyName" -}}
+{{- include "newrelic.common.insightsKey._customSecretKey" . | default "insightsKey" -}}
+{{- end -}}
+
+{{/*
+Return local insightsKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._licenseKey" -}}
+{{- if .Values.insightsKey -}}
+  {{- .Values.insightsKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.insightsKey -}}
+    {{- .Values.global.insightsKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the Insights Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretName" -}}
+{{- if .Values.customInsightsKeySecretName -}}
+  {{- .Values.customInsightsKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretName -}}
+    {{- .Values.global.customInsightsKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretKey" -}}
+{{- if .Values.customInsightsKeySecretKey -}}
+  {{- .Values.customInsightsKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretKey }}
+    {{- .Values.global.customInsightsKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_insights_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_insights_secret.yaml.tpl
new file mode 100644
index 000000000..556caa6ca
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_insights_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the insights key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secret" }}
+{{- if not (include "newrelic.common.insightsKey._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.insightsKey._licenseKey" .) }}
+    {{- fail "You must specify a insightsKey or a customInsightsSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.insightsKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.insightsKey.secretKeyName" . }}: {{ include "newrelic.common.insightsKey._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_labels.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_labels.tpl
new file mode 100644
index 000000000..b02594828
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_labels.tpl
@@ -0,0 +1,54 @@
+{{/*
+This will render the labels that should be used in all the manifests used by the helm chart.
+*/}}
+{{- define "newrelic.common.labels" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- $chart := dict "helm.sh/chart" (include "newrelic.common.naming.chart" . ) -}}
+{{- $managedBy := dict "app.kubernetes.io/managed-by" .Release.Service -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $labels := mustMergeOverwrite $chart $managedBy $selectorLabels -}}
+{{- if .Chart.AppVersion -}}
+{{- $labels = mustMergeOverwrite $labels (dict "app.kubernetes.io/version" .Chart.AppVersion) -}}
+{{- end -}}
+
+{{- $globalUserLabels := $global.labels | default dict -}}
+{{- $localUserLabels := .Values.labels | default dict -}}
+
+{{- $labels = mustMergeOverwrite $labels $globalUserLabels $localUserLabels -}}
+
+{{- toYaml $labels -}}
+{{- end -}}
+
+
+
+{{/*
+This will render the labels that should be used in deployments/daemonsets template pods as a selector.
+*/}}
+{{- define "newrelic.common.labels.selectorLabels" -}}
+{{- $name := dict "app.kubernetes.io/name" ( include "newrelic.common.naming.name" . ) -}}
+{{- $instance := dict "app.kubernetes.io/instance" .Release.Name -}}
+
+{{- $selectorLabels := mustMergeOverwrite $name $instance -}}
+
+{{- toYaml $selectorLabels -}}
+{{- end }}
+
+
+
+{{/*
+Pod labels
+*/}}
+{{- define "newrelic.common.labels.podLabels" -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- $globalPodLabels := $global.podLabels | default dict }}
+
+{{- $localPodLabels := .Values.podLabels | default dict }}
+
+{{- $podLabels := mustMergeOverwrite $selectorLabels $globalPodLabels $localPodLabels -}}
+
+{{- toYaml $podLabels -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_license.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_license.tpl
new file mode 100644
index 000000000..cb349f6bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_license.tpl
@@ -0,0 +1,68 @@
+{{/*
+Return the name of the secret holding the License Key.
+*/}}
+{{- define "newrelic.common.license.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "license" ) -}}
+{{- include "newrelic.common.license._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+*/}}
+{{- define "newrelic.common.license.secretKeyName" -}}
+{{- include "newrelic.common.license._customSecretKey" . | default "licenseKey" -}}
+{{- end -}}
+
+{{/*
+Return local licenseKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._licenseKey" -}}
+{{- if .Values.licenseKey -}}
+  {{- .Values.licenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.licenseKey -}}
+    {{- .Values.global.licenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the License Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretName" -}}
+{{- if .Values.customSecretName -}}
+  {{- .Values.customSecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretName -}}
+    {{- .Values.global.customSecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretKey" -}}
+{{- if .Values.customSecretLicenseKey -}}
+  {{- .Values.customSecretLicenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretLicenseKey }}
+    {{- .Values.global.customSecretLicenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the user set a custom secret for the license.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._usesCustomSecret" -}}
+{{- if or (include "newrelic.common.license._customSecretName" .) (include "newrelic.common.license._customSecretKey" .) -}}
+true
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_license_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_license_secret.yaml.tpl
new file mode 100644
index 000000000..610a0a337
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_license_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the license key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.license.secret" }}
+{{- if not (include "newrelic.common.license._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.license._licenseKey" .) }}
+    {{- fail "You must specify a licenseKey or a customSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.license.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.license.secretKeyName" . }}: {{ include "newrelic.common.license._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_low-data-mode.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_low-data-mode.tpl
new file mode 100644
index 000000000..3dd55ef2f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_low-data-mode.tpl
@@ -0,0 +1,26 @@
+{{- /*
+Abstraction of the lowDataMode toggle.
+This helper allows to override the global `.global.lowDataMode` with the value of `.lowDataMode`.
+Returns "true" if `lowDataMode` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.lowDataMode" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "lowDataMode" | kindIs "bool") -}}
+    {{- if .Values.lowDataMode -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.lowDataMode" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.lowDataMode -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "lowDataMode" | kindIs "bool" -}}
+    {{- if $global.lowDataMode -}}
+        {{- $global.lowDataMode -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_naming.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_naming.tpl
new file mode 100644
index 000000000..19fa92648
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_naming.tpl
@@ -0,0 +1,73 @@
+{{/*
+This is an function to be called directly with a string just to truncate strings to
+63 chars because some Kubernetes name fields are limited to that.
+*/}}
+{{- define "newrelic.common.naming.truncateToDNS" -}}
+{{- . | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+
+
+{{- /*
+Given a name and a suffix returns a 'DNS Valid' which always include the suffix, truncating the name if needed.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If suffix is too long it gets truncated but it always takes precedence over name, so a 63 chars suffix would suppress the name.
+Usage:
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" "<my-name>" "suffix" "my-suffix" ) }}
+*/ -}}
+{{- define "newrelic.common.naming.truncateToDNSWithSuffix" -}}
+{{- $suffix := (include "newrelic.common.naming.truncateToDNS" .suffix) -}}
+{{- $maxLen := (max (sub 63 (add1 (len $suffix))) 0) -}} {{- /* We prepend "-" to the suffix so an additional character is needed */ -}}
+
+{{- $newName := .name | trunc ($maxLen | int) | trimSuffix "-"  -}}
+{{- if $newName -}}
+{{- printf "%s-%s" $newName $suffix -}}
+{{- else -}}
+{{ $suffix }}
+{{- end -}}
+
+{{- end -}}
+
+
+
+{{/*
+Expand the name of the chart.
+Uses the Chart name by default if nameOverride is not set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.name" -}}
+{{- $name := .Values.nameOverride | default .Chart.Name -}}
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+{{- end }}
+
+
+
+{{/*
+Create a default fully qualified app name.
+By default the full name will be "<release_name>" just in if it has the chart name included in that, if not
+it will be concatenated like "<release_name>-<chart_chart>". This could change if fullnameOverride or
+nameOverride are set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.fullname" -}}
+{{- $name := include "newrelic.common.naming.name" . -}}
+
+{{- if .Values.fullnameOverride -}}
+    {{- $name = .Values.fullnameOverride  -}}
+{{- else if not (contains $name .Release.Name) -}}
+    {{- $name = printf "%s-%s" .Release.Name $name -}}
+{{- end -}}
+
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+
+{{- end -}}
+
+
+
+{{/*
+Create chart name and version as used by the chart label.
+This function should not be used for naming objects. Use "common.naming.{name,fullname}" instead.
+*/}}
+{{- define "newrelic.common.naming.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_nodeselector.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_nodeselector.tpl
new file mode 100644
index 000000000..d48887341
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_nodeselector.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod nodeSelector */ -}}
+{{- define "newrelic.common.nodeSelector" -}}
+    {{- if .Values.nodeSelector -}}
+        {{- toYaml .Values.nodeSelector -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.nodeSelector -}}
+            {{- toYaml .Values.global.nodeSelector -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_priority-class-name.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_priority-class-name.tpl
new file mode 100644
index 000000000..50182b734
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_priority-class-name.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the pod priorityClassName */ -}}
+{{- define "newrelic.common.priorityClassName" -}}
+    {{- if .Values.priorityClassName -}}
+        {{- .Values.priorityClassName -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.priorityClassName -}}
+            {{- .Values.global.priorityClassName -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_privileged.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_privileged.tpl
new file mode 100644
index 000000000..f3ae814dd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_privileged.tpl
@@ -0,0 +1,28 @@
+{{- /*
+This is a helper that returns whether the chart should assume the user is fine deploying privileged pods.
+*/ -}}
+{{- define "newrelic.common.privileged" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists. */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if get .Values "privileged" | kindIs "bool" -}}
+    {{- if .Values.privileged -}}
+        {{- .Values.privileged -}}
+    {{- end -}}
+{{- else if get $global "privileged" | kindIs "bool" -}}
+    {{- if $global.privileged -}}
+        {{- $global.privileged -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return directly "true" or "false" based in the exist of "newrelic.common.privileged" */ -}}
+{{- define "newrelic.common.privileged.value" -}}
+{{- if include "newrelic.common.privileged" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_proxy.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_proxy.tpl
new file mode 100644
index 000000000..60f34c7ec
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_proxy.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the proxy */ -}}
+{{- define "newrelic.common.proxy" -}}
+    {{- if .Values.proxy -}}
+        {{- .Values.proxy -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.proxy -}}
+            {{- .Values.global.proxy -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_region.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_region.tpl
new file mode 100644
index 000000000..bdcacf323
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_region.tpl
@@ -0,0 +1,74 @@
+{{/*
+Return the region that is being used by the user
+*/}}
+{{- define "newrelic.common.region" -}}
+{{- if and (include "newrelic.common.license._usesCustomSecret" .) (not (include "newrelic.common.region._fromValues" .)) -}}
+  {{- fail "This Helm Chart is not able to compute the region. You must specify a .global.region or .region if the license is set using a custom secret." -}}
+{{- end -}}
+
+{{- /* Defaults */ -}}
+{{- $region := "us" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+  {{- $region = "staging" -}}
+{{- else if include "newrelic.common.region._isEULicenseKey" . -}}
+  {{- $region = "eu" -}}
+{{- end -}}
+
+{{- include "newrelic.common.region.validate" (include "newrelic.common.region._fromValues" . | default $region ) -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values if valid. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+
+Usage: `include "newrelic.common.region.validate" "us"`
+*/}}
+{{- define "newrelic.common.region.validate" -}}
+{{- /* Ref: https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21 */ -}}
+{{- $region := . | lower -}}
+{{- if eq $region "us" -}}
+  US
+{{- else if eq $region "eu" -}}
+  EU
+{{- else if eq $region "staging" -}}
+  Staging
+{{- else if eq $region "local" -}}
+  Local
+{{- else -}}
+  {{- fail (printf "the region provided is not valid: %s not in \"US\" \"EU\" \"Staging\" \"Local\"" .) -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._fromValues" -}}
+{{- if .Values.region -}}
+  {{- .Values.region -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.region -}}
+    {{- .Values.global.region -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the license is for EU region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._isEULicenseKey" -}}
+{{- if not (include "newrelic.common.license._usesCustomSecret" .) -}}
+  {{- $license := include "newrelic.common.license._licenseKey" . -}}
+  {{- if hasPrefix "eu" $license -}}
+    true
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_security-context.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_security-context.tpl
new file mode 100644
index 000000000..9edfcabfd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_security-context.tpl
@@ -0,0 +1,23 @@
+{{- /* Defines the container securityContext context */ -}}
+{{- define "newrelic.common.securityContext.container" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.containerSecurityContext -}}
+    {{- toYaml .Values.containerSecurityContext -}}
+{{- else if $global.containerSecurityContext -}}
+    {{- toYaml $global.containerSecurityContext -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the pod securityContext context */ -}}
+{{- define "newrelic.common.securityContext.pod" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.podSecurityContext -}}
+    {{- toYaml .Values.podSecurityContext -}}
+{{- else if $global.podSecurityContext -}}
+    {{- toYaml $global.podSecurityContext -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_serviceaccount.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_serviceaccount.tpl
new file mode 100644
index 000000000..2d352f6ea
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_serviceaccount.tpl
@@ -0,0 +1,90 @@
+{{- /* Defines if the service account has to be created or not */ -}}
+{{- define "newrelic.common.serviceAccount.create" -}}
+{{- $valueFound := false -}}
+
+{{- /* Look for a global creation of a service account */ -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "create" | kindIs "bool") -}}
+        {{- $valueFound = true -}}
+        {{- if .Values.serviceAccount.create -}}
+            {{- /*
+                We want only to return when this is true, returning `false` here will template "false" (string) when doing
+                an `(include "newrelic.common.serviceAccount.name" .)`, which is not an "empty string" so it is `true` if it is used
+                as an evaluation somewhere else.
+            */ -}}
+            {{- .Values.serviceAccount.create -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* Look for a local creation of a service account */ -}}
+{{- if not $valueFound -}}
+    {{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+    {{- $global := index .Values "global" | default dict -}}
+    {{- if get $global "serviceAccount" | kindIs "map" -}}
+        {{- if get $global.serviceAccount "create" | kindIs "bool" -}}
+            {{- $valueFound = true -}}
+            {{- if $global.serviceAccount.create -}}
+                {{- $global.serviceAccount.create -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* In case no serviceAccount value has been found, default to "true" */ -}}
+{{- if not $valueFound -}}
+true
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the name of the service account */ -}}
+{{- define "newrelic.common.serviceAccount.name" -}}
+{{- $localServiceAccount := "" -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "name" | kindIs "string") -}}
+        {{- $localServiceAccount = .Values.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := "" -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "name" | kindIs "string" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- if (include "newrelic.common.serviceAccount.create" .) -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default (include "newrelic.common.naming.fullname" .) -}}
+{{- else -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default "default" -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Merge the global and local annotations for the service account */ -}}
+{{- define "newrelic.common.serviceAccount.annotations" -}}
+{{- $localServiceAccount := dict -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if get .Values.serviceAccount "annotations" -}}
+        {{- $localServiceAccount = .Values.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := dict -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "annotations" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $merged := mustMergeOverwrite $globalServiceAccount $localServiceAccount -}}
+
+{{- if $merged -}}
+    {{- toYaml $merged -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_staging.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_staging.tpl
new file mode 100644
index 000000000..bd9ad09bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_staging.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the nrStaging toggle.
+This helper allows to override the global `.global.nrStaging` with the value of `.nrStaging`.
+Returns "true" if `nrStaging` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.nrStaging" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "nrStaging" | kindIs "bool") -}}
+    {{- if .Values.nrStaging -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.nrStaging" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.nrStaging -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "nrStaging" | kindIs "bool" -}}
+    {{- if $global.nrStaging -}}
+        {{- $global.nrStaging -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Returns "true" of "false" directly instead of empty string (Helm falsiness) based on the exit of "newrelic.common.nrStaging"
+*/ -}}
+{{- define "newrelic.common.nrStaging.value" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_tolerations.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_tolerations.tpl
new file mode 100644
index 000000000..e016b38e2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_tolerations.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod tolerations */ -}}
+{{- define "newrelic.common.tolerations" -}}
+    {{- if .Values.tolerations -}}
+        {{- toYaml .Values.tolerations -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.tolerations -}}
+            {{- toYaml .Values.global.tolerations -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_userkey.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_userkey.tpl
new file mode 100644
index 000000000..982ea8e09
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_userkey.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the API Key.
+*/}}
+{{- define "newrelic.common.userKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "userkey" ) -}}
+{{- include "newrelic.common.userKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+*/}}
+{{- define "newrelic.common.userKey.secretKeyName" -}}
+{{- include "newrelic.common.userKey._customSecretKey" . | default "userKey" -}}
+{{- end -}}
+
+{{/*
+Return local API Key if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._userKey" -}}
+{{- if .Values.userKey -}}
+  {{- .Values.userKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.userKey -}}
+    {{- .Values.global.userKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the API Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretName" -}}
+{{- if .Values.customUserKeySecretName -}}
+  {{- .Values.customUserKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretName -}}
+    {{- .Values.global.customUserKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretKey" -}}
+{{- if .Values.customUserKeySecretKey -}}
+  {{- .Values.customUserKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretKey }}
+    {{- .Values.global.customUserKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_userkey_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_userkey_secret.yaml.tpl
new file mode 100644
index 000000000..b97985654
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_userkey_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the user key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.userKey.secret" }}
+{{- if not (include "newrelic.common.userKey._customSecretName" .) }}
+{{- /* Fail if user key is empty and required: */ -}}
+{{- if not (include "newrelic.common.userKey._userKey" .) }}
+    {{- fail "You must specify a userKey or a customUserKeySecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.userKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.userKey.secretKeyName" . }}: {{ include "newrelic.common.userKey._userKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_verbose-log.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_verbose-log.tpl
new file mode 100644
index 000000000..2286d4681
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/templates/_verbose-log.tpl
@@ -0,0 +1,54 @@
+{{- /*
+Abstraction of the verbose toggle.
+This helper allows to override the global `.global.verboseLog` with the value of `.verboseLog`.
+Returns "true" if `verbose` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.verboseLog" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "verboseLog" | kindIs "bool") -}}
+    {{- if .Values.verboseLog -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.verboseLog" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.verboseLog -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "verboseLog" | kindIs "bool" -}}
+    {{- if $global.verboseLog -}}
+        {{- $global.verboseLog -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsBoolean" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return 1 or 0 directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsInt" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+1
+{{- else -}}
+0
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/values.yaml
new file mode 100644
index 000000000..75e2d112a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/charts/common-library/values.yaml
@@ -0,0 +1 @@
+# values are not needed for the library chart, however this file is still needed for helm lint to work.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/NOTES.txt b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/NOTES.txt
new file mode 100644
index 000000000..f5d1cb647
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/NOTES.txt
@@ -0,0 +1,36 @@
+This project is currently in preview.
+Issues and contributions should be reported to the project's GitHub.
+{{- if (include "k8s-agents-operator.areValuesValid" .) }}
+=====================================
+
+                             ********
+                         ****************
+                     **********    **********,
+                    &&&****            ****/(((
+                    &&&&&&&              ((((((
+                     &&&&&&&&&&          ((((((
+                         &&&&&&&&        ((((((
+                            &&&&&        ((((((
+                            &&&&&      ((((((((
+                            &&&&& .((((((((((
+                            &&&&&((((((((
+                              &&&(((,
+
+Your deployment of the New Relic Agent Operator is complete.
+You can check on the progress of this by running the following command:
+
+kubectl get deployments -o wide -w --namespace {{ .Release.Namespace }} {{ include "newrelic.common.naming.fullname" . }}
+
+WARNING: This deployment will be incomplete until you configure your Instrumentation custom resource definition.
+=====================================
+
+Please visit https://github.com/newrelic/k8s-agents-operator for instructions on how to create & configure the
+Instrumentation custom resource definition required by the Operator.
+{{- else }}
+
+##############################################################################
+####     ERROR: You did not set a license key.                            ####
+##############################################################################
+
+This deployment will be incomplete until you get your ingest license key from New Relic.
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/_helpers.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/_helpers.tpl
new file mode 100644
index 000000000..9e57804bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/_helpers.tpl
@@ -0,0 +1,25 @@
+{{/*
+Returns if the template should render, it checks if the required values are set.
+*/}}
+{{- define "k8s-agents-operator.areValuesValid" -}}
+{{- $licenseKey := include "newrelic.common.license._licenseKey" . -}}
+{{- and (or $licenseKey)}}
+{{- end -}}
+
+{{- define "k8s-agents-operator.manager.image" -}}
+{{- $managerVersion := .Values.controllerManager.manager.image.version | default .Chart.AppVersion -}}
+{{- if eq (substr 0 7 $managerVersion) "sha256:" -}}
+{{- printf "%s@%s" .Values.controllerManager.manager.image.repository $managerVersion -}}
+{{- else -}}
+{{- printf "%s:%s" .Values.controllerManager.manager.image.repository $managerVersion -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "k8s-agents-operator.kubeRbacProxy.image" -}}
+{{- $kubeRbacProxyVersion := .Values.controllerManager.kubeRbacProxy.image.version | default .Chart.AppVersion -}}
+{{- if eq (substr 0 7 $kubeRbacProxyVersion) "sha256:" -}}
+{{- printf "%s@%s" .Values.controllerManager.kubeRbacProxy.image.repository $kubeRbacProxyVersion -}}
+{{- else -}}
+{{- printf "%s:%s" .Values.controllerManager.kubeRbacProxy.image.repository $kubeRbacProxyVersion -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/_naming.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/_naming.tpl
new file mode 100644
index 000000000..39498726d
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/_naming.tpl
@@ -0,0 +1,52 @@
+{{/* Controller manager service certificate's secret. */}}
+{{- define "k8s-agents-operator.certificateSecret.name" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "controller-manager-service-cert") -}}
+{{- end }}
+
+{{- define "k8s-agents-operator.webhook.service.name" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "webhook-service") -}}
+{{- end -}}
+
+{{- define "k8s-agents-operator.webhook.mutating.name" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "mutation") -}}
+{{- end -}}
+
+{{- define "k8s-agents-operator.webhook.validating.name" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "validation") -}}
+{{- end -}}
+
+{{- define "k8s-agents-operator.cert-manager.issuer.name" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "selfsigned-issuer") -}}
+{{- end -}}
+
+{{- define "k8s-agents-operator.cert-manager.certificate.name" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "serving-cert") -}}
+{{- end -}}
+
+{{- define "k8s-agents-operator.rbac.proxy.role.name" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "proxy-role") -}}
+{{- end -}}
+
+{{- define "k8s-agents-operator.rbac.proxy.roleBinding.name" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "proxy-rolebinding") -}}
+{{- end -}}
+
+{{- define "k8s-agents-operator.rbac.manager.role.name" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "manager-role") -}}
+{{- end -}}
+
+{{- define "k8s-agents-operator.rbac.manager.roleBinding.name" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "manager-rolebinding") -}}
+{{- end -}}
+
+{{- define "k8s-agents-operator.rbac.leaderElection.role.name" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "leader-election-role") -}}
+{{- end -}}
+
+{{- define "k8s-agents-operator.rbac.leaderElection.roleBinding.name" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "leader-election-rolebinding") -}}
+{{- end -}}
+
+{{- define "k8s-agents-operator.rbac.metricsReader.role.name" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "metrics-reader") -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/_security_context.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/_security_context.tpl
new file mode 100644
index 000000000..a3b079719
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/_security_context.tpl
@@ -0,0 +1,21 @@
+{{- /*
+A helper to return the container security context to apply to kubeRbacProxy.
+*/ -}}
+{{- define "k8s-agents-operator.kubeRbacProxy.securityContext.container" -}}
+{{- if .Values.controllerManager.kubeRbacProxy.containerSecurityContext -}}
+    {{- toYaml .Values.controllerManager.kubeRbacProxy.containerSecurityContext -}}
+{{- else if include "newrelic.common.securityContext.container" . -}}
+    {{- include "newrelic.common.securityContext.container" . -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+A helper to return the container security context to apply to the manager.
+*/ -}}
+{{- define "k8s-agents-operator.manager.securityContext.container" -}}
+{{- if .Values.controllerManager.manager.containerSecurityContext -}}
+    {{- toYaml .Values.controllerManager.manager.containerSecurityContext -}}
+{{- else if include "newrelic.common.securityContext.container" . -}}
+    {{- include "newrelic.common.securityContext.container" . -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/_tls.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/_tls.tpl
new file mode 100644
index 000000000..b57e03cfc
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/_tls.tpl
@@ -0,0 +1,40 @@
+{{/*
+Return certificate and CA for Webhooks.
+It handles variants when a cert has to be generated by Helm,
+a cert is loaded from an existing secret or is provided via `.Values`
+*/}}
+{{- define "k8s-agents-operator.webhookCert" -}}
+{{- $caCert := "" }}
+{{- $clientCert := "" }}
+{{- $clientKey := "" }}
+{{- if .Values.admissionWebhooks.autoGenerateCert.enabled }}
+    {{- $prevSecret := (lookup "v1" "Secret" .Release.Namespace (include "k8s-agents-operator.certificateSecret.name" . )) }}
+    {{- if and (not .Values.admissionWebhooks.autoGenerateCert.recreate) $prevSecret }}
+        {{- $clientCert = index $prevSecret "data" "tls.crt" }}
+        {{- $clientKey = index $prevSecret "data" "tls.key" }}
+        {{- $caCert = index $prevSecret "data" "ca.crt" }}
+        {{- if not $caCert }}
+            {{- $prevHook := (lookup "admissionregistration.k8s.io/v1" "MutatingWebhookConfiguration" .Release.Namespace (print (include "newrelic.common.naming.fullname" . ) "-mutation")) }}
+            {{- if not (eq (toString $prevHook) "<nil>") }}
+                {{- $caCert = (first $prevHook.webhooks).clientConfig.caBundle }}
+            {{- end }}
+        {{- end }}
+    {{- else }}
+        {{- $certValidity := int .Values.admissionWebhooks.autoGenerateCert.certPeriodDays | default 365 }}
+        {{- $ca := genCA "k8s-agents-operator-operator-ca" $certValidity }}
+        {{- $domain1 := printf "%s.%s.svc" (include "k8s-agents-operator.webhook.service.name" .) $.Release.Namespace }}
+        {{- $domain2 := printf "%s.%s.svc.%s" (include "k8s-agents-operator.webhook.service.name" .) $.Release.Namespace $.Values.kubernetesClusterDomain }}
+        {{- $domains := list $domain1 $domain2 }}
+        {{- $cert := genSignedCert (include "newrelic.common.naming.fullname" .) nil $domains $certValidity $ca }}
+        {{- $clientCert = b64enc $cert.Cert }}
+        {{- $clientKey = b64enc $cert.Key }}
+        {{- $caCert = b64enc $ca.Cert }}
+    {{- end }}
+{{- else }}
+    {{- $clientCert = .Files.Get .Values.admissionWebhooks.certFile | b64enc }}
+    {{- $clientKey = .Files.Get .Values.admissionWebhooks.keyFile | b64enc }}
+    {{- $caCert = .Files.Get .Values.admissionWebhooks.caFile | b64enc }}
+{{- end }}
+{{- $result := dict "clientCert" $clientCert "clientKey" $clientKey "caCert" $caCert }}
+{{- $result | toYaml }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/deployment.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/deployment.yaml
new file mode 100644
index 000000000..0d7a56f87
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/deployment.yaml
@@ -0,0 +1,122 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    control-plane: controller-manager
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.controllerManager.replicas }}
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+      control-plane: controller-manager
+  template:
+    metadata:
+      labels:
+        control-plane: controller-manager
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    spec:
+      serviceAccountName: {{ include "newrelic.common.serviceAccount.name" . }}
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.priorityClassName" . }}
+      priorityClassName: {{ . }}
+      {{- end }}
+      {{- with include "newrelic.common.dnsConfig" . }}
+      dnsConfig:
+        {{- . | nindent 8 }}
+      {{- end }}
+      terminationGracePeriodSeconds: 10
+      containers:
+      - name: manager
+        {{- with include "k8s-agents-operator.manager.securityContext.container" . }}
+        securityContext:
+          {{- . | nindent 10 }}
+        {{- end }}
+        args:
+        - --metrics-addr=127.0.0.1:8080
+        {{- if .Values.controllerManager.manager.leaderElection.enabled }}
+        - --enable-leader-election
+        {{- end }}
+        - --zap-log-level=info
+        - --zap-time-encoding=rfc3339nano
+        env:
+        - name: OPERATOR_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        - name: ENABLE_WEBHOOKS
+          value: "true"
+        image: {{ include "k8s-agents-operator.manager.image" . }}
+        imagePullPolicy: {{ .Values.controllerManager.manager.image.pullPolicy | default "Always" }}
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8081
+          initialDelaySeconds: 15
+          periodSeconds: 20
+        ports:
+        - containerPort: 9443
+          name: webhook-server
+          protocol: TCP
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: 8081
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        resources:
+          {{- toYaml .Values.controllerManager.manager.resources | nindent 10 }}
+        volumeMounts:
+        - mountPath: /tmp/k8s-webhook-server/serving-certs
+          name: cert
+          readOnly: true
+      - name: kube-rbac-proxy
+        {{- with include "k8s-agents-operator.kubeRbacProxy.securityContext.container" . }}
+        securityContext:
+          {{- . | nindent 10 }}
+        {{- end }}
+        args:
+        - --secure-listen-address=0.0.0.0:8443
+        - --upstream=http://127.0.0.1:8080/
+        - --logtostderr=true
+        - --v=0
+        env:
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        image: {{ include "k8s-agents-operator.kubeRbacProxy.image" . }}
+        ports:
+        - containerPort: 8443
+          name: https
+          protocol: TCP
+        resources:
+          {{- toYaml .Values.controllerManager.kubeRbacProxy.resources | nindent 10 }}
+      {{- if or .Values.admissionWebhooks.create (include "k8s-agents-operator.certificateSecret.name" . ) }}
+      volumes:
+      - name: cert
+        secret:
+          defaultMode: 420
+          secretName: {{ include "k8s-agents-operator.certificateSecret.name" . }}
+      {{- end }}
+      {{- with include "newrelic.common.nodeSelector" . }}
+      nodeSelector:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.affinity" . }}
+      affinity:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.tolerations" . }}
+      tolerations:
+        {{- . | nindent 8 }}
+      {{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/instrumentation-crd.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/instrumentation-crd.yaml
new file mode 100644
index 000000000..68dbde935
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/instrumentation-crd.yaml
@@ -0,0 +1,407 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: instrumentations.newrelic.com
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.14.0
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  group: newrelic.com
+  names:
+    kind: Instrumentation
+    listKind: InstrumentationList
+    plural: instrumentations
+    shortNames:
+    - nragent
+    - nragents
+    singular: instrumentation
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: Instrumentation is the Schema for the instrumentations API
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: InstrumentationSpec defines the desired state of Instrumentation
+            properties:
+              agent:
+                description: Agent defines configuration for agent instrumentation.
+                properties:
+                  env:
+                    description: |-
+                      Env defines Go specific env vars. There are four layers for env vars' definitions and
+                      the precedence order is: `original container env vars` > `language specific env vars` > `common env vars` > `instrument spec configs' vars`.
+                      If the former var had been defined, then the other vars would be ignored.
+                    items:
+                      description: EnvVar represents an environment variable present
+                        in a Container.
+                      properties:
+                        name:
+                          description: Name of the environment variable. Must be a C_IDENTIFIER.
+                          type: string
+                        value:
+                          description: |-
+                            Variable references $(VAR_NAME) are expanded
+                            using the previously defined environment variables in the container and
+                            any service environment variables. If a variable cannot be resolved,
+                            the reference in the input string will be unchanged. Double $$ are reduced
+                            to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                            "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                            Escaped references will never be expanded, regardless of whether the variable
+                            exists or not.
+                            Defaults to "".
+                          type: string
+                        valueFrom:
+                          description: Source for the environment variable's value.
+                            Cannot be used if value is not empty.
+                          properties:
+                            configMapKeyRef:
+                              description: Selects a key of a ConfigMap.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  description: |-
+                                    Name of the referent.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    TODO: Add other useful fields. apiVersion, kind, uid?
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            fieldRef:
+                              description: |-
+                                Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
+                              properties:
+                                apiVersion:
+                                  description: Version of the schema the FieldPath is
+                                    written in terms of, defaults to "v1".
+                                  type: string
+                                fieldPath:
+                                  description: Path of the field to select in the specified
+                                    API version.
+                                  type: string
+                              required:
+                              - fieldPath
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            resourceFieldRef:
+                              description: |-
+                                Selects a resource of the container: only resources limits and requests
+                                (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
+                              properties:
+                                containerName:
+                                  description: 'Container name: required for volumes,
+                                    optional for env vars'
+                                  type: string
+                                divisor:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: Specifies the output format of the exposed
+                                    resources, defaults to "1"
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                resource:
+                                  description: 'Required: resource to select'
+                                  type: string
+                              required:
+                              - resource
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secretKeyRef:
+                              description: Selects a key of a secret in the pod's namespace
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  description: |-
+                                    Name of the referent.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    TODO: Add other useful fields. apiVersion, kind, uid?
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                      required:
+                      - name
+                      type: object
+                    type: array
+                  image:
+                    description: Image is a container image with Go SDK and auto-instrumentation.
+                    type: string
+                  language:
+                    description: Language is the language that will be instrumented.
+                    type: string
+                  resourceRequirements:
+                    description: Resources describes the compute resource requirements.
+                    properties:
+                      claims:
+                        description: |-
+                          Claims lists the names of resources, defined in spec.resourceClaims,
+                          that are used by this container.
+  
+  
+                          This is an alpha field and requires enabling the
+                          DynamicResourceAllocation feature gate.
+  
+  
+                          This field is immutable. It can only be set for containers.
+                        items:
+                          description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                          properties:
+                            name:
+                              description: |-
+                                Name must match the name of one entry in pod.spec.resourceClaims of
+                                the Pod where this field is used. It makes that resource available
+                                inside a container.
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
+                      limits:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: |-
+                          Limits describes the maximum amount of compute resources allowed.
+                          More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                        type: object
+                      requests:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: |-
+                          Requests describes the minimum amount of compute resources required.
+                          If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                          otherwise to an implementation-defined value.
+                          More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                        type: object
+                    type: object
+                  volumeLimitSize:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: |-
+                      VolumeSizeLimit defines size limit for volume used for auto-instrumentation.
+                      The default size is 200Mi.
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
+                type: object
+              exporter:
+                description: Exporter defines exporter configuration.
+                properties:
+                  endpoint:
+                    description: Endpoint is address of the collector with OTLP endpoint.
+                    type: string
+                type: object
+              licenseKeySecret:
+                description: |-
+                  LicenseKeySecret defines where to take the licenseKeySecret.
+                  it should be present in the operator namespace.
+                type: string
+              namespaceLabelSelector:
+                description: PodLabelSelector defines to which pods the config should
+                  be applied.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              podLabelSelector:
+                description: PodLabelSelector defines to which pods the config should
+                  be applied.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              propagators:
+                description: |-
+                  Propagators defines inter-process context propagation configuration.
+                  Values in this list will be set in the OTEL_PROPAGATORS env var.
+                  Enum=tracecontext;none
+                items:
+                  description: Propagator represents the propagation type.
+                  enum:
+                  - tracecontext
+                  - none
+                  type: string
+                type: array
+              resource:
+                description: Resource defines the configuration for the resource attributes,
+                  as defined by the OpenTelemetry specification.
+                properties:
+                  addK8sUIDAttributes:
+                    description: AddK8sUIDAttributes defines whether K8s UID attributes
+                      should be collected (e.g. k8s.deployment.uid).
+                    type: boolean
+                  resourceAttributes:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Attributes defines attributes that are added to the resource.
+                      For example environment: dev
+                    type: object
+                type: object
+              sampler:
+                description: Sampler defines sampling configuration.
+                properties:
+                  argument:
+                    description: |-
+                      Argument defines sampler argument.
+                      The value depends on the sampler type.
+                      For instance for parentbased_traceidratio sampler type it is a number in range [0..1] e.g. 0.25.
+                      The value will be set in the OTEL_TRACES_SAMPLER_ARG env var.
+                    type: string
+                  type:
+                    description: |-
+                      Type defines sampler type.
+                      The value will be set in the OTEL_TRACES_SAMPLER env var.
+                      The value can be for instance parentbased_always_on, parentbased_always_off, parentbased_traceidratio...
+                    enum:
+                    - always_on
+                    - always_off
+                    - traceidratio
+                    - parentbased_always_on
+                    - parentbased_always_off
+                    - parentbased_traceidratio
+                    type: string
+                type: object
+            type: object
+          status:
+            description: InstrumentationStatus defines the observed state of Instrumentation
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/leader-election-rbac.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/leader-election-rbac.yaml
new file mode 100644
index 000000000..65111dd95
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/leader-election-rbac.yaml
@@ -0,0 +1,51 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "k8s-agents-operator.rbac.leaderElection.role.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - ""
+  resources:
+  - configmaps/status
+  verbs:
+  - get
+  - update
+  - patch
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "k8s-agents-operator.rbac.leaderElection.roleBinding.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "k8s-agents-operator.rbac.leaderElection.role.name" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/manager-rbac.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/manager-rbac.yaml
new file mode 100644
index 000000000..a292d931a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/manager-rbac.yaml
@@ -0,0 +1,88 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "k8s-agents-operator.rbac.manager.role.name" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+- apiGroups: [ "" ]
+  resources: ["secrets"]
+  verbs:
+    - get
+    - list
+    - create
+    - delete
+    - deletecollection
+    - patch
+    - update
+    - watch
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - apps
+  resources:
+  - replicasets
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - create
+  - get
+  - list
+  - update
+- apiGroups:
+  - newrelic.com
+  resources:
+  - instrumentations
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - route.openshift.io
+  resources:
+  - routes
+  - routes/custom-host
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "k8s-agents-operator.rbac.manager.roleBinding.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "k8s-agents-operator.rbac.manager.role.name" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/metrics-reader-rbac.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/metrics-reader-rbac.yaml
new file mode 100644
index 000000000..d76636a23
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/metrics-reader-rbac.yaml
@@ -0,0 +1,11 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "k8s-agents-operator.rbac.metricsReader.role.name" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+- nonResourceURLs:
+  - /metrics
+  verbs:
+  - get
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/metrics-service.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/metrics-service.yaml
new file mode 100644
index 000000000..427f60f08
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/metrics-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    control-plane: controller-manager
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.metricsService.type }}
+  selector:
+    {{- include "newrelic.common.labels.selectorLabels" . | nindent 4 }}
+    control-plane: controller-manager
+  ports:
+	{{- .Values.metricsService.ports | toYaml | nindent 2 -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/proxy-rbac.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/proxy-rbac.yaml
new file mode 100644
index 000000000..47f300926
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/proxy-rbac.yaml
@@ -0,0 +1,35 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "k8s-agents-operator.rbac.proxy.role.name" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create
+- apiGroups:
+  - authorization.k8s.io
+  resources:
+  - subjectaccessreviews
+  verbs:
+  - create
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "k8s-agents-operator.rbac.proxy.roleBinding.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "k8s-agents-operator.rbac.proxy.role.name" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/secret.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/secret.yaml
new file mode 100644
index 000000000..b437d4f14
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/secret.yaml
@@ -0,0 +1,19 @@
+{{/*
+Renders the license key secret if user has not specified a custom secret.
+*/}}
+{{- if not (include "newrelic.common.license._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.license._licenseKey" .) }}
+    {{- fail "You must specify a licenseKey" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: newrelic-key-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  new_relic_license_key: {{ include "newrelic.common.license._licenseKey" . | b64enc }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/selfsigned-issuer.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/selfsigned-issuer.yaml
new file mode 100644
index 000000000..13e089b9c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/selfsigned-issuer.yaml
@@ -0,0 +1,11 @@
+{{- if and .Values.admissionWebhooks.create .Values.admissionWebhooks.certManager.enabled }}
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ include "k8s-agents-operator.cert-manager.issuer.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  selfSigned: {}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/service-account.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/service-account.yaml
new file mode 100644
index 000000000..552e9e1c5
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/service-account.yaml
@@ -0,0 +1,11 @@
+{{- if include "newrelic.common.serviceAccount.create" . }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  annotations:
+    {{- include "newrelic.common.serviceAccount.annotations" . | nindent 4 }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/serving-cert.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/serving-cert.yaml
new file mode 100644
index 000000000..76e005a3a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/serving-cert.yaml
@@ -0,0 +1,20 @@
+{{- if and .Values.admissionWebhooks.create .Values.admissionWebhooks.certManager.enabled }}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ include "k8s-agents-operator.cert-manager.certificate.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  dnsNames:
+  - '{{ include "k8s-agents-operator.webhook.service.name" . }}.{{ .Release.Namespace }}.svc'
+  - '{{ include "k8s-agents-operator.webhook.service.name" . }}.{{ .Release.Namespace }}.svc.{{ .Values.kubernetesClusterDomain }}'
+  issuerRef:
+    kind: Issuer
+    name: {{ include "k8s-agents-operator.cert-manager.issuer.name" . }}
+  secretName: {{ include "k8s-agents-operator.certificateSecret.name" . }}
+  subject:
+    organizationalUnits:
+    - k8s-agents-operator
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/webhook-configuration.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/webhook-configuration.yaml
new file mode 100644
index 000000000..a32941061
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/webhook-configuration.yaml
@@ -0,0 +1,134 @@
+{{- $tls := fromYaml (include "k8s-agents-operator.webhookCert" .) }}
+{{- if .Values.admissionWebhooks.autoGenerateCert.enabled }}
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/tls
+metadata:
+  name: {{ include "k8s-agents-operator.certificateSecret.name" . }}
+  annotations:
+    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook-delete-policy": "before-hook-creation"
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+    app.kubernetes.io/component: webhook
+  namespace: {{ .Release.Namespace }}
+data:
+  tls.crt: {{ $tls.clientCert }}
+  tls.key: {{ $tls.clientKey }}
+  ca.crt: {{ $tls.caCert }}
+{{- end }}
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: {{ include "k8s-agents-operator.webhook.mutating.name" . }}
+  {{- if .Values.admissionWebhooks.certManager.enabled }}
+  annotations:
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "k8s-agents-operator.cert-manager.certificate.name" . }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    {{- if .Values.admissionWebhooks.autoGenerateCert.enabled }}
+    caBundle: {{ $tls.caCert }}
+    {{- end }}
+    service:
+      name: {{ include "k8s-agents-operator.webhook.service.name" . }}
+      namespace: {{ .Release.Namespace }}
+      path: /mutate-newrelic-com-v1alpha2-instrumentation
+  failurePolicy: Fail
+  name: minstrumentation.kb.io
+  rules:
+  - apiGroups:
+    - newrelic.com
+    apiVersions:
+    - v1alpha2
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - instrumentations
+  sideEffects: None
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    {{- if .Values.admissionWebhooks.autoGenerateCert.enabled }}
+    caBundle: {{ $tls.caCert }}
+    {{- end }}
+    service:
+      name: {{ include "k8s-agents-operator.webhook.service.name" . }}
+      namespace: {{ .Release.Namespace }}
+      path: /mutate-v1-pod
+  failurePolicy: Ignore
+  name: mpod.kb.io
+  rules:
+  - apiGroups:
+    - ""
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - pods
+  sideEffects: None
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  name: {{ include "k8s-agents-operator.webhook.validating.name" . }}
+  {{- if .Values.admissionWebhooks.certManager.enabled }}
+  annotations:
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "k8s-agents-operator.cert-manager.certificate.name" . }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+webhooks:
+- admissionReviewVersions:
+    - v1
+  clientConfig:
+    {{- if .Values.admissionWebhooks.autoGenerateCert.enabled }}
+    caBundle: {{ $tls.caCert }}
+    {{- end }}
+    service:
+      name: {{ include "k8s-agents-operator.webhook.service.name" . }}
+      namespace: {{ .Release.Namespace }}
+      path: /validate-newrelic-com-v1alpha2-instrumentation
+  failurePolicy: Fail
+  name: vinstrumentationcreateupdate.kb.io
+  rules:
+    - apiGroups:
+        - newrelic.com
+      apiVersions:
+        - v1alpha2
+      operations:
+        - CREATE
+        - UPDATE
+      resources:
+        - instrumentations
+  sideEffects: None
+- admissionReviewVersions:
+    - v1
+  clientConfig:
+    {{- if .Values.admissionWebhooks.autoGenerateCert.enabled }}
+    caBundle: {{ $tls.caCert }}
+    {{- end }}
+    service:
+      name: {{ include "k8s-agents-operator.webhook.service.name" . }}
+      namespace: {{ .Release.Namespace }}
+      path: /validate-newrelic-com-v1alpha2-instrumentation
+  failurePolicy: Ignore
+  name: vinstrumentationdelete.kb.io
+  rules:
+    - apiGroups:
+        - newrelic.com
+      apiVersions:
+        - v1alpha2
+      operations:
+        - DELETE
+      resources:
+        - instrumentations
+  sideEffects: None
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/webhook-service.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/webhook-service.yaml
new file mode 100644
index 000000000..cb649dcf6
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/templates/webhook-service.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "k8s-agents-operator.webhook.service.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.webhookService.type }}
+  selector:
+    {{- include "newrelic.common.labels.selectorLabels" . | nindent 4 }}
+    control-plane: controller-manager
+  ports:
+	{{- .Values.webhookService.ports | toYaml | nindent 2 -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/affinity_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/affinity_test.yaml
new file mode 100644
index 000000000..7f12318d1
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/affinity_test.yaml
@@ -0,0 +1,107 @@
+suite: affinity
+templates:
+  - templates/deployment.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: sets affinity to default when no values provided
+    set:
+      licenseKey: us-whatever
+    asserts:
+      - notExists:
+          path: spec.template.spec.affinity
+        template: templates/deployment.yaml
+  - it: sets affinity from global by common-library
+    set:
+      licenseKey: us-whatever
+      global:
+        affinity:
+          podAffinity:
+            requiredDuringSchedulingIgnoredDuringExecution:
+              - labelSelector:
+                  matchExpressions:
+                    - key: globalKey
+                      operator: In
+                      values:
+                        - S1
+                topologyKey: failure-domain.beta.kubernetes.io/zone
+    asserts:
+      - equal:
+          path: spec.template.spec.affinity
+          value:
+            podAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                - labelSelector:
+                    matchExpressions:
+                      - key: globalKey
+                        operator: In
+                        values:
+                          - S1
+                  topologyKey: failure-domain.beta.kubernetes.io/zone
+        template: templates/deployment.yaml
+  - it: sets affinity from values by common-library
+    set:
+      licenseKey: us-whatever
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: topLevelKey
+                    operator: In
+                    values:
+                      - S1
+              topologyKey: failure-domain.beta.kubernetes.io/zone
+    asserts:
+      - equal:
+          path: spec.template.spec.affinity
+          value:
+            podAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                - labelSelector:
+                    matchExpressions:
+                      - key: topLevelKey
+                        operator: In
+                        values:
+                          - S1
+                  topologyKey: failure-domain.beta.kubernetes.io/zone
+        template: templates/deployment.yaml
+  - it: sets affinity from values by common-library overriding global values
+    set:
+      licenseKey: us-whatever
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: topLevelKey
+                    operator: In
+                    values:
+                      - S1
+              topologyKey: failure-domain.beta.kubernetes.io/zone
+      global:
+        affinity:
+          podAffinity:
+            requiredDuringSchedulingIgnoredDuringExecution:
+              - labelSelector:
+                  matchExpressions:
+                    - key: globalKey
+                      operator: In
+                      values:
+                        - S1
+                topologyKey: failure-domain.beta.kubernetes.io/zone
+    asserts:
+      - equal:
+          path: spec.template.spec.affinity
+          value:
+            podAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                - labelSelector:
+                    matchExpressions:
+                      - key: topLevelKey
+                        operator: In
+                        values:
+                          - S1
+                  topologyKey: failure-domain.beta.kubernetes.io/zone
+        template: templates/deployment.yaml
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/annotations_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/annotations_test.yaml
new file mode 100644
index 000000000..f84dcce3b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/annotations_test.yaml
@@ -0,0 +1,29 @@
+suite: annotations
+templates:
+  - templates/deployment.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: sets pod annotations to default when no values provided
+    set:
+      licenseKey: us-whatever
+    asserts:
+      - notExists:
+          path: spec.template.metadata.annotations
+        template: templates/deployment.yaml
+  - it: sets pod annotations from values
+    set:
+      licenseKey: us-whatever
+      podAnnotations:
+        deploymentKey1: "deploymentValue1"
+        deploymentKey2: "deploymentValue2"
+    asserts:
+      - equal:
+          path: spec.template.metadata.annotations.deploymentKey1
+          value: deploymentValue1
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.template.metadata.annotations.deploymentKey2
+          value: deploymentValue2
+        template: templates/deployment.yaml
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/cert_manager_certificate_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/cert_manager_certificate_test.yaml
new file mode 100644
index 000000000..0cd8cf080
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/cert_manager_certificate_test.yaml
@@ -0,0 +1,53 @@
+suite: cert-manager
+templates:
+  - templates/serving-cert.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: creates cert-manager resources if cert-manager enabled and auto cert disabled
+    set:
+      licenseKey: us-whatever
+      admissionWebhooks:
+        autoGenerateCert:
+          enabled: false
+        certManager:
+          enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+  - it: creates Certificate in default domain if cert-manager enabled and auto cert disabled
+    set:
+      licenseKey: us-whatever
+      admissionWebhooks:
+        autoGenerateCert:
+          enabled: false
+        certManager:
+          enabled: true
+    asserts:
+      - equal:
+          path: kind
+          value: Certificate
+      - equal:
+          path: spec.dnsNames
+          value:
+            - my-release-k8s-agents-operator-webhook-service.my-namespace.svc
+            - my-release-k8s-agents-operator-webhook-service.my-namespace.svc.cluster.local
+  - it: creates Certificate in custom domain if cert-manager enabled and auto cert disabled
+    set:
+      licenseKey: us-whatever
+      admissionWebhooks:
+        autoGenerateCert:
+          enabled: false
+        certManager:
+          enabled: true
+      kubernetesClusterDomain: kubey.test
+    asserts:
+      - equal:
+          path: kind
+          value: Certificate
+      - equal:
+          path: spec.dnsNames
+          value:
+            - my-release-k8s-agents-operator-webhook-service.my-namespace.svc
+            - my-release-k8s-agents-operator-webhook-service.my-namespace.svc.kubey.test
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/cert_manager_issuer_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/cert_manager_issuer_test.yaml
new file mode 100644
index 000000000..ce9c48d79
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/cert_manager_issuer_test.yaml
@@ -0,0 +1,32 @@
+suite: cert-manager
+templates:
+  - templates/selfsigned-issuer.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: creates cert-manager resources if cert-manager enabled and auto cert disabled
+    set:
+      licenseKey: us-whatever
+      admissionWebhooks:
+        autoGenerateCert:
+          enabled: false
+        certManager:
+          enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+  - it: creates Issuer if cert-manager enabled and auto cert disabled
+    set:
+      licenseKey: us-whatever
+      admissionWebhooks:
+        autoGenerateCert:
+          enabled: false
+        certManager:
+          enabled: true
+    asserts:
+      - equal:
+          path: kind
+          value: Issuer
+      - exists:
+          path: spec.selfSigned
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/images_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/images_test.yaml
new file mode 100644
index 000000000..ac47fda68
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/images_test.yaml
@@ -0,0 +1,61 @@
+suite: images
+templates:
+  - templates/deployment.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: has a default image version
+    set:
+      licenseKey: us-whatever
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ".*nil.*"
+        template: templates/deployment.yaml
+      - notMatchRegex:
+          path: spec.template.spec.containers[1].image
+          pattern: ".*nil.*"
+        template: templates/deployment.yaml
+  - it: loads image and version
+    set:
+      licenseKey: us-whatever
+      controllerManager:
+        manager:
+          image:
+            repository: nr/test-1
+            version: "1.1.1"
+        kubeRbacProxy:
+          image:
+            repository: nr/test-2
+            version: "1.1.2"
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: nr/test-1:1.1.1
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.template.spec.containers[1].image
+          value: nr/test-2:1.1.2
+        template: templates/deployment.yaml
+  - it: loads image and version using SHA digest
+    set:
+      licenseKey: us-whatever
+      controllerManager:
+        manager:
+          image:
+            repository: nr/test-1
+            version: "sha256:e2399e70e99ac370ca6a3c7e5affa9655da3b246d0ada77c40ed155b3726ee2e"
+        kubeRbacProxy:
+          image:
+            repository: nr/test-2
+            version: "sha256:771a9a173e033a3ad8b46f5c00a7036eaa88c8d8d1fbd89217325168998113ea"
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: nr/test-1@sha256:e2399e70e99ac370ca6a3c7e5affa9655da3b246d0ada77c40ed155b3726ee2e
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.template.spec.containers[1].image
+          value: nr/test-2@sha256:771a9a173e033a3ad8b46f5c00a7036eaa88c8d8d1fbd89217325168998113ea
+        template: templates/deployment.yaml
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/node_selector_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/node_selector_test.yaml
new file mode 100644
index 000000000..690fd76f5
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/node_selector_test.yaml
@@ -0,0 +1,51 @@
+suite: nodeSelector
+templates:
+  - templates/deployment.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: sets nodeSelector to default when no values provided
+    set:
+      licenseKey: us-whatever
+    asserts:
+      - notExists:
+          path: spec.template.spec.nodeSelector
+        template: templates/deployment.yaml
+  - it: sets nodeSelector from global by common-library
+    set:
+      licenseKey: us-whatever
+      global:
+        nodeSelector:
+          globalKey: globalValue
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            globalKey: globalValue
+        template: templates/deployment.yaml
+  - it: sets nodeSelector from values by common-library
+    set:
+      licenseKey: us-whatever
+      nodeSelector:
+        topLevelKey: topLevelValue
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            topLevelKey: topLevelValue
+        template: templates/deployment.yaml
+  - it: sets nodeSelector from values by common-library overriding global values
+    set:
+      licenseKey: us-whatever
+      nodeSelector:
+        topLevelKey: topLevelValue
+      global:
+        nodeSelector:
+          globalKey: globalValue
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            topLevelKey: topLevelValue
+        template: templates/deployment.yaml
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/resources_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/resources_test.yaml
new file mode 100644
index 000000000..021c8b5a5
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/resources_test.yaml
@@ -0,0 +1,28 @@
+suite: resources
+templates:
+  - templates/deployment.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: sets pod resources to default when no values provided
+    set:
+      licenseKey: us-whatever
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].resources
+          value:
+            requests:
+              cpu: 100m
+              memory: 64Mi
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.template.spec.containers[1].resources
+          value:
+            limits:
+              cpu: 500m
+              memory: 128Mi
+            requests:
+              cpu: 5m
+              memory: 64Mi
+        template: templates/deployment.yaml
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/security_context_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/security_context_test.yaml
new file mode 100644
index 000000000..aa34c65f7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/security_context_test.yaml
@@ -0,0 +1,191 @@
+suite: securityContext
+templates:
+  - templates/deployment.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: sets pod securityContext set to defaults when no values provided
+    set:
+      licenseKey: us-whatever
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext
+          value:
+            runAsGroup: 65532
+            runAsNonRoot: true
+            runAsUser: 65532
+            fsGroup: 65532
+        template: templates/deployment.yaml
+  - it: ignores pod securityContext from global by common-library
+    set:
+      licenseKey: us-whatever
+      global:
+        podSecurityContext:
+          globalKey: globalValue
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext
+          value:
+            runAsGroup: 65532
+            runAsNonRoot: true
+            runAsUser: 65532
+            fsGroup: 65532
+        template: templates/deployment.yaml
+  - it: appends pod securityContext from values by common-library
+    set:
+      licenseKey: us-whatever
+      podSecurityContext:
+        topLevelKey: topLevelValue
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext
+          value:
+            runAsGroup: 65532
+            runAsNonRoot: true
+            runAsUser: 65532
+            fsGroup: 65532
+            topLevelKey: topLevelValue
+        template: templates/deployment.yaml
+  - it: sets pod securityContext from values by common-library overriding global values
+    set:
+      licenseKey: us-whatever
+      podSecurityContext:
+        topLevelKey: topLevelValue
+      global:
+        podSecurityContext:
+          globalKey: globalValue
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext
+          value:
+            runAsGroup: 65532
+            runAsNonRoot: true
+            runAsUser: 65532
+            fsGroup: 65532
+            topLevelKey: topLevelValue
+        template: templates/deployment.yaml
+  - it: sets container securityContext set to defaults when no values provided
+    set:
+      licenseKey: us-whatever
+    asserts:
+      - notExists:
+          path: spec.template.spec.containers[0].securityContext
+        template: templates/deployment.yaml
+      - notExists:
+          path: spec.template.spec.containers[1].securityContext
+        template: templates/deployment.yaml
+  - it: sets container securityContext from global by common-library
+    set:
+      licenseKey: us-whatever
+      global:
+        containerSecurityContext:
+          globalKey: globalValue
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].securityContext
+          value:
+            globalKey: globalValue
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.template.spec.containers[1].securityContext
+          value:
+            globalKey: globalValue
+        template: templates/deployment.yaml
+  - it: sets container securityContext from values by common-library
+    set:
+      licenseKey: us-whatever
+      containerSecurityContext:
+        topLevelKey: topLevelValue
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].securityContext
+          value:
+            topLevelKey: topLevelValue
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.template.spec.containers[1].securityContext
+          value:
+            topLevelKey: topLevelValue
+        template: templates/deployment.yaml
+  - it: sets container securityContext from values by common-library overriding global values
+    set:
+      licenseKey: us-whatever
+      containerSecurityContext:
+        topLevelKey: topLevelValue
+      global:
+        containerSecurityContext:
+          globalKey: globalValue
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].securityContext
+          value:
+            topLevelKey: topLevelValue
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.template.spec.containers[1].securityContext
+          value:
+            topLevelKey: topLevelValue
+        template: templates/deployment.yaml
+  - it: sets container securityContext from manager values
+    set:
+      licenseKey: us-whatever
+      controllerManager:
+        manager:
+          containerSecurityContext:
+            managerKey: managerValue
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].securityContext
+          value:
+            managerKey: managerValue
+        template: templates/deployment.yaml
+  - it: sets container securityContext from kubeRbacProxy values
+    set:
+      licenseKey: us-whatever
+      controllerManager:
+        kubeRbacProxy:
+          containerSecurityContext:
+            kubeRbacProxyKey: kubeRbacProxyValue
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[1].securityContext
+          value:
+            kubeRbacProxyKey: kubeRbacProxyValue
+        template: templates/deployment.yaml
+  - it: sets container securityContext from manager values overriding top level and global values
+    set:
+      licenseKey: us-whatever
+      containerSecurityContext:
+        topLevelKey: topLevelValue
+      global:
+        containerSecurityContext:
+          globalKey: globalValue
+      controllerManager:
+        manager:
+          containerSecurityContext:
+            managerKey: managerValue
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].securityContext
+          value:
+            managerKey: managerValue
+        template: templates/deployment.yaml
+  - it: sets container securityContext from kubeRbacProxy values overriding top level and global values
+    set:
+      licenseKey: us-whatever
+      containerSecurityContext:
+        topLevelKey: topLevelValue
+      global:
+        containerSecurityContext:
+          globalKey: globalValue
+      controllerManager:
+        kubeRbacProxy:
+          containerSecurityContext:
+            kubeRbacProxyKey: kubeRbacProxyValue
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[1].securityContext
+          value:
+            kubeRbacProxyKey: kubeRbacProxyValue
+        template: templates/deployment.yaml
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/service_account_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/service_account_test.yaml
new file mode 100644
index 000000000..2d48ab226
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/service_account_test.yaml
@@ -0,0 +1,83 @@
+suite: serviceAccount
+templates:
+  - templates/service-account.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: by default creates a service account
+    set:
+      licenseKey: test
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  - it: creates a service account if there are no global values
+    set:
+      licenseKey: test
+      global: null
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  - it: creates a global a service account
+    set:
+      licenseKey: test
+      global:
+        serviceAccount:
+          create: true
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  - it: create a local service account
+    set:
+      licenseKey: test
+      serviceAccount:
+        create: true
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  - it: disables a global a service account
+    set:
+      licenseKey: test
+      global:
+        serviceAccount:
+          create: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: disables a local a service account
+    set:
+      licenseKey: test
+      serviceAccount:
+        create: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: allows overriding the global enabling of a service account
+    set:
+      licenseKey: test
+      global:
+        serviceAccount:
+          create: true
+      serviceAccount:
+        create: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: allows overriding the global disabling of a service account
+    set:
+      licenseKey: test
+      global:
+        serviceAccount:
+          create: false
+      serviceAccount:
+        create: true
+    asserts:
+      - hasDocuments:
+          count: 1
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/tolerations_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/tolerations_test.yaml
new file mode 100644
index 000000000..71e21e044
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/tolerations_test.yaml
@@ -0,0 +1,65 @@
+suite: tolerations
+templates:
+  - templates/deployment.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: sets tolerations to default when no values provided
+    set:
+      licenseKey: us-whatever
+    asserts:
+      - notExists:
+          path: spec.template.spec.tolerations
+        template: templates/deployment.yaml
+  - it: sets tolerations from global by common-library
+    set:
+      licenseKey: us-whatever
+      global:
+        tolerations:
+          - key: "globalKey"
+            operator: "Exists"
+            effect: "NoSchedule"
+    asserts:
+      - equal:
+          path: spec.template.spec.tolerations
+          value:
+            - key: "globalKey"
+              operator: "Exists"
+              effect: "NoSchedule"
+        template: templates/deployment.yaml
+  - it: sets tolerations from values by common-library
+    set:
+      licenseKey: us-whatever
+      tolerations:
+        - key: "topLevelKey"
+          operator: "Exists"
+          effect: "NoSchedule"
+    asserts:
+      - equal:
+          path: spec.template.spec.tolerations
+          value:
+            - key: "topLevelKey"
+              operator: "Exists"
+              effect: "NoSchedule"
+        template: templates/deployment.yaml
+  - it: sets tolerations from values by common-library overriding global values
+    set:
+      licenseKey: us-whatever
+      tolerations:
+        - key: "topLevelKey"
+          operator: "Exists"
+          effect: "NoSchedule"
+      global:
+        tolerations:
+          - key: "globalKey"
+            operator: "Exists"
+            effect: "NoSchedule"
+    asserts:
+      - equal:
+          path: spec.template.spec.tolerations
+          value:
+            - key: "topLevelKey"
+              operator: "Exists"
+              effect: "NoSchedule"
+        template: templates/deployment.yaml
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/webhook_ssl_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/webhook_ssl_test.yaml
new file mode 100644
index 000000000..9343a43a4
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/tests/webhook_ssl_test.yaml
@@ -0,0 +1,176 @@
+suite: webhook ssl
+templates:
+  - templates/webhook-configuration.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: creates ssl certificate secret by default
+    set:
+      licenseKey: us-whatever
+    asserts:
+      - hasDocuments:
+          count: 3
+      - containsDocument:
+          kind: Secret
+          apiVersion: v1
+          name: my-release-k8s-agents-operator-controller-manager-service-cert
+          namespace: my-namespace
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-controller-manager-service-cert
+      - exists:
+          path: data["tls.crt"]
+        template: templates/webhook-configuration.yaml
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-controller-manager-service-cert
+      - exists:
+          path: data["tls.key"]
+        template: templates/webhook-configuration.yaml
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-controller-manager-service-cert
+      - exists:
+          path: data["ca.crt"]
+        template: templates/webhook-configuration.yaml
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-controller-manager-service-cert
+  - it: does not inject cert-manager annotations into MutatingWebhook by default
+    set:
+      licenseKey: us-whatever
+    asserts:
+      - notExists:
+          path: metadata.annotations["cert-manager.io/inject-ca-from"]
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-mutation
+  - it: does not inject cert-manager annotations into ValidatingWebhook by default
+    set:
+      licenseKey: us-whatever
+    asserts:
+      - notExists:
+          path: metadata.annotations["cert-manager.io/inject-ca-from"]
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-validation
+  - it: does inject caBundle into MutatingWebhook clientConfigs by default
+    set:
+      licenseKey: us-whatever
+    asserts:
+      - lengthEqual:
+          path: webhooks
+          count: 2
+      - exists:
+          path: webhooks[0].clientConfig.caBundle
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-mutation
+      - exists:
+          path: webhooks[1].clientConfig.caBundle
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-mutation
+  - it: does inject caBundle into ValidatingWebhook clientConfigs by default
+    set:
+      licenseKey: us-whatever
+    asserts:
+      - lengthEqual:
+          path: webhooks
+          count: 2
+      - exists:
+          path: webhooks[0].clientConfig.caBundle
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-mutation
+      - exists:
+          path: webhooks[1].clientConfig.caBundle
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-validation
+  - it: does not creates ssl certificate secret if cert-manager enabled and auto cert disabled
+    set:
+      licenseKey: us-whatever
+      admissionWebhooks:
+        autoGenerateCert:
+          enabled: false
+        certManager:
+          enabled: true
+    asserts:
+      - hasDocuments:
+          count: 2
+  - it: injects cert-manager annotations into MutatingWebhook if cert-manager enabled and auto cert disabled
+    set:
+      licenseKey: us-whatever
+      admissionWebhooks:
+        autoGenerateCert:
+          enabled: false
+        certManager:
+          enabled: true
+    asserts:
+      - equal:
+          path: metadata.annotations["cert-manager.io/inject-ca-from"]
+          value: my-namespace/my-release-k8s-agents-operator-serving-cert
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-mutation
+  - it: injects cert-manager annotations into ValidatingWebhook if cert-manager enabled and auto cert disabled
+    set:
+      licenseKey: us-whatever
+      admissionWebhooks:
+        autoGenerateCert:
+          enabled: false
+        certManager:
+          enabled: true
+    asserts:
+      - equal:
+          path: metadata.annotations["cert-manager.io/inject-ca-from"]
+          value: my-namespace/my-release-k8s-agents-operator-serving-cert
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-validation
+  - it: does not inject caBundle into MutatingWebhook clientConfigs if cert-manager enabled and auto cert disabled
+    set:
+      licenseKey: us-whatever
+      admissionWebhooks:
+        autoGenerateCert:
+          enabled: false
+        certManager:
+          enabled: true
+    asserts:
+      - lengthEqual:
+          path: webhooks
+          count: 2
+      - notExists:
+          path: webhooks[0].clientConfig.caBundle
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-mutation
+      - notExists:
+          path: webhooks[1].clientConfig.caBundle
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-mutation
+  - it: does not inject caBundle into ValidatingWebhook clientConfigs if cert-manager enabled and auto cert disabled
+    set:
+      licenseKey: us-whatever
+      admissionWebhooks:
+        autoGenerateCert:
+          enabled: false
+        certManager:
+          enabled: true
+    asserts:
+      - lengthEqual:
+          path: webhooks
+          count: 2
+      - notExists:
+          path: webhooks[0].clientConfig.caBundle
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-mutation
+      - notExists:
+          path: webhooks[1].clientConfig.caBundle
+        documentSelector:
+          path: metadata.name
+          value: my-release-k8s-agents-operator-validation
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/values.yaml
new file mode 100644
index 000000000..ce6fc27d7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/k8s-agents-operator/values.yaml
@@ -0,0 +1,132 @@
+# Default values for k8s-agents-operator.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+# -- This set this license key to use. Can be configured also with `global.licenseKey`
+licenseKey: ""
+
+# -- Additional labels for chart pods
+podLabels: {}
+# -- Additional labels for chart objects
+labels: {}
+# -- Annotations to be added to the deployment.
+podAnnotations: {}
+
+# -- Sets pod's priorityClassName. Can be configured also with `global.priorityClassName`
+priorityClassName: ""
+
+# -- Sets pod's dnsConfig. Can be configured also with `global.dnsConfig`
+dnsConfig: {}
+
+# -- Sets all pods' node selector. Can be configured also with `global.nodeSelector`
+nodeSelector: {}
+# -- Sets all pods' tolerations to node taints. Can be configured also with `global.tolerations`
+tolerations: []
+# -- Sets all pods' affinities. Can be configured also with `global.affinity`
+affinity: {}
+# -- Sets all security contexts (at pod level).
+# -- Source: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+# -- SecurityContext holds pod-level security attributes and common container settings
+podSecurityContext:
+  runAsGroup: 65532
+  runAsNonRoot: true
+  runAsUser: 65532
+  fsGroup: 65532
+# -- Sets all security context (at container level). Can be configured also with `global.securityContext.container`
+containerSecurityContext: {}
+
+kubernetesClusterDomain: cluster.local
+
+controllerManager:
+  replicas: 1
+
+  manager:
+    image:
+      # -- Sets the repository and image to use for the manager. Please ensure you're using trusted New Relic images.
+      repository: newrelic/k8s-agents-operator
+      # -- Sets the manager image version to retrieve. Could be a tag i.e. "v0.17.0" or a SHA digest i.e. "sha256:e2399e70e99ac370ca6a3c7e5affa9655da3b246d0ada77c40ed155b3726ee2e"
+      version:
+      pullPolicy:
+    resources:
+      requests:
+        cpu: 100m
+        memory: 64Mi
+    # -- Sets security context (at container level) for the manager. Overrides `containerSecurityContext` and `global.containerSecurityContext`
+    containerSecurityContext: {}
+    # -- Source: https://docs.openshift.com/container-platform/4.10/operators/operator_sdk/osdk-leader-election.html
+    # -- Enable leader election mechanism for protecting against split brain if multiple operator pods/replicas are started
+    leaderElection:
+      enabled: true
+
+  kubeRbacProxy:
+    image:
+      # -- Sets the repository and image to use for kube-rbac-proxy. Please ensure you're using a trusted image.
+      repository: gcr.io/kubebuilder/kube-rbac-proxy
+      # -- Sets the kube-rbac-proxy image version to retrieve. Could be a tag i.e. "v0.16.0" or a SHA digest i.e. "sha256:771a9a173e033a3ad8b46f5c00a7036eaa88c8d8d1fbd89217325168998113ea"
+      version: sha256:771a9a173e033a3ad8b46f5c00a7036eaa88c8d8d1fbd89217325168998113ea
+    resources:
+      limits:
+        cpu: 500m
+        memory: 128Mi
+      requests:
+        cpu: 5m
+        memory: 64Mi
+    # -- Sets security context (at container level) for kubeRbacProxy. Overrides `containerSecurityContext` and `global.containerSecurityContext`
+    containerSecurityContext: {}
+
+# -- Settings controlling ServiceAccount creation
+# @default -- See `values.yaml`
+serviceAccount:
+  # serviceAccount.create -- (bool) Specifies whether a ServiceAccount should be created
+  # @default -- `true`
+  create:
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+  # Specify any annotations to add to the ServiceAccount
+  annotations:
+
+metricsService:
+  ports:
+  - name: https
+    port: 8443
+    protocol: TCP
+    targetPort: https
+  type: ClusterIP
+
+webhookService:
+  ports:
+  - port: 443
+    protocol: TCP
+    targetPort: 9443
+  type: ClusterIP
+
+# -- Admission webhooks make sure only requests with correctly formatted rules will get into the Operator
+admissionWebhooks:
+  create: true
+
+  ## TLS Certificate Option 1: Use Helm to automatically generate self-signed certificate.
+  ## certManager must be disabled and autoGenerateCert must be enabled.
+  autoGenerateCert:
+    # -- If true and certManager.enabled is false, Helm will automatically create a self-signed cert and secret for you.
+    enabled: true
+    # -- If set to true, new webhook key/certificate is generated on helm upgrade.
+    recreate: true
+    # -- Cert validity period time in days.
+    certPeriodDays: 365
+
+  ## TLS Certificate Option 2: Use certManager to generate self-signed certificate.
+  certManager:
+    # -- If true and autoGenerateCert.enabled is false, cert-manager will create a self-signed cert and secret for you.
+    enabled: false
+
+  ## TLS Certificate Option 3: Use your own self-signed certificate.
+  ## certManager and autoGenerateCert must be disabled and certFile, keyFile, and caFile must be set.
+  ## The chart reads the contents of the file paths with the helm .Files.Get function.
+  ## Refer to this doc https://helm.sh/docs/chart_template_guide/accessing_files/ to understand
+  ## limitations of file paths accessible to the chart.
+  # -- Path to your own PEM-encoded certificate.
+  certFile: ""
+  # -- Path to your own PEM-encoded private key.
+  keyFile: ""
+  # -- Path to the CA cert.
+  caFile: ""
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/Chart.yaml
new file mode 100644
index 000000000..755213319
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/Chart.yaml
@@ -0,0 +1,26 @@
+annotations:
+  artifacthub.io/license: Apache-2.0
+  artifacthub.io/links: |
+    - name: Chart Source
+      url: https://github.com/prometheus-community/helm-charts
+apiVersion: v2
+appVersion: 2.13.0
+description: Install kube-state-metrics to generate and expose cluster-level metrics
+home: https://github.com/kubernetes/kube-state-metrics/
+keywords:
+- metric
+- monitoring
+- prometheus
+- kubernetes
+maintainers:
+- email: tariq.ibrahim@mulesoft.com
+  name: tariq1890
+- email: manuel@rueg.eu
+  name: mrueg
+- email: david@0xdc.me
+  name: dotdc
+name: kube-state-metrics
+sources:
+- https://github.com/kubernetes/kube-state-metrics/
+type: application
+version: 5.26.0
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/README.md
new file mode 100644
index 000000000..843be89e6
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/README.md
@@ -0,0 +1,85 @@
+# kube-state-metrics Helm Chart
+
+Installs the [kube-state-metrics agent](https://github.com/kubernetes/kube-state-metrics).
+
+## Get Repository Info
+<!-- textlint-disable -->
+```console
+helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+helm repo update
+```
+
+_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._
+<!-- textlint-enable -->
+
+## Install Chart
+
+```console
+helm install [RELEASE_NAME] prometheus-community/kube-state-metrics [flags]
+```
+
+_See [configuration](#configuration) below._
+
+_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._
+
+## Uninstall Chart
+
+```console
+helm uninstall [RELEASE_NAME]
+```
+
+This removes all the Kubernetes components associated with the chart and deletes the release.
+
+_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._
+
+## Upgrading Chart
+
+```console
+helm upgrade [RELEASE_NAME] prometheus-community/kube-state-metrics [flags]
+```
+
+_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._
+
+### Migrating from stable/kube-state-metrics and kubernetes/kube-state-metrics
+
+You can upgrade in-place:
+
+1. [get repository info](#get-repository-info)
+1. [upgrade](#upgrading-chart) your existing release name using the new chart repository
+
+## Upgrading to v3.0.0
+
+v3.0.0 includes kube-state-metrics v2.0, see the [changelog](https://github.com/kubernetes/kube-state-metrics/blob/release-2.0/CHANGELOG.md) for major changes on the application-side.
+
+The upgraded chart now the following changes:
+
+* Dropped support for helm v2 (helm v3 or later is required)
+* collectors key was renamed to resources
+* namespace key was renamed to namespaces
+
+## Configuration
+
+See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments:
+
+```console
+helm show values prometheus-community/kube-state-metrics
+```
+
+### kube-rbac-proxy
+
+You can enable `kube-state-metrics` endpoint protection using `kube-rbac-proxy`. By setting `kubeRBACProxy.enabled: true`, this chart will deploy one RBAC proxy container per endpoint (metrics & telemetry).
+To authorize access, authenticate your requests (via a `ServiceAccount` for example) with a `ClusterRole` attached such as:
+
+```yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: kube-state-metrics-read
+rules:
+  - apiGroups: [ "" ]
+    resources: ["services/kube-state-metrics"]
+    verbs:
+      - get
+```
+
+See [kube-rbac-proxy examples](https://github.com/brancz/kube-rbac-proxy/tree/master/examples/resource-attributes) for more details.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/NOTES.txt b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/NOTES.txt
new file mode 100644
index 000000000..3589c24ec
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/NOTES.txt
@@ -0,0 +1,23 @@
+kube-state-metrics is a simple service that listens to the Kubernetes API server and generates metrics about the state of the objects.
+The exposed metrics can be found here:
+https://github.com/kubernetes/kube-state-metrics/blob/master/docs/README.md#exposed-metrics
+
+The metrics are exported on the HTTP endpoint /metrics on the listening port.
+In your case, {{ template "kube-state-metrics.fullname" . }}.{{ template "kube-state-metrics.namespace" . }}.svc.cluster.local:{{ .Values.service.port }}/metrics
+
+They are served either as plaintext or protobuf depending on the Accept header.
+They are designed to be consumed either by Prometheus itself or by a scraper that is compatible with scraping a Prometheus client endpoint.
+
+{{- if .Values.kubeRBACProxy.enabled}}
+
+kube-rbac-proxy endpoint protections is enabled:
+- Metrics endpoints are now HTTPS
+- Ensure that the client authenticates the requests (e.g. via service account) with the following role permissions:
+```
+rules:
+  - apiGroups: [ "" ]
+    resources: ["services/{{ template "kube-state-metrics.fullname" . }}"]
+    verbs:
+      - get
+```
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/_helpers.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/_helpers.tpl
new file mode 100644
index 000000000..3dd326da4
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/_helpers.tpl
@@ -0,0 +1,156 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "kube-state-metrics.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "kube-state-metrics.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "kube-state-metrics.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "kube-state-metrics.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts
+*/}}
+{{- define "kube-state-metrics.namespace" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "kube-state-metrics.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Generate basic labels
+*/}}
+{{- define "kube-state-metrics.labels" }}
+helm.sh/chart: {{ template "kube-state-metrics.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/component: metrics
+app.kubernetes.io/part-of: {{ template "kube-state-metrics.name" . }}
+{{- include "kube-state-metrics.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+{{- if .Values.customLabels }}
+{{ tpl (toYaml .Values.customLabels) . }}
+{{- end }}
+{{- if .Values.releaseLabel }}
+release: {{ .Release.Name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "kube-state-metrics.selectorLabels" }}
+{{- if .Values.selectorOverride }}
+{{ toYaml .Values.selectorOverride }}
+{{- else }}
+app.kubernetes.io/name: {{ include "kube-state-metrics.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+{{- end }}
+
+{{/* Sets default scrape limits for servicemonitor */}}
+{{- define "servicemonitor.scrapeLimits" -}}
+{{- with .sampleLimit }}
+sampleLimit: {{ . }}
+{{- end }}
+{{- with .targetLimit }}
+targetLimit: {{ . }}
+{{- end }}
+{{- with .labelLimit }}
+labelLimit: {{ . }}
+{{- end }}
+{{- with .labelNameLengthLimit }}
+labelNameLengthLimit: {{ . }}
+{{- end }}
+{{- with .labelValueLengthLimit }}
+labelValueLengthLimit: {{ . }}
+{{- end }}
+{{- end -}}
+
+{{/*
+Formats imagePullSecrets. Input is (dict "Values" .Values "imagePullSecrets" .{specific imagePullSecrets})
+*/}}
+{{- define "kube-state-metrics.imagePullSecrets" -}}
+{{- range (concat .Values.global.imagePullSecrets .imagePullSecrets) }}
+  {{- if eq (typeOf .) "map[string]interface {}" }}
+- {{ toYaml . | trim }}
+  {{- else }}
+- name: {{ . }}
+  {{- end }}
+{{- end }}
+{{- end -}}
+
+{{/*
+The image to use for kube-state-metrics
+*/}}
+{{- define "kube-state-metrics.image" -}}
+{{- if .Values.image.sha }}
+{{- if .Values.global.imageRegistry }}
+{{- printf "%s/%s:%s@%s" .Values.global.imageRegistry .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
+{{- else }}
+{{- printf "%s/%s:%s@%s" .Values.image.registry .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
+{{- end }}
+{{- else }}
+{{- if .Values.global.imageRegistry }}
+{{- printf "%s/%s:%s" .Values.global.imageRegistry .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) }}
+{{- else }}
+{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+The image to use for kubeRBACProxy
+*/}}
+{{- define "kubeRBACProxy.image" -}}
+{{- if .Values.kubeRBACProxy.image.sha }}
+{{- if .Values.global.imageRegistry }}
+{{- printf "%s/%s:%s@%s" .Values.global.imageRegistry .Values.kubeRBACProxy.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.kubeRBACProxy.image.tag) .Values.kubeRBACProxy.image.sha }}
+{{- else }}
+{{- printf "%s/%s:%s@%s" .Values.kubeRBACProxy.image.registry .Values.kubeRBACProxy.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.kubeRBACProxy.image.tag) .Values.kubeRBACProxy.image.sha }}
+{{- end }}
+{{- else }}
+{{- if .Values.global.imageRegistry }}
+{{- printf "%s/%s:%s" .Values.global.imageRegistry .Values.kubeRBACProxy.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.kubeRBACProxy.image.tag) }}
+{{- else }}
+{{- printf "%s/%s:%s" .Values.kubeRBACProxy.image.registry .Values.kubeRBACProxy.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.kubeRBACProxy.image.tag) }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/ciliumnetworkpolicy.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/ciliumnetworkpolicy.yaml
new file mode 100644
index 000000000..025cd47a8
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/ciliumnetworkpolicy.yaml
@@ -0,0 +1,33 @@
+{{- if and .Values.networkPolicy.enabled (eq .Values.networkPolicy.flavor "cilium") }}
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  {{- if .Values.annotations }}
+  annotations:
+    {{ toYaml .Values.annotations | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+  name: {{ template "kube-state-metrics.fullname" . }}
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+spec:
+  endpointSelector:
+    matchLabels:
+      {{- include "kube-state-metrics.selectorLabels" . | indent 6 }}
+  egress:
+    {{- if and .Values.networkPolicy.cilium .Values.networkPolicy.cilium.kubeApiServerSelector }}
+      {{ toYaml .Values.networkPolicy.cilium.kubeApiServerSelector | nindent 6 }}
+    {{- else }}
+    - toEntities:
+      - kube-apiserver
+    {{- end }}
+  ingress:
+  - toPorts:
+    - ports:
+      - port: {{ .Values.service.port | quote }}
+        protocol: TCP
+      {{- if .Values.selfMonitor.enabled }}
+      - port: {{ .Values.selfMonitor.telemetryPort | default 8081 | quote }}
+        protocol: TCP
+      {{ end }}
+{{ end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/clusterrolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/clusterrolebinding.yaml
new file mode 100644
index 000000000..cf9f628d0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/clusterrolebinding.yaml
@@ -0,0 +1,20 @@
+{{- if and .Values.rbac.create .Values.rbac.useClusterRole -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+  name: {{ template "kube-state-metrics.fullname" . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+{{- if .Values.rbac.useExistingRole }}
+  name: {{ .Values.rbac.useExistingRole }}
+{{- else }}
+  name: {{ template "kube-state-metrics.fullname" . }}
+{{- end }}
+subjects:
+- kind: ServiceAccount
+  name: {{ template "kube-state-metrics.serviceAccountName" . }}
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/crs-configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/crs-configmap.yaml
new file mode 100644
index 000000000..d38a75a51
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/crs-configmap.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.customResourceState.enabled}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "kube-state-metrics.fullname" . }}-customresourcestate-config
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+  {{- if .Values.annotations }}
+  annotations:
+    {{ toYaml .Values.annotations | nindent 4 }}
+  {{- end }}
+data:
+  config.yaml: |
+    {{- toYaml .Values.customResourceState.config | nindent 4 }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/deployment.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/deployment.yaml
new file mode 100644
index 000000000..2aff18888
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/deployment.yaml
@@ -0,0 +1,336 @@
+apiVersion: apps/v1
+{{- if .Values.autosharding.enabled }}
+kind: StatefulSet
+{{- else }}
+kind: Deployment
+{{- end }}
+metadata:
+  name: {{ template "kube-state-metrics.fullname" . }}
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+  {{- if .Values.annotations }}
+  annotations:
+{{ toYaml .Values.annotations | indent 4 }}
+  {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "kube-state-metrics.selectorLabels" . | indent 6 }}
+  replicas: {{ .Values.replicas }}
+  {{- if not .Values.autosharding.enabled }}
+  strategy:
+    type: {{ .Values.updateStrategy | default "RollingUpdate" }}
+  {{- end }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
+  {{- if .Values.autosharding.enabled }}
+  serviceName: {{ template "kube-state-metrics.fullname" . }}
+  volumeClaimTemplates: []
+  {{- end }}
+  template:
+    metadata:
+      labels:
+        {{- include "kube-state-metrics.labels" . | indent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- if .Values.podAnnotations }}
+      annotations:
+      {{ toYaml .Values.podAnnotations | nindent 8 }}
+      {{- end }}
+    spec:
+      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
+      hostNetwork: {{ .Values.hostNetwork }}
+      serviceAccountName: {{ template "kube-state-metrics.serviceAccountName" . }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext: {{- omit .Values.securityContext "enabled" | toYaml | nindent 8 }}
+      {{- end }}
+    {{- if .Values.priorityClassName }}
+      priorityClassName: {{ .Values.priorityClassName }}
+    {{- end }}
+      {{- with .Values.initContainers }}
+      initContainers:
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+      containers:
+      {{- $servicePort := ternary 9090 (.Values.service.port | default 8080) .Values.kubeRBACProxy.enabled}}
+      {{- $telemetryPort := ternary 9091 (.Values.selfMonitor.telemetryPort | default 8081) .Values.kubeRBACProxy.enabled}}
+      - name: {{ template "kube-state-metrics.name" . }}
+        {{- if  .Values.autosharding.enabled }}
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        {{- end }}
+        args:
+        {{-  if .Values.extraArgs  }}
+        {{- .Values.extraArgs | toYaml | nindent 8 }}
+        {{-  end  }}
+        - --port={{ $servicePort }}
+        {{-  if .Values.collectors  }}
+        - --resources={{ .Values.collectors | join "," }}
+        {{-  end  }}
+        {{- if .Values.metricLabelsAllowlist }}
+        - --metric-labels-allowlist={{ .Values.metricLabelsAllowlist | join "," }}
+        {{- end }}
+        {{- if .Values.metricAnnotationsAllowList }}
+        - --metric-annotations-allowlist={{ .Values.metricAnnotationsAllowList | join "," }}
+        {{- end }}
+        {{- if .Values.metricAllowlist }}
+        - --metric-allowlist={{ .Values.metricAllowlist | join "," }}
+        {{- end }}
+        {{- if .Values.metricDenylist }}
+        - --metric-denylist={{ .Values.metricDenylist | join "," }}
+        {{- end }}
+        {{- $namespaces := list }}
+        {{- if .Values.namespaces }}
+        {{- range $ns := join "," .Values.namespaces | split "," }}
+        {{- $namespaces = append $namespaces (tpl $ns $) }}
+        {{- end }}
+        {{- end }}
+        {{- if .Values.releaseNamespace }}
+        {{- $namespaces = append $namespaces ( include "kube-state-metrics.namespace" . ) }}
+        {{- end }}
+        {{- if $namespaces }}
+        - --namespaces={{ $namespaces | mustUniq | join "," }}
+        {{- end }}
+        {{- if .Values.namespacesDenylist }}
+        - --namespaces-denylist={{ tpl (.Values.namespacesDenylist | join ",") $ }}
+        {{- end }}
+        {{- if .Values.autosharding.enabled }}
+        - --pod=$(POD_NAME)
+        - --pod-namespace=$(POD_NAMESPACE)
+        {{- end }}
+        {{- if .Values.kubeconfig.enabled }}
+        - --kubeconfig=/opt/k8s/.kube/config
+        {{- end }}
+        {{- if .Values.kubeRBACProxy.enabled }}
+        - --telemetry-host=127.0.0.1
+        - --telemetry-port={{ $telemetryPort }}
+        {{- else }}
+        {{- if .Values.selfMonitor.telemetryHost }}
+        - --telemetry-host={{ .Values.selfMonitor.telemetryHost }}
+        {{- end }}
+        {{- if .Values.selfMonitor.telemetryPort }}
+        - --telemetry-port={{ $telemetryPort }}
+        {{- end }}
+        {{- end }}
+        {{- if .Values.customResourceState.enabled }}
+        - --custom-resource-state-config-file=/etc/customresourcestate/config.yaml
+        {{- end }}
+        {{- if or (.Values.kubeconfig.enabled) (.Values.customResourceState.enabled) (.Values.volumeMounts) }}
+        volumeMounts:
+        {{- if .Values.kubeconfig.enabled }}
+        - name: kubeconfig
+          mountPath: /opt/k8s/.kube/
+          readOnly: true
+        {{- end }}
+        {{- if .Values.customResourceState.enabled }}
+        - name: customresourcestate-config
+          mountPath: /etc/customresourcestate
+          readOnly: true
+        {{- end }}
+        {{- if .Values.volumeMounts }}
+{{ toYaml .Values.volumeMounts | indent 8 }}
+        {{- end }}
+        {{- end }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        image: {{ include "kube-state-metrics.image" . }}
+        {{- if eq .Values.kubeRBACProxy.enabled false }}
+        ports:
+        - containerPort: {{ .Values.service.port | default 8080}}
+          name: "http"
+        {{- if .Values.selfMonitor.enabled }}
+        - containerPort: {{ $telemetryPort }}
+          name: "metrics"
+        {{- end }}
+        {{- end }}
+        {{- if .Values.startupProbe.enabled }}
+        startupProbe:
+          failureThreshold: {{ .Values.startupProbe.failureThreshold }}
+          httpGet:
+            {{- if .Values.hostNetwork }}
+            host: 127.0.0.1
+            {{- end }}
+            httpHeaders:
+            {{- range $_, $header := .Values.startupProbe.httpGet.httpHeaders }}
+            - name: {{ $header.name }}
+              value: {{ $header.value }}
+            {{- end }}
+            path: /healthz
+            port: {{ $servicePort }}
+            scheme: {{ upper .Values.startupProbe.httpGet.scheme }}
+          initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.startupProbe.periodSeconds }}
+          successThreshold: {{ .Values.startupProbe.successThreshold }}
+          timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}
+        {{- end }}
+        livenessProbe:
+          failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          httpGet:
+            {{- if .Values.hostNetwork }}
+            host: 127.0.0.1
+            {{- end }}
+            httpHeaders:
+            {{- range $_, $header := .Values.livenessProbe.httpGet.httpHeaders }}
+            - name: {{ $header.name }}
+              value: {{ $header.value }}
+            {{- end }}
+            path: /livez
+            port: {{ $servicePort }}
+            scheme: {{ upper .Values.livenessProbe.httpGet.scheme }}
+          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+          successThreshold: {{ .Values.livenessProbe.successThreshold }}
+          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+        readinessProbe:
+          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          httpGet:
+            {{- if .Values.hostNetwork }}
+            host: 127.0.0.1
+            {{- end }}
+            httpHeaders:
+            {{- range $_, $header := .Values.readinessProbe.httpGet.httpHeaders }}
+            - name: {{ $header.name }}
+              value: {{ $header.value }}
+            {{- end }}
+            path: /readyz
+            port: {{ $servicePort }}
+            scheme: {{ upper .Values.readinessProbe.httpGet.scheme }}
+          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+          successThreshold: {{ .Values.readinessProbe.successThreshold }}
+          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+        resources:
+{{ toYaml .Values.resources | indent 10 }}
+{{- if .Values.containerSecurityContext }}
+        securityContext:
+{{ toYaml .Values.containerSecurityContext | indent 10 }}
+{{- end }}
+        {{-  if .Values.kubeRBACProxy.enabled  }}
+      - name: kube-rbac-proxy-http
+        args:
+        {{-  if .Values.kubeRBACProxy.extraArgs  }}
+        {{- .Values.kubeRBACProxy.extraArgs | toYaml | nindent 8 }}
+        {{-  end  }}
+        - --secure-listen-address=:{{ .Values.service.port | default 8080}}
+        - --upstream=http://127.0.0.1:{{ $servicePort }}/
+        - --proxy-endpoints-port=8888
+        - --config-file=/etc/kube-rbac-proxy-config/config-file.yaml
+        volumeMounts:
+          - name: kube-rbac-proxy-config
+            mountPath: /etc/kube-rbac-proxy-config
+          {{- with .Values.kubeRBACProxy.volumeMounts }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
+        imagePullPolicy: {{ .Values.kubeRBACProxy.image.pullPolicy }}
+        image: {{ include "kubeRBACProxy.image" . }}
+        ports:
+          - containerPort: {{ .Values.service.port | default 8080}}
+            name: "http"
+          - containerPort: 8888
+            name: "http-healthz"
+        readinessProbe:
+          httpGet:
+            scheme: HTTPS
+            port: 8888
+            path: healthz
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+        {{- if .Values.kubeRBACProxy.resources }}
+        resources:
+{{ toYaml .Values.kubeRBACProxy.resources | indent 10 }}
+{{- end }}
+{{- if .Values.kubeRBACProxy.containerSecurityContext }}
+        securityContext:
+{{ toYaml .Values.kubeRBACProxy.containerSecurityContext | indent 10 }}
+{{- end }}
+      {{-  if .Values.selfMonitor.enabled  }}
+      - name: kube-rbac-proxy-telemetry
+        args:
+        {{-  if .Values.kubeRBACProxy.extraArgs  }}
+        {{- .Values.kubeRBACProxy.extraArgs | toYaml | nindent 8 }}
+        {{-  end  }}
+        - --secure-listen-address=:{{ .Values.selfMonitor.telemetryPort | default 8081 }}
+        - --upstream=http://127.0.0.1:{{ $telemetryPort }}/
+        - --proxy-endpoints-port=8889
+        - --config-file=/etc/kube-rbac-proxy-config/config-file.yaml
+        volumeMounts:
+          - name: kube-rbac-proxy-config
+            mountPath: /etc/kube-rbac-proxy-config
+          {{- with .Values.kubeRBACProxy.volumeMounts }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
+        imagePullPolicy: {{ .Values.kubeRBACProxy.image.pullPolicy }}
+        image: {{ include "kubeRBACProxy.image" . }}
+        ports:
+          - containerPort: {{ .Values.selfMonitor.telemetryPort | default 8081 }}
+            name: "metrics"
+          - containerPort: 8889
+            name: "metrics-healthz"
+        readinessProbe:
+          httpGet:
+            scheme: HTTPS
+            port: 8889
+            path: healthz
+          initialDelaySeconds: 5
+          timeoutSeconds: 5
+        {{- if .Values.kubeRBACProxy.resources }}
+        resources:
+{{ toYaml .Values.kubeRBACProxy.resources | indent 10 }}
+{{- end }}
+{{- if .Values.kubeRBACProxy.containerSecurityContext }}
+        securityContext:
+{{ toYaml .Values.kubeRBACProxy.containerSecurityContext | indent 10 }}
+{{- end }}
+      {{- end }}
+      {{- end }}
+      {{- with .Values.containers }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+{{- if or .Values.imagePullSecrets .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- include "kube-state-metrics.imagePullSecrets" (dict "Values" .Values "imagePullSecrets" .Values.imagePullSecrets) | indent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ tpl (toYaml .) $ | indent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+{{ tpl (toYaml .) $ | indent 8 }}
+      {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+{{ toYaml .Values.topologySpreadConstraints | indent 8 }}
+      {{- end }}
+      {{- if or (.Values.kubeconfig.enabled) (.Values.customResourceState.enabled) (.Values.volumes) (.Values.kubeRBACProxy.enabled) }}
+      volumes:
+      {{- if .Values.kubeconfig.enabled}}
+        - name: kubeconfig
+          secret:
+            secretName: {{ template "kube-state-metrics.fullname" . }}-kubeconfig
+      {{- end }}
+      {{- if .Values.kubeRBACProxy.enabled}}
+        - name: kube-rbac-proxy-config
+          configMap:
+            name: {{ template "kube-state-metrics.fullname" . }}-rbac-config
+      {{- end }}
+      {{- if .Values.customResourceState.enabled}}
+        - name: customresourcestate-config
+          configMap:
+            name: {{ template "kube-state-metrics.fullname" . }}-customresourcestate-config
+      {{- end }}
+      {{- if .Values.volumes }}
+{{ toYaml .Values.volumes | indent 8 }}
+      {{- end }}
+      {{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/extra-manifests.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/extra-manifests.yaml
new file mode 100644
index 000000000..567f7bf32
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/extra-manifests.yaml
@@ -0,0 +1,4 @@
+{{ range .Values.extraManifests }}
+---
+{{ tpl (toYaml .) $ }}
+{{ end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/kubeconfig-secret.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/kubeconfig-secret.yaml
new file mode 100644
index 000000000..6af008450
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/kubeconfig-secret.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.kubeconfig.enabled -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "kube-state-metrics.fullname" . }}-kubeconfig
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+type: Opaque
+data:
+  config: '{{ .Values.kubeconfig.secret }}'
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/networkpolicy.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/networkpolicy.yaml
new file mode 100644
index 000000000..309b38ec5
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/networkpolicy.yaml
@@ -0,0 +1,43 @@
+{{- if and .Values.networkPolicy.enabled (eq .Values.networkPolicy.flavor "kubernetes") }}
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+  {{- if .Values.annotations }}
+  annotations:
+    {{ toYaml .Values.annotations | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+  name: {{ template "kube-state-metrics.fullname" . }}
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+spec:
+  {{- if .Values.networkPolicy.egress }}
+  ## Deny all egress by default
+  egress:
+    {{- toYaml .Values.networkPolicy.egress | nindent 4 }}
+  {{- end }}
+  ingress:
+  {{- if .Values.networkPolicy.ingress }}
+    {{- toYaml .Values.networkPolicy.ingress | nindent 4 }}
+  {{- else }}
+    ## Allow ingress on default ports by default
+  - ports:
+    - port: {{ .Values.service.port | default 8080 }}
+      protocol: TCP
+    {{- if .Values.selfMonitor.enabled }}
+    {{- $telemetryPort := ternary 9091 (.Values.selfMonitor.telemetryPort | default 8081) .Values.kubeRBACProxy.enabled}}
+    - port: {{ $telemetryPort }}
+      protocol: TCP
+    {{- end }}
+  {{- end }}
+  podSelector:
+    {{- if .Values.networkPolicy.podSelector }}
+    {{- toYaml .Values.networkPolicy.podSelector | nindent 4 }}
+    {{- else }}
+    matchLabels:
+      {{- include "kube-state-metrics.selectorLabels" . | indent 6 }}
+    {{- end }}
+  policyTypes:
+    - Ingress
+    - Egress
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/pdb.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/pdb.yaml
new file mode 100644
index 000000000..3771b511d
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/pdb.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.podDisruptionBudget -}}
+{{ if $.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" -}}
+apiVersion: policy/v1
+{{- else -}}
+apiVersion: policy/v1beta1
+{{- end }}
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "kube-state-metrics.fullname" . }}
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }}
+{{ toYaml .Values.podDisruptionBudget | indent 2 }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/podsecuritypolicy.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/podsecuritypolicy.yaml
new file mode 100644
index 000000000..8905e113e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/podsecuritypolicy.yaml
@@ -0,0 +1,39 @@
+{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ template "kube-state-metrics.fullname" . }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+{{- if .Values.podSecurityPolicy.annotations }}
+  annotations:
+{{ toYaml .Values.podSecurityPolicy.annotations | indent 4 }}
+{{- end }}
+spec:
+  privileged: false
+  volumes:
+    - 'secret'
+{{- if .Values.podSecurityPolicy.additionalVolumes }}
+{{ toYaml .Values.podSecurityPolicy.additionalVolumes | indent 4 }}
+{{- end }}
+  hostNetwork: false
+  hostIPC: false
+  hostPID: false
+  runAsUser:
+    rule: 'MustRunAsNonRoot'
+  seLinux:
+    rule: 'RunAsAny'
+  supplementalGroups:
+    rule: 'MustRunAs'
+    ranges:
+      # Forbid adding the root group.
+      - min: 1
+        max: 65535
+  fsGroup:
+    rule: 'MustRunAs'
+    ranges:
+      # Forbid adding the root group.
+      - min: 1
+        max: 65535
+  readOnlyRootFilesystem: false
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/psp-clusterrole.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/psp-clusterrole.yaml
new file mode 100644
index 000000000..654e4a3d5
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/psp-clusterrole.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+  name: psp-{{ template "kube-state-metrics.fullname" . }}
+rules:
+{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
+{{- if semverCompare "> 1.15.0-0" $kubeTargetVersion }}
+- apiGroups: ['policy']
+{{- else }}
+- apiGroups: ['extensions']
+{{- end }}
+  resources: ['podsecuritypolicies']
+  verbs:     ['use']
+  resourceNames:
+  - {{ template "kube-state-metrics.fullname" . }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml
new file mode 100644
index 000000000..5b62a18bd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml
@@ -0,0 +1,16 @@
+{{- if and .Values.podSecurityPolicy.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+  name: psp-{{ template "kube-state-metrics.fullname" . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: psp-{{ template "kube-state-metrics.fullname" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "kube-state-metrics.serviceAccountName" . }}
+    namespace: {{ template "kube-state-metrics.namespace" . }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/rbac-configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/rbac-configmap.yaml
new file mode 100644
index 000000000..671dc9d66
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/rbac-configmap.yaml
@@ -0,0 +1,22 @@
+{{- if .Values.kubeRBACProxy.enabled}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "kube-state-metrics.fullname" . }}-rbac-config
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+  {{- if .Values.annotations }}
+  annotations:
+    {{ toYaml .Values.annotations | nindent 4 }}
+  {{- end }}
+data:
+  config-file.yaml: |+
+    authorization:
+      resourceAttributes:
+        namespace: {{ template "kube-state-metrics.namespace" . }}
+        apiVersion: v1
+        resource: services
+        subresource: {{ template "kube-state-metrics.fullname" . }}
+        name: {{ template "kube-state-metrics.fullname" . }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/role.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/role.yaml
new file mode 100644
index 000000000..d33687f2d
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/role.yaml
@@ -0,0 +1,212 @@
+{{- if and (eq .Values.rbac.create true) (not .Values.rbac.useExistingRole) -}}
+{{- range (ternary (join "," .Values.namespaces | split "," ) (list "") (eq $.Values.rbac.useClusterRole false)) }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+{{- if eq $.Values.rbac.useClusterRole false }}
+kind: Role
+{{- else }}
+kind: ClusterRole
+{{- end }}
+metadata:
+  labels:
+    {{- include "kube-state-metrics.labels" $ | indent 4 }}
+  name: {{ template "kube-state-metrics.fullname" $ }}
+{{- if eq $.Values.rbac.useClusterRole false }}
+  namespace: {{ . }}
+{{- end }}
+rules:
+{{ if has "certificatesigningrequests" $.Values.collectors }}
+- apiGroups: ["certificates.k8s.io"]
+  resources:
+  - certificatesigningrequests
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "configmaps" $.Values.collectors }}
+- apiGroups: [""]
+  resources:
+  - configmaps
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "cronjobs" $.Values.collectors }}
+- apiGroups: ["batch"]
+  resources:
+  - cronjobs
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "daemonsets" $.Values.collectors }}
+- apiGroups: ["extensions", "apps"]
+  resources:
+  - daemonsets
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "deployments" $.Values.collectors }}
+- apiGroups: ["extensions", "apps"]
+  resources:
+  - deployments
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "endpoints" $.Values.collectors }}
+- apiGroups: [""]
+  resources:
+  - endpoints
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "endpointslices" $.Values.collectors }}
+- apiGroups: ["discovery.k8s.io"]
+  resources:
+  - endpointslices
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "horizontalpodautoscalers" $.Values.collectors }}
+- apiGroups: ["autoscaling"]
+  resources:
+  - horizontalpodautoscalers
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "ingresses" $.Values.collectors }}
+- apiGroups: ["extensions", "networking.k8s.io"]
+  resources:
+  - ingresses
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "jobs" $.Values.collectors }}
+- apiGroups: ["batch"]
+  resources:
+  - jobs
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "leases" $.Values.collectors }}
+- apiGroups: ["coordination.k8s.io"]
+  resources:
+  - leases
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "limitranges" $.Values.collectors }}
+- apiGroups: [""]
+  resources:
+  - limitranges
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "mutatingwebhookconfigurations" $.Values.collectors }}
+- apiGroups: ["admissionregistration.k8s.io"]
+  resources:
+    - mutatingwebhookconfigurations
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "namespaces" $.Values.collectors }}
+- apiGroups: [""]
+  resources:
+  - namespaces
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "networkpolicies" $.Values.collectors }}
+- apiGroups: ["networking.k8s.io"]
+  resources:
+  - networkpolicies
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "nodes" $.Values.collectors }}
+- apiGroups: [""]
+  resources:
+  - nodes
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "persistentvolumeclaims" $.Values.collectors }}
+- apiGroups: [""]
+  resources:
+  - persistentvolumeclaims
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "persistentvolumes" $.Values.collectors }}
+- apiGroups: [""]
+  resources:
+  - persistentvolumes
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "poddisruptionbudgets" $.Values.collectors }}
+- apiGroups: ["policy"]
+  resources:
+    - poddisruptionbudgets
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "pods" $.Values.collectors }}
+- apiGroups: [""]
+  resources:
+  - pods
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "replicasets" $.Values.collectors }}
+- apiGroups: ["extensions", "apps"]
+  resources:
+  - replicasets
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "replicationcontrollers" $.Values.collectors }}
+- apiGroups: [""]
+  resources:
+  - replicationcontrollers
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "resourcequotas" $.Values.collectors }}
+- apiGroups: [""]
+  resources:
+  - resourcequotas
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "secrets" $.Values.collectors }}
+- apiGroups: [""]
+  resources:
+  - secrets
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "services" $.Values.collectors }}
+- apiGroups: [""]
+  resources:
+  - services
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "statefulsets" $.Values.collectors }}
+- apiGroups: ["apps"]
+  resources:
+  - statefulsets
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "storageclasses" $.Values.collectors }}
+- apiGroups: ["storage.k8s.io"]
+  resources:
+    - storageclasses
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "validatingwebhookconfigurations" $.Values.collectors }}
+- apiGroups: ["admissionregistration.k8s.io"]
+  resources:
+    - validatingwebhookconfigurations
+  verbs: ["list", "watch"]
+{{ end -}}
+{{ if has "volumeattachments" $.Values.collectors }}
+- apiGroups: ["storage.k8s.io"]
+  resources:
+    - volumeattachments
+  verbs: ["list", "watch"]
+{{ end -}}
+{{-  if $.Values.kubeRBACProxy.enabled  }}
+- apiGroups: ["authentication.k8s.io"]
+  resources:
+    - tokenreviews
+  verbs: ["create"]
+- apiGroups: ["authorization.k8s.io"]
+  resources:
+    - subjectaccessreviews
+  verbs: ["create"]
+{{- end }}
+{{- if $.Values.customResourceState.enabled }}
+- apiGroups: ["apiextensions.k8s.io"]
+  resources:
+    - customresourcedefinitions
+  verbs: ["list", "watch"]
+{{- end }}
+{{ if $.Values.rbac.extraRules }}
+{{ toYaml $.Values.rbac.extraRules }}
+{{ end }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/rolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/rolebinding.yaml
new file mode 100644
index 000000000..330651b73
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/rolebinding.yaml
@@ -0,0 +1,24 @@
+{{- if and (eq  .Values.rbac.create true) (eq .Values.rbac.useClusterRole false) -}}
+{{- range (join "," $.Values.namespaces) | split "," }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    {{- include "kube-state-metrics.labels" $ | indent 4 }}
+  name: {{ template "kube-state-metrics.fullname" $ }}
+  namespace: {{ . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+{{- if (not $.Values.rbac.useExistingRole) }}
+  name: {{ template "kube-state-metrics.fullname" $ }}
+{{- else }}
+  name: {{ $.Values.rbac.useExistingRole }}
+{{- end }}
+subjects:
+- kind: ServiceAccount
+  name: {{ template "kube-state-metrics.serviceAccountName" $ }}
+  namespace: {{ template "kube-state-metrics.namespace" $ }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/service.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/service.yaml
new file mode 100644
index 000000000..90c235148
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/service.yaml
@@ -0,0 +1,53 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "kube-state-metrics.fullname" . }}
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+  annotations:
+    {{- if .Values.prometheusScrape }}
+    prometheus.io/scrape: '{{ .Values.prometheusScrape }}'
+    {{- end }}
+    {{- if .Values.service.annotations }}
+    {{- toYaml .Values.service.annotations | nindent 4 }}
+    {{- end }}
+spec:
+  type: "{{ .Values.service.type }}"
+  {{- if .Values.service.ipDualStack.enabled }}
+  ipFamilies: {{ toYaml .Values.service.ipDualStack.ipFamilies | nindent 4 }}
+  ipFamilyPolicy: {{ .Values.service.ipDualStack.ipFamilyPolicy }}
+  {{- end }}
+  ports:
+  - name: "http"
+    protocol: TCP
+    port: {{ .Values.service.port | default 8080}}
+  {{- if .Values.service.nodePort }}
+    nodePort: {{ .Values.service.nodePort }}
+  {{- end }}
+    targetPort: {{ .Values.service.port | default 8080}}
+  {{ if .Values.selfMonitor.enabled }}
+  - name: "metrics"
+    protocol: TCP
+    port: {{ .Values.selfMonitor.telemetryPort | default 8081 }}
+    targetPort: {{ .Values.selfMonitor.telemetryPort | default 8081 }}
+  {{- if .Values.selfMonitor.telemetryNodePort }}
+    nodePort: {{ .Values.selfMonitor.telemetryNodePort }}
+  {{- end }}
+  {{ end }}
+{{- if .Values.service.loadBalancerIP }}
+  loadBalancerIP: "{{ .Values.service.loadBalancerIP }}"
+{{- end }}
+{{- if .Values.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- range $cidr := .Values.service.loadBalancerSourceRanges }}
+    - {{ $cidr }}
+  {{- end }}
+{{- end }}
+{{- if .Values.autosharding.enabled }}
+  clusterIP: None
+{{- else if .Values.service.clusterIP }}
+  clusterIP: "{{ .Values.service.clusterIP }}"
+{{- end }}
+  selector:
+    {{- include "kube-state-metrics.selectorLabels" . | indent 4 }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/serviceaccount.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/serviceaccount.yaml
new file mode 100644
index 000000000..c302bc7ca
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/serviceaccount.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
+metadata:
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+  name: {{ template "kube-state-metrics.serviceAccountName" . }}
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+{{- if .Values.serviceAccount.annotations }}
+  annotations:
+{{ toYaml .Values.serviceAccount.annotations | indent 4 }}
+{{- end }}
+{{- if or .Values.serviceAccount.imagePullSecrets .Values.global.imagePullSecrets }}
+imagePullSecrets:
+  {{- include "kube-state-metrics.imagePullSecrets" (dict "Values" .Values "imagePullSecrets" .Values.serviceAccount.imagePullSecrets) | indent 2 }}
+{{- end }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/servicemonitor.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/servicemonitor.yaml
new file mode 100644
index 000000000..99d7fa924
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/servicemonitor.yaml
@@ -0,0 +1,120 @@
+{{- if .Values.prometheus.monitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "kube-state-metrics.fullname" . }}
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+  {{- with .Values.prometheus.monitor.additionalLabels }}
+    {{- tpl (toYaml . | nindent 4) $ }}
+  {{- end }}
+  {{- with .Values.prometheus.monitor.annotations }}
+  annotations:
+    {{- tpl (toYaml . | nindent 4) $ }}
+  {{- end }}
+spec:
+  jobLabel: {{ default "app.kubernetes.io/name" .Values.prometheus.monitor.jobLabel }}
+  {{- with .Values.prometheus.monitor.targetLabels }}
+  targetLabels:
+    {{- toYaml . | trim | nindent 4 }}
+  {{- end }}
+  {{- with .Values.prometheus.monitor.podTargetLabels }}
+  podTargetLabels:
+    {{- toYaml . | trim | nindent 4 }}
+  {{- end }}
+  {{- include "servicemonitor.scrapeLimits" .Values.prometheus.monitor | indent 2 }}
+  {{- if .Values.prometheus.monitor.namespaceSelector }}
+  namespaceSelector:
+    matchNames:
+    {{- with .Values.prometheus.monitor.namespaceSelector }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+  {{- end }}
+  selector:
+    matchLabels:
+    {{- with .Values.prometheus.monitor.selectorOverride }}
+      {{- toYaml . | nindent 6 }}
+    {{- else }}
+      {{- include "kube-state-metrics.selectorLabels" . | indent 6 }}
+    {{- end }}
+  endpoints:
+    - port: http
+    {{- if or .Values.prometheus.monitor.http.interval .Values.prometheus.monitor.interval }}
+      interval: {{ .Values.prometheus.monitor.http.interval | default .Values.prometheus.monitor.interval }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.http.scrapeTimeout .Values.prometheus.monitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.prometheus.monitor.http.scrapeTimeout | default .Values.prometheus.monitor.scrapeTimeout }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.http.proxyUrl .Values.prometheus.monitor.proxyUrl }}
+      proxyUrl: {{ .Values.prometheus.monitor.http.proxyUrl | default .Values.prometheus.monitor.proxyUrl }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.http.enableHttp2 .Values.prometheus.monitor.enableHttp2 }}
+      enableHttp2: {{ .Values.prometheus.monitor.http.enableHttp2 | default .Values.prometheus.monitor.enableHttp2 }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.http.honorLabels .Values.prometheus.monitor.honorLabels }}
+      honorLabels: true
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.http.metricRelabelings .Values.prometheus.monitor.metricRelabelings }}
+      metricRelabelings:
+        {{- toYaml (.Values.prometheus.monitor.http.metricRelabelings | default .Values.prometheus.monitor.metricRelabelings) | nindent 8 }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.http.relabelings .Values.prometheus.monitor.relabelings }}
+      relabelings:
+        {{- toYaml (.Values.prometheus.monitor.http.relabelings | default .Values.prometheus.monitor.relabelings) | nindent 8 }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.http.scheme .Values.prometheus.monitor.scheme }}
+      scheme: {{ .Values.prometheus.monitor.http.scheme | default .Values.prometheus.monitor.scheme }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.http.tlsConfig .Values.prometheus.monitor.tlsConfig }}
+      tlsConfig:
+        {{- toYaml (.Values.prometheus.monitor.http.tlsConfig | default .Values.prometheus.monitor.tlsConfig) | nindent 8 }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.http.bearerTokenFile .Values.prometheus.monitor.bearerTokenFile }}
+      bearerTokenFile: {{ .Values.prometheus.monitor.http.bearerTokenFile | default .Values.prometheus.monitor.bearerTokenFile }}
+    {{- end }}
+    {{- with (.Values.prometheus.monitor.http.bearerTokenSecret | default .Values.prometheus.monitor.bearerTokenSecret) }}
+      bearerTokenSecret:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+  {{- if .Values.selfMonitor.enabled }}
+    - port: metrics
+    {{- if or .Values.prometheus.monitor.metrics.interval .Values.prometheus.monitor.interval }}
+      interval: {{ .Values.prometheus.monitor.metrics.interval | default .Values.prometheus.monitor.interval }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.metrics.scrapeTimeout .Values.prometheus.monitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.prometheus.monitor.metrics.scrapeTimeout | default .Values.prometheus.monitor.scrapeTimeout }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.metrics.proxyUrl .Values.prometheus.monitor.proxyUrl }}
+      proxyUrl: {{ .Values.prometheus.monitor.metrics.proxyUrl | default .Values.prometheus.monitor.proxyUrl }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.metrics.enableHttp2 .Values.prometheus.monitor.enableHttp2 }}
+      enableHttp2: {{ .Values.prometheus.monitor.metrics.enableHttp2 | default .Values.prometheus.monitor.enableHttp2 }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.metrics.honorLabels .Values.prometheus.monitor.honorLabels }}
+      honorLabels: true
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.metrics.metricRelabelings .Values.prometheus.monitor.metricRelabelings }}
+      metricRelabelings:
+        {{- toYaml (.Values.prometheus.monitor.metrics.metricRelabelings | default .Values.prometheus.monitor.metricRelabelings) | nindent 8 }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.metrics.relabelings .Values.prometheus.monitor.relabelings }}
+      relabelings:
+        {{- toYaml (.Values.prometheus.monitor.metrics.relabelings | default .Values.prometheus.monitor.relabelings) | nindent 8 }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.metrics.scheme .Values.prometheus.monitor.scheme }}
+      scheme: {{ .Values.prometheus.monitor.metrics.scheme | default .Values.prometheus.monitor.scheme }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.metrics.tlsConfig .Values.prometheus.monitor.tlsConfig }}
+      tlsConfig:
+        {{- toYaml (.Values.prometheus.monitor.metrics.tlsConfig | default .Values.prometheus.monitor.tlsConfig) | nindent 8 }}
+    {{- end }}
+    {{- if or .Values.prometheus.monitor.metrics.bearerTokenFile .Values.prometheus.monitor.bearerTokenFile }}
+      bearerTokenFile: {{ .Values.prometheus.monitor.metrics.bearerTokenFile | default .Values.prometheus.monitor.bearerTokenFile }}
+    {{- end }}
+    {{- with (.Values.prometheus.monitor.metrics.bearerTokenSecret | default .Values.prometheus.monitor.bearerTokenSecret) }}
+      bearerTokenSecret:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+  {{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/stsdiscovery-role.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/stsdiscovery-role.yaml
new file mode 100644
index 000000000..489de147c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/stsdiscovery-role.yaml
@@ -0,0 +1,26 @@
+{{- if and .Values.autosharding.enabled .Values.rbac.create -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: stsdiscovery-{{ template "kube-state-metrics.fullname" . }}
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - get
+- apiGroups:
+  - apps
+  resourceNames:
+  - {{ template "kube-state-metrics.fullname" . }}
+  resources:
+  - statefulsets
+  verbs:
+  - get
+  - list
+  - watch
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/stsdiscovery-rolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/stsdiscovery-rolebinding.yaml
new file mode 100644
index 000000000..73b37a4f6
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/stsdiscovery-rolebinding.yaml
@@ -0,0 +1,17 @@
+{{- if and .Values.autosharding.enabled .Values.rbac.create -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: stsdiscovery-{{ template "kube-state-metrics.fullname" . }}
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: stsdiscovery-{{ template "kube-state-metrics.fullname" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "kube-state-metrics.serviceAccountName" . }}
+    namespace: {{ template "kube-state-metrics.namespace" . }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/verticalpodautoscaler.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/verticalpodautoscaler.yaml
new file mode 100644
index 000000000..f46305b51
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/templates/verticalpodautoscaler.yaml
@@ -0,0 +1,44 @@
+{{- if and (.Capabilities.APIVersions.Has "autoscaling.k8s.io/v1") (.Values.verticalPodAutoscaler.enabled) }}
+apiVersion: autoscaling.k8s.io/v1
+kind: VerticalPodAutoscaler
+metadata:
+  name: {{ template "kube-state-metrics.fullname" . }}
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+spec:
+  {{- with .Values.verticalPodAutoscaler.recommenders }}
+  recommenders:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  resourcePolicy:
+    containerPolicies:
+    - containerName: {{ template "kube-state-metrics.name" . }}
+      {{- with .Values.verticalPodAutoscaler.controlledResources }}
+      controlledResources:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.verticalPodAutoscaler.controlledValues }}
+      controlledValues: {{ .Values.verticalPodAutoscaler.controlledValues }}
+      {{- end }}
+      {{- if .Values.verticalPodAutoscaler.maxAllowed }}
+      maxAllowed:
+        {{ toYaml .Values.verticalPodAutoscaler.maxAllowed | nindent 8 }}
+      {{- end }}
+      {{- if .Values.verticalPodAutoscaler.minAllowed }}
+      minAllowed:
+        {{ toYaml .Values.verticalPodAutoscaler.minAllowed | nindent 8 }}
+      {{- end }}
+  targetRef:
+    apiVersion: apps/v1
+    {{- if .Values.autosharding.enabled }}
+    kind: StatefulSet
+    {{- else }}
+    kind: Deployment
+    {{- end }}
+    name:  {{ template "kube-state-metrics.fullname" . }}
+  {{- with .Values.verticalPodAutoscaler.updatePolicy }}
+  updatePolicy:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/values.yaml
new file mode 100644
index 000000000..a7b2bdad6
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/kube-state-metrics/values.yaml
@@ -0,0 +1,542 @@
+# Default values for kube-state-metrics.
+prometheusScrape: true
+image:
+  registry: registry.k8s.io
+  repository: kube-state-metrics/kube-state-metrics
+  # If unset use v + .Charts.appVersion
+  tag: ""
+  sha: ""
+  pullPolicy: IfNotPresent
+
+imagePullSecrets: []
+# - name: "image-pull-secret"
+
+global:
+  # To help compatibility with other charts which use global.imagePullSecrets.
+  # Allow either an array of {name: pullSecret} maps (k8s-style), or an array of strings (more common helm-style).
+  # global:
+  #   imagePullSecrets:
+  #   - name: pullSecret1
+  #   - name: pullSecret2
+  # or
+  # global:
+  #   imagePullSecrets:
+  #   - pullSecret1
+  #   - pullSecret2
+  imagePullSecrets: []
+  #
+  # Allow parent charts to override registry hostname
+  imageRegistry: ""
+
+# If set to true, this will deploy kube-state-metrics as a StatefulSet and the data
+# will be automatically sharded across <.Values.replicas> pods using the built-in
+# autodiscovery feature: https://github.com/kubernetes/kube-state-metrics#automated-sharding
+# This is an experimental feature and there are no stability guarantees.
+autosharding:
+  enabled: false
+
+replicas: 1
+
+# Change the deployment strategy when autosharding is disabled.
+# ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
+# The default is "RollingUpdate" as per Kubernetes defaults.
+# During a release, 'RollingUpdate' can lead to two running instances for a short period of time while 'Recreate' can create a small gap in data.
+# updateStrategy: Recreate
+
+# Number of old history to retain to allow rollback
+# Default Kubernetes value is set to 10
+revisionHistoryLimit: 10
+
+# List of additional cli arguments to configure kube-state-metrics
+# for example: --enable-gzip-encoding, --log-file, etc.
+# all the possible args can be found here: https://github.com/kubernetes/kube-state-metrics/blob/master/docs/cli-arguments.md
+extraArgs: []
+
+# If false then the user will opt out of automounting API credentials.
+automountServiceAccountToken: true
+
+service:
+  port: 8080
+  # Default to clusterIP for backward compatibility
+  type: ClusterIP
+  ipDualStack:
+    enabled: false
+    ipFamilies: ["IPv6", "IPv4"]
+    ipFamilyPolicy: "PreferDualStack"
+  nodePort: 0
+  loadBalancerIP: ""
+  # Only allow access to the loadBalancerIP from these IPs
+  loadBalancerSourceRanges: []
+  clusterIP: ""
+  annotations: {}
+
+## Additional labels to add to all resources
+customLabels: {}
+  # app: kube-state-metrics
+
+## Override selector labels
+selectorOverride: {}
+
+## set to true to add the release label so scraping of the servicemonitor with kube-prometheus-stack works out of the box
+releaseLabel: false
+
+hostNetwork: false
+
+rbac:
+  # If true, create & use RBAC resources
+  create: true
+
+  # Set to a rolename to use existing role - skipping role creating - but still doing serviceaccount and rolebinding to it, rolename set here.
+  # useExistingRole: your-existing-role
+
+  # If set to false - Run without Cluteradmin privs needed - ONLY works if namespace is also set (if useExistingRole is set this name is used as ClusterRole or Role to bind to)
+  useClusterRole: true
+
+  # Add permissions for CustomResources' apiGroups in Role/ClusterRole. Should be used in conjunction with Custom Resource State Metrics configuration
+  # Example:
+  # - apiGroups: ["monitoring.coreos.com"]
+  #   resources: ["prometheuses"]
+  #   verbs: ["list", "watch"]
+  extraRules: []
+
+# Configure kube-rbac-proxy. When enabled, creates one kube-rbac-proxy container per exposed HTTP endpoint (metrics and telemetry if enabled).
+# The requests are served through the same service but requests are then HTTPS.
+kubeRBACProxy:
+  enabled: false
+  image:
+    registry: quay.io
+    repository: brancz/kube-rbac-proxy
+    tag: v0.18.0
+    sha: ""
+    pullPolicy: IfNotPresent
+
+  # List of additional cli arguments to configure kube-rbac-prxy
+  # for example: --tls-cipher-suites, --log-file, etc.
+  # all the possible args can be found here: https://github.com/brancz/kube-rbac-proxy#usage
+  extraArgs: []
+
+  ## Specify security settings for a Container
+  ## Allows overrides and additional options compared to (Pod) securityContext
+  ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
+  containerSecurityContext:
+    readOnlyRootFilesystem: true
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop:
+      - ALL
+
+  resources: {}
+    # We usually recommend not to specify default resources and to leave this as a conscious
+    # choice for the user. This also increases chances charts run on environments with little
+    # resources, such as Minikube. If you do want to specify resources, uncomment the following
+    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+    # limits:
+    #  cpu: 100m
+    #  memory: 64Mi
+    # requests:
+    #  cpu: 10m
+    #  memory: 32Mi
+
+  ## volumeMounts enables mounting custom volumes in rbac-proxy containers
+  ## Useful for TLS certificates and keys
+  volumeMounts: []
+    # - mountPath: /etc/tls
+    #   name: kube-rbac-proxy-tls
+    #   readOnly: true
+
+serviceAccount:
+  # Specifies whether a ServiceAccount should be created, require rbac true
+  create: true
+  # The name of the ServiceAccount to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name:
+  # Reference to one or more secrets to be used when pulling images
+  # ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+  imagePullSecrets: []
+  # ServiceAccount annotations.
+  # Use case: AWS EKS IAM roles for service accounts
+  # ref: https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.html
+  annotations: {}
+  # If false then the user will opt out of automounting API credentials.
+  automountServiceAccountToken: true
+
+prometheus:
+  monitor:
+    enabled: false
+    annotations: {}
+    additionalLabels: {}
+    namespace: ""
+    namespaceSelector: []
+    jobLabel: ""
+    targetLabels: []
+    podTargetLabels: []
+    ## SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
+    ##
+    sampleLimit: 0
+
+    ## TargetLimit defines a limit on the number of scraped targets that will be accepted.
+    ##
+    targetLimit: 0
+
+    ## Per-scrape limit on number of labels that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+    ##
+    labelLimit: 0
+
+    ## Per-scrape limit on length of labels name that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+    ##
+    labelNameLengthLimit: 0
+
+    ## Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+    ##
+    labelValueLengthLimit: 0
+    selectorOverride: {}
+
+    ## kube-state-metrics endpoint
+    http:
+      interval: ""
+      scrapeTimeout: ""
+      proxyUrl: ""
+      ## Whether to enable HTTP2 for servicemonitor
+      enableHttp2: false
+      honorLabels: false
+      metricRelabelings: []
+      relabelings: []
+      scheme: ""
+      ## File to read bearer token for scraping targets
+      bearerTokenFile: ""
+      ## Secret to mount to read bearer token for scraping targets. The secret needs
+      ## to be in the same namespace as the service monitor and accessible by the
+      ## Prometheus Operator
+      bearerTokenSecret: {}
+        # name: secret-name
+        # key:  key-name
+      tlsConfig: {}
+
+    ## selfMonitor endpoint
+    metrics:
+      interval: ""
+      scrapeTimeout: ""
+      proxyUrl: ""
+      ## Whether to enable HTTP2 for servicemonitor
+      enableHttp2: false
+      honorLabels: false
+      metricRelabelings: []
+      relabelings: []
+      scheme: ""
+      ## File to read bearer token for scraping targets
+      bearerTokenFile: ""
+      ## Secret to mount to read bearer token for scraping targets. The secret needs
+      ## to be in the same namespace as the service monitor and accessible by the
+      ## Prometheus Operator
+      bearerTokenSecret: {}
+        # name: secret-name
+        # key:  key-name
+      tlsConfig: {}
+
+## Specify if a Pod Security Policy for kube-state-metrics must be created
+## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/
+##
+podSecurityPolicy:
+  enabled: false
+  annotations: {}
+    ## Specify pod annotations
+    ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#apparmor
+    ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#seccomp
+    ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#sysctl
+    ##
+    # seccomp.security.alpha.kubernetes.io/allowedProfileNames: '*'
+    # seccomp.security.alpha.kubernetes.io/defaultProfileName: 'docker/default'
+    # apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default'
+
+  additionalVolumes: []
+
+## Configure network policy for kube-state-metrics
+networkPolicy:
+  enabled: false
+  # networkPolicy.flavor -- Flavor of the network policy to use.
+  # Can be:
+  # * kubernetes for networking.k8s.io/v1/NetworkPolicy
+  # * cilium     for cilium.io/v2/CiliumNetworkPolicy
+  flavor: kubernetes
+
+  ## Configure the cilium network policy kube-apiserver selector
+  # cilium:
+    # kubeApiServerSelector:
+      # - toEntities:
+      #   - kube-apiserver
+
+  # egress:
+  # - {}
+  # ingress:
+  # - {}
+  # podSelector:
+  #   matchLabels:
+  #     app.kubernetes.io/name: kube-state-metrics
+
+securityContext:
+  enabled: true
+  runAsGroup: 65534
+  runAsUser: 65534
+  fsGroup: 65534
+  runAsNonRoot: true
+  seccompProfile:
+    type: RuntimeDefault
+
+## Specify security settings for a Container
+## Allows overrides and additional options compared to (Pod) securityContext
+## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
+containerSecurityContext:
+  readOnlyRootFilesystem: true
+  allowPrivilegeEscalation: false
+  capabilities:
+    drop:
+    - ALL
+
+## Node labels for pod assignment
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+nodeSelector: {}
+
+## Affinity settings for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+affinity: {}
+
+## Tolerations for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+tolerations: []
+
+## Topology spread constraints for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/
+topologySpreadConstraints: []
+
+# Annotations to be added to the deployment/statefulset
+annotations: {}
+
+# Annotations to be added to the pod
+podAnnotations: {}
+
+# Labels to be added to the pod
+podLabels: {}
+
+## Assign a PriorityClassName to pods if set
+# priorityClassName: ""
+
+# Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+podDisruptionBudget: {}
+
+# Comma-separated list of metrics to be exposed.
+# This list comprises of exact metric names and/or regex patterns.
+# The allowlist and denylist are mutually exclusive.
+metricAllowlist: []
+
+# Comma-separated list of metrics not to be enabled.
+# This list comprises of exact metric names and/or regex patterns.
+# The allowlist and denylist are mutually exclusive.
+metricDenylist: []
+
+# Comma-separated list of additional Kubernetes label keys that will be used in the resource's
+# labels metric. By default the metric contains only name and namespace labels.
+# To include additional labels, provide a list of resource names in their plural form and Kubernetes
+# label keys you would like to allow for them (Example: '=namespaces=[k8s-label-1,k8s-label-n,...],pods=[app],...)'.
+# A single '*' can be provided per resource instead to allow any labels, but that has
+# severe performance implications (Example: '=pods=[*]').
+metricLabelsAllowlist: []
+  # - namespaces=[k8s-label-1,k8s-label-n]
+
+# Comma-separated list of Kubernetes annotations keys that will be used in the resource'
+# labels metric. By default the metric contains only name and namespace labels.
+# To include additional annotations provide a list of resource names in their plural form and Kubernetes
+# annotation keys you would like to allow for them (Example: '=namespaces=[kubernetes.io/team,...],pods=[kubernetes.io/team],...)'.
+# A single '*' can be provided per resource instead to allow any annotations, but that has
+# severe performance implications (Example: '=pods=[*]').
+metricAnnotationsAllowList: []
+  # - pods=[k8s-annotation-1,k8s-annotation-n]
+
+# Available collectors for kube-state-metrics.
+# By default, all available resources are enabled, comment out to disable.
+collectors:
+  - certificatesigningrequests
+  - configmaps
+  - cronjobs
+  - daemonsets
+  - deployments
+  - endpoints
+  - horizontalpodautoscalers
+  - ingresses
+  - jobs
+  - leases
+  - limitranges
+  - mutatingwebhookconfigurations
+  - namespaces
+  - networkpolicies
+  - nodes
+  - persistentvolumeclaims
+  - persistentvolumes
+  - poddisruptionbudgets
+  - pods
+  - replicasets
+  - replicationcontrollers
+  - resourcequotas
+  - secrets
+  - services
+  - statefulsets
+  - storageclasses
+  - validatingwebhookconfigurations
+  - volumeattachments
+
+# Enabling kubeconfig will pass the --kubeconfig argument to the container
+kubeconfig:
+  enabled: false
+  # base64 encoded kube-config file
+  secret:
+
+# Enabling support for customResourceState, will create a configMap including your config that will be read from kube-state-metrics
+customResourceState:
+  enabled: false
+  # Add (Cluster)Role permissions to list/watch the customResources defined in the config to rbac.extraRules
+  config: {}
+
+# Enable only the release namespace for collecting resources. By default all namespaces are collected.
+# If releaseNamespace and namespaces are both set a merged list will be collected.
+releaseNamespace: false
+
+# Comma-separated list(string) or yaml list of namespaces to be enabled for collecting resources. By default all namespaces are collected.
+namespaces: ""
+
+# Comma-separated list of namespaces not to be enabled. If namespaces and namespaces-denylist are both set,
+# only namespaces that are excluded in namespaces-denylist will be used.
+namespacesDenylist: ""
+
+## Override the deployment namespace
+##
+namespaceOverride: ""
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #  cpu: 100m
+  #  memory: 64Mi
+  # requests:
+  #  cpu: 10m
+  #  memory: 32Mi
+
+## Provide a k8s version to define apiGroups for podSecurityPolicy Cluster Role.
+## For example: kubeTargetVersionOverride: 1.14.9
+##
+kubeTargetVersionOverride: ""
+
+# Enable self metrics configuration for service and Service Monitor
+# Default values for telemetry configuration can be overridden
+# If you set telemetryNodePort, you must also set service.type to NodePort
+selfMonitor:
+  enabled: false
+  # telemetryHost: 0.0.0.0
+  # telemetryPort: 8081
+  # telemetryNodePort: 0
+
+# Enable vertical pod autoscaler support for kube-state-metrics
+verticalPodAutoscaler:
+  enabled: false
+
+  # Recommender responsible for generating recommendation for the object.
+  # List should be empty (then the default recommender will generate the recommendation)
+  # or contain exactly one recommender.
+  # recommenders: []
+  # - name: custom-recommender-performance
+
+  # List of resources that the vertical pod autoscaler can control. Defaults to cpu and memory
+  controlledResources: []
+  # Specifies which resource values should be controlled: RequestsOnly or RequestsAndLimits.
+  # controlledValues: RequestsAndLimits
+
+  # Define the max allowed resources for the pod
+  maxAllowed: {}
+  # cpu: 200m
+  # memory: 100Mi
+  # Define the min allowed resources for the pod
+  minAllowed: {}
+  # cpu: 200m
+  # memory: 100Mi
+
+  # updatePolicy:
+    # Specifies minimal number of replicas which need to be alive for VPA Updater to attempt pod eviction
+    # minReplicas: 1
+    # Specifies whether recommended updates are applied when a Pod is started and whether recommended updates
+    # are applied during the life of a Pod. Possible values are "Off", "Initial", "Recreate", and "Auto".
+    # updateMode: Auto
+
+# volumeMounts are used to add custom volume mounts to deployment.
+# See example below
+volumeMounts: []
+#  - mountPath: /etc/config
+#    name: config-volume
+
+# volumes are used to add custom volumes to deployment
+# See example below
+volumes: []
+#  - configMap:
+#      name: cm-for-volume
+#    name: config-volume
+
+# Extra manifests to deploy as an array
+extraManifests: []
+  # - apiVersion: v1
+  #   kind: ConfigMap
+  #   metadata:
+  #   labels:
+  #     name: prometheus-extra
+  #   data:
+  #     extra-data: "value"
+
+## Containers allows injecting additional containers.
+containers: []
+  # - name: crd-init
+  #   image: kiwigrid/k8s-sidecar:latest
+
+## InitContainers allows injecting additional initContainers.
+initContainers: []
+  # - name: crd-sidecar
+  #   image: kiwigrid/k8s-sidecar:latest
+
+## Settings for startup, liveness and readiness probes
+## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
+##
+
+## Startup probe can optionally be enabled.
+##
+startupProbe:
+  enabled: false
+  failureThreshold: 3
+  httpGet:
+    httpHeaders: []
+    scheme: http
+  initialDelaySeconds: 0
+  periodSeconds: 10
+  successThreshold: 1
+  timeoutSeconds: 5
+
+## Liveness probe
+##
+livenessProbe:
+  failureThreshold: 3
+  httpGet:
+    httpHeaders: []
+    scheme: http
+  initialDelaySeconds: 5
+  periodSeconds: 10
+  successThreshold: 1
+  timeoutSeconds: 5
+
+## Readiness probe
+##
+readinessProbe:
+  failureThreshold: 3
+  httpGet:
+    httpHeaders: []
+    scheme: http
+  initialDelaySeconds: 5
+  periodSeconds: 10
+  successThreshold: 1
+  timeoutSeconds: 5
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/.helmignore
new file mode 100644
index 000000000..f62b5519e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/.helmignore
@@ -0,0 +1 @@
+templates/admission-webhooks/job-patch/README.md
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/Chart.lock b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/Chart.lock
new file mode 100644
index 000000000..f5e47e2b9
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.1
+digest: sha256:cfa7bfb136b9bcfe87e37d3556c3fedecc58f42685c4ce39485da106408b6619
+generated: "2025-01-16T06:38:24.059194146Z"
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/Chart.yaml
new file mode 100644
index 000000000..4818f7cd3
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/Chart.yaml
@@ -0,0 +1,33 @@
+apiVersion: v2
+appVersion: 0.21.5
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.1
+description: A Helm chart to deploy the New Relic Infrastructure Kubernetes Operator.
+home: https://hub.docker.com/r/newrelic/newrelic-infra-operator
+icon: https://newrelic.com/themes/custom/curio/assets/mediakit/new_relic_logo_vertical.svg
+keywords:
+- infrastructure
+- newrelic
+- monitoring
+maintainers:
+- name: alvarocabanas
+  url: https://github.com/alvarocabanas
+- name: carlossscastro
+  url: https://github.com/carlossscastro
+- name: sigilioso
+  url: https://github.com/sigilioso
+- name: gsanchezgavier
+  url: https://github.com/gsanchezgavier
+- name: kang-makes
+  url: https://github.com/kang-makes
+- name: marcsanmi
+  url: https://github.com/marcsanmi
+- name: paologallinaharbur
+  url: https://github.com/paologallinaharbur
+name: newrelic-infra-operator
+sources:
+- https://github.com/newrelic/newrelic-infra-operator
+- https://github.com/newrelic/newrelic-infra-operator/tree/main/charts/newrelic-infra-operator
+version: 2.13.5
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/README.md
new file mode 100644
index 000000000..736675b6d
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/README.md
@@ -0,0 +1,113 @@
+# newrelic-infra-operator
+
+A Helm chart to deploy the New Relic Infrastructure Kubernetes Operator.
+
+**Homepage:** <https://hub.docker.com/r/newrelic/newrelic-infra-operator>
+
+## Helm installation
+
+You can install this chart using [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) located in the
+[helm-charts repository](https://github.com/newrelic/helm-charts) or directly from this repository by adding this Helm repository:
+
+```shell
+helm repo add newrelic-infra-operator https://newrelic.github.io/newrelic-infra-operator
+helm upgrade --install newrelic-infra-operator/newrelic-infra-operator -f your-custom-values.yaml
+```
+
+## Source Code
+
+* <https://github.com/newrelic/newrelic-infra-operator>
+* <https://github.com/newrelic/newrelic-infra-operator/tree/main/charts/newrelic-infra-operator>
+
+## Usage example
+
+Make sure you have [added the New Relic chart repository.](../../README.md#install)
+
+Then, to install this chart, run the following command:
+
+```sh
+helm upgrade --install [release-name] newrelic-infra-operator/newrelic-infra-operator --set cluster=my_cluster_name --set licenseKey [your-license-key]
+```
+
+When installing on Fargate add as well `--set fargate=true`
+
+### Configure in which pods the sidecar should be injected
+
+Policies are available in order to configure in which pods the sidecar should be injected.
+Each policy is evaluated independently and if at least one policy matches the operator will inject the sidecar.
+
+Policies are composed by `namespaceSelector` checking the labels of the Pod namespace, `podSelector` checking
+the labels of the Pod and `namespace` checking the namespace name. Each of those, if specified, are ANDed.
+
+By default, the policies are configured in order to inject the sidecar in each pod belonging to a Fargate profile.
+
+> Moreover, it is possible to add the label `infra-operator.newrelic.com/disable-injection` to Pods to exclude injection
+for a single Pod that otherwise would be selected by the policies.
+
+Please make sure to configure policies correctly to avoid injecting sidecar for pods running on EC2 nodes
+already monitored by the infrastructure DaemonSet.
+
+### Configure the sidecar with labelsSelectors
+
+It is also possible to configure `resourceRequirements` and `extraEnvVars` based on the labels of the mutating Pod.
+
+The current configuration increases the resource requirements for sidecar injected on `KSM` instances. Moreover,
+injectes disable the `DISABLE_KUBE_STATE_METRICS` environment variable for Pods not running on `KSM` instances
+to decrease the load on the API server.
+
+## Values managed globally
+
+This chart implements the [New Relic's common Helm library](https://github.com/newrelic/helm-charts/tree/master/library/common-library) which
+means that it honors a wide range of defaults and globals common to most New Relic Helm charts.
+
+Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
+[user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| admissionWebhooksPatchJob | object | See `values.yaml` | Image used to create certificates and inject them to the admission webhook |
+| admissionWebhooksPatchJob.image.pullSecrets | list | `[]` | The secrets that are needed to pull images from a custom registry. |
+| admissionWebhooksPatchJob.volumeMounts | list | `[]` | Volume mounts to add to the job, you might want to mount tmp if Pod Security Policies. Enforce a read-only root. |
+| admissionWebhooksPatchJob.volumes | list | `[]` | Volumes to add to the job container. |
+| affinity | object | `{}` | Sets pod/node affinities. Can be configured also with `global.affinity` |
+| certManager.enabled | bool | `false` | Use cert manager for webhook certs |
+| cluster | string | `""` | Name of the Kubernetes cluster monitored. Mandatory. Can be configured also with `global.cluster` |
+| config | object | See `values.yaml` | Operator configuration |
+| config.ignoreMutationErrors | bool | `true` | IgnoreMutationErrors instruments the operator to ignore injection error instead of failing. If set to false errors of the injection could block the creation of pods. |
+| config.infraAgentInjection | object | See `values.yaml` | configuration of the sidecar injection webhook |
+| config.infraAgentInjection.agentConfig | object | See `values.yaml` | agentConfig contains the configuration for the container agent injected |
+| config.infraAgentInjection.agentConfig.configSelectors | list | See `values.yaml` | configSelectors is the way to configure resource requirements and extra envVars of the injected sidecar container. When mutating it will be applied the first configuration having the labelSelector matching with the mutating pod. |
+| config.infraAgentInjection.agentConfig.image | object | See `values.yaml` | Image of the infrastructure agent to be injected. |
+| containerSecurityContext | object | `{}` | Sets security context (at container level). Can be configured also with `global.containerSecurityContext` |
+| customSecretLicenseKey | string | `""` | In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located. Can be configured also with `global.customSecretLicenseKey` |
+| customSecretName | string | `""` | In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there. Can be configured also with `global.customSecretName` |
+| dnsConfig | object | `{}` | Sets pod's dnsConfig. Can be configured also with `global.dnsConfig` |
+| fullnameOverride | string | `""` | Override the full name of the release |
+| hostNetwork | bool | `false` | Sets pod's hostNetwork. Can be configured also with `global.hostNetwork` |
+| image | object | See `values.yaml` | Image for the New Relic Infrastructure Operator |
+| image.pullSecrets | list | `[]` | The secrets that are needed to pull images from a custom registry. |
+| licenseKey | string | `""` | This set this license key to use. Can be configured also with `global.licenseKey` |
+| nameOverride | string | `""` | Override the name of the chart |
+| nodeSelector | object | `{}` | Sets pod's node selector. Can be configured also with `global.nodeSelector` |
+| podAnnotations | object | `{}` | Annotations to add to the pod. |
+| podSecurityContext | object | `{"fsGroup":1001,"runAsGroup":1001,"runAsUser":1001}` | Sets security context (at pod level). Can be configured also with `global.podSecurityContext` |
+| priorityClassName | string | `""` | Sets pod's priorityClassName. Can be configured also with `global.priorityClassName` |
+| rbac.pspEnabled | bool | `false` | Whether the chart should create Pod Security Policy objects. |
+| replicas | int | `1` |  |
+| resources | object | `{"limits":{"memory":"80M"},"requests":{"cpu":"100m","memory":"30M"}}` | Resources available for this pod |
+| serviceAccount | object | See `values.yaml` | Settings controlling ServiceAccount creation |
+| serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created |
+| timeoutSeconds | int | `10` | Webhook timeout Ref: https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#timeouts |
+| tolerations | list | `[]` | Sets pod's tolerations to node taints. Can be configured also with `global.tolerations` |
+
+## Maintainers
+
+* [alvarocabanas](https://github.com/alvarocabanas)
+* [carlossscastro](https://github.com/carlossscastro)
+* [sigilioso](https://github.com/sigilioso)
+* [gsanchezgavier](https://github.com/gsanchezgavier)
+* [kang-makes](https://github.com/kang-makes)
+* [marcsanmi](https://github.com/marcsanmi)
+* [paologallinaharbur](https://github.com/paologallinaharbur)
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/README.md.gotmpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/README.md.gotmpl
new file mode 100644
index 000000000..1ef603355
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/README.md.gotmpl
@@ -0,0 +1,77 @@
+{{ template "chart.header" . }}
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+## Helm installation
+
+You can install this chart using [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) located in the
+[helm-charts repository](https://github.com/newrelic/helm-charts) or directly from this repository by adding this Helm repository:
+
+```shell
+helm repo add newrelic-infra-operator https://newrelic.github.io/newrelic-infra-operator
+helm upgrade --install newrelic-infra-operator/newrelic-infra-operator -f your-custom-values.yaml
+```
+
+{{ template "chart.sourcesSection" . }}
+
+## Usage example
+
+Make sure you have [added the New Relic chart repository.](../../README.md#install)
+
+Then, to install this chart, run the following command:
+
+```sh
+helm upgrade --install [release-name] newrelic-infra-operator/newrelic-infra-operator --set cluster=my_cluster_name --set licenseKey [your-license-key]
+```
+
+When installing on Fargate add as well `--set fargate=true`
+
+### Configure in which pods the sidecar should be injected
+
+Policies are available in order to configure in which pods the sidecar should be injected.
+Each policy is evaluated independently and if at least one policy matches the operator will inject the sidecar.
+
+Policies are composed by `namespaceSelector` checking the labels of the Pod namespace, `podSelector` checking
+the labels of the Pod and `namespace` checking the namespace name. Each of those, if specified, are ANDed.
+
+By default, the policies are configured in order to inject the sidecar in each pod belonging to a Fargate profile.
+
+> Moreover, it is possible to add the label `infra-operator.newrelic.com/disable-injection` to Pods to exclude injection
+for a single Pod that otherwise would be selected by the policies.
+
+Please make sure to configure policies correctly to avoid injecting sidecar for pods running on EC2 nodes
+already monitored by the infrastructure DaemonSet.
+
+### Configure the sidecar with labelsSelectors
+
+It is also possible to configure `resourceRequirements` and `extraEnvVars` based on the labels of the mutating Pod.
+
+The current configuration increases the resource requirements for sidecar injected on `KSM` instances. Moreover,
+injectes disable the `DISABLE_KUBE_STATE_METRICS` environment variable for Pods not running on `KSM` instances
+to decrease the load on the API server.
+
+## Values managed globally
+
+This chart implements the [New Relic's common Helm library](https://github.com/newrelic/helm-charts/tree/master/library/common-library) which
+means that it honors a wide range of defaults and globals common to most New Relic Helm charts.
+
+Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
+[user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
+
+{{ template "chart.valuesSection" . }}
+
+{{ if .Maintainers }}
+## Maintainers
+{{ range .Maintainers }}
+{{- if .Name }}
+{{- if .Url }}
+* [{{ .Name }}]({{ .Url }})
+{{- else }}
+* {{ .Name }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/Chart.yaml
new file mode 100644
index 000000000..adfc765bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/Chart.yaml
@@ -0,0 +1,17 @@
+apiVersion: v2
+description: Provides helpers to provide consistency on all the charts
+keywords:
+- newrelic
+- chart-library
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+- name: kang-makes
+  url: https://github.com/kang-makes
+name: common-library
+type: library
+version: 1.3.1
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/DEVELOPERS.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/DEVELOPERS.md
new file mode 100644
index 000000000..7208c673e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/DEVELOPERS.md
@@ -0,0 +1,747 @@
+# Functions/templates documented for chart writers
+Here is some rough documentation separated by the file that contains the function, the function
+name and how to use it. We are not covering functions that start with `_` (e.g.
+`newrelic.common.license._licenseKey`) because they are used internally by this library for
+other helpers. Helm does not have the concept of "public" or "private" functions/templates so
+this is a convention of ours.
+
+## _naming.tpl
+These functions are used to name objects.
+
+### `newrelic.common.naming.name`
+This is the same as the idiomatic `CHART-NAME.name` that is created when you use `helm create`.
+
+It honors `.Values.nameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.name" . }}
+```
+
+### `newrelic.common.naming.fullname`
+This is the same as the idiomatic `CHART-NAME.fullname` that is created when you use `helm create`
+
+It honors `.Values.fullnameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.fullname" . }}
+```
+
+### `newrelic.common.naming.chart`
+This is the same as the idiomatic `CHART-NAME.chart` that is created when you use `helm create`.
+
+It is mostly useless for chart writers. It is used internally for templating the labels but there
+is no reason to keep it "private".
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.chart" . }}
+```
+
+### `newrelic.common.naming.truncateToDNS`
+This is a useful template that could be used to trim a string to 63 chars and does not end with a dash (`-`).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $truncatedName := include "newrelic.common.naming.truncateToDNS" $nameToTruncate }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-string-that-should-be */ -}}
+```
+
+### `newrelic.common.naming.truncateToDNSWithSuffix`
+This template function is the same as the above but instead of receiving a string you should give a `dict`
+with a `name` and a `suffix`. This function will join them with a dash (`-`) and trim the `name` so the
+result of `name-suffix` is no more than 63 chars
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $suffix := "A-NOT-SO-LONG-SUFFIX" }}
+{{- $truncatedName := include "truncateToDNSWithSuffix" (dict "name" $nameToTruncate "suffix" $suffix) }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-A-NOT-SO-LONG-SUFFIX */ -}}
+```
+
+
+
+## _labels.tpl
+### `newrelic.common.labels`, `newrelic.common.labels.selectorLabels` and `newrelic.common.labels.podLabels`
+These are functions that are used to label objects. They are configured by this `values.yaml`
+```yaml
+global:
+  podLabels: {}  # included in all the pods of all the charts that implement this library
+  labels: {}  # included in all the objects of all the charts that implement this library
+podLabels: {}  # included in all the pods of this chart
+labels: {}  # included in all the objects of this chart
+```
+
+label maps are merged from global to local values.
+
+And chart writer should use them like this:
+```mustache
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+```
+
+`newrelic.common.labels.podLabels` includes `newrelic.common.labels.selectorLabels` automatically.
+
+
+
+## _priority-class-name.tpl
+### `newrelic.common.priorityClassName`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  priorityClassName: ""
+priorityClassName: ""
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `priorityClassName` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.priorityClassName" . }}
+  priorityClassName: {{ . }}
+  {{- end }}
+```
+
+
+
+## _hostnetwork.tpl
+### `newrelic.common.hostNetwork`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  hostNetwork:  # Note that this is empty (nil)
+hostNetwork:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `hostNetwork` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.hostNetwork" . }}
+  hostNetwork: {{ . }}
+  {{- end }}
+```
+
+### `newrelic.common.hostNetwork.value`
+This function is an abstraction of the function above but this returns directly "true" or "false".
+
+Be careful with using this with an `if` as Helm does evaluate "false" (string) as `true`.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+```
+
+
+
+## _dnsconfig.tpl
+### `newrelic.common.dnsConfig`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  dnsConfig: {}
+dnsConfig: {}
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `dnsConfig` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.dnsConfig" . }}
+  dnsConfig:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _images.tpl
+These functions help us to deal with how images are templated. This allows setting `registries`
+where to fetch images globally while being flexible enough to fit in different maps of images
+and deployments with one or more images. This is the example of a complex `values.yaml` that
+we are going to use during the documentation of these functions:
+
+```yaml
+global:
+  images:
+    registry: nexus-3-instance.internal.clients-domain.tld
+jobImage:
+  registry: # defaults to "example.tld" when empty in these examples
+  repository: ingress-nginx/kube-webhook-certgen
+  tag: v1.1.1
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+images:
+  integration:
+    registry:
+    repository: newrelic/nri-kube-events
+    tag: 1.8.0
+    pullPolicy: IfNotPresent
+  agent:
+    registry:
+    repository: newrelic/k8s-events-forwarder
+    tag: 1.22.0
+    pullPolicy: IfNotPresent
+  pullSecrets: []
+```
+
+### `newrelic.common.images.image`
+This will return a string with the image ready to be downloaded that includes the registry, the image and the tag.
+`defaultRegistry` is used to keep `registry` field empty in `values.yaml` so you can override the image using
+`global.images.registry`, your local `jobImage.registry` and be able to fallback to a registry that is not `docker.io`
+(Or the default repository that the client could have set in the CRI).
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.image" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.registry`
+It returns the registry from the global or local values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.registry" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.repository`
+It returns the image from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.tag`
+It returns the image's tag from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.renderPullSecrets`
+If returns a merged map that contains the pull secrets from the global configuration and the local one.  
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.jobImage.pullSecrets "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+```
+
+
+
+## _serviceaccount.tpl
+These functions are used to evaluate if the service account should be created, with which name and add annotations to it.
+
+The functions that the common library has implemented for service accounts are:
+* `newrelic.common.serviceAccount.create`
+* `newrelic.common.serviceAccount.name`
+* `newrelic.common.serviceAccount.annotations`
+
+Usage:
+```mustache
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- with (include "newrelic.common.serviceAccount.annotations" .) }}
+  annotations:
+    {{- . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
+```
+
+
+
+## _affinity.tpl, _nodeselector.tpl and _tolerations.tpl
+These three files are almost the same and they follow the idiomatic way of `helm create`.
+
+Each function also looks if there is a global value like the other helpers.
+```yaml
+global:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+affinity: {}
+nodeSelector: {}
+tolerations: []
+```
+
+The values here are replaced instead of be merged. If a value at root level is found, the global one is ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.nodeSelector" . }}
+  nodeSelector:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.affinity" . }}
+  affinity:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.tolerations" . }}
+  tolerations:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _agent-config.tpl
+### `newrelic.common.agentConfig.defaults`
+This returns a YAML that the agent can use directly as a config that includes other options from the values file like verbose mode,
+custom attributes, FedRAMP and such.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include newrelic.common.naming.truncateToDNSWithSuffix (dict "name" (include "newrelic.common.naming.fullname" .) suffix "agent-config") }}
+  namespace: {{ .Release.Namespace }}
+data:
+  newrelic-infra.yml: |-
+    # This is the configuration file for the infrastructure agent. See:
+    # https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+    {{- include "newrelic.common.agentConfig.defaults" . | nindent 4 }}
+```
+
+
+
+## _cluster.tpl
+### `newrelic.common.cluster`
+Returns the cluster name
+
+Usage:
+```mustache
+{{ include "newrelic.common.cluster" . }}
+```
+
+
+
+## _custom-attributes.tpl
+### `newrelic.common.customAttributes`
+Return custom attributes in YAML format.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example
+data:
+  custom-attributes.yaml: |
+    {{- include "newrelic.common.customAttributes" . | nindent 4 }}
+  custom-attributes.json: |
+    {{- include "newrelic.common.customAttributes" . | fromYaml | toJson | nindent 4 }}
+```
+
+
+
+## _fedramp.tpl
+### `newrelic.common.fedramp.enabled`
+Returns true if FedRAMP is enabled or an empty string if not. It can be safely used in conditionals as an empty string is a Helm falsiness.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled" . }}
+```
+
+### `newrelic.common.fedramp.enabled.value`
+Returns true if FedRAMP is enabled or false if not. This is to have the value of FedRAMP ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled.value" . }}
+```
+
+
+
+## _license.tpl
+### `newrelic.common.license.secretName` and ### `newrelic.common.license.secretKeyName`
+Returns the secret and key inside the secret where to read the license key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the license key.
+
+To create the secret use `newrelic.common.license.secret`.
+
+Usage:
+```mustache
+{{- if and (.Values.controlPlane.enabled) (not (include "newrelic.fargate" .)) }}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+  containers:
+  - name: agent
+    env:
+    - name: "NRIA_LICENSE_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.license.secretName" . }}
+          key: {{ include "newrelic.common.license.secretKeyName" . }}
+```
+
+
+
+## _license_secret.tpl
+### `newrelic.common.license.secret`
+This function templates the secret that is used by agents and integrations with the license Key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any license key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.license.secret" . -}}
+```
+
+
+
+## _insights.tpl
+### `newrelic.common.insightsKey.secretName` and ### `newrelic.common.insightsKey.secretKeyName`
+Returns the secret and key inside the secret where to read the insights key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.insightsKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "INSIGHTS_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.insightsKey.secretName" . }}
+          key: {{ include "newrelic.common.insightsKey.secretKeyName" . }}
+```
+
+
+
+## _insights_secret.tpl
+### `newrelic.common.insightsKey.secret`
+This function templates the secret that is used by agents and integrations with the insights key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any insights key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.insightsKey.secret" . -}}
+```
+
+
+
+## _userkey.tpl
+### `newrelic.common.userKey.secretName` and ### `newrelic.common.userKey.secretKeyName`
+Returns the secret and key inside the secret where to read a user key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.userKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "API_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.userKey.secretName" . }}
+          key: {{ include "newrelic.common.userKey.secretKeyName" . }}
+```
+
+
+
+## _userkey_secret.tpl
+### `newrelic.common.userKey.secret`
+This function templates the secret that is used by agents and integrations with a user key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any API key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.userKey.secret" . -}}
+```
+
+
+
+## _region.tpl
+### `newrelic.common.region.validate`
+Given a string, return a normalized name for the region if valid.
+
+This function does not need the context of the chart, only the value to be validated. The region returned
+honors the region [definition of the newrelic-client-go implementation](https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21)
+so (as of 2024/09/14) it returns the region as "US", "EU", "Staging", or "Local".
+
+In case the region provided does not match these 4, the helper calls `fail` and abort the templating.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region.validate" "us" }}
+```
+
+### `newrelic.common.region`
+It reads global and local variables for `region`:
+```yaml
+global:
+  region:  # Note that this can be empty (nil) or "" (empty string)
+region:  # Note that this can be empty (nil) or "" (empty string)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in your
+values a `region` is defined, the global one is going to be always ignored.
+
+This function gives protection so it enforces users to give the license key as a value in their
+`values.yaml` or specify a global or local `region` value. To understand how the `region` value
+works, read the documentation of `newrelic.common.region.validate`.
+
+The function will change the region from US, EU or Staging based of the license key and the
+`nrStaging` toggle. Whichever region is computed from the license/toggle can be overridden by
+the `region` value.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region" . }}
+```
+
+
+
+## _low-data-mode.tpl
+### `newrelic.common.lowDataMode`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  lowDataMode:  # Note that this is empty (nil)
+lowDataMode:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `lowdataMode` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.lowDataMode" . }}
+```
+
+
+
+## _privileged.tpl
+### `newrelic.common.privileged`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  privileged:  # Note that this is empty (nil)
+privileged:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `privileged` is defined, the global one is going to be always ignored.
+
+Chart writers could override this and put directly a `true` in the `values.yaml` to override the
+default of the common library.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged" . }}
+```
+
+### `newrelic.common.privileged.value`
+Returns true if privileged mode is enabled or false if not. This is to have the value of privileged ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged.value" . }}
+```
+
+
+
+## _proxy.tpl
+### `newrelic.common.proxy`
+Returns the proxy URL configured by the user. 
+
+Usage:
+```mustache
+{{ include "newrelic.common.proxy" . }}
+```
+
+
+
+## _security-context.tpl
+Use these functions to share the security context among all charts. Useful in clusters that have security enforcing not to
+use the root user (like OpenShift) or users that have an admission webhooks.
+
+The functions are:
+* `newrelic.common.securityContext.container`
+* `newrelic.common.securityContext.pod`
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+    spec:
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+
+      containers:
+        - name: example
+          {{- with include "nriKubernetes.securityContext.container" . }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+```
+
+
+
+## _staging.tpl
+### `newrelic.common.nrStaging`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  nrStaging:  # Note that this is empty (nil)
+nrStaging:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `nrStaging` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging" . }}
+```
+
+### `newrelic.common.nrStaging.value`
+Returns true if staging is enabled or false if not. This is to have the staging value ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging.value" . }}
+```
+
+
+
+## _verbose-log.tpl
+### `newrelic.common.verboseLog`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  verboseLog:  # Note that this is empty (nil)
+verboseLog:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `verboseLog` is defined, the global one is going to be always ignored.
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsBoolean`
+Returns true if verbose is enabled or false if not. This is to have the verbose value ready to be templated as a boolean
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsBoolean" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsInt`
+Returns 1 if verbose is enabled or 0 if not. This is to have the verbose value ready to be templated as an integer
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsInt" . }}
+```
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/README.md
new file mode 100644
index 000000000..10f08ca67
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/README.md
@@ -0,0 +1,106 @@
+# Helm Common library
+
+The common library is a way to unify the UX through all the Helm charts that implement it.
+
+The tooling suite that New Relic is huge and growing and this allows to set things globally
+and locally for a single chart.
+
+## Documentation for chart writers
+
+If you are writing a chart that is going to use this library you can check the [developers guide](/library/common-library/DEVELOPERS.md) to see all
+the functions/templates that we have implemented, what they do and how to use them.
+
+## Values managed globally
+
+We want to have a seamless experience through all the charts so we created this library that tries to standardize the behaviour
+of all the charts. Sadly, because of the complexity of all these integrations, not all the charts behave exactly as expected.
+
+An example is `newrelic-infrastructure` that ignores `hostNetwork` in the control plane scraper because most of the users has the
+control plane listening in the node to `localhost`.
+
+For each chart that has a special behavior (or further information of the behavior) there is a "chart particularities" section
+in its README.md that explains which is the expected behavior.
+
+At the time of writing this, all the charts from `nri-bundle` except `newrelic-logging` and `synthetics-minion` implements this
+library and honors global options as described in this document.
+
+Here is a list of global options:
+
+| Global keys | Local keys | Default | Merged[<sup>1</sup>](#values-managed-globally-1) | Description |
+|-------------|------------|---------|--------------------------------------------------|-------------|
+| global.cluster | cluster | `""` |  | Name of the Kubernetes cluster monitored |
+| global.licenseKey | licenseKey | `""` |  | This set this license key to use |
+| global.customSecretName | customSecretName | `""` |  | In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there |
+| global.customSecretLicenseKey | customSecretLicenseKey | `""` |  | In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located |
+| global.podLabels | podLabels | `{}` | yes | Additional labels for chart pods |
+| global.labels | labels | `{}` | yes | Additional labels for chart objects |
+| global.priorityClassName | priorityClassName | `""` |  | Sets pod's priorityClassName |
+| global.hostNetwork | hostNetwork | `false` |  | Sets pod's hostNetwork |
+| global.dnsConfig | dnsConfig | `{}` |  | Sets pod's dnsConfig |
+| global.images.registry | See [Further information](#values-managed-globally-2) | `""` |  | Changes the registry where to get the images. Useful when there is an internal image cache/proxy |
+| global.images.pullSecrets | See [Further information](#values-managed-globally-2) | `[]` | yes | Set secrets to be able to fetch images |
+| global.podSecurityContext | podSecurityContext | `{}` |  | Sets security context (at pod level) |
+| global.containerSecurityContext | containerSecurityContext | `{}` |  | Sets security context (at container level) |
+| global.affinity | affinity | `{}` |  | Sets pod/node affinities |
+| global.nodeSelector | nodeSelector | `{}` |  | Sets pod's node selector |
+| global.tolerations | tolerations | `[]` |  | Sets pod's tolerations to node taints |
+| global.serviceAccount.create | serviceAccount.create | `true` |  | Configures if the service account should be created or not |
+| global.serviceAccount.name | serviceAccount.name | name of the release |  | Change the name of the service account. This is honored if you disable on this cahrt the creation of the service account so you can use your own. |
+| global.serviceAccount.annotations | serviceAccount.annotations | `{}` | yes | Add these annotations to the service account we create |
+| global.customAttributes | customAttributes | `{}` |  | Adds extra attributes to the cluster and all the metrics emitted to the backend |
+| global.fedramp | fedramp | `false` |  | Enables FedRAMP |
+| global.lowDataMode | lowDataMode | `false` |  | Reduces number of metrics sent in order to reduce costs |
+| global.privileged | privileged | Depends on the chart |  | In each integration it has different behavior. See [Further information](#values-managed-globally-3) but all aims to send less metrics to the backend to try to save costs |
+| global.proxy | proxy | `""` |  | Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port` |
+| global.nrStaging | nrStaging | `false` |  | Send the metrics to the staging backend. Requires a valid staging license key |
+| global.verboseLog | verboseLog | `false` |  | Sets the debug/trace logs to this integration or all integrations if it is set globally |
+
+### Further information
+<a name="values-managed-globally-1"></a>
+#### 1. Merged
+
+Merged means that the values from global are not replaced by the local ones. Think in this example:
+```yaml
+global:
+  labels:
+    global: global
+  hostNetwork: true
+  nodeSelector:
+    global: global
+
+labels:
+  local: local
+nodeSelector:
+  local: local
+hostNetwork: false
+```
+
+This values will template `hostNetwork` to `false`, a map of labels `{ "global": "global", "local": "local" }` and a `nodeSelector` with
+`{ "local": "local" }`.
+
+As Helm by default merges all the maps it could be confusing that we have two behaviors (merging `labels` and replacing `nodeSelector`)
+the `values` from global to local. This is the rationale behind this:
+* `hostNetwork` is templated to `false` because is overriding the value defined globally.
+* `labels` are merged because the user may want to label all the New Relic pods at once and label other solution pods differently for
+  clarity' sake.
+* `nodeSelector` does not merge as `labels` because could make it harder to overwrite/delete a selector that comes from global because
+  of the logic that Helm follows merging maps.
+
+<a name="values-managed-globally-2"></a>
+#### 2. Fine grain registries
+
+Some charts only have 1 image while others that can have 2 or more images. The local path for the registry can change depending
+on the chart itself.
+
+As this is mostly unique per helm chart, you should take a look to the chart's values table (or directly to the `values.yaml` file to see all the
+images that you can change.
+
+This should only be needed if you have an advanced setup that forces you to have granularity enough to force a proxy/cache registry per integration.
+
+
+<a name="values-managed-globally-3"></a>
+#### 3. Privileged mode
+
+By default, from the common library, the privileged mode is set to false. But most of the helm charts require this to be true to fetch more
+metrics so could see a true in some charts. The consequences of the privileged mode differ from one chart to another so for each chart that
+honors the privileged mode toggle should be a section in the README explaining which is the behavior with it enabled or disabled.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_affinity.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_affinity.tpl
new file mode 100644
index 000000000..1b2636754
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_affinity.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod affinity */ -}}
+{{- define "newrelic.common.affinity" -}}
+    {{- if .Values.affinity -}}
+        {{- toYaml .Values.affinity -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.affinity -}}
+            {{- toYaml .Values.global.affinity -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_agent-config.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_agent-config.tpl
new file mode 100644
index 000000000..9c32861a0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_agent-config.tpl
@@ -0,0 +1,26 @@
+{{/*
+This helper should return the defaults that all agents should have
+*/}}
+{{- define "newrelic.common.agentConfig.defaults" -}}
+{{- if include "newrelic.common.verboseLog" . }}
+log:
+  level: trace
+{{- end }}
+
+{{- if (include "newrelic.common.nrStaging" . ) }}
+staging: true
+{{- end }}
+
+{{- with include "newrelic.common.proxy" . }}
+proxy: {{ . | quote }}
+{{- end }}
+
+{{- with include "newrelic.common.fedramp.enabled" . }}
+fedramp: {{ . }}
+{{- end }}
+
+{{- with fromYaml ( include "newrelic.common.customAttributes" . ) }}
+custom_attributes:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_cluster.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_cluster.tpl
new file mode 100644
index 000000000..0197dd35a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_cluster.tpl
@@ -0,0 +1,15 @@
+{{/*
+Return the cluster
+*/}}
+{{- define "newrelic.common.cluster" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.cluster -}}
+    {{- .Values.cluster -}}
+{{- else if $global.cluster -}}
+    {{- $global.cluster -}}
+{{- else -}}
+    {{ fail "There is not cluster name definition set neither in `.global.cluster' nor `.cluster' in your values.yaml. Cluster name is required." }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_custom-attributes.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_custom-attributes.tpl
new file mode 100644
index 000000000..92020719c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_custom-attributes.tpl
@@ -0,0 +1,17 @@
+{{/*
+This will render custom attributes as a YAML ready to be templated or be used with `fromYaml`.
+*/}}
+{{- define "newrelic.common.customAttributes" -}}
+{{- $customAttributes := dict -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- if $global.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes $global.customAttributes -}}
+{{- end -}}
+
+{{- if .Values.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes .Values.customAttributes -}}
+{{- end -}}
+
+{{- toYaml $customAttributes -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_dnsconfig.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_dnsconfig.tpl
new file mode 100644
index 000000000..d4e40aa8a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_dnsconfig.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod dnsConfig */ -}}
+{{- define "newrelic.common.dnsConfig" -}}
+    {{- if .Values.dnsConfig -}}
+        {{- toYaml .Values.dnsConfig -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.dnsConfig -}}
+            {{- toYaml .Values.global.dnsConfig -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_fedramp.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_fedramp.tpl
new file mode 100644
index 000000000..9df8d6b5e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_fedramp.tpl
@@ -0,0 +1,25 @@
+{{- /* Defines the fedRAMP flag */ -}}
+{{- define "newrelic.common.fedramp.enabled" -}}
+    {{- if .Values.fedramp -}}
+        {{- if .Values.fedramp.enabled -}}
+            {{- .Values.fedramp.enabled -}}
+        {{- end -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.fedramp -}}
+             {{- if .Values.global.fedramp.enabled -}}
+                {{- .Values.global.fedramp.enabled -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return FedRAMP value directly ready to be templated */ -}}
+{{- define "newrelic.common.fedramp.enabled.value" -}}
+{{- if include "newrelic.common.fedramp.enabled" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_hostnetwork.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_hostnetwork.tpl
new file mode 100644
index 000000000..4cf017ef7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_hostnetwork.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper allows to override the global `.global.hostNetwork` with the value of `.hostNetwork`.
+Returns "true" if `hostNetwork` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.hostNetwork" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- /*
+`get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs
+
+We also want only to return when this is true, returning `false` here will template "false" (string) when doing
+an `(include "newrelic.common.hostNetwork" .)`, which is not an "empty string" so it is `true` if it is used
+as an evaluation somewhere else.
+*/ -}}
+{{- if get .Values "hostNetwork" | kindIs "bool" -}}
+    {{- if .Values.hostNetwork -}}
+        {{- .Values.hostNetwork -}}
+    {{- end -}}
+{{- else if get $global "hostNetwork" | kindIs "bool" -}}
+    {{- if $global.hostNetwork -}}
+        {{- $global.hostNetwork -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper abstracts the function "newrelic.common.hostNetwork" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.hostNetwork.value" -}}
+{{- if include "newrelic.common.hostNetwork" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_images.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_images.tpl
new file mode 100644
index 000000000..d4fb43290
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_images.tpl
@@ -0,0 +1,94 @@
+{{- /*
+Return the proper image name
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.image" -}}
+    {{- $registryName := include "newrelic.common.images.registry" ( dict "imageRoot" .imageRoot "defaultRegistry" .defaultRegistry "context" .context ) -}}
+    {{- $repositoryName := include "newrelic.common.images.repository" .imageRoot -}}
+    {{- $tag := include "newrelic.common.images.tag" ( dict "imageRoot" .imageRoot "context" .context) -}}
+
+    {{- if $registryName -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag | quote -}}
+    {{- else -}}
+        {{- printf "%s:%s" $repositoryName $tag | quote -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image registry
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.registry" -}}
+{{- $globalRegistry := "" -}}
+{{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+        {{- with .context.Values.global.images.registry -}}
+            {{- $globalRegistry = . -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $localRegistry := "" -}}
+{{- if .imageRoot.registry -}}
+    {{- $localRegistry = .imageRoot.registry -}}
+{{- end -}}
+
+{{- $registry := $localRegistry | default $globalRegistry | default .defaultRegistry -}}
+{{- if $registry -}}
+    {{- $registry -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image repository
+{{ include "newrelic.common.images.repository" .Values.path.to.the.image }}
+*/ -}}
+{{- define "newrelic.common.images.repository" -}}
+    {{- .repository -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image tag
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.path.to.the.image "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.tag" -}}
+    {{- .imageRoot.tag | default .context.Chart.AppVersion | toString -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper Image Pull Registry Secret Names evaluating values as templates
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.path.to.the.images.pullSecrets1, .Values.path.to.the.images.pullSecrets2) "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.renderPullSecrets" -}}
+  {{- $flatlist := list }}
+
+  {{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+      {{- if .context.Values.global.images.pullSecrets -}}
+        {{- range .context.Values.global.images.pullSecrets -}}
+          {{- $flatlist = append $flatlist . -}}
+        {{- end -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- range .pullSecrets -}}
+    {{- if not (empty .) -}}
+      {{- range . -}}
+        {{- $flatlist = append $flatlist . -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if $flatlist -}}
+    {{- toYaml $flatlist -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_insights.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_insights.tpl
new file mode 100644
index 000000000..895c37732
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_insights.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the Insights Key.
+*/}}
+{{- define "newrelic.common.insightsKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "insightskey" ) -}}
+{{- include "newrelic.common.insightsKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secretKeyName" -}}
+{{- include "newrelic.common.insightsKey._customSecretKey" . | default "insightsKey" -}}
+{{- end -}}
+
+{{/*
+Return local insightsKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._licenseKey" -}}
+{{- if .Values.insightsKey -}}
+  {{- .Values.insightsKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.insightsKey -}}
+    {{- .Values.global.insightsKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the Insights Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretName" -}}
+{{- if .Values.customInsightsKeySecretName -}}
+  {{- .Values.customInsightsKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretName -}}
+    {{- .Values.global.customInsightsKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretKey" -}}
+{{- if .Values.customInsightsKeySecretKey -}}
+  {{- .Values.customInsightsKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretKey }}
+    {{- .Values.global.customInsightsKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_insights_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_insights_secret.yaml.tpl
new file mode 100644
index 000000000..556caa6ca
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_insights_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the insights key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secret" }}
+{{- if not (include "newrelic.common.insightsKey._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.insightsKey._licenseKey" .) }}
+    {{- fail "You must specify a insightsKey or a customInsightsSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.insightsKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.insightsKey.secretKeyName" . }}: {{ include "newrelic.common.insightsKey._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_labels.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_labels.tpl
new file mode 100644
index 000000000..1cc1e792b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_labels.tpl
@@ -0,0 +1,58 @@
+{{/*
+This will render the labels that should be used in all the manifests used by the helm chart.
+*/}}
+{{- define "newrelic.common.labels" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- $chart := dict "helm.sh/chart" (include "newrelic.common.naming.chart" . ) -}}
+{{- $managedBy := dict "app.kubernetes.io/managed-by" .Release.Service -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $labels := mustMergeOverwrite $chart $managedBy $selectorLabels -}}
+{{- if .Chart.AppVersion -}}
+{{- $labels = mustMergeOverwrite $labels (dict "app.kubernetes.io/version" .Chart.AppVersion) -}}
+{{- end -}}
+
+{{- $globalUserLabels := $global.labels | default dict -}}
+{{- $localUserLabels := .Values.labels | default dict -}}
+
+{{- $labels = mustMergeOverwrite $labels $globalUserLabels $localUserLabels -}}
+
+{{- range $k, $v := $labels -}}
+  {{- $_ := set $labels $k (include "newrelic.common.naming.truncateToDNS" $v ) -}}
+{{- end -}}
+
+{{- toYaml $labels -}}
+{{- end -}}
+
+
+
+{{/*
+This will render the labels that should be used in deployments/daemonsets template pods as a selector.
+*/}}
+{{- define "newrelic.common.labels.selectorLabels" -}}
+{{- $name := dict "app.kubernetes.io/name" ( include "newrelic.common.naming.name" . ) -}}
+{{- $instance := dict "app.kubernetes.io/instance" .Release.Name -}}
+
+{{- $selectorLabels := mustMergeOverwrite $name $instance -}}
+
+{{- toYaml $selectorLabels -}}
+{{- end }}
+
+
+
+{{/*
+Pod labels
+*/}}
+{{- define "newrelic.common.labels.podLabels" -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- $globalPodLabels := $global.podLabels | default dict }}
+
+{{- $localPodLabels := .Values.podLabels | default dict }}
+
+{{- $podLabels := mustMergeOverwrite $selectorLabels $globalPodLabels $localPodLabels -}}
+
+{{- toYaml $podLabels -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_license.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_license.tpl
new file mode 100644
index 000000000..cb349f6bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_license.tpl
@@ -0,0 +1,68 @@
+{{/*
+Return the name of the secret holding the License Key.
+*/}}
+{{- define "newrelic.common.license.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "license" ) -}}
+{{- include "newrelic.common.license._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+*/}}
+{{- define "newrelic.common.license.secretKeyName" -}}
+{{- include "newrelic.common.license._customSecretKey" . | default "licenseKey" -}}
+{{- end -}}
+
+{{/*
+Return local licenseKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._licenseKey" -}}
+{{- if .Values.licenseKey -}}
+  {{- .Values.licenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.licenseKey -}}
+    {{- .Values.global.licenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the License Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretName" -}}
+{{- if .Values.customSecretName -}}
+  {{- .Values.customSecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretName -}}
+    {{- .Values.global.customSecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretKey" -}}
+{{- if .Values.customSecretLicenseKey -}}
+  {{- .Values.customSecretLicenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretLicenseKey }}
+    {{- .Values.global.customSecretLicenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the user set a custom secret for the license.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._usesCustomSecret" -}}
+{{- if or (include "newrelic.common.license._customSecretName" .) (include "newrelic.common.license._customSecretKey" .) -}}
+true
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_license_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_license_secret.yaml.tpl
new file mode 100644
index 000000000..610a0a337
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_license_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the license key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.license.secret" }}
+{{- if not (include "newrelic.common.license._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.license._licenseKey" .) }}
+    {{- fail "You must specify a licenseKey or a customSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.license.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.license.secretKeyName" . }}: {{ include "newrelic.common.license._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_low-data-mode.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_low-data-mode.tpl
new file mode 100644
index 000000000..3dd55ef2f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_low-data-mode.tpl
@@ -0,0 +1,26 @@
+{{- /*
+Abstraction of the lowDataMode toggle.
+This helper allows to override the global `.global.lowDataMode` with the value of `.lowDataMode`.
+Returns "true" if `lowDataMode` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.lowDataMode" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "lowDataMode" | kindIs "bool") -}}
+    {{- if .Values.lowDataMode -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.lowDataMode" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.lowDataMode -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "lowDataMode" | kindIs "bool" -}}
+    {{- if $global.lowDataMode -}}
+        {{- $global.lowDataMode -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_naming.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_naming.tpl
new file mode 100644
index 000000000..19fa92648
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_naming.tpl
@@ -0,0 +1,73 @@
+{{/*
+This is an function to be called directly with a string just to truncate strings to
+63 chars because some Kubernetes name fields are limited to that.
+*/}}
+{{- define "newrelic.common.naming.truncateToDNS" -}}
+{{- . | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+
+
+{{- /*
+Given a name and a suffix returns a 'DNS Valid' which always include the suffix, truncating the name if needed.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If suffix is too long it gets truncated but it always takes precedence over name, so a 63 chars suffix would suppress the name.
+Usage:
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" "<my-name>" "suffix" "my-suffix" ) }}
+*/ -}}
+{{- define "newrelic.common.naming.truncateToDNSWithSuffix" -}}
+{{- $suffix := (include "newrelic.common.naming.truncateToDNS" .suffix) -}}
+{{- $maxLen := (max (sub 63 (add1 (len $suffix))) 0) -}} {{- /* We prepend "-" to the suffix so an additional character is needed */ -}}
+
+{{- $newName := .name | trunc ($maxLen | int) | trimSuffix "-"  -}}
+{{- if $newName -}}
+{{- printf "%s-%s" $newName $suffix -}}
+{{- else -}}
+{{ $suffix }}
+{{- end -}}
+
+{{- end -}}
+
+
+
+{{/*
+Expand the name of the chart.
+Uses the Chart name by default if nameOverride is not set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.name" -}}
+{{- $name := .Values.nameOverride | default .Chart.Name -}}
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+{{- end }}
+
+
+
+{{/*
+Create a default fully qualified app name.
+By default the full name will be "<release_name>" just in if it has the chart name included in that, if not
+it will be concatenated like "<release_name>-<chart_chart>". This could change if fullnameOverride or
+nameOverride are set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.fullname" -}}
+{{- $name := include "newrelic.common.naming.name" . -}}
+
+{{- if .Values.fullnameOverride -}}
+    {{- $name = .Values.fullnameOverride  -}}
+{{- else if not (contains $name .Release.Name) -}}
+    {{- $name = printf "%s-%s" .Release.Name $name -}}
+{{- end -}}
+
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+
+{{- end -}}
+
+
+
+{{/*
+Create chart name and version as used by the chart label.
+This function should not be used for naming objects. Use "common.naming.{name,fullname}" instead.
+*/}}
+{{- define "newrelic.common.naming.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_nodeselector.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_nodeselector.tpl
new file mode 100644
index 000000000..d48887341
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_nodeselector.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod nodeSelector */ -}}
+{{- define "newrelic.common.nodeSelector" -}}
+    {{- if .Values.nodeSelector -}}
+        {{- toYaml .Values.nodeSelector -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.nodeSelector -}}
+            {{- toYaml .Values.global.nodeSelector -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_priority-class-name.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_priority-class-name.tpl
new file mode 100644
index 000000000..50182b734
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_priority-class-name.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the pod priorityClassName */ -}}
+{{- define "newrelic.common.priorityClassName" -}}
+    {{- if .Values.priorityClassName -}}
+        {{- .Values.priorityClassName -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.priorityClassName -}}
+            {{- .Values.global.priorityClassName -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_privileged.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_privileged.tpl
new file mode 100644
index 000000000..f3ae814dd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_privileged.tpl
@@ -0,0 +1,28 @@
+{{- /*
+This is a helper that returns whether the chart should assume the user is fine deploying privileged pods.
+*/ -}}
+{{- define "newrelic.common.privileged" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists. */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if get .Values "privileged" | kindIs "bool" -}}
+    {{- if .Values.privileged -}}
+        {{- .Values.privileged -}}
+    {{- end -}}
+{{- else if get $global "privileged" | kindIs "bool" -}}
+    {{- if $global.privileged -}}
+        {{- $global.privileged -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return directly "true" or "false" based in the exist of "newrelic.common.privileged" */ -}}
+{{- define "newrelic.common.privileged.value" -}}
+{{- if include "newrelic.common.privileged" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_proxy.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_proxy.tpl
new file mode 100644
index 000000000..60f34c7ec
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_proxy.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the proxy */ -}}
+{{- define "newrelic.common.proxy" -}}
+    {{- if .Values.proxy -}}
+        {{- .Values.proxy -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.proxy -}}
+            {{- .Values.global.proxy -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_region.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_region.tpl
new file mode 100644
index 000000000..bdcacf323
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_region.tpl
@@ -0,0 +1,74 @@
+{{/*
+Return the region that is being used by the user
+*/}}
+{{- define "newrelic.common.region" -}}
+{{- if and (include "newrelic.common.license._usesCustomSecret" .) (not (include "newrelic.common.region._fromValues" .)) -}}
+  {{- fail "This Helm Chart is not able to compute the region. You must specify a .global.region or .region if the license is set using a custom secret." -}}
+{{- end -}}
+
+{{- /* Defaults */ -}}
+{{- $region := "us" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+  {{- $region = "staging" -}}
+{{- else if include "newrelic.common.region._isEULicenseKey" . -}}
+  {{- $region = "eu" -}}
+{{- end -}}
+
+{{- include "newrelic.common.region.validate" (include "newrelic.common.region._fromValues" . | default $region ) -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values if valid. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+
+Usage: `include "newrelic.common.region.validate" "us"`
+*/}}
+{{- define "newrelic.common.region.validate" -}}
+{{- /* Ref: https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21 */ -}}
+{{- $region := . | lower -}}
+{{- if eq $region "us" -}}
+  US
+{{- else if eq $region "eu" -}}
+  EU
+{{- else if eq $region "staging" -}}
+  Staging
+{{- else if eq $region "local" -}}
+  Local
+{{- else -}}
+  {{- fail (printf "the region provided is not valid: %s not in \"US\" \"EU\" \"Staging\" \"Local\"" .) -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._fromValues" -}}
+{{- if .Values.region -}}
+  {{- .Values.region -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.region -}}
+    {{- .Values.global.region -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the license is for EU region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._isEULicenseKey" -}}
+{{- if not (include "newrelic.common.license._usesCustomSecret" .) -}}
+  {{- $license := include "newrelic.common.license._licenseKey" . -}}
+  {{- if hasPrefix "eu" $license -}}
+    true
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_security-context.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_security-context.tpl
new file mode 100644
index 000000000..9edfcabfd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_security-context.tpl
@@ -0,0 +1,23 @@
+{{- /* Defines the container securityContext context */ -}}
+{{- define "newrelic.common.securityContext.container" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.containerSecurityContext -}}
+    {{- toYaml .Values.containerSecurityContext -}}
+{{- else if $global.containerSecurityContext -}}
+    {{- toYaml $global.containerSecurityContext -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the pod securityContext context */ -}}
+{{- define "newrelic.common.securityContext.pod" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.podSecurityContext -}}
+    {{- toYaml .Values.podSecurityContext -}}
+{{- else if $global.podSecurityContext -}}
+    {{- toYaml $global.podSecurityContext -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_serviceaccount.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_serviceaccount.tpl
new file mode 100644
index 000000000..2d352f6ea
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_serviceaccount.tpl
@@ -0,0 +1,90 @@
+{{- /* Defines if the service account has to be created or not */ -}}
+{{- define "newrelic.common.serviceAccount.create" -}}
+{{- $valueFound := false -}}
+
+{{- /* Look for a global creation of a service account */ -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "create" | kindIs "bool") -}}
+        {{- $valueFound = true -}}
+        {{- if .Values.serviceAccount.create -}}
+            {{- /*
+                We want only to return when this is true, returning `false` here will template "false" (string) when doing
+                an `(include "newrelic.common.serviceAccount.name" .)`, which is not an "empty string" so it is `true` if it is used
+                as an evaluation somewhere else.
+            */ -}}
+            {{- .Values.serviceAccount.create -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* Look for a local creation of a service account */ -}}
+{{- if not $valueFound -}}
+    {{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+    {{- $global := index .Values "global" | default dict -}}
+    {{- if get $global "serviceAccount" | kindIs "map" -}}
+        {{- if get $global.serviceAccount "create" | kindIs "bool" -}}
+            {{- $valueFound = true -}}
+            {{- if $global.serviceAccount.create -}}
+                {{- $global.serviceAccount.create -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* In case no serviceAccount value has been found, default to "true" */ -}}
+{{- if not $valueFound -}}
+true
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the name of the service account */ -}}
+{{- define "newrelic.common.serviceAccount.name" -}}
+{{- $localServiceAccount := "" -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "name" | kindIs "string") -}}
+        {{- $localServiceAccount = .Values.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := "" -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "name" | kindIs "string" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- if (include "newrelic.common.serviceAccount.create" .) -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default (include "newrelic.common.naming.fullname" .) -}}
+{{- else -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default "default" -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Merge the global and local annotations for the service account */ -}}
+{{- define "newrelic.common.serviceAccount.annotations" -}}
+{{- $localServiceAccount := dict -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if get .Values.serviceAccount "annotations" -}}
+        {{- $localServiceAccount = .Values.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := dict -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "annotations" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $merged := mustMergeOverwrite $globalServiceAccount $localServiceAccount -}}
+
+{{- if $merged -}}
+    {{- toYaml $merged -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_staging.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_staging.tpl
new file mode 100644
index 000000000..bd9ad09bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_staging.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the nrStaging toggle.
+This helper allows to override the global `.global.nrStaging` with the value of `.nrStaging`.
+Returns "true" if `nrStaging` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.nrStaging" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "nrStaging" | kindIs "bool") -}}
+    {{- if .Values.nrStaging -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.nrStaging" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.nrStaging -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "nrStaging" | kindIs "bool" -}}
+    {{- if $global.nrStaging -}}
+        {{- $global.nrStaging -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Returns "true" of "false" directly instead of empty string (Helm falsiness) based on the exit of "newrelic.common.nrStaging"
+*/ -}}
+{{- define "newrelic.common.nrStaging.value" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_tolerations.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_tolerations.tpl
new file mode 100644
index 000000000..e016b38e2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_tolerations.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod tolerations */ -}}
+{{- define "newrelic.common.tolerations" -}}
+    {{- if .Values.tolerations -}}
+        {{- toYaml .Values.tolerations -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.tolerations -}}
+            {{- toYaml .Values.global.tolerations -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_userkey.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_userkey.tpl
new file mode 100644
index 000000000..982ea8e09
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_userkey.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the API Key.
+*/}}
+{{- define "newrelic.common.userKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "userkey" ) -}}
+{{- include "newrelic.common.userKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+*/}}
+{{- define "newrelic.common.userKey.secretKeyName" -}}
+{{- include "newrelic.common.userKey._customSecretKey" . | default "userKey" -}}
+{{- end -}}
+
+{{/*
+Return local API Key if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._userKey" -}}
+{{- if .Values.userKey -}}
+  {{- .Values.userKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.userKey -}}
+    {{- .Values.global.userKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the API Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretName" -}}
+{{- if .Values.customUserKeySecretName -}}
+  {{- .Values.customUserKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretName -}}
+    {{- .Values.global.customUserKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretKey" -}}
+{{- if .Values.customUserKeySecretKey -}}
+  {{- .Values.customUserKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretKey }}
+    {{- .Values.global.customUserKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_userkey_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_userkey_secret.yaml.tpl
new file mode 100644
index 000000000..b97985654
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_userkey_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the user key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.userKey.secret" }}
+{{- if not (include "newrelic.common.userKey._customSecretName" .) }}
+{{- /* Fail if user key is empty and required: */ -}}
+{{- if not (include "newrelic.common.userKey._userKey" .) }}
+    {{- fail "You must specify a userKey or a customUserKeySecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.userKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.userKey.secretKeyName" . }}: {{ include "newrelic.common.userKey._userKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_verbose-log.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_verbose-log.tpl
new file mode 100644
index 000000000..2286d4681
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/templates/_verbose-log.tpl
@@ -0,0 +1,54 @@
+{{- /*
+Abstraction of the verbose toggle.
+This helper allows to override the global `.global.verboseLog` with the value of `.verboseLog`.
+Returns "true" if `verbose` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.verboseLog" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "verboseLog" | kindIs "bool") -}}
+    {{- if .Values.verboseLog -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.verboseLog" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.verboseLog -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "verboseLog" | kindIs "bool" -}}
+    {{- if $global.verboseLog -}}
+        {{- $global.verboseLog -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsBoolean" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return 1 or 0 directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsInt" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+1
+{{- else -}}
+0
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/values.yaml
new file mode 100644
index 000000000..75e2d112a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/charts/common-library/values.yaml
@@ -0,0 +1 @@
+# values are not needed for the library chart, however this file is still needed for helm lint to work.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/ci/test-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/ci/test-values.yaml
new file mode 100644
index 000000000..3e154e1d4
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/ci/test-values.yaml
@@ -0,0 +1,39 @@
+cluster: test-cluster
+licenseKey: pleasePassCIThanks
+serviceAccount:
+  name: newrelic-infra-operator-test
+image:
+  repository: e2e/newrelic-infra-operator
+  tag: test  # Defaults to AppVersion
+  pullPolicy: IfNotPresent
+  pullSecrets:
+  - name: test-pull-secret
+admissionWebhooksPatchJob:
+  volumeMounts:
+  - name: tmp
+    mountPath: /tmp
+  volumes:
+  - name: tmp
+    emptyDir:
+podAnnotations:
+  test-annotation: test-value
+affinity:
+  podAffinity:
+    preferredDuringSchedulingIgnoredDuringExecution:
+    - weight: 1
+      podAffinityTerm:
+        topologyKey: topology.kubernetes.io/zone
+        labelSelector:
+          matchExpressions:
+          - key: test-key
+            operator: In
+            values:
+            - test-value
+tolerations:
+- key: "key1"
+  operator: "Exists"
+  effect: "NoSchedule"
+nodeSelector:
+  beta.kubernetes.io/os: linux
+
+fargate: true
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/NOTES.txt b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/NOTES.txt
new file mode 100644
index 000000000..5b11d2d83
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/NOTES.txt
@@ -0,0 +1,4 @@
+Your deployment of the New Relic Infrastructure Operator is complete.
+You can check on the progress of this by running the following command:
+
+    kubectl get deployments -o wide -w --namespace {{ .Release.Namespace }} {{ include "newrelic.common.naming.fullname" . }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/_helpers.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/_helpers.tpl
new file mode 100644
index 000000000..8a8858c82
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/_helpers.tpl
@@ -0,0 +1,136 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Renders a value that contains template.
+Usage:
+{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }}
+*/}}
+{{- define "tplvalues.render" -}}
+    {{- if typeIs "string" .value }}
+        {{- tpl .value .context }}
+    {{- else }}
+        {{- tpl (.value | toYaml) .context }}
+    {{- end }}
+{{- end -}}
+
+{{- /*
+Naming helpers
+*/ -}}
+{{- define "newrelic-infra-operator.name.admission" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.name" .) "suffix" "admission") }}
+{{- end -}}
+
+{{- define "newrelic-infra-operator.fullname.admission" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "admission") }}
+{{- end -}}
+
+{{- define "newrelic-infra-operator.fullname.admission.serviceAccount" -}}
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+  {{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "admission") -}}
+{{- else -}}
+  {{- include "newrelic.common.serviceAccount.name" . -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "newrelic-infra-operator.name.admission-create" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.name" .) "suffix" "admission-create") }}
+{{- end -}}
+
+{{- define "newrelic-infra-operator.fullname.admission-create" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "admission-create") }}
+{{- end -}}
+
+{{- define "newrelic-infra-operator.name.admission-patch" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.name" .) "suffix" "admission-patch") }}
+{{- end -}}
+
+{{- define "newrelic-infra-operator.fullname.admission-patch" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "admission-patch") }}
+{{- end -}}
+
+{{- define "newrelic-infra-operator.fullname.self-signed-issuer" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "self-signed-issuer") }}
+{{- end -}}
+
+{{- define "newrelic-infra-operator.fullname.root-cert" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "root-cert") }}
+{{- end -}}
+
+{{- define "newrelic-infra-operator.fullname.root-issuer" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "root-issuer") }}
+{{- end -}}
+
+{{- define "newrelic-infra-operator.fullname.webhook-cert" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "webhook-cert") }}
+{{- end -}}
+
+{{- define "newrelic-infra-operator.fullname.infra-agent" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "infra-agent") }}
+{{- end -}}
+
+{{- define "newrelic-infra-operator.fullname.config" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "config") }}
+{{- end -}}
+
+{{/*
+Returns Infra-agent rules
+*/}}
+{{- define "newrelic-infra-operator.infra-agent-monitoring-rules" -}}
+- apiGroups: [""]
+  resources:
+    - "nodes"
+    - "nodes/metrics"
+    - "nodes/stats"
+    - "nodes/proxy"
+    - "pods"
+    - "services"
+    - "namespaces"
+  verbs: ["get", "list"]
+- nonResourceURLs: ["/metrics"]
+  verbs: ["get"]
+{{- end -}}
+
+{{/*
+Returns fargate
+*/}}
+{{- define "newrelic-infra-operator.fargate" -}}
+{{- if .Values.global }}
+  {{- if .Values.global.fargate }}
+    {{- .Values.global.fargate -}}
+  {{- end -}}
+{{- else if .Values.fargate }}
+  {{- .Values.fargate -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns fargate configuration for configmap data
+*/}}
+{{- define "newrelic-infra-operator.fargate-config" -}}
+infraAgentInjection:
+  resourcePrefix: {{ include "newrelic.common.naming.fullname" . }}
+{{- if include "newrelic-infra-operator.fargate" . }}
+{{- if not .Values.config.infraAgentInjection.policies }}
+  policies:
+    - podSelector:
+        matchExpressions:
+          - key: "eks.amazonaws.com/fargate-profile"
+            operator: Exists
+{{- end }}
+  agentConfig:
+{{- if not .Values.config.infraAgentInjection.agentConfig.customAttributes }}
+    customAttributes:
+      - name: computeType
+        defaultValue: serverless
+      - name: fargateProfile
+        fromLabel: eks.amazonaws.com/fargate-profile
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns configmap data
+*/}}
+{{- define "newrelic-infra-operator.configmap.data" -}}
+{{ toYaml (merge (include "newrelic-infra-operator.fargate-config" . | fromYaml) .Values.config) }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/clusterrole.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/clusterrole.yaml
new file mode 100644
index 000000000..44c2b3eba
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/clusterrole.yaml
@@ -0,0 +1,27 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "newrelic-infra-operator.fullname.admission" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "newrelic-infra-operator.name.admission" . }}
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - admissionregistration.k8s.io
+    resources:
+      - mutatingwebhookconfigurations
+    verbs:
+      - get
+      - update
+  {{- if .Values.rbac.pspEnabled }}
+  - apiGroups: ['policy']
+    resources: ['podsecuritypolicies']
+    verbs: ['use']
+    resourceNames:
+    - {{ include "newrelic-infra-operator.fullname.admission" . }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/clusterrolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/clusterrolebinding.yaml
new file mode 100644
index 000000000..902206c22
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/clusterrolebinding.yaml
@@ -0,0 +1,20 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "newrelic-infra-operator.fullname.admission" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "newrelic-infra-operator.name.admission" . }}
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "newrelic-infra-operator.fullname.admission" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "newrelic-infra-operator.fullname.admission.serviceAccount" . }}
+    namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/job-createSecret.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/job-createSecret.yaml
new file mode 100644
index 000000000..022e6254e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/job-createSecret.yaml
@@ -0,0 +1,57 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-infra-operator.fullname.admission-create" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "newrelic-infra-operator.name.admission-create" . }}
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  template:
+    metadata:
+      name: {{ include "newrelic-infra-operator.fullname.admission-create" . }}
+      labels:
+        app: {{ include "newrelic-infra-operator.name.admission-create" . }}
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+    spec:
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" ( list .Values.admissionWebhooksPatchJob.image.pullSecrets ) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: create
+          image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "registry.k8s.io" "imageRoot" .Values.admissionWebhooksPatchJob.image "context" .) }}
+          imagePullPolicy: {{ .Values.admissionWebhooksPatchJob.image.pullPolicy }}
+          args:
+            - create
+            - --host={{ include "newrelic.common.naming.fullname" . }},{{ include "newrelic.common.naming.fullname" . }}.{{ .Release.Namespace }}.svc
+            - --namespace={{ .Release.Namespace }}
+            - --secret-name={{ include "newrelic-infra-operator.fullname.admission" . }}
+            - --cert-name=tls.crt
+            - --key-name=tls.key
+          {{- if .Values.admissionWebhooksPatchJob.image.volumeMounts }}
+          volumeMounts:
+          {{- include "tplvalues.render" ( dict "value" .Values.admissionWebhooksPatchJob.image.volumeMounts "context" $ ) | nindent 10 }}
+          {{- end }}
+      {{- if .Values.admissionWebhooksPatchJob.image.volumes }}
+      volumes:
+      {{- include "tplvalues.render" ( dict "value" .Values.admissionWebhooksPatchJob.image.volumes "context" $ ) | nindent 8 }}
+      {{- end }}
+      restartPolicy: OnFailure
+      serviceAccountName: {{ include "newrelic-infra-operator.fullname.admission.serviceAccount" . }}
+      securityContext:
+        runAsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 2000
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{ include "newrelic.common.nodeSelector" . | nindent 8 }}
+      {{- with include "newrelic.common.tolerations" . }}
+      tolerations:
+        {{- . | nindent 8 -}}
+      {{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/job-patchWebhook.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
new file mode 100644
index 000000000..61e363678
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -0,0 +1,57 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-infra-operator.fullname.admission-patch" . }}
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "newrelic-infra-operator.name.admission-patch" . }}
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  template:
+    metadata:
+      name: {{ include "newrelic-infra-operator.fullname.admission-patch" . }}
+      labels:
+        app: {{ include "newrelic-infra-operator.name.admission-patch" . }}
+        {{- include "newrelic.common.labels" . | nindent 8 }}
+    spec:
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" ( list .Values.admissionWebhooksPatchJob.image.pullSecrets ) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: patch
+          image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "registry.k8s.io" "imageRoot" .Values.admissionWebhooksPatchJob.image "context" .) }}
+          imagePullPolicy: {{ .Values.admissionWebhooksPatchJob.image.pullPolicy }}
+          args:
+            - patch
+            - --webhook-name={{ include "newrelic.common.naming.fullname" . }}
+            - --namespace={{ .Release.Namespace }}
+            - --secret-name={{ include "newrelic-infra-operator.fullname.admission" . }}
+            - --patch-failure-policy=Ignore
+            - --patch-validating=false
+          {{- if .Values.admissionWebhooksPatchJob.image.volumeMounts }}
+          volumeMounts:
+          {{- include "tplvalues.render" ( dict "value" .Values.admissionWebhooksPatchJob.image.volumeMounts "context" $ ) | nindent 10 }}
+          {{- end }}
+      {{- if .Values.admissionWebhooksPatchJob.image.volumes }}
+      volumes:
+      {{- include "tplvalues.render" ( dict "value" .Values.admissionWebhooksPatchJob.image.volumes "context" $ ) | nindent 8 }}
+      {{- end }}
+      restartPolicy: OnFailure
+      serviceAccountName: {{ include "newrelic-infra-operator.fullname.admission.serviceAccount" . }}
+      securityContext:
+        runAsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 2000
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{ include "newrelic.common.nodeSelector" . | nindent 8 }}
+      {{- with include "newrelic.common.tolerations" . }}
+      tolerations:
+        {{- . | nindent 8 -}}
+      {{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/psp.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/psp.yaml
new file mode 100644
index 000000000..64237abb4
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/psp.yaml
@@ -0,0 +1,50 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled) (.Values.rbac.pspEnabled)) }}
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ include "newrelic-infra-operator.fullname.admission" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "newrelic-infra-operator.name.admission" . }}
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  privileged: false
+  # Required to prevent escalations to root.
+  # allowPrivilegeEscalation: false
+  # This is redundant with non-root + disallow privilege escalation,
+  # but we can provide it for defense in depth.
+  # requiredDropCapabilities:
+  #   - ALL
+  # Allow core volume types.
+  volumes:
+    - 'configMap'
+    - 'emptyDir'
+    - 'projected'
+    - 'secret'
+    - 'downwardAPI'
+    - 'persistentVolumeClaim'
+  hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+  hostIPC: false
+  hostPID: false
+  runAsUser:
+    # Permits the container to run with root privileges as well.
+    rule: 'RunAsAny'
+  seLinux:
+    # This policy assumes the nodes are using AppArmor rather than SELinux.
+    rule: 'RunAsAny'
+  supplementalGroups:
+    rule: 'MustRunAs'
+    ranges:
+      # Forbid adding the root group.
+      - min: 0
+        max: 65535
+  fsGroup:
+    rule: 'MustRunAs'
+    ranges:
+      # Forbid adding the root group.
+      - min: 0
+        max: 65535
+  readOnlyRootFilesystem: false
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/role.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/role.yaml
new file mode 100644
index 000000000..e3213f7c5
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/role.yaml
@@ -0,0 +1,21 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-infra-operator.fullname.admission" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "newrelic-infra-operator.name.admission" . }}
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+    verbs:
+      - get
+      - create
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/rolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/rolebinding.yaml
new file mode 100644
index 000000000..67eb79298
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/rolebinding.yaml
@@ -0,0 +1,21 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-infra-operator.fullname.admission" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "newrelic-infra-operator.name.admission" . }}
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "newrelic-infra-operator.fullname.admission" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "newrelic-infra-operator.fullname.admission.serviceAccount" . }}
+    namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/serviceaccount.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/serviceaccount.yaml
new file mode 100644
index 000000000..18eb7347d
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/job-patch/serviceaccount.yaml
@@ -0,0 +1,14 @@
+{{- $createServiceAccount := include "newrelic.common.serviceAccount.create" . -}}
+{{- if (and $createServiceAccount (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-infra-operator.fullname.admission.serviceAccount" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "newrelic-infra-operator.name.admission" . }}
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/mutatingWebhookConfiguration.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/mutatingWebhookConfiguration.yaml
new file mode 100644
index 000000000..efa605255
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/admission-webhooks/mutatingWebhookConfiguration.yaml
@@ -0,0 +1,32 @@
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+{{- if .Values.certManager.enabled }}
+  annotations:
+    certmanager.k8s.io/inject-ca-from: {{ printf "%s/%s-root-cert" .Release.Namespace (include "newrelic.common.naming.fullname" .) | quote }}
+    cert-manager.io/inject-ca-from: {{ printf "%s/%s-root-cert" .Release.Namespace (include "newrelic.common.naming.fullname" .) | quote }}
+{{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+webhooks:
+- name: newrelic-infra-operator.newrelic.com
+  clientConfig:
+    service:
+      name: {{ include "newrelic.common.naming.fullname" . }}
+      namespace: {{ .Release.Namespace }}
+      path: "/mutate-v1-pod"
+{{- if not .Values.certManager.enabled }}
+    caBundle: ""
+{{- end }}
+  rules:
+  - operations: ["CREATE"]
+    apiGroups: [""]
+    apiVersions: ["v1"]
+    resources: ["pods"]
+  failurePolicy: Ignore
+  timeoutSeconds: {{ .Values.timeoutSeconds }}
+  sideEffects: NoneOnDryRun
+  admissionReviewVersions:
+  - v1
+  reinvocationPolicy: IfNeeded
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/cert-manager.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/cert-manager.yaml
new file mode 100644
index 000000000..800dc2453
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/cert-manager.yaml
@@ -0,0 +1,52 @@
+{{ if .Values.certManager.enabled }}
+---
+# Create a selfsigned Issuer, in order to create a root CA certificate for
+# signing webhook serving certificates
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-infra-operator.fullname.self-signed-issuer" . }}
+spec:
+  selfSigned: {}
+---
+# Generate a CA Certificate used to sign certificates for the webhook
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-infra-operator.fullname.root-cert" . }}
+spec:
+  secretName: {{ include "newrelic-infra-operator.fullname.root-cert" . }}
+  duration: 43800h # 5y
+  issuerRef:
+    name: {{ include "newrelic-infra-operator.fullname.self-signed-issuer" . }}
+  commonName: "ca.webhook.nri"
+  isCA: true
+---
+# Create an Issuer that uses the above generated CA certificate to issue certs
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-infra-operator.fullname.root-issuer" . }}
+spec:
+  ca:
+    secretName: {{ include "newrelic-infra-operator.fullname.root-cert" . }}
+---
+# Finally, generate a serving certificate for the webhook to use
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-infra-operator.fullname.webhook-cert" . }}
+spec:
+  secretName: {{ include "newrelic-infra-operator.fullname.admission" . }}
+  duration: 8760h # 1y
+  issuerRef:
+    name: {{ include "newrelic-infra-operator.fullname.root-issuer" . }}
+  dnsNames:
+  - {{ include "newrelic.common.naming.fullname" . }}
+  - {{ include "newrelic.common.naming.fullname" . }}.{{ .Release.Namespace }}
+  - {{ include "newrelic.common.naming.fullname" . }}.{{ .Release.Namespace }}.svc
+{{ end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/clusterrole.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/clusterrole.yaml
new file mode 100644
index 000000000..cb20e310d
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/clusterrole.yaml
@@ -0,0 +1,39 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+  {{/* Allow creating and updating secrets with license key for infra agent. */ -}}
+  - apiGroups: [""]
+    resources:
+      - "secrets"
+    verbs: ["get", "update", "patch"]
+    resourceNames: [ {{ include "newrelic-infra-operator.fullname.config" . | quote }} ]
+  {{/* resourceNames used above do not support "create" verb. */ -}}
+  - apiGroups: [""]
+    resources:
+      - "secrets"
+    verbs: ["create"]
+  {{/* "list" and "watch" are required for controller-runtime caching. */ -}}
+  - apiGroups: ["rbac.authorization.k8s.io"]
+    resources: ["clusterrolebindings"]
+    verbs: ["list", "watch", "get"]
+  {{/* Our controller needs permission to add the ServiceAccounts from the user to the -infra-agent CRB. */ -}}
+  - apiGroups: ["rbac.authorization.k8s.io"]
+    resources: ["clusterrolebindings"]
+    verbs: ["update"]
+    resourceNames: [ {{ include "newrelic-infra-operator.fullname.infra-agent" . | quote }} ]
+  {{- /* Controller must have permissions it will grant to other ServiceAccounts. */ -}}
+  {{- include "newrelic-infra-operator.infra-agent-monitoring-rules" . | nindent 2 }}
+---
+{{/* infra-agent is the ClusterRole to be used by the injected agents to get metrics */}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "newrelic-infra-operator.fullname.infra-agent" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+  {{- include "newrelic-infra-operator.infra-agent-monitoring-rules" . | nindent 2 }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/clusterrolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/clusterrolebinding.yaml
new file mode 100644
index 000000000..1f5f8b89b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/clusterrolebinding.yaml
@@ -0,0 +1,26 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "newrelic.common.naming.fullname" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "newrelic.common.serviceAccount.name" . }}
+    namespace: {{ .Release.Namespace }}
+---
+{{/* infra-agent is the ClusterRoleBinding to be used by the ServiceAccounts of the injected agents */}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "newrelic-infra-operator.fullname.infra-agent" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "newrelic-infra-operator.fullname.infra-agent" . }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/configmap.yaml
new file mode 100644
index 000000000..fdb4a1e3b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/configmap.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-infra-operator.fullname.config" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  operator.yaml: {{- include "newrelic-infra-operator.configmap.data" . | toYaml | nindent 4  }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/deployment.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/deployment.yaml
new file mode 100644
index 000000000..40f389887
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/deployment.yaml
@@ -0,0 +1,92 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicas }}
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        {{- if .Values.podAnnotations }}
+        {{- toYaml .Values.podAnnotations | nindent 8 }}
+        {{- end }}
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+    spec:
+      serviceAccountName: {{ template "newrelic.common.serviceAccount.name" . }}
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" ( list .Values.image.pullSecrets ) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 }}
+      {{- end }}
+      containers:
+      - name: {{ include "newrelic.common.naming.name" . }}
+        image: {{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.image "context" .) }}
+        imagePullPolicy: "{{ .Values.image.pullPolicy }}"
+        {{- with include "newrelic.common.securityContext.container" . }}
+        securityContext:
+          {{- . | nindent 10 }}
+        {{- end }}
+        env:
+        - name: CLUSTER_NAME
+          value: {{ include "newrelic.common.cluster" . }}
+        - name: NRIA_LICENSE_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "newrelic.common.license.secretName" . }}
+              key: {{ include "newrelic.common.license.secretKeyName" . }}
+        volumeMounts:
+        - name: config
+          mountPath: /etc/newrelic/newrelic-infra-operator/
+        - name: tls-key-cert-pair
+          mountPath: /tmp/k8s-webhook-server/serving-certs/
+        readinessProbe:
+          httpGet:
+            path: /healthz
+            port: 9440
+          initialDelaySeconds: 1
+          periodSeconds: 1
+        {{- if .Values.resources }}
+        resources:
+          {{- toYaml .Values.resources | nindent 10 }}
+        {{- end }}
+      volumes:
+      - name: config
+        configMap:
+          name: {{ include "newrelic-infra-operator.fullname.config" . }}
+      - name: tls-key-cert-pair
+        secret:
+          secretName: {{ include "newrelic-infra-operator.fullname.admission" . }}
+      {{- with include "newrelic.common.priorityClassName" . }}
+      priorityClassName: {{ . }}
+      {{- end }}
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{ include "newrelic.common.nodeSelector" . | nindent 8 }}
+      {{- with include "newrelic.common.tolerations" . }}
+      tolerations:
+        {{- . | nindent 8 -}}
+      {{- end }}
+      {{- with include "newrelic.common.affinity" . }}
+      affinity:
+        {{- . | nindent 8 -}}
+      {{- end }}
+      {{- with include "newrelic.common.dnsConfig" . }}
+      dnsConfig:
+        {{- . | nindent 8 }}
+      {{- end }}
+      hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+      {{- if include "newrelic.common.hostNetwork" . }}
+      dnsPolicy: ClusterFirstWithHostNet
+      {{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/secret.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/secret.yaml
new file mode 100644
index 000000000..f558ee86c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/secret.yaml
@@ -0,0 +1,2 @@
+{{- /* Common library will take care of creating the secret or not. */}}
+{{- include "newrelic.common.license.secret" . }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/service.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/service.yaml
new file mode 100644
index 000000000..04af4d09c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  ports:
+  - port: 443
+    targetPort: 9443
+  selector:
+    {{- include "newrelic.common.labels.selectorLabels" . | nindent 4 }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/serviceaccount.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/serviceaccount.yaml
new file mode 100644
index 000000000..b1e74523e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/templates/serviceaccount.yaml
@@ -0,0 +1,13 @@
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- if include "newrelic.common.serviceAccount.annotations" . }}
+  annotations:
+    {{- include "newrelic.common.serviceAccount.annotations" . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/tests/deployment_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/tests/deployment_test.yaml
new file mode 100644
index 000000000..a1ffa88d0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/tests/deployment_test.yaml
@@ -0,0 +1,32 @@
+suite: test cluster environment variable setup
+templates:
+  - templates/deployment.yaml
+  - templates/configmap.yaml
+  - templates/secret.yaml
+release:
+  name: my-release
+  namespace: my-namespac
+tests:
+  - it: has a linux node selector by default
+    set:
+      cluster: my-cluster
+      licenseKey: use-whatever
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+        template: templates/deployment.yaml
+  - it: has a linux node selector and additional selectors
+    set:
+      cluster: my-cluster
+      licenseKey: use-whatever
+      nodeSelector:
+        aCoolTestLabel: aCoolTestValue
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+            aCoolTestLabel: aCoolTestValue
+        template: templates/deployment.yaml
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/tests/job_patch_psp_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/tests/job_patch_psp_test.yaml
new file mode 100644
index 000000000..78f1b1f6a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/tests/job_patch_psp_test.yaml
@@ -0,0 +1,23 @@
+suite: test rendering for PSPs
+templates:
+  - templates/admission-webhooks/job-patch/psp.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: If PSPs are enabled PodSecurityPolicy is rendered
+    set:
+      cluster: test-cluster
+      licenseKey: use-whatever
+      rbac:
+        pspEnabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+  - it: If PSPs are disabled PodSecurityPolicy isn't rendered
+    set:
+        cluster: test-cluster
+        licenseKey: use-whatever
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/tests/job_serviceaccount_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/tests/job_serviceaccount_test.yaml
new file mode 100644
index 000000000..c6acda2db
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/tests/job_serviceaccount_test.yaml
@@ -0,0 +1,64 @@
+suite: test job' serviceAccount
+templates:
+  - templates/admission-webhooks/job-patch/job-createSecret.yaml
+  - templates/admission-webhooks/job-patch/job-patchWebhook.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: RBAC points to the service account that is created by default
+    set:
+      cluster: test-cluster
+      licenseKey: use-whatever
+      rbac.create: true
+      serviceAccount.create: true
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: my-release-newrelic-infra-operator-admission
+
+  - it: RBAC points to the service account the user supplies when serviceAccount is disabled
+    set:
+      cluster: test-cluster
+      licenseKey: use-whatever
+      rbac.create: true
+      serviceAccount.create: false
+      serviceAccount.name: sa-test
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: sa-test
+
+  - it: RBAC points to the service account the user supplies when serviceAccount is disabled
+    set:
+      cluster: test-cluster
+      licenseKey: use-whatever
+      rbac.create: true
+      serviceAccount.create: false
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: default
+
+  - it: has a linux node selector by default
+    set:
+      cluster: my-cluster
+      licenseKey: use-whatever
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+
+  - it: has a linux node selector and additional selectors
+    set:
+      cluster: my-cluster
+      licenseKey: use-whatever
+      nodeSelector:
+        aCoolTestLabel: aCoolTestValue
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+            aCoolTestLabel: aCoolTestValue
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/tests/rbac_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/tests/rbac_test.yaml
new file mode 100644
index 000000000..03473cb39
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/tests/rbac_test.yaml
@@ -0,0 +1,41 @@
+suite: test RBAC creation
+templates:
+  - templates/admission-webhooks/job-patch/rolebinding.yaml
+  - templates/admission-webhooks/job-patch/clusterrolebinding.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: RBAC points to the service account that is created by default
+    set:
+      cluster: test-cluster
+      licenseKey: use-whatever
+      rbac.create: true
+      serviceAccount.create: true
+    asserts:
+      - equal:
+          path: subjects[0].name
+          value: my-release-newrelic-infra-operator-admission
+
+  - it: RBAC points to the service account the user supplies when serviceAccount is disabled
+    set:
+      cluster: test-cluster
+      licenseKey: use-whatever
+      rbac.create: true
+      serviceAccount.create: false
+      serviceAccount.name: sa-test
+    asserts:
+      - equal:
+          path: subjects[0].name
+          value: sa-test
+
+  - it: RBAC points to the service account the user supplies when serviceAccount is disabled
+    set:
+      cluster: test-cluster
+      licenseKey: use-whatever
+      rbac.create: true
+      serviceAccount.create: false
+    asserts:
+      - equal:
+          path: subjects[0].name
+          value: default
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/values.yaml
new file mode 100644
index 000000000..3dd6fd055
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infra-operator/values.yaml
@@ -0,0 +1,222 @@
+# -- Override the name of the chart
+nameOverride: ""
+# -- Override the full name of the release
+fullnameOverride: ""
+
+# -- Name of the Kubernetes cluster monitored. Mandatory. Can be configured also with `global.cluster`
+cluster: ""
+# -- This set this license key to use. Can be configured also with `global.licenseKey`
+licenseKey: ""
+# -- In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there. Can be configured also with `global.customSecretName`
+customSecretName: ""
+# -- In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located. Can be configured also with `global.customSecretLicenseKey`
+customSecretLicenseKey: ""
+
+# -- Image for the New Relic Infrastructure Operator
+# @default -- See `values.yaml`
+image:
+  repository: newrelic/newrelic-infra-operator
+  tag: ""
+  pullPolicy: IfNotPresent
+  # -- The secrets that are needed to pull images from a custom registry.
+  pullSecrets: []
+  # - name: regsecret
+
+# -- Image used to create certificates and inject them to the admission webhook
+# @default -- See `values.yaml`
+admissionWebhooksPatchJob:
+  image:
+    registry:  # Defaults to registry.k8s.io
+    repository: ingress-nginx/kube-webhook-certgen
+    tag: v1.3.0
+    pullPolicy: IfNotPresent
+    # -- The secrets that are needed to pull images from a custom registry.
+    pullSecrets: []
+    # - name: regsecret
+
+  # -- Volume mounts to add to the job, you might want to mount tmp if Pod Security Policies.
+  # Enforce a read-only root.
+  volumeMounts: []
+  # - name: tmp
+  #   mountPath: /tmp
+  # -- Volumes to add to the job container.
+  volumes: []
+  # - name: tmp
+  #   emptyDir: {}
+
+rbac:
+  # rbac.pspEnabled -- Whether the chart should create Pod Security Policy objects.
+  pspEnabled: false
+
+replicas: 1
+
+# -- Resources available for this pod
+resources:
+  limits:
+    memory: 80M
+  requests:
+    cpu: 100m
+    memory: 30M
+
+# -- Settings controlling ServiceAccount creation
+# @default -- See `values.yaml`
+serviceAccount:
+  # serviceAccount.create -- (bool) Specifies whether a ServiceAccount should be created
+  # @default -- `true`
+  create:
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+  # Specify any annotations to add to the ServiceAccount
+  annotations:
+
+# -- Annotations to add to the pod.
+podAnnotations: {}
+
+# -- Sets pod's priorityClassName. Can be configured also with `global.priorityClassName`
+priorityClassName: ""
+# -- (bool) Sets pod's hostNetwork. Can be configured also with `global.hostNetwork`
+# @default -- `false`
+hostNetwork:
+# -- Sets pod's dnsConfig. Can be configured also with `global.dnsConfig`
+dnsConfig: {}
+# -- Sets security context (at pod level). Can be configured also with `global.podSecurityContext`
+podSecurityContext:
+  fsGroup: 1001
+  runAsUser: 1001
+  runAsGroup: 1001
+# -- Sets security context (at container level). Can be configured also with `global.containerSecurityContext`
+containerSecurityContext: {}
+
+# -- Sets pod/node affinities. Can be configured also with `global.affinity`
+affinity: {}
+# -- Sets pod's node selector. Can be configured also with `global.nodeSelector`
+nodeSelector: {}
+# -- Sets pod's tolerations to node taints. Can be configured also with `global.tolerations`
+tolerations: []
+
+certManager:
+  # certManager.enabled -- Use cert manager for webhook certs
+  enabled: false
+
+# -- Webhook timeout
+# Ref: https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#timeouts
+timeoutSeconds: 10
+
+# -- Operator configuration
+# @default -- See `values.yaml`
+config:
+  # -- IgnoreMutationErrors instruments the operator to ignore injection error instead of failing.
+  # If set to false errors of the injection could block the creation of pods.
+  ignoreMutationErrors: true
+
+  # -- configuration of the sidecar injection webhook
+  # @default -- See `values.yaml`
+  infraAgentInjection:
+#    policies:
+#      - podSelector:
+#          matchExpressions:
+#            - key: app
+#              operator: In
+#              values: [ "nginx-sidecar" ]
+#
+    # All policies are ORed, if one policy matches the sidecar is injected.
+  # Within a policy PodSelectors, NamespaceSelector and NamespaceName are ANDed, any of these, if not specified, is ignored.
+  # The following policy is injected if global.fargate=true and matches all pods belonging to any fargate profile.
+  #    policies:
+  #    - podSelector:
+  #        matchExpressions:
+  #        - key: "eks.amazonaws.com/fargate-profile"
+  #          operator: Exists
+  # Also NamespaceName and NamespaceSelector can be leveraged.
+  #      namespaceName: "my-namespace"
+  #      namespaceSelector: {}
+
+    # -- agentConfig contains the configuration for the container agent injected
+    # @default -- See `values.yaml`
+    agentConfig:
+    # Custom  Attributes allows to pass any custom attribute to the injected infra agents.
+    # The value is computed either from the defaultValue or taken at injected time from Label specified in "fromLabel".
+    # Either the label should exist or the default should be specified in order to have the injection working.
+    # customAttributes:
+    #   - name: computeType
+    #     defaultValue: serverless
+    #   - name: fargateProfile
+    #     fromLabel: eks.amazonaws.com/fargate-profile
+
+      # -- Image of the infrastructure agent to be injected.
+      # @default -- See `values.yaml`
+      image:
+        repository: newrelic/infrastructure-k8s
+        tag: 2.13.15-unprivileged
+        pullPolicy: IfNotPresent
+
+      # -- configSelectors is the way to configure resource requirements and extra envVars of the injected sidecar container.
+      # When mutating it will be applied the first configuration having the labelSelector matching with the mutating pod.
+      # @default -- See `values.yaml`
+      configSelectors:
+      - resourceRequirements:  # resourceRequirements to apply to the injected sidecar.
+          limits:
+            memory: 100M
+            cpu: 200m
+          requests:
+            memory: 50M
+            cpu: 100m
+        extraEnvVars:  # extraEnvVars to pass to the injected sidecar.
+          DISABLE_KUBE_STATE_METRICS: "true"
+        # NRIA_VERBOSE: "1"
+        labelSelector:
+          matchExpressions:
+          - key: "app.kubernetes.io/name"
+            operator: NotIn
+            values: ["kube-state-metrics"]
+          - key: "app"
+            operator: NotIn
+            values: ["kube-state-metrics"]
+          - key: "k8s-app"
+            operator: NotIn
+            values: ["kube-state-metrics"]
+
+      - resourceRequirements:
+          limits:
+            memory: 300M
+            cpu: 300m
+          requests:
+            memory: 150M
+            cpu: 150m
+        labelSelector:
+          matchLabels:
+            k8s-app: kube-state-metrics
+      # extraEnvVars:
+      #   NRIA_VERBOSE: "1"
+
+      - resourceRequirements:
+          limits:
+            memory: 300M
+            cpu: 300m
+          requests:
+            memory: 150M
+            cpu: 150m
+        labelSelector:
+          matchLabels:
+            app: kube-state-metrics
+      # extraEnvVars:
+      #   NRIA_VERBOSE: "1"
+
+      - resourceRequirements:
+          limits:
+            memory: 300M
+            cpu: 300m
+          requests:
+            memory: 150M
+            cpu: 150m
+        labelSelector:
+          matchLabels:
+            app.kubernetes.io/name: kube-state-metrics
+      # extraEnvVars:
+      #   NRIA_VERBOSE: "1"
+
+      # pod Security Context of the sidecar injected.
+      # Notice that ReadOnlyRootFilesystem and AllowPrivilegeEscalation enforced respectively to true and to false.
+      # podSecurityContext:
+      #   RunAsUser:
+      #   RunAsGroup:
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/.helmignore
new file mode 100644
index 000000000..2bfa6a4d9
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/.helmignore
@@ -0,0 +1 @@
+tests/
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/Chart.lock b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/Chart.lock
new file mode 100644
index 000000000..2b805a69b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.1
+digest: sha256:cfa7bfb136b9bcfe87e37d3556c3fedecc58f42685c4ce39485da106408b6619
+generated: "2025-01-08T01:32:29.437794856Z"
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/Chart.yaml
new file mode 100644
index 000000000..bee1333af
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/Chart.yaml
@@ -0,0 +1,26 @@
+apiVersion: v2
+appVersion: 3.33.0
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.1
+description: A Helm chart to deploy the New Relic Kubernetes monitoring solution
+home: https://docs.newrelic.com/docs/kubernetes-pixie/kubernetes-integration/get-started/introduction-kubernetes-integration/
+icon: https://newrelic.com/themes/custom/curio/assets/mediakit/NR_logo_Horizontal.svg
+keywords:
+- infrastructure
+- newrelic
+- monitoring
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+name: newrelic-infrastructure
+sources:
+- https://github.com/newrelic/nri-kubernetes/
+- https://github.com/newrelic/nri-kubernetes/tree/main/charts/newrelic-infrastructure
+- https://github.com/newrelic/infrastructure-agent/
+version: 3.38.0
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/README.md
new file mode 100644
index 000000000..f80831dd9
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/README.md
@@ -0,0 +1,221 @@
+# newrelic-infrastructure
+
+A Helm chart to deploy the New Relic Kubernetes monitoring solution
+
+**Homepage:** <https://docs.newrelic.com/docs/kubernetes-pixie/kubernetes-integration/get-started/introduction-kubernetes-integration/>
+
+# Helm installation
+
+You can install this chart using [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) located in the
+[helm-charts repository](https://github.com/newrelic/helm-charts) or directly from this repository by adding this Helm repository:
+
+```shell
+helm repo add nri-kubernetes https://newrelic.github.io/nri-kubernetes
+helm upgrade --install newrelic-infrastructure nri-kubernetes/newrelic-infrastructure -f your-custom-values.yaml
+```
+
+## Source Code
+
+* <https://github.com/newrelic/nri-kubernetes/>
+* <https://github.com/newrelic/nri-kubernetes/tree/main/charts/newrelic-infrastructure>
+* <https://github.com/newrelic/infrastructure-agent/>
+
+## Values managed globally
+
+This chart implements the [New Relic's common Helm library](https://github.com/newrelic/helm-charts/tree/master/library/common-library) which
+means that it honors a wide range of defaults and globals common to most New Relic Helm charts.
+
+Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
+[user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
+
+## Chart particularities
+
+### Low data mode
+There are two mechanisms to reduce the amount of data that this integration sends to New Relic. See this snippet from the `values.yaml` file:
+```yaml
+common:
+  config:
+    interval: 15s
+
+lowDataMode: false
+```
+
+The `lowDataMode` toggle is the simplest way to reduce data send to Newrelic. Setting it to `true` changes the default scrape interval from 15 seconds
+(the default) to 30 seconds.
+
+If you need for some reason to fine-tune the number of seconds you can use `common.config.interval` directly. If you take a look at the `values.yaml`
+file, the value there is `nil`. If any value is set there, the `lowDataMode` toggle is ignored as this value takes precedence.
+
+Setting this interval above 40 seconds can make you experience issues with the Kubernetes Cluster Explorer so this chart limits setting the interval
+inside the range of 10 to 40 seconds.
+
+### Affinities and tolerations
+
+The New Relic common library allows to set affinities, tolerations, and node selectors globally using e.g. `.global.affinity` to ease the configuration
+when you use this chart using `nri-bundle`. This chart has an extra level of granularity to the components that it deploys:
+control plane, ksm, and kubelet.
+
+Take this snippet as an example:
+```yaml
+global:
+  affinity: {}
+affinity: {}
+
+kubelet:
+  affinity: {}
+ksm:
+  affinity: {}
+controlPlane:
+  affinity: {}
+```
+
+The order to set an affinity is to set first any `kubelet.affinity`, `ksm.affinity`, or `controlPlane.affinity`. If these values are empty the chart
+fallbacks to `affinity` (at root level), and if that value is empty, the chart fallbacks to `global.affinity`.
+
+The same procedure applies to `nodeSelector` and `tolerations`.
+
+On the other hand, some components have affinities and tolerations predefined e.g. to be able to run kubelet pods on nodes that are tainted as control plane
+nodes or to schedule the KSM scraper on the same node of KSM to reduce the inter-node traffic.
+
+If you are having problems assigning pods to nodes it may be because of this. Take a look at the [`values.yaml`](values.yaml) to see if the pod that is
+not having your expected behavior has any predefined value.
+
+### `hostNetwork` toggle
+
+In versions below v3, changing the `privileged` mode affected the `hostNetwork`. We changed this behavior and now you can set pods to use `hostNetwork`
+using the corresponding [flags from the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md)
+(`.global.hostNetwork` and `.hostNetwork`) but the component that scrapes data from the control plane has always set `hostNetwork` enabled by default
+(Look in the [`values.yaml`](values.yaml) for `controlPlane.hostNetwork: true`)
+
+This is because the most common configuration of the control plane components is to be configured to listen only to `localhost`.
+
+If your cluster security policy does not allow to use `hostNetwork`, you can disable it control plane monitoring by setting `controlPlane.enabled` to
+`false.`
+
+### `privileged` toggle
+
+The default value for `privileged` [from the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md) is
+`false` but in this particular this chart it is set to `true` (Look in the [`values.yaml`](values.yaml) for `privileged: true`)
+
+This is because when `kubelet` pods need to run in privileged mode to fetch cpu, memory, process, and network metrics of your nodes.
+
+If your cluster security policy does not allow to have `privileged` in your pod' security context, you can disable it by setting `privileged` to
+`false` taking into account that you will lose all the metrics from the host and some metadata from the host that are added to the metrics of the
+integrations that you have configured.
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` | Sets pod/node affinities set almost globally. (See [Affinities and tolerations](README.md#affinities-and-tolerations)) |
+| cluster | string | `""` | Name of the Kubernetes cluster monitored. Can be configured also with `global.cluster` |
+| common | object | See `values.yaml` | Config that applies to all instances of the solution: kubelet, ksm, control plane and sidecars. |
+| common.agentConfig | object | `{}` | Config for the Infrastructure agent. Will be used by the forwarder sidecars and the agent running integrations. See: https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/ |
+| common.config.interval | duration | `15s` (See [Low data mode](README.md#low-data-mode)) | Intervals larger than 40s are not supported and will cause the NR UI to not behave properly. Any non-nil value will override the `lowDataMode` default. |
+| common.config.namespaceSelector | object | `{}` | Config for filtering ksm and kubelet metrics by namespace. |
+| containerSecurityContext | object | `{}` | Sets security context (at container level). Can be configured also with `global.containerSecurityContext` |
+| controlPlane | object | See `values.yaml` | Configuration for the control plane scraper. |
+| controlPlane.affinity | object | Deployed only in control plane nodes. | Affinity for the control plane DaemonSet. |
+| controlPlane.agentConfig | object | `{}` | Config for the Infrastructure agent that will forward the metrics to the backend. It will be merged with the configuration in `.common.agentConfig` See: https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/ |
+| controlPlane.config.apiServer | object | Common settings for most K8s distributions. | API Server monitoring configuration |
+| controlPlane.config.apiServer.enabled | bool | `true` | Enable API Server monitoring |
+| controlPlane.config.controllerManager | object | Common settings for most K8s distributions. | Controller manager monitoring configuration |
+| controlPlane.config.controllerManager.enabled | bool | `true` | Enable controller manager monitoring. |
+| controlPlane.config.etcd | object | Common settings for most K8s distributions. | etcd monitoring configuration |
+| controlPlane.config.etcd.enabled | bool | `true` | Enable etcd monitoring. Might require manual configuration in some environments. |
+| controlPlane.config.retries | int | `3` | Number of retries after timeout expired |
+| controlPlane.config.scheduler | object | Common settings for most K8s distributions. | Scheduler monitoring configuration |
+| controlPlane.config.scheduler.enabled | bool | `true` | Enable scheduler monitoring. |
+| controlPlane.config.timeout | string | `"10s"` | Timeout for the Kubernetes APIs contacted by the integration |
+| controlPlane.enabled | bool | `true` | Deploy control plane monitoring component. |
+| controlPlane.hostNetwork | bool | `true` | Run Control Plane scraper with `hostNetwork`. `hostNetwork` is required for most control plane configurations, as they only accept connections from localhost. |
+| controlPlane.kind | string | `"DaemonSet"` | How to deploy the control plane scraper. If autodiscovery is in use, it should be `DaemonSet`. Advanced users using static endpoints set this to `Deployment` to avoid reporting metrics twice. |
+| controlPlane.tolerations | list | Schedules in all tainted nodes | Tolerations for the control plane DaemonSet. |
+| customAttributes | object | `{}` | Adds extra attributes to the cluster and all the metrics emitted to the backend. Can be configured also with `global.customAttributes` |
+| customSecretLicenseKey | string | `""` | In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located. Can be configured also with `global.customSecretLicenseKey` |
+| customSecretName | string | `""` | In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there. Can be configured also with `global.customSecretName` |
+| dnsConfig | object | `{}` | Sets pod's dnsConfig. Can be configured also with `global.dnsConfig` |
+| enableProcessMetrics | bool | `false` | Collect detailed metrics from processes running in the host. This defaults to true for accounts created before July 20, 2020. ref: https://docs.newrelic.com/docs/release-notes/infrastructure-release-notes/infrastructure-agent-release-notes/new-relic-infrastructure-agent-1120 |
+| fedramp.enabled | bool | `false` | Enables FedRAMP. Can be configured also with `global.fedramp.enabled` |
+| fullnameOverride | string | `""` | Override the full name of the release |
+| hostNetwork | bool | `false` | Sets pod's hostNetwork. Can be configured also with `global.hostNetwork` |
+| images | object | See `values.yaml` | Images used by the chart for the integration and agents. |
+| images.agent | object | See `values.yaml` | Image for the New Relic Infrastructure Agent plus integrations. |
+| images.forwarder | object | See `values.yaml` | Image for the New Relic Infrastructure Agent sidecar. |
+| images.integration | object | See `values.yaml` | Image for the New Relic Kubernetes integration. |
+| images.pullSecrets | list | `[]` | The secrets that are needed to pull images from a custom registry. |
+| integrations | object | `{}` | Config files for other New Relic integrations that should run in this cluster. |
+| ksm | object | See `values.yaml` | Configuration for the Deployment that collects state metrics from KSM (kube-state-metrics). |
+| ksm.affinity | object | Deployed in the same node as KSM | Affinity for the KSM Deployment. |
+| ksm.agentConfig | object | `{}` | Config for the Infrastructure agent that will forward the metrics to the backend. It will be merged with the configuration in `.common.agentConfig` See: https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/ |
+| ksm.config.retries | int | `3` | Number of retries after timeout expired |
+| ksm.config.scheme | string | `"http"` | Scheme to use to connect to kube-state-metrics. Supported values are `http` and `https`. |
+| ksm.config.selector | string | `"app.kubernetes.io/name=kube-state-metrics"` | Label selector that will be used to automatically discover an instance of kube-state-metrics running in the cluster. |
+| ksm.config.timeout | string | `"10s"` | Timeout for the ksm API contacted by the integration |
+| ksm.enabled | bool | `true` | Enable cluster state monitoring. Advanced users only. Setting this to `false` is not supported and will break the New Relic experience. |
+| ksm.forwarder | object | 100m/150M -/850M | Resources for the Frowarder pod. large clusters. |
+| ksm.hostNetwork | bool | Not set | Sets pod's hostNetwork. When set bypasses global/common variable |
+| ksm.ksm | object | 100m/150M -/850M | Resources for the KSM scraper pod. Keep in mind that sharding is not supported at the moment, so memory usage for this component ramps up quickly on large clusters. |
+| ksm.tolerations | list | Schedules in all tainted nodes | Tolerations for the KSM Deployment. |
+| kubelet | object | See `values.yaml` | Configuration for the DaemonSet that collects metrics from the Kubelet. |
+| kubelet.agentConfig | object | `{}` | Config for the Infrastructure agent that will forward the metrics to the backend and will run the integrations in this cluster. It will be merged with the configuration in `.common.agentConfig`. You can see all the agent configurations in [New Relic docs](https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/) e.g. you can set `passthrough_environment` int the [config file](https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/configure-infrastructure-agent/#config-file) so the agent let use that environment variables to the integrations. |
+| kubelet.config.retries | int | `3` | Number of retries after timeout expired |
+| kubelet.config.scraperMaxReruns | int | `4` | Max number of scraper rerun when scraper runtime error happens |
+| kubelet.config.timeout | string | `"10s"` | Timeout for the kubelet APIs contacted by the integration |
+| kubelet.enabled | bool | `true` | Enable kubelet monitoring. Advanced users only. Setting this to `false` is not supported and will break the New Relic experience. |
+| kubelet.extraEnv | list | `[]` | Add user environment variables to the agent |
+| kubelet.extraEnvFrom | list | `[]` | Add user environment from configMaps or secrets as variables to the agent |
+| kubelet.extraVolumeMounts | list | `[]` | Defines where to mount volumes specified with `extraVolumes` |
+| kubelet.extraVolumes | list | `[]` | Volumes to mount in the containers |
+| kubelet.hostNetwork | bool | Not set | Sets pod's hostNetwork. When set bypasses global/common variable |
+| kubelet.tolerations | list | Schedules in all tainted nodes | Tolerations for the control plane DaemonSet. |
+| labels | object | `{}` | Additional labels for chart objects. Can be configured also with `global.labels` |
+| licenseKey | string | `""` | This set this license key to use. Can be configured also with `global.licenseKey` |
+| lowDataMode | bool | `false` (See [Low data mode](README.md#low-data-mode)) | Send less data by incrementing the interval from `15s` (the default when `lowDataMode` is `false` or `nil`) to `30s`. Non-nil values of `common.config.interval` will override this value. |
+| nameOverride | string | `""` | Override the name of the chart |
+| nodeSelector | object | `{}` | Sets pod's node selector almost globally. (See [Affinities and tolerations](README.md#affinities-and-tolerations)) |
+| nrStaging | bool | `false` | Send the metrics to the staging backend. Requires a valid staging license key. Can be configured also with `global.nrStaging` |
+| podAnnotations | object | `{}` | Annotations to be added to all pods created by the integration. |
+| podLabels | object | `{}` | Additional labels for chart pods. Can be configured also with `global.podLabels` |
+| podSecurityContext | object | `{}` | Sets security context (at pod level). Can be configured also with `global.podSecurityContext` |
+| priorityClassName | string | `""` | Sets pod's priorityClassName. Can be configured also with `global.priorityClassName` |
+| privileged | bool | `true` | Run the integration with full access to the host filesystem and network. Running in this mode allows reporting fine-grained cpu, memory, process and network metrics for your nodes. |
+| proxy | string | `""` | Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port`. Can be configured also with `global.proxy` |
+| rbac.create | bool | `true` | Whether the chart should automatically create the RBAC objects required to run. |
+| rbac.pspEnabled | bool | `false` | Whether the chart should create Pod Security Policy objects. |
+| selfMonitoring.pixie.enabled | bool | `false` | Enables the Pixie Health Check nri-flex config. This Flex config performs periodic checks of the Pixie /healthz and /statusz endpoints exposed by the Pixie Cloud Connector. A status for each endpoint is sent to New Relic in a pixieHealthCheck event. |
+| serviceAccount | object | See `values.yaml` | Settings controlling ServiceAccount creation. |
+| serviceAccount.create | bool | `true` | Whether the chart should automatically create the ServiceAccount objects required to run. |
+| sink.http.probeBackoff | string | `"5s"` | The amount of time the scraper container to backoff when it fails to probe infra agent sidecar. |
+| sink.http.probeTimeout | string | `"90s"` | The amount of time the scraper container to probe infra agent sidecar container before giving up and restarting during pod starts. |
+| strategy | object | `type: Recreate` | Update strategy for the deployed Deployments. |
+| tolerations | list | `[]` | Sets pod's tolerations to node taints almost globally. (See [Affinities and tolerations](README.md#affinities-and-tolerations)) |
+| updateStrategy | object | See `values.yaml` | Update strategy for the deployed DaemonSets. |
+| verboseLog | bool | `false` | Sets the debug logs to this integration or all integrations if it is set globally. Can be configured also with `global.verboseLog` |
+
+## Maintainers
+
+* [juanjjaramillo](https://github.com/juanjjaramillo)
+* [csongnr](https://github.com/csongnr)
+* [dbudziwojskiNR](https://github.com/dbudziwojskiNR)
+
+## Past Contributors
+
+Previous iterations of this chart started as a community project in the [stable Helm chart repository](github.com/helm/charts/). New Relic is very thankful for all the 15+ community members that contributed and helped maintain the chart there over the years:
+
+* coreypobrien
+* sstarcher
+* jmccarty3
+* slayerjain
+* ryanhope2
+* rk295
+* michaelajr
+* isindir
+* idirouhab
+* ismferd
+* enver
+* diclophis
+* jeffdesc
+* costimuraru
+* verwilst
+* ezelenka
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/README.md.gotmpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/README.md.gotmpl
new file mode 100644
index 000000000..32fac5c23
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/README.md.gotmpl
@@ -0,0 +1,137 @@
+{{ template "chart.header" . }}
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+# Helm installation
+
+You can install this chart using [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) located in the
+[helm-charts repository](https://github.com/newrelic/helm-charts) or directly from this repository by adding this Helm repository:
+
+```shell
+helm repo add nri-kubernetes https://newrelic.github.io/nri-kubernetes
+helm upgrade --install newrelic-infrastructure nri-kubernetes/newrelic-infrastructure -f your-custom-values.yaml
+```
+
+{{ template "chart.sourcesSection" . }}
+
+## Values managed globally
+
+This chart implements the [New Relic's common Helm library](https://github.com/newrelic/helm-charts/tree/master/library/common-library) which
+means that it honors a wide range of defaults and globals common to most New Relic Helm charts.
+
+Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
+[user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
+
+## Chart particularities
+
+### Low data mode
+There are two mechanisms to reduce the amount of data that this integration sends to New Relic. See this snippet from the `values.yaml` file:
+```yaml
+common:
+  config:
+    interval: 15s
+
+lowDataMode: false
+```
+
+The `lowDataMode` toggle is the simplest way to reduce data send to Newrelic. Setting it to `true` changes the default scrape interval from 15 seconds
+(the default) to 30 seconds.
+
+If you need for some reason to fine-tune the number of seconds you can use `common.config.interval` directly. If you take a look at the `values.yaml`
+file, the value there is `nil`. If any value is set there, the `lowDataMode` toggle is ignored as this value takes precedence.
+
+Setting this interval above 40 seconds can make you experience issues with the Kubernetes Cluster Explorer so this chart limits setting the interval
+inside the range of 10 to 40 seconds.
+
+### Affinities and tolerations
+
+The New Relic common library allows to set affinities, tolerations, and node selectors globally using e.g. `.global.affinity` to ease the configuration
+when you use this chart using `nri-bundle`. This chart has an extra level of granularity to the components that it deploys:
+control plane, ksm, and kubelet.
+
+Take this snippet as an example:
+```yaml
+global:
+  affinity: {}
+affinity: {}
+
+kubelet:
+  affinity: {}
+ksm:
+  affinity: {}
+controlPlane:
+  affinity: {}
+```
+
+The order to set an affinity is to set first any `kubelet.affinity`, `ksm.affinity`, or `controlPlane.affinity`. If these values are empty the chart
+fallbacks to `affinity` (at root level), and if that value is empty, the chart fallbacks to `global.affinity`.
+
+The same procedure applies to `nodeSelector` and `tolerations`.
+
+On the other hand, some components have affinities and tolerations predefined e.g. to be able to run kubelet pods on nodes that are tainted as control plane
+nodes or to schedule the KSM scraper on the same node of KSM to reduce the inter-node traffic.
+
+If you are having problems assigning pods to nodes it may be because of this. Take a look at the [`values.yaml`](values.yaml) to see if the pod that is
+not having your expected behavior has any predefined value.
+
+### `hostNetwork` toggle
+
+In versions below v3, changing the `privileged` mode affected the `hostNetwork`. We changed this behavior and now you can set pods to use `hostNetwork`
+using the corresponding [flags from the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md)
+(`.global.hostNetwork` and `.hostNetwork`) but the component that scrapes data from the control plane has always set `hostNetwork` enabled by default
+(Look in the [`values.yaml`](values.yaml) for `controlPlane.hostNetwork: true`)
+
+This is because the most common configuration of the control plane components is to be configured to listen only to `localhost`.
+
+If your cluster security policy does not allow to use `hostNetwork`, you can disable it control plane monitoring by setting `controlPlane.enabled` to
+`false.`
+
+### `privileged` toggle
+
+The default value for `privileged` [from the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md) is
+`false` but in this particular this chart it is set to `true` (Look in the [`values.yaml`](values.yaml) for `privileged: true`)
+
+This is because when `kubelet` pods need to run in privileged mode to fetch cpu, memory, process, and network metrics of your nodes.
+
+If your cluster security policy does not allow to have `privileged` in your pod' security context, you can disable it by setting `privileged` to
+`false` taking into account that you will lose all the metrics from the host and some metadata from the host that are added to the metrics of the
+integrations that you have configured.
+
+{{ template "chart.valuesSection" . }}
+
+{{ if .Maintainers }}
+## Maintainers
+{{ range .Maintainers }}
+{{- if .Name }}
+{{- if .Url }}
+* [{{ .Name }}]({{ .Url }})
+{{- else }}
+* {{ .Name }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+## Past Contributors
+
+Previous iterations of this chart started as a community project in the [stable Helm chart repository](github.com/helm/charts/). New Relic is very thankful for all the 15+ community members that contributed and helped maintain the chart there over the years:
+
+* coreypobrien
+* sstarcher
+* jmccarty3
+* slayerjain
+* ryanhope2
+* rk295
+* michaelajr
+* isindir
+* idirouhab
+* ismferd
+* enver
+* diclophis
+* jeffdesc
+* costimuraru
+* verwilst
+* ezelenka
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/Chart.yaml
new file mode 100644
index 000000000..adfc765bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/Chart.yaml
@@ -0,0 +1,17 @@
+apiVersion: v2
+description: Provides helpers to provide consistency on all the charts
+keywords:
+- newrelic
+- chart-library
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+- name: kang-makes
+  url: https://github.com/kang-makes
+name: common-library
+type: library
+version: 1.3.1
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/DEVELOPERS.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/DEVELOPERS.md
new file mode 100644
index 000000000..7208c673e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/DEVELOPERS.md
@@ -0,0 +1,747 @@
+# Functions/templates documented for chart writers
+Here is some rough documentation separated by the file that contains the function, the function
+name and how to use it. We are not covering functions that start with `_` (e.g.
+`newrelic.common.license._licenseKey`) because they are used internally by this library for
+other helpers. Helm does not have the concept of "public" or "private" functions/templates so
+this is a convention of ours.
+
+## _naming.tpl
+These functions are used to name objects.
+
+### `newrelic.common.naming.name`
+This is the same as the idiomatic `CHART-NAME.name` that is created when you use `helm create`.
+
+It honors `.Values.nameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.name" . }}
+```
+
+### `newrelic.common.naming.fullname`
+This is the same as the idiomatic `CHART-NAME.fullname` that is created when you use `helm create`
+
+It honors `.Values.fullnameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.fullname" . }}
+```
+
+### `newrelic.common.naming.chart`
+This is the same as the idiomatic `CHART-NAME.chart` that is created when you use `helm create`.
+
+It is mostly useless for chart writers. It is used internally for templating the labels but there
+is no reason to keep it "private".
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.chart" . }}
+```
+
+### `newrelic.common.naming.truncateToDNS`
+This is a useful template that could be used to trim a string to 63 chars and does not end with a dash (`-`).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $truncatedName := include "newrelic.common.naming.truncateToDNS" $nameToTruncate }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-string-that-should-be */ -}}
+```
+
+### `newrelic.common.naming.truncateToDNSWithSuffix`
+This template function is the same as the above but instead of receiving a string you should give a `dict`
+with a `name` and a `suffix`. This function will join them with a dash (`-`) and trim the `name` so the
+result of `name-suffix` is no more than 63 chars
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $suffix := "A-NOT-SO-LONG-SUFFIX" }}
+{{- $truncatedName := include "truncateToDNSWithSuffix" (dict "name" $nameToTruncate "suffix" $suffix) }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-A-NOT-SO-LONG-SUFFIX */ -}}
+```
+
+
+
+## _labels.tpl
+### `newrelic.common.labels`, `newrelic.common.labels.selectorLabels` and `newrelic.common.labels.podLabels`
+These are functions that are used to label objects. They are configured by this `values.yaml`
+```yaml
+global:
+  podLabels: {}  # included in all the pods of all the charts that implement this library
+  labels: {}  # included in all the objects of all the charts that implement this library
+podLabels: {}  # included in all the pods of this chart
+labels: {}  # included in all the objects of this chart
+```
+
+label maps are merged from global to local values.
+
+And chart writer should use them like this:
+```mustache
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+```
+
+`newrelic.common.labels.podLabels` includes `newrelic.common.labels.selectorLabels` automatically.
+
+
+
+## _priority-class-name.tpl
+### `newrelic.common.priorityClassName`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  priorityClassName: ""
+priorityClassName: ""
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `priorityClassName` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.priorityClassName" . }}
+  priorityClassName: {{ . }}
+  {{- end }}
+```
+
+
+
+## _hostnetwork.tpl
+### `newrelic.common.hostNetwork`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  hostNetwork:  # Note that this is empty (nil)
+hostNetwork:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `hostNetwork` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.hostNetwork" . }}
+  hostNetwork: {{ . }}
+  {{- end }}
+```
+
+### `newrelic.common.hostNetwork.value`
+This function is an abstraction of the function above but this returns directly "true" or "false".
+
+Be careful with using this with an `if` as Helm does evaluate "false" (string) as `true`.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+```
+
+
+
+## _dnsconfig.tpl
+### `newrelic.common.dnsConfig`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  dnsConfig: {}
+dnsConfig: {}
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `dnsConfig` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.dnsConfig" . }}
+  dnsConfig:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _images.tpl
+These functions help us to deal with how images are templated. This allows setting `registries`
+where to fetch images globally while being flexible enough to fit in different maps of images
+and deployments with one or more images. This is the example of a complex `values.yaml` that
+we are going to use during the documentation of these functions:
+
+```yaml
+global:
+  images:
+    registry: nexus-3-instance.internal.clients-domain.tld
+jobImage:
+  registry: # defaults to "example.tld" when empty in these examples
+  repository: ingress-nginx/kube-webhook-certgen
+  tag: v1.1.1
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+images:
+  integration:
+    registry:
+    repository: newrelic/nri-kube-events
+    tag: 1.8.0
+    pullPolicy: IfNotPresent
+  agent:
+    registry:
+    repository: newrelic/k8s-events-forwarder
+    tag: 1.22.0
+    pullPolicy: IfNotPresent
+  pullSecrets: []
+```
+
+### `newrelic.common.images.image`
+This will return a string with the image ready to be downloaded that includes the registry, the image and the tag.
+`defaultRegistry` is used to keep `registry` field empty in `values.yaml` so you can override the image using
+`global.images.registry`, your local `jobImage.registry` and be able to fallback to a registry that is not `docker.io`
+(Or the default repository that the client could have set in the CRI).
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.image" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.registry`
+It returns the registry from the global or local values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.registry" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.repository`
+It returns the image from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.tag`
+It returns the image's tag from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.renderPullSecrets`
+If returns a merged map that contains the pull secrets from the global configuration and the local one.  
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.jobImage.pullSecrets "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+```
+
+
+
+## _serviceaccount.tpl
+These functions are used to evaluate if the service account should be created, with which name and add annotations to it.
+
+The functions that the common library has implemented for service accounts are:
+* `newrelic.common.serviceAccount.create`
+* `newrelic.common.serviceAccount.name`
+* `newrelic.common.serviceAccount.annotations`
+
+Usage:
+```mustache
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- with (include "newrelic.common.serviceAccount.annotations" .) }}
+  annotations:
+    {{- . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
+```
+
+
+
+## _affinity.tpl, _nodeselector.tpl and _tolerations.tpl
+These three files are almost the same and they follow the idiomatic way of `helm create`.
+
+Each function also looks if there is a global value like the other helpers.
+```yaml
+global:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+affinity: {}
+nodeSelector: {}
+tolerations: []
+```
+
+The values here are replaced instead of be merged. If a value at root level is found, the global one is ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.nodeSelector" . }}
+  nodeSelector:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.affinity" . }}
+  affinity:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.tolerations" . }}
+  tolerations:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _agent-config.tpl
+### `newrelic.common.agentConfig.defaults`
+This returns a YAML that the agent can use directly as a config that includes other options from the values file like verbose mode,
+custom attributes, FedRAMP and such.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include newrelic.common.naming.truncateToDNSWithSuffix (dict "name" (include "newrelic.common.naming.fullname" .) suffix "agent-config") }}
+  namespace: {{ .Release.Namespace }}
+data:
+  newrelic-infra.yml: |-
+    # This is the configuration file for the infrastructure agent. See:
+    # https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+    {{- include "newrelic.common.agentConfig.defaults" . | nindent 4 }}
+```
+
+
+
+## _cluster.tpl
+### `newrelic.common.cluster`
+Returns the cluster name
+
+Usage:
+```mustache
+{{ include "newrelic.common.cluster" . }}
+```
+
+
+
+## _custom-attributes.tpl
+### `newrelic.common.customAttributes`
+Return custom attributes in YAML format.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example
+data:
+  custom-attributes.yaml: |
+    {{- include "newrelic.common.customAttributes" . | nindent 4 }}
+  custom-attributes.json: |
+    {{- include "newrelic.common.customAttributes" . | fromYaml | toJson | nindent 4 }}
+```
+
+
+
+## _fedramp.tpl
+### `newrelic.common.fedramp.enabled`
+Returns true if FedRAMP is enabled or an empty string if not. It can be safely used in conditionals as an empty string is a Helm falsiness.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled" . }}
+```
+
+### `newrelic.common.fedramp.enabled.value`
+Returns true if FedRAMP is enabled or false if not. This is to have the value of FedRAMP ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled.value" . }}
+```
+
+
+
+## _license.tpl
+### `newrelic.common.license.secretName` and ### `newrelic.common.license.secretKeyName`
+Returns the secret and key inside the secret where to read the license key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the license key.
+
+To create the secret use `newrelic.common.license.secret`.
+
+Usage:
+```mustache
+{{- if and (.Values.controlPlane.enabled) (not (include "newrelic.fargate" .)) }}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+  containers:
+  - name: agent
+    env:
+    - name: "NRIA_LICENSE_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.license.secretName" . }}
+          key: {{ include "newrelic.common.license.secretKeyName" . }}
+```
+
+
+
+## _license_secret.tpl
+### `newrelic.common.license.secret`
+This function templates the secret that is used by agents and integrations with the license Key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any license key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.license.secret" . -}}
+```
+
+
+
+## _insights.tpl
+### `newrelic.common.insightsKey.secretName` and ### `newrelic.common.insightsKey.secretKeyName`
+Returns the secret and key inside the secret where to read the insights key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.insightsKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "INSIGHTS_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.insightsKey.secretName" . }}
+          key: {{ include "newrelic.common.insightsKey.secretKeyName" . }}
+```
+
+
+
+## _insights_secret.tpl
+### `newrelic.common.insightsKey.secret`
+This function templates the secret that is used by agents and integrations with the insights key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any insights key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.insightsKey.secret" . -}}
+```
+
+
+
+## _userkey.tpl
+### `newrelic.common.userKey.secretName` and ### `newrelic.common.userKey.secretKeyName`
+Returns the secret and key inside the secret where to read a user key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.userKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "API_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.userKey.secretName" . }}
+          key: {{ include "newrelic.common.userKey.secretKeyName" . }}
+```
+
+
+
+## _userkey_secret.tpl
+### `newrelic.common.userKey.secret`
+This function templates the secret that is used by agents and integrations with a user key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any API key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.userKey.secret" . -}}
+```
+
+
+
+## _region.tpl
+### `newrelic.common.region.validate`
+Given a string, return a normalized name for the region if valid.
+
+This function does not need the context of the chart, only the value to be validated. The region returned
+honors the region [definition of the newrelic-client-go implementation](https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21)
+so (as of 2024/09/14) it returns the region as "US", "EU", "Staging", or "Local".
+
+In case the region provided does not match these 4, the helper calls `fail` and abort the templating.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region.validate" "us" }}
+```
+
+### `newrelic.common.region`
+It reads global and local variables for `region`:
+```yaml
+global:
+  region:  # Note that this can be empty (nil) or "" (empty string)
+region:  # Note that this can be empty (nil) or "" (empty string)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in your
+values a `region` is defined, the global one is going to be always ignored.
+
+This function gives protection so it enforces users to give the license key as a value in their
+`values.yaml` or specify a global or local `region` value. To understand how the `region` value
+works, read the documentation of `newrelic.common.region.validate`.
+
+The function will change the region from US, EU or Staging based of the license key and the
+`nrStaging` toggle. Whichever region is computed from the license/toggle can be overridden by
+the `region` value.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region" . }}
+```
+
+
+
+## _low-data-mode.tpl
+### `newrelic.common.lowDataMode`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  lowDataMode:  # Note that this is empty (nil)
+lowDataMode:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `lowdataMode` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.lowDataMode" . }}
+```
+
+
+
+## _privileged.tpl
+### `newrelic.common.privileged`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  privileged:  # Note that this is empty (nil)
+privileged:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `privileged` is defined, the global one is going to be always ignored.
+
+Chart writers could override this and put directly a `true` in the `values.yaml` to override the
+default of the common library.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged" . }}
+```
+
+### `newrelic.common.privileged.value`
+Returns true if privileged mode is enabled or false if not. This is to have the value of privileged ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged.value" . }}
+```
+
+
+
+## _proxy.tpl
+### `newrelic.common.proxy`
+Returns the proxy URL configured by the user. 
+
+Usage:
+```mustache
+{{ include "newrelic.common.proxy" . }}
+```
+
+
+
+## _security-context.tpl
+Use these functions to share the security context among all charts. Useful in clusters that have security enforcing not to
+use the root user (like OpenShift) or users that have an admission webhooks.
+
+The functions are:
+* `newrelic.common.securityContext.container`
+* `newrelic.common.securityContext.pod`
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+    spec:
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+
+      containers:
+        - name: example
+          {{- with include "nriKubernetes.securityContext.container" . }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+```
+
+
+
+## _staging.tpl
+### `newrelic.common.nrStaging`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  nrStaging:  # Note that this is empty (nil)
+nrStaging:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `nrStaging` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging" . }}
+```
+
+### `newrelic.common.nrStaging.value`
+Returns true if staging is enabled or false if not. This is to have the staging value ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging.value" . }}
+```
+
+
+
+## _verbose-log.tpl
+### `newrelic.common.verboseLog`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  verboseLog:  # Note that this is empty (nil)
+verboseLog:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `verboseLog` is defined, the global one is going to be always ignored.
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsBoolean`
+Returns true if verbose is enabled or false if not. This is to have the verbose value ready to be templated as a boolean
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsBoolean" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsInt`
+Returns 1 if verbose is enabled or 0 if not. This is to have the verbose value ready to be templated as an integer
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsInt" . }}
+```
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/README.md
new file mode 100644
index 000000000..10f08ca67
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/README.md
@@ -0,0 +1,106 @@
+# Helm Common library
+
+The common library is a way to unify the UX through all the Helm charts that implement it.
+
+The tooling suite that New Relic is huge and growing and this allows to set things globally
+and locally for a single chart.
+
+## Documentation for chart writers
+
+If you are writing a chart that is going to use this library you can check the [developers guide](/library/common-library/DEVELOPERS.md) to see all
+the functions/templates that we have implemented, what they do and how to use them.
+
+## Values managed globally
+
+We want to have a seamless experience through all the charts so we created this library that tries to standardize the behaviour
+of all the charts. Sadly, because of the complexity of all these integrations, not all the charts behave exactly as expected.
+
+An example is `newrelic-infrastructure` that ignores `hostNetwork` in the control plane scraper because most of the users has the
+control plane listening in the node to `localhost`.
+
+For each chart that has a special behavior (or further information of the behavior) there is a "chart particularities" section
+in its README.md that explains which is the expected behavior.
+
+At the time of writing this, all the charts from `nri-bundle` except `newrelic-logging` and `synthetics-minion` implements this
+library and honors global options as described in this document.
+
+Here is a list of global options:
+
+| Global keys | Local keys | Default | Merged[<sup>1</sup>](#values-managed-globally-1) | Description |
+|-------------|------------|---------|--------------------------------------------------|-------------|
+| global.cluster | cluster | `""` |  | Name of the Kubernetes cluster monitored |
+| global.licenseKey | licenseKey | `""` |  | This set this license key to use |
+| global.customSecretName | customSecretName | `""` |  | In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there |
+| global.customSecretLicenseKey | customSecretLicenseKey | `""` |  | In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located |
+| global.podLabels | podLabels | `{}` | yes | Additional labels for chart pods |
+| global.labels | labels | `{}` | yes | Additional labels for chart objects |
+| global.priorityClassName | priorityClassName | `""` |  | Sets pod's priorityClassName |
+| global.hostNetwork | hostNetwork | `false` |  | Sets pod's hostNetwork |
+| global.dnsConfig | dnsConfig | `{}` |  | Sets pod's dnsConfig |
+| global.images.registry | See [Further information](#values-managed-globally-2) | `""` |  | Changes the registry where to get the images. Useful when there is an internal image cache/proxy |
+| global.images.pullSecrets | See [Further information](#values-managed-globally-2) | `[]` | yes | Set secrets to be able to fetch images |
+| global.podSecurityContext | podSecurityContext | `{}` |  | Sets security context (at pod level) |
+| global.containerSecurityContext | containerSecurityContext | `{}` |  | Sets security context (at container level) |
+| global.affinity | affinity | `{}` |  | Sets pod/node affinities |
+| global.nodeSelector | nodeSelector | `{}` |  | Sets pod's node selector |
+| global.tolerations | tolerations | `[]` |  | Sets pod's tolerations to node taints |
+| global.serviceAccount.create | serviceAccount.create | `true` |  | Configures if the service account should be created or not |
+| global.serviceAccount.name | serviceAccount.name | name of the release |  | Change the name of the service account. This is honored if you disable on this cahrt the creation of the service account so you can use your own. |
+| global.serviceAccount.annotations | serviceAccount.annotations | `{}` | yes | Add these annotations to the service account we create |
+| global.customAttributes | customAttributes | `{}` |  | Adds extra attributes to the cluster and all the metrics emitted to the backend |
+| global.fedramp | fedramp | `false` |  | Enables FedRAMP |
+| global.lowDataMode | lowDataMode | `false` |  | Reduces number of metrics sent in order to reduce costs |
+| global.privileged | privileged | Depends on the chart |  | In each integration it has different behavior. See [Further information](#values-managed-globally-3) but all aims to send less metrics to the backend to try to save costs |
+| global.proxy | proxy | `""` |  | Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port` |
+| global.nrStaging | nrStaging | `false` |  | Send the metrics to the staging backend. Requires a valid staging license key |
+| global.verboseLog | verboseLog | `false` |  | Sets the debug/trace logs to this integration or all integrations if it is set globally |
+
+### Further information
+<a name="values-managed-globally-1"></a>
+#### 1. Merged
+
+Merged means that the values from global are not replaced by the local ones. Think in this example:
+```yaml
+global:
+  labels:
+    global: global
+  hostNetwork: true
+  nodeSelector:
+    global: global
+
+labels:
+  local: local
+nodeSelector:
+  local: local
+hostNetwork: false
+```
+
+This values will template `hostNetwork` to `false`, a map of labels `{ "global": "global", "local": "local" }` and a `nodeSelector` with
+`{ "local": "local" }`.
+
+As Helm by default merges all the maps it could be confusing that we have two behaviors (merging `labels` and replacing `nodeSelector`)
+the `values` from global to local. This is the rationale behind this:
+* `hostNetwork` is templated to `false` because is overriding the value defined globally.
+* `labels` are merged because the user may want to label all the New Relic pods at once and label other solution pods differently for
+  clarity' sake.
+* `nodeSelector` does not merge as `labels` because could make it harder to overwrite/delete a selector that comes from global because
+  of the logic that Helm follows merging maps.
+
+<a name="values-managed-globally-2"></a>
+#### 2. Fine grain registries
+
+Some charts only have 1 image while others that can have 2 or more images. The local path for the registry can change depending
+on the chart itself.
+
+As this is mostly unique per helm chart, you should take a look to the chart's values table (or directly to the `values.yaml` file to see all the
+images that you can change.
+
+This should only be needed if you have an advanced setup that forces you to have granularity enough to force a proxy/cache registry per integration.
+
+
+<a name="values-managed-globally-3"></a>
+#### 3. Privileged mode
+
+By default, from the common library, the privileged mode is set to false. But most of the helm charts require this to be true to fetch more
+metrics so could see a true in some charts. The consequences of the privileged mode differ from one chart to another so for each chart that
+honors the privileged mode toggle should be a section in the README explaining which is the behavior with it enabled or disabled.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_affinity.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_affinity.tpl
new file mode 100644
index 000000000..1b2636754
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_affinity.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod affinity */ -}}
+{{- define "newrelic.common.affinity" -}}
+    {{- if .Values.affinity -}}
+        {{- toYaml .Values.affinity -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.affinity -}}
+            {{- toYaml .Values.global.affinity -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_agent-config.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_agent-config.tpl
new file mode 100644
index 000000000..9c32861a0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_agent-config.tpl
@@ -0,0 +1,26 @@
+{{/*
+This helper should return the defaults that all agents should have
+*/}}
+{{- define "newrelic.common.agentConfig.defaults" -}}
+{{- if include "newrelic.common.verboseLog" . }}
+log:
+  level: trace
+{{- end }}
+
+{{- if (include "newrelic.common.nrStaging" . ) }}
+staging: true
+{{- end }}
+
+{{- with include "newrelic.common.proxy" . }}
+proxy: {{ . | quote }}
+{{- end }}
+
+{{- with include "newrelic.common.fedramp.enabled" . }}
+fedramp: {{ . }}
+{{- end }}
+
+{{- with fromYaml ( include "newrelic.common.customAttributes" . ) }}
+custom_attributes:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_cluster.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_cluster.tpl
new file mode 100644
index 000000000..0197dd35a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_cluster.tpl
@@ -0,0 +1,15 @@
+{{/*
+Return the cluster
+*/}}
+{{- define "newrelic.common.cluster" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.cluster -}}
+    {{- .Values.cluster -}}
+{{- else if $global.cluster -}}
+    {{- $global.cluster -}}
+{{- else -}}
+    {{ fail "There is not cluster name definition set neither in `.global.cluster' nor `.cluster' in your values.yaml. Cluster name is required." }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_custom-attributes.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_custom-attributes.tpl
new file mode 100644
index 000000000..92020719c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_custom-attributes.tpl
@@ -0,0 +1,17 @@
+{{/*
+This will render custom attributes as a YAML ready to be templated or be used with `fromYaml`.
+*/}}
+{{- define "newrelic.common.customAttributes" -}}
+{{- $customAttributes := dict -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- if $global.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes $global.customAttributes -}}
+{{- end -}}
+
+{{- if .Values.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes .Values.customAttributes -}}
+{{- end -}}
+
+{{- toYaml $customAttributes -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_dnsconfig.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_dnsconfig.tpl
new file mode 100644
index 000000000..d4e40aa8a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_dnsconfig.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod dnsConfig */ -}}
+{{- define "newrelic.common.dnsConfig" -}}
+    {{- if .Values.dnsConfig -}}
+        {{- toYaml .Values.dnsConfig -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.dnsConfig -}}
+            {{- toYaml .Values.global.dnsConfig -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_fedramp.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_fedramp.tpl
new file mode 100644
index 000000000..9df8d6b5e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_fedramp.tpl
@@ -0,0 +1,25 @@
+{{- /* Defines the fedRAMP flag */ -}}
+{{- define "newrelic.common.fedramp.enabled" -}}
+    {{- if .Values.fedramp -}}
+        {{- if .Values.fedramp.enabled -}}
+            {{- .Values.fedramp.enabled -}}
+        {{- end -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.fedramp -}}
+             {{- if .Values.global.fedramp.enabled -}}
+                {{- .Values.global.fedramp.enabled -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return FedRAMP value directly ready to be templated */ -}}
+{{- define "newrelic.common.fedramp.enabled.value" -}}
+{{- if include "newrelic.common.fedramp.enabled" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_hostnetwork.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_hostnetwork.tpl
new file mode 100644
index 000000000..4cf017ef7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_hostnetwork.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper allows to override the global `.global.hostNetwork` with the value of `.hostNetwork`.
+Returns "true" if `hostNetwork` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.hostNetwork" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- /*
+`get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs
+
+We also want only to return when this is true, returning `false` here will template "false" (string) when doing
+an `(include "newrelic.common.hostNetwork" .)`, which is not an "empty string" so it is `true` if it is used
+as an evaluation somewhere else.
+*/ -}}
+{{- if get .Values "hostNetwork" | kindIs "bool" -}}
+    {{- if .Values.hostNetwork -}}
+        {{- .Values.hostNetwork -}}
+    {{- end -}}
+{{- else if get $global "hostNetwork" | kindIs "bool" -}}
+    {{- if $global.hostNetwork -}}
+        {{- $global.hostNetwork -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper abstracts the function "newrelic.common.hostNetwork" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.hostNetwork.value" -}}
+{{- if include "newrelic.common.hostNetwork" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_images.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_images.tpl
new file mode 100644
index 000000000..d4fb43290
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_images.tpl
@@ -0,0 +1,94 @@
+{{- /*
+Return the proper image name
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.image" -}}
+    {{- $registryName := include "newrelic.common.images.registry" ( dict "imageRoot" .imageRoot "defaultRegistry" .defaultRegistry "context" .context ) -}}
+    {{- $repositoryName := include "newrelic.common.images.repository" .imageRoot -}}
+    {{- $tag := include "newrelic.common.images.tag" ( dict "imageRoot" .imageRoot "context" .context) -}}
+
+    {{- if $registryName -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag | quote -}}
+    {{- else -}}
+        {{- printf "%s:%s" $repositoryName $tag | quote -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image registry
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.registry" -}}
+{{- $globalRegistry := "" -}}
+{{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+        {{- with .context.Values.global.images.registry -}}
+            {{- $globalRegistry = . -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $localRegistry := "" -}}
+{{- if .imageRoot.registry -}}
+    {{- $localRegistry = .imageRoot.registry -}}
+{{- end -}}
+
+{{- $registry := $localRegistry | default $globalRegistry | default .defaultRegistry -}}
+{{- if $registry -}}
+    {{- $registry -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image repository
+{{ include "newrelic.common.images.repository" .Values.path.to.the.image }}
+*/ -}}
+{{- define "newrelic.common.images.repository" -}}
+    {{- .repository -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image tag
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.path.to.the.image "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.tag" -}}
+    {{- .imageRoot.tag | default .context.Chart.AppVersion | toString -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper Image Pull Registry Secret Names evaluating values as templates
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.path.to.the.images.pullSecrets1, .Values.path.to.the.images.pullSecrets2) "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.renderPullSecrets" -}}
+  {{- $flatlist := list }}
+
+  {{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+      {{- if .context.Values.global.images.pullSecrets -}}
+        {{- range .context.Values.global.images.pullSecrets -}}
+          {{- $flatlist = append $flatlist . -}}
+        {{- end -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- range .pullSecrets -}}
+    {{- if not (empty .) -}}
+      {{- range . -}}
+        {{- $flatlist = append $flatlist . -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if $flatlist -}}
+    {{- toYaml $flatlist -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_insights.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_insights.tpl
new file mode 100644
index 000000000..895c37732
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_insights.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the Insights Key.
+*/}}
+{{- define "newrelic.common.insightsKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "insightskey" ) -}}
+{{- include "newrelic.common.insightsKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secretKeyName" -}}
+{{- include "newrelic.common.insightsKey._customSecretKey" . | default "insightsKey" -}}
+{{- end -}}
+
+{{/*
+Return local insightsKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._licenseKey" -}}
+{{- if .Values.insightsKey -}}
+  {{- .Values.insightsKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.insightsKey -}}
+    {{- .Values.global.insightsKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the Insights Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretName" -}}
+{{- if .Values.customInsightsKeySecretName -}}
+  {{- .Values.customInsightsKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretName -}}
+    {{- .Values.global.customInsightsKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretKey" -}}
+{{- if .Values.customInsightsKeySecretKey -}}
+  {{- .Values.customInsightsKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretKey }}
+    {{- .Values.global.customInsightsKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_insights_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_insights_secret.yaml.tpl
new file mode 100644
index 000000000..556caa6ca
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_insights_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the insights key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secret" }}
+{{- if not (include "newrelic.common.insightsKey._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.insightsKey._licenseKey" .) }}
+    {{- fail "You must specify a insightsKey or a customInsightsSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.insightsKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.insightsKey.secretKeyName" . }}: {{ include "newrelic.common.insightsKey._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_labels.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_labels.tpl
new file mode 100644
index 000000000..1cc1e792b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_labels.tpl
@@ -0,0 +1,58 @@
+{{/*
+This will render the labels that should be used in all the manifests used by the helm chart.
+*/}}
+{{- define "newrelic.common.labels" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- $chart := dict "helm.sh/chart" (include "newrelic.common.naming.chart" . ) -}}
+{{- $managedBy := dict "app.kubernetes.io/managed-by" .Release.Service -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $labels := mustMergeOverwrite $chart $managedBy $selectorLabels -}}
+{{- if .Chart.AppVersion -}}
+{{- $labels = mustMergeOverwrite $labels (dict "app.kubernetes.io/version" .Chart.AppVersion) -}}
+{{- end -}}
+
+{{- $globalUserLabels := $global.labels | default dict -}}
+{{- $localUserLabels := .Values.labels | default dict -}}
+
+{{- $labels = mustMergeOverwrite $labels $globalUserLabels $localUserLabels -}}
+
+{{- range $k, $v := $labels -}}
+  {{- $_ := set $labels $k (include "newrelic.common.naming.truncateToDNS" $v ) -}}
+{{- end -}}
+
+{{- toYaml $labels -}}
+{{- end -}}
+
+
+
+{{/*
+This will render the labels that should be used in deployments/daemonsets template pods as a selector.
+*/}}
+{{- define "newrelic.common.labels.selectorLabels" -}}
+{{- $name := dict "app.kubernetes.io/name" ( include "newrelic.common.naming.name" . ) -}}
+{{- $instance := dict "app.kubernetes.io/instance" .Release.Name -}}
+
+{{- $selectorLabels := mustMergeOverwrite $name $instance -}}
+
+{{- toYaml $selectorLabels -}}
+{{- end }}
+
+
+
+{{/*
+Pod labels
+*/}}
+{{- define "newrelic.common.labels.podLabels" -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- $globalPodLabels := $global.podLabels | default dict }}
+
+{{- $localPodLabels := .Values.podLabels | default dict }}
+
+{{- $podLabels := mustMergeOverwrite $selectorLabels $globalPodLabels $localPodLabels -}}
+
+{{- toYaml $podLabels -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_license.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_license.tpl
new file mode 100644
index 000000000..cb349f6bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_license.tpl
@@ -0,0 +1,68 @@
+{{/*
+Return the name of the secret holding the License Key.
+*/}}
+{{- define "newrelic.common.license.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "license" ) -}}
+{{- include "newrelic.common.license._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+*/}}
+{{- define "newrelic.common.license.secretKeyName" -}}
+{{- include "newrelic.common.license._customSecretKey" . | default "licenseKey" -}}
+{{- end -}}
+
+{{/*
+Return local licenseKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._licenseKey" -}}
+{{- if .Values.licenseKey -}}
+  {{- .Values.licenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.licenseKey -}}
+    {{- .Values.global.licenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the License Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretName" -}}
+{{- if .Values.customSecretName -}}
+  {{- .Values.customSecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretName -}}
+    {{- .Values.global.customSecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretKey" -}}
+{{- if .Values.customSecretLicenseKey -}}
+  {{- .Values.customSecretLicenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretLicenseKey }}
+    {{- .Values.global.customSecretLicenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the user set a custom secret for the license.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._usesCustomSecret" -}}
+{{- if or (include "newrelic.common.license._customSecretName" .) (include "newrelic.common.license._customSecretKey" .) -}}
+true
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_license_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_license_secret.yaml.tpl
new file mode 100644
index 000000000..610a0a337
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_license_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the license key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.license.secret" }}
+{{- if not (include "newrelic.common.license._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.license._licenseKey" .) }}
+    {{- fail "You must specify a licenseKey or a customSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.license.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.license.secretKeyName" . }}: {{ include "newrelic.common.license._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_low-data-mode.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_low-data-mode.tpl
new file mode 100644
index 000000000..3dd55ef2f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_low-data-mode.tpl
@@ -0,0 +1,26 @@
+{{- /*
+Abstraction of the lowDataMode toggle.
+This helper allows to override the global `.global.lowDataMode` with the value of `.lowDataMode`.
+Returns "true" if `lowDataMode` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.lowDataMode" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "lowDataMode" | kindIs "bool") -}}
+    {{- if .Values.lowDataMode -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.lowDataMode" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.lowDataMode -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "lowDataMode" | kindIs "bool" -}}
+    {{- if $global.lowDataMode -}}
+        {{- $global.lowDataMode -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_naming.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_naming.tpl
new file mode 100644
index 000000000..19fa92648
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_naming.tpl
@@ -0,0 +1,73 @@
+{{/*
+This is an function to be called directly with a string just to truncate strings to
+63 chars because some Kubernetes name fields are limited to that.
+*/}}
+{{- define "newrelic.common.naming.truncateToDNS" -}}
+{{- . | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+
+
+{{- /*
+Given a name and a suffix returns a 'DNS Valid' which always include the suffix, truncating the name if needed.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If suffix is too long it gets truncated but it always takes precedence over name, so a 63 chars suffix would suppress the name.
+Usage:
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" "<my-name>" "suffix" "my-suffix" ) }}
+*/ -}}
+{{- define "newrelic.common.naming.truncateToDNSWithSuffix" -}}
+{{- $suffix := (include "newrelic.common.naming.truncateToDNS" .suffix) -}}
+{{- $maxLen := (max (sub 63 (add1 (len $suffix))) 0) -}} {{- /* We prepend "-" to the suffix so an additional character is needed */ -}}
+
+{{- $newName := .name | trunc ($maxLen | int) | trimSuffix "-"  -}}
+{{- if $newName -}}
+{{- printf "%s-%s" $newName $suffix -}}
+{{- else -}}
+{{ $suffix }}
+{{- end -}}
+
+{{- end -}}
+
+
+
+{{/*
+Expand the name of the chart.
+Uses the Chart name by default if nameOverride is not set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.name" -}}
+{{- $name := .Values.nameOverride | default .Chart.Name -}}
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+{{- end }}
+
+
+
+{{/*
+Create a default fully qualified app name.
+By default the full name will be "<release_name>" just in if it has the chart name included in that, if not
+it will be concatenated like "<release_name>-<chart_chart>". This could change if fullnameOverride or
+nameOverride are set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.fullname" -}}
+{{- $name := include "newrelic.common.naming.name" . -}}
+
+{{- if .Values.fullnameOverride -}}
+    {{- $name = .Values.fullnameOverride  -}}
+{{- else if not (contains $name .Release.Name) -}}
+    {{- $name = printf "%s-%s" .Release.Name $name -}}
+{{- end -}}
+
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+
+{{- end -}}
+
+
+
+{{/*
+Create chart name and version as used by the chart label.
+This function should not be used for naming objects. Use "common.naming.{name,fullname}" instead.
+*/}}
+{{- define "newrelic.common.naming.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_nodeselector.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_nodeselector.tpl
new file mode 100644
index 000000000..d48887341
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_nodeselector.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod nodeSelector */ -}}
+{{- define "newrelic.common.nodeSelector" -}}
+    {{- if .Values.nodeSelector -}}
+        {{- toYaml .Values.nodeSelector -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.nodeSelector -}}
+            {{- toYaml .Values.global.nodeSelector -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_priority-class-name.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_priority-class-name.tpl
new file mode 100644
index 000000000..50182b734
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_priority-class-name.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the pod priorityClassName */ -}}
+{{- define "newrelic.common.priorityClassName" -}}
+    {{- if .Values.priorityClassName -}}
+        {{- .Values.priorityClassName -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.priorityClassName -}}
+            {{- .Values.global.priorityClassName -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_privileged.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_privileged.tpl
new file mode 100644
index 000000000..f3ae814dd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_privileged.tpl
@@ -0,0 +1,28 @@
+{{- /*
+This is a helper that returns whether the chart should assume the user is fine deploying privileged pods.
+*/ -}}
+{{- define "newrelic.common.privileged" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists. */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if get .Values "privileged" | kindIs "bool" -}}
+    {{- if .Values.privileged -}}
+        {{- .Values.privileged -}}
+    {{- end -}}
+{{- else if get $global "privileged" | kindIs "bool" -}}
+    {{- if $global.privileged -}}
+        {{- $global.privileged -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return directly "true" or "false" based in the exist of "newrelic.common.privileged" */ -}}
+{{- define "newrelic.common.privileged.value" -}}
+{{- if include "newrelic.common.privileged" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_proxy.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_proxy.tpl
new file mode 100644
index 000000000..60f34c7ec
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_proxy.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the proxy */ -}}
+{{- define "newrelic.common.proxy" -}}
+    {{- if .Values.proxy -}}
+        {{- .Values.proxy -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.proxy -}}
+            {{- .Values.global.proxy -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_region.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_region.tpl
new file mode 100644
index 000000000..bdcacf323
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_region.tpl
@@ -0,0 +1,74 @@
+{{/*
+Return the region that is being used by the user
+*/}}
+{{- define "newrelic.common.region" -}}
+{{- if and (include "newrelic.common.license._usesCustomSecret" .) (not (include "newrelic.common.region._fromValues" .)) -}}
+  {{- fail "This Helm Chart is not able to compute the region. You must specify a .global.region or .region if the license is set using a custom secret." -}}
+{{- end -}}
+
+{{- /* Defaults */ -}}
+{{- $region := "us" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+  {{- $region = "staging" -}}
+{{- else if include "newrelic.common.region._isEULicenseKey" . -}}
+  {{- $region = "eu" -}}
+{{- end -}}
+
+{{- include "newrelic.common.region.validate" (include "newrelic.common.region._fromValues" . | default $region ) -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values if valid. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+
+Usage: `include "newrelic.common.region.validate" "us"`
+*/}}
+{{- define "newrelic.common.region.validate" -}}
+{{- /* Ref: https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21 */ -}}
+{{- $region := . | lower -}}
+{{- if eq $region "us" -}}
+  US
+{{- else if eq $region "eu" -}}
+  EU
+{{- else if eq $region "staging" -}}
+  Staging
+{{- else if eq $region "local" -}}
+  Local
+{{- else -}}
+  {{- fail (printf "the region provided is not valid: %s not in \"US\" \"EU\" \"Staging\" \"Local\"" .) -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._fromValues" -}}
+{{- if .Values.region -}}
+  {{- .Values.region -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.region -}}
+    {{- .Values.global.region -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the license is for EU region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._isEULicenseKey" -}}
+{{- if not (include "newrelic.common.license._usesCustomSecret" .) -}}
+  {{- $license := include "newrelic.common.license._licenseKey" . -}}
+  {{- if hasPrefix "eu" $license -}}
+    true
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_security-context.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_security-context.tpl
new file mode 100644
index 000000000..9edfcabfd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_security-context.tpl
@@ -0,0 +1,23 @@
+{{- /* Defines the container securityContext context */ -}}
+{{- define "newrelic.common.securityContext.container" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.containerSecurityContext -}}
+    {{- toYaml .Values.containerSecurityContext -}}
+{{- else if $global.containerSecurityContext -}}
+    {{- toYaml $global.containerSecurityContext -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the pod securityContext context */ -}}
+{{- define "newrelic.common.securityContext.pod" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.podSecurityContext -}}
+    {{- toYaml .Values.podSecurityContext -}}
+{{- else if $global.podSecurityContext -}}
+    {{- toYaml $global.podSecurityContext -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_serviceaccount.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_serviceaccount.tpl
new file mode 100644
index 000000000..2d352f6ea
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_serviceaccount.tpl
@@ -0,0 +1,90 @@
+{{- /* Defines if the service account has to be created or not */ -}}
+{{- define "newrelic.common.serviceAccount.create" -}}
+{{- $valueFound := false -}}
+
+{{- /* Look for a global creation of a service account */ -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "create" | kindIs "bool") -}}
+        {{- $valueFound = true -}}
+        {{- if .Values.serviceAccount.create -}}
+            {{- /*
+                We want only to return when this is true, returning `false` here will template "false" (string) when doing
+                an `(include "newrelic.common.serviceAccount.name" .)`, which is not an "empty string" so it is `true` if it is used
+                as an evaluation somewhere else.
+            */ -}}
+            {{- .Values.serviceAccount.create -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* Look for a local creation of a service account */ -}}
+{{- if not $valueFound -}}
+    {{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+    {{- $global := index .Values "global" | default dict -}}
+    {{- if get $global "serviceAccount" | kindIs "map" -}}
+        {{- if get $global.serviceAccount "create" | kindIs "bool" -}}
+            {{- $valueFound = true -}}
+            {{- if $global.serviceAccount.create -}}
+                {{- $global.serviceAccount.create -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* In case no serviceAccount value has been found, default to "true" */ -}}
+{{- if not $valueFound -}}
+true
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the name of the service account */ -}}
+{{- define "newrelic.common.serviceAccount.name" -}}
+{{- $localServiceAccount := "" -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "name" | kindIs "string") -}}
+        {{- $localServiceAccount = .Values.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := "" -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "name" | kindIs "string" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- if (include "newrelic.common.serviceAccount.create" .) -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default (include "newrelic.common.naming.fullname" .) -}}
+{{- else -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default "default" -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Merge the global and local annotations for the service account */ -}}
+{{- define "newrelic.common.serviceAccount.annotations" -}}
+{{- $localServiceAccount := dict -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if get .Values.serviceAccount "annotations" -}}
+        {{- $localServiceAccount = .Values.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := dict -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "annotations" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $merged := mustMergeOverwrite $globalServiceAccount $localServiceAccount -}}
+
+{{- if $merged -}}
+    {{- toYaml $merged -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_staging.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_staging.tpl
new file mode 100644
index 000000000..bd9ad09bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_staging.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the nrStaging toggle.
+This helper allows to override the global `.global.nrStaging` with the value of `.nrStaging`.
+Returns "true" if `nrStaging` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.nrStaging" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "nrStaging" | kindIs "bool") -}}
+    {{- if .Values.nrStaging -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.nrStaging" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.nrStaging -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "nrStaging" | kindIs "bool" -}}
+    {{- if $global.nrStaging -}}
+        {{- $global.nrStaging -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Returns "true" of "false" directly instead of empty string (Helm falsiness) based on the exit of "newrelic.common.nrStaging"
+*/ -}}
+{{- define "newrelic.common.nrStaging.value" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_tolerations.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_tolerations.tpl
new file mode 100644
index 000000000..e016b38e2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_tolerations.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod tolerations */ -}}
+{{- define "newrelic.common.tolerations" -}}
+    {{- if .Values.tolerations -}}
+        {{- toYaml .Values.tolerations -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.tolerations -}}
+            {{- toYaml .Values.global.tolerations -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_userkey.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_userkey.tpl
new file mode 100644
index 000000000..982ea8e09
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_userkey.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the API Key.
+*/}}
+{{- define "newrelic.common.userKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "userkey" ) -}}
+{{- include "newrelic.common.userKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+*/}}
+{{- define "newrelic.common.userKey.secretKeyName" -}}
+{{- include "newrelic.common.userKey._customSecretKey" . | default "userKey" -}}
+{{- end -}}
+
+{{/*
+Return local API Key if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._userKey" -}}
+{{- if .Values.userKey -}}
+  {{- .Values.userKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.userKey -}}
+    {{- .Values.global.userKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the API Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretName" -}}
+{{- if .Values.customUserKeySecretName -}}
+  {{- .Values.customUserKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretName -}}
+    {{- .Values.global.customUserKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretKey" -}}
+{{- if .Values.customUserKeySecretKey -}}
+  {{- .Values.customUserKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretKey }}
+    {{- .Values.global.customUserKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_userkey_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_userkey_secret.yaml.tpl
new file mode 100644
index 000000000..b97985654
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_userkey_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the user key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.userKey.secret" }}
+{{- if not (include "newrelic.common.userKey._customSecretName" .) }}
+{{- /* Fail if user key is empty and required: */ -}}
+{{- if not (include "newrelic.common.userKey._userKey" .) }}
+    {{- fail "You must specify a userKey or a customUserKeySecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.userKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.userKey.secretKeyName" . }}: {{ include "newrelic.common.userKey._userKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_verbose-log.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_verbose-log.tpl
new file mode 100644
index 000000000..2286d4681
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/templates/_verbose-log.tpl
@@ -0,0 +1,54 @@
+{{- /*
+Abstraction of the verbose toggle.
+This helper allows to override the global `.global.verboseLog` with the value of `.verboseLog`.
+Returns "true" if `verbose` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.verboseLog" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "verboseLog" | kindIs "bool") -}}
+    {{- if .Values.verboseLog -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.verboseLog" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.verboseLog -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "verboseLog" | kindIs "bool" -}}
+    {{- if $global.verboseLog -}}
+        {{- $global.verboseLog -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsBoolean" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return 1 or 0 directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsInt" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+1
+{{- else -}}
+0
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/values.yaml
new file mode 100644
index 000000000..75e2d112a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/charts/common-library/values.yaml
@@ -0,0 +1 @@
+# values are not needed for the library chart, however this file is still needed for helm lint to work.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/ci/test-cplane-kind-deployment-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/ci/test-cplane-kind-deployment-values.yaml
new file mode 100644
index 000000000..1e2c36d21
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/ci/test-cplane-kind-deployment-values.yaml
@@ -0,0 +1,135 @@
+global:
+  licenseKey: 1234567890abcdef1234567890abcdef12345678
+  cluster: test-cluster
+
+common:
+  agentConfig:
+    # We set it in order for the kubelet to not crash when posting tho the agent. Since the License_Key is
+    # not valid, the Identity Api doesn't return an AgentID and the server from the Agent takes to long to respond
+    is_forward_only: true
+  config:
+    sink:
+      http:
+        timeout: 180s
+
+customAttributes:
+  new: relic
+  loren: ipsum
+
+# Disable KSM scraper as it is not enabled when testing this chart individually.
+ksm:
+  enabled: false
+
+# K8s DaemonSets update strategy.
+updateStrategy:
+  type: RollingUpdate
+  rollingUpdate:
+    maxUnavailable: 1
+
+enableProcessMetrics: "false"
+serviceAccount:
+  create: true
+
+podAnnotations:
+  annotation1: "annotation"
+podLabels:
+  label1: "label"
+
+securityContext:
+  runAsUser: 1000
+  runAsGroup: 2000
+  allowPrivilegeEscalation: false
+  readOnlyRootFilesystem: true
+
+privileged: true
+
+rbac:
+  create: true
+  pspEnabled: false
+
+prefixDisplayNameWithCluster: false
+useNodeNameAsDisplayName: true
+integrations_config: []
+
+kubelet:
+  enabled: true
+  annotations: {}
+  tolerations:
+    - operator: "Exists"
+      effect: "NoSchedule"
+    - operator: "Exists"
+      effect: "NoExecute"
+  extraEnv:
+    - name: ENV_VAR1
+      value: "var1"
+    - name: ENV_VAR2
+      value: "var2"
+  resources:
+    limits:
+      memory: 400M
+    requests:
+      cpu: 100m
+      memory: 180M
+  config:
+    scheme: "http"
+
+controlPlane:
+  kind: Deployment
+  enabled: true
+  config:
+    etcd:
+      enabled: true
+      autodiscover:
+        - selector: "tier=control-plane,component=etcd"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:4001
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+            - url: http://localhost:2381
+    scheduler:
+      enabled: true
+      autodiscover:
+        - selector: "tier=control-plane,component=kube-scheduler"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:10259
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+    controllerManager:
+      enabled: true
+      autodiscover:
+        - selector: "tier=control-plane,component=kube-controller-manager"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:10257
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+                mtls:
+                  secretName: secret-name
+                  secretNamespace: default
+    apiServer:
+      enabled: true
+      autodiscover:
+        - selector: "tier=control-plane,component=kube-apiserver"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:8443
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+                mtls:
+                  secretName: secret-name4
+            - url: http://localhost:8080
+
+images:
+  integration:
+    tag: test
+    repository: e2e/nri-kubernetes
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/ci/test-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/ci/test-values.yaml
new file mode 100644
index 000000000..125a49607
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/ci/test-values.yaml
@@ -0,0 +1,134 @@
+global:
+  licenseKey: 1234567890abcdef1234567890abcdef12345678
+  cluster: test-cluster
+
+common:
+  agentConfig:
+    # We set it in order for the kubelet to not crash when posting tho the agent. Since the License_Key is
+    # not valid, the Identity Api doesn't return an AgentID and the server from the Agent takes to long to respond
+    is_forward_only: true
+  config:
+    sink:
+      http:
+        timeout: 180s
+
+customAttributes:
+  new: relic
+  loren: ipsum
+
+# Disable KSM scraper as it is not enabled when testing this chart individually.
+ksm:
+  enabled: false
+
+# K8s DaemonSets update strategy.
+updateStrategy:
+  type: RollingUpdate
+  rollingUpdate:
+    maxUnavailable: 1
+
+enableProcessMetrics: "false"
+serviceAccount:
+  create: true
+
+podAnnotations:
+  annotation1: "annotation"
+podLabels:
+  label1: "label"
+
+securityContext:
+  runAsUser: 1000
+  runAsGroup: 2000
+  allowPrivilegeEscalation: false
+  readOnlyRootFilesystem: true
+
+privileged: true
+
+rbac:
+  create: true
+  pspEnabled: false
+
+prefixDisplayNameWithCluster: false
+useNodeNameAsDisplayName: true
+integrations_config: []
+
+kubelet:
+  enabled: true
+  annotations: {}
+  tolerations:
+    - operator: "Exists"
+      effect: "NoSchedule"
+    - operator: "Exists"
+      effect: "NoExecute"
+  extraEnv:
+    - name: ENV_VAR1
+      value: "var1"
+    - name: ENV_VAR2
+      value: "var2"
+  resources:
+    limits:
+      memory: 400M
+    requests:
+      cpu: 100m
+      memory: 180M
+  config:
+    scheme: "http"
+
+controlPlane:
+  enabled: true
+  config:
+    etcd:
+      enabled: true
+      autodiscover:
+        - selector: "tier=control-plane,component=etcd"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:4001
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+            - url: http://localhost:2381
+    scheduler:
+      enabled: true
+      autodiscover:
+        - selector: "tier=control-plane,component=kube-scheduler"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:10259
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+    controllerManager:
+      enabled: true
+      autodiscover:
+        - selector: "tier=control-plane,component=kube-controller-manager"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:10257
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+                mtls:
+                  secretName: secret-name
+                  secretNamespace: default
+    apiServer:
+      enabled: true
+      autodiscover:
+        - selector: "tier=control-plane,component=kube-apiserver"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:8443
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+                mtls:
+                  secretName: secret-name4
+            - url: http://localhost:8080
+
+images:
+  integration:
+    tag: test
+    repository: e2e/nri-kubernetes
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/NOTES.txt b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/NOTES.txt
new file mode 100644
index 000000000..16cc6ea13
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/NOTES.txt
@@ -0,0 +1,131 @@
+{{- if not .Values.forceUnsupportedInterval }}
+{{- $max := 40 }}
+{{- $min := 10 }}
+{{- if not (.Values.common.config.interval | hasSuffix "s") }}
+{{ fail (printf "Interval must be between %ds and %ds" $min $max ) }}
+{{- end }}
+{{- if gt ( .Values.common.config.interval | trimSuffix "s" | int64 ) $max }}
+{{ fail (printf "Intervals larger than %ds are not supported" $max) }}
+{{- end }}
+{{- if lt ( .Values.common.config.interval | trimSuffix "s" | int64 ) $min }}
+{{ fail (printf "Intervals smaller than %ds are not supported" $min) }}
+{{- end }}
+{{- end }}
+
+{{- if or (not .Values.ksm.enabled) (not .Values.kubelet.enabled) }}
+Warning:
+========
+
+You have specified ksm or kubelet integration components as not enabled.
+Those components are needed to have the full experience on NROne kubernetes explorer.
+{{- end }}
+
+{{- if and .Values.controlPlane.enabled (not (include "nriKubernetes.controlPlane.hostNetwork" .)) }}
+Warning:
+========
+
+Most Control Plane components listen in the loopback address only, which is not reachable without `hostNetwork: true`.
+Control plane autodiscovery might not work as expected.
+You can enable hostNetwork for all pods by setting `global.hotNetwork`, `hostNetwork` or only for the control
+plane pods by setting `controlPlane.hostNetwork: true`. Alternatively, you can disable control plane monitoring altogether with
+`controlPlane.enabled: false`.
+{{- end }}
+
+{{- if and (include "newrelic.fargate" .) .Values.kubelet.affinity }}
+Warning:
+========
+
+You have specified both an EKS Fargate environment (global.fargate) and custom
+nodeAffinity rules, so we couldn't automatically exclude the kubelet daemonSet from
+Fargate nodes. In order for the integration to work, you MUST manually exclude
+the daemonSet from Fargate nodes.
+
+Please make sure your `values.yaml' contains a .kubelet.affinity.nodeAffinity that achieve the same effect as:
+
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+        - matchExpressions:
+            - key: eks.amazonaws.com/compute-type
+              operator: NotIn
+              values:
+                - fargate
+{{- end }}
+
+{{- if and .Values.nodeAffinity .Values.controlPlane.enabled }}
+WARNING: `nodeAffinity` is deprecated
+=====================================
+
+We have applied the old `nodeAffinity` to KSM and Kubelet components, but *NOT* to the control plane component as it
+might conflict with the default nodeSelector.
+This shimming will be removed in the future, please convert your `nodeAffinity` item into:
+`ksm.affinity.nodeAffinity`, `controlPlane.affinity.nodeAffinity`, and `kubelet.affinity.nodeAffinity`.
+{{- end }}
+
+{{- if and .Values.integrations_config }}
+WARNING: `integrations_config` is deprecated
+============================================
+
+We have automatically translated `integrations_config` to the new format, but this shimming will be removed in the
+future. Please migrate your configs to the new format in the `integrations` key.
+{{- end }}
+
+{{- if or .Values.kubeStateMetricsScheme .Values.kubeStateMetricsPort .Values.kubeStateMetricsUrl .Values.kubeStateMetricsPodLabel .Values.kubeStateMetricsNamespace }}
+WARNING: `kubeStateMetrics*` are deprecated
+===========================================
+
+We have automatically translated your `kubeStateMetrics*` values to the new format, but this shimming will be removed in
+the future. Please migrate your configs to the new format in the `ksm.config` key.
+{{- end }}
+
+{{- if .Values.runAsUser }}
+WARNING: `runAsUser` is deprecated
+==================================
+
+We have automatically translated your `runAsUser` setting to the new format, but this shimming will be removed in the
+future. Please migrate your configs to the new format in the `securityContext` key.
+{{- end }}
+
+{{- if .Values.config }}
+WARNING: `config` is deprecated
+===============================
+
+We have automatically translated your `config` setting to the new format, but this shimming will be removed in the
+future. Please migrate your agent config to the new format in the `common.agentConfig` key.
+{{- end }}
+
+
+{{ $errors:= "" }}
+
+{{- if .Values.logFile }}
+{{ $errors = printf "%s\n\n%s" $errors (include "newrelic.compatibility.message.logFile" . ) }}
+{{- end }}
+
+{{- if .Values.resources }}
+{{ $errors = printf "%s\n\n%s" $errors (include "newrelic.compatibility.message.resources" . ) }}
+{{- end }}
+
+{{- if .Values.image }}
+{{ $errors = printf "%s\n\n%s" $errors (include "newrelic.compatibility.message.image" . ) }}
+{{- end }}
+
+{{- if .Values.enableWindows }}
+{{ $errors = printf "%s\n\n%s" $errors (include "newrelic.compatibility.message.windows" . ) }}
+{{- end }}
+
+{{- if ( or .Values.controllerManagerEndpointUrl  .Values.schedulerEndpointUrl .Values.etcdEndpointUrl .Values.apiServerEndpointUrl )}}
+{{ $errors = printf "%s\n\n%s" $errors (include "newrelic.compatibility.message.apiURL" . ) }}
+{{- end }}
+
+{{- if ( or .Values.etcdTlsSecretName .Values.etcdTlsSecretNamespace )}}
+{{ $errors = printf "%s\n\n%s" $errors (include "newrelic.compatibility.message.etcdSecrets" . ) }}
+{{- end }}
+
+{{- if .Values.apiServerSecurePort }}
+{{ $errors = printf "%s\n\n%s" $errors (include "newrelic.compatibility.message.apiServerSecurePort" . ) }}
+{{- end }}
+
+{{- if $errors | trim}}
+{{- fail (printf "\n\n%s\n%s" (include "newrelic.compatibility.message.common" . ) $errors )  }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/_helpers.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/_helpers.tpl
new file mode 100644
index 000000000..033ef0bfc
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/_helpers.tpl
@@ -0,0 +1,118 @@
+{{/*
+Create a default fully qualified app name.
+
+This is a copy and paste from the common-library's name helper because the overriding system was broken.
+As we have to change the logic to use "nrk8s" instead of `.Chart.Name` we need to maintain here a version
+of the fullname helper
+
+By default the full name will be "<release_name>" just in if it has "nrk8s" included in that, if not
+it will be concatenated like "<release_name>-nrk8s". This could change if fullnameOverride or
+nameOverride are set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "nriKubernetes.naming.fullname" -}}
+{{- $name := .Values.nameOverride | default "nrk8s" -}}
+
+{{- if .Values.fullnameOverride -}}
+    {{- $name = .Values.fullnameOverride  -}}
+{{- else if not (contains $name .Release.Name) -}}
+    {{- $name = printf "%s-%s" .Release.Name $name -}}
+{{- end -}}
+
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+{{- end -}}
+
+
+
+{{- /* Naming helpers*/ -}}
+{{- define "nriKubernetes.naming.secrets" }}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "nriKubernetes.naming.fullname" .) "suffix" "secrets") -}}
+{{- end -}}
+
+
+
+{{- /* Return a YAML with the mode to be added to the labels */ -}}
+{{- define "nriKubernetes._mode" -}}
+{{- if include "newrelic.common.privileged" . -}}
+    mode: privileged
+{{- else -}}
+    mode: unprivileged
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Add `mode` label to the labels that come from the common library for all the objects
+*/}}
+{{- define "nriKubernetes.labels" -}}
+{{- $labels := include "newrelic.common.labels" . | fromYaml -}}
+{{- $mode := fromYaml ( include "nriKubernetes._mode" . ) -}}
+
+{{- mustMergeOverwrite $labels $mode | toYaml -}}
+{{- end -}}
+
+
+
+{{/*
+Add `mode` label to the labels that come from the common library for podLabels
+*/}}
+{{- define "nriKubernetes.labels.podLabels" -}}
+{{- $labels := include "newrelic.common.labels.podLabels" . | fromYaml -}}
+{{- $mode := fromYaml ( include "nriKubernetes._mode" . ) -}}
+
+{{- mustMergeOverwrite $labels $mode | toYaml -}}
+{{- end -}}
+
+
+
+{{/*
+Returns fargate
+*/}}
+{{- define "newrelic.fargate" -}}
+{{- if .Values.fargate -}}
+  {{- .Values.fargate -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.fargate -}}
+    {{- .Values.global.fargate -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- define "newrelic.integrationConfigDefaults" -}}
+{{- if include "newrelic.common.lowDataMode" . -}}
+interval: 30s
+{{- else  -}}
+interval: 15s
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* These are the defaults that are used for all the containers in this chart (except the kubelet's agent */ -}}
+{{- define "nriKubernetes.securityContext.containerDefaults" -}}
+runAsUser: 1000
+runAsGroup: 2000
+allowPrivilegeEscalation: false
+readOnlyRootFilesystem: true
+{{- end -}}
+
+
+
+{{- /* Allow to change pod defaults dynamically based if we are running in privileged mode or not */ -}}
+{{- define "nriKubernetes.securityContext.container" -}}
+{{- $defaults := fromYaml ( include "nriKubernetes.securityContext.containerDefaults" . ) -}}
+{{- $compatibilityLayer := include "newrelic.compatibility.securityContext" . | fromYaml -}}
+{{- $commonLibrary := include "newrelic.common.securityContext.container" . | fromYaml -}}
+
+{{- $finalSecurityContext := dict -}}
+{{- if $commonLibrary -}}
+    {{- $finalSecurityContext = mustMergeOverwrite $commonLibrary $compatibilityLayer  -}}
+{{- else -}}
+    {{- $finalSecurityContext = mustMergeOverwrite $defaults $compatibilityLayer  -}}
+{{- end -}}
+
+{{- toYaml $finalSecurityContext -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/_helpers_compatibility.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/_helpers_compatibility.tpl
new file mode 100644
index 000000000..07365e5a1
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/_helpers_compatibility.tpl
@@ -0,0 +1,202 @@
+{{/*
+Returns true if .Values.ksm.enabled is true and the legacy disableKubeStateMetrics is not set
+*/}}
+{{- define "newrelic.compatibility.ksm.enabled" -}}
+{{- if and .Values.ksm.enabled (not .Values.disableKubeStateMetrics) -}}
+true
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns legacy ksm values
+*/}}
+{{- define "newrelic.compatibility.ksm.legacyData" -}}
+enabled: true
+{{- if .Values.kubeStateMetricsScheme }}
+scheme: {{ .Values.kubeStateMetricsScheme }}
+{{- end -}}
+{{- if .Values.kubeStateMetricsPort }}
+port: {{ .Values.kubeStateMetricsPort }}
+{{- end -}}
+{{- if .Values.kubeStateMetricsUrl }}
+staticURL: {{ .Values.kubeStateMetricsUrl }}
+{{- end -}}
+{{- if .Values.kubeStateMetricsPodLabel }}
+selector: {{ printf "%s=kube-state-metrics" .Values.kubeStateMetricsPodLabel }}
+{{- end -}}
+{{- if  .Values.kubeStateMetricsNamespace }}
+namespace: {{ .Values.kubeStateMetricsNamespace}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns the new value if available, otherwise falling back on the legacy one
+*/}}
+{{- define "newrelic.compatibility.valueWithFallback" -}}
+{{- if .supported }}
+{{- toYaml .supported}}
+{{- else if .legacy -}}
+{{- toYaml .legacy}}
+{{- end }}
+{{- end -}}
+
+{{/*
+Returns a dictionary with legacy runAsUser config
+*/}}
+{{- define "newrelic.compatibility.securityContext" -}}
+{{- if  .Values.runAsUser -}}
+{{ dict "runAsUser" .Values.runAsUser | toYaml }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns legacy annotations if available
+*/}}
+{{- define "newrelic.compatibility.annotations" -}}
+{{- with  .Values.daemonSet -}}
+{{- with  .annotations -}}
+{{- toYaml . }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns agent configmap merged with legacy config and legacy eventQueueDepth config
+*/}}
+{{- define "newrelic.compatibility.agentConfig" -}}
+{{- $oldConfig := deepCopy (.Values.config | default dict) -}}
+{{- $newConfig := deepCopy .Values.common.agentConfig -}}
+{{- $eventQueueDepth := dict -}}
+
+{{- if .Values.eventQueueDepth -}}
+{{- $eventQueueDepth = dict "event_queue_depth" .Values.eventQueueDepth -}}
+{{- end -}}
+
+{{- mustMergeOverwrite $oldConfig $newConfig $eventQueueDepth | toYaml -}}
+{{- end -}}
+
+{{- /*
+Return a valid podSpec.affinity object from the old `.Values.nodeAffinity`.
+*/ -}}
+{{- define "newrelic.compatibility.nodeAffinity" -}}
+{{- if .Values.nodeAffinity -}}
+nodeAffinity:
+  {{- toYaml .Values.nodeAffinity | nindent 2 }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns legacy integrations_config configmap data
+*/}}
+{{- define "newrelic.compatibility.integrations" -}}
+{{- if .Values.integrations_config -}}
+{{- range .Values.integrations_config }}
+{{ .name -}}: |-
+  {{- toYaml .data | nindent 2 }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "newrelic.compatibility.message.logFile" -}}
+The 'logFile' option is no longer supported and has been replaced by:
+ - common.agentConfig.log_file.
+
+------
+{{- end -}}
+
+{{- define "newrelic.compatibility.message.resources" -}}
+You have specified the legacy 'resources' option in your values, which is not fully compatible with the v3 version.
+This version deploys three different components and therefore you'll need to specify resources for each of them.
+Please use
+ - ksm.resources,
+ - controlPlane.resources,
+ - kubelet.resources.
+
+------
+{{- end -}}
+
+{{- define "newrelic.compatibility.message.apiServerSecurePort" -}}
+You have specified the legacy 'apiServerSecurePort' option in your values, which is not fully compatible with the v3
+version.
+Please configure the API Server port as a part of 'apiServer.autodiscover[].endpoints'
+
+------
+{{- end -}}
+
+{{- define "newrelic.compatibility.message.windows" -}}
+nri-kubernetes v3 does not support deploying into windows Nodes.
+Please use the latest 2.x version of the chart.
+
+------
+{{- end -}}
+
+{{- define "newrelic.compatibility.message.etcdSecrets" -}}
+Values "etcdTlsSecretName" and "etcdTlsSecretNamespace" are no longer supported, please specify them as a part of the
+'etcd' config in the values, for example:
+ - endpoints:
+     - url: https://localhost:9979
+       insecureSkipVerify: true
+       auth:
+         type: mTLS
+         mtls:
+           secretName: {{ .Values.etcdTlsSecretName | default "etcdTlsSecretName"}}
+           secretNamespace: {{ .Values.etcdTlsSecretNamespace | default "etcdTlsSecretNamespace"}}
+
+------
+{{- end -}}
+
+{{- define "newrelic.compatibility.message.apiURL" -}}
+Values "controllerManagerEndpointUrl", "etcdEndpointUrl", "apiServerEndpointUrl", "schedulerEndpointUrl" are no longer
+supported, please specify them as a part of the 'controlplane' config in the values, for example
+  autodiscover:
+    - selector: "tier=control-plane,component=etcd"
+      namespace: kube-system
+      matchNode: true
+      endpoints:
+        - url: https://localhost:4001
+          insecureSkipVerify: true
+          auth:
+            type: bearer
+
+------
+{{- end -}}
+
+{{- define "newrelic.compatibility.message.image" -}}
+Configuring image repository an tag under 'image' is no longer supported.
+The following values are no longer supported and are currently ignored:
+ - image.repository
+ - image.tag
+ - image.pullPolicy
+ - image.pullSecrets
+
+Notice that the 3.x version of the integration uses 3 different images.
+Please set:
+ - images.forwarder.* to configure the infrastructure-agent forwarder.
+ - images.agent.* to configure the image bundling the infrastructure-agent and on-host integrations.
+ - images.integration.* to configure the image in charge of scraping k8s data.
+
+------
+{{- end -}}
+
+{{- define "newrelic.compatibility.message.customAttributes" -}}
+We still support using custom attributes but we support it as a map and dropped it as a string.
+customAttributes: {{ .Values.customAttributes | quote }}
+
+You should change your values to something like this:
+
+customAttributes:
+{{- range $k, $v := fromJson .Values.customAttributes -}}
+  {{- $k | nindent 2 }}: {{ $v | quote }}
+{{- end }}
+
+**NOTE**: If you read above errors like "invalid character ':' after top-level value" or "json: cannot unmarshal string into Go value of type map[string]interface {}" means that the string you have in your values is not a valid JSON, Helm is not able to parse it and we could not show you how you should change it. Sorry.
+{{- end -}}
+
+{{- define "newrelic.compatibility.message.common" -}}
+######
+The chart cannot be rendered since the values listed below are not supported. Please replace those with the new ones compatible with newrelic-infrastructure V3.
+
+Keep in mind that the flag "--reuse-values" is not supported when migrating from V2 to V3.
+Further information can be found in the official docs https://docs.newrelic.com/docs/kubernetes-pixie/kubernetes-integration/get-started/changes-since-v3#migration-guide"
+######
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/clusterrole.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/clusterrole.yaml
new file mode 100644
index 000000000..391dc1e1f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/clusterrole.yaml
@@ -0,0 +1,35 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.naming.fullname" . }}
+rules:
+  - apiGroups: [""]
+    resources:
+      - "nodes/metrics"
+      - "nodes/stats"
+      - "nodes/proxy"
+    verbs: ["get", "list"]
+  - apiGroups: [ "" ]
+    resources:
+      - "endpoints"
+      - "services"
+      - "nodes"
+      - "namespaces"
+      - "pods"
+    verbs: [ "get", "list", "watch" ]
+  - nonResourceURLs: ["/metrics"]
+    verbs: ["get"]
+  {{- if .Values.rbac.pspEnabled }}
+  - apiGroups:
+      - extensions
+    resources:
+      - podsecuritypolicies
+    resourceNames:
+      - privileged-{{ include "newrelic.common.naming.fullname" . }}
+    verbs:
+      - use
+  {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/clusterrolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/clusterrolebinding.yaml
new file mode 100644
index 000000000..fc5dfb8da
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/clusterrolebinding.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.naming.fullname" . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "newrelic.common.naming.fullname" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_affinity_helper.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_affinity_helper.tpl
new file mode 100644
index 000000000..320d16dae
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_affinity_helper.tpl
@@ -0,0 +1,11 @@
+{{- /*
+As this chart deploys what it should be three charts to maintain the transition to v3 as smooth as possible.
+This means that this chart has 3 affinity so a helper should be done per scraper.
+*/ -}}
+{{- define "nriKubernetes.controlPlane.affinity" -}}
+{{- if .Values.controlPlane.affinity -}}
+    {{- toYaml .Values.controlPlane.affinity -}}
+{{- else if include "newrelic.common.affinity" . -}}
+    {{- include "newrelic.common.affinity" . -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_agent-config_helper.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_agent-config_helper.tpl
new file mode 100644
index 000000000..e113def82
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_agent-config_helper.tpl
@@ -0,0 +1,20 @@
+{{- /*
+Defaults for controlPlane's agent config
+*/ -}}
+{{- define "nriKubernetes.controlPlane.agentConfig.defaults" -}}
+is_forward_only: true
+http_server_enabled: true
+http_server_port: 8001
+{{- end -}}
+
+
+
+{{- define "nriKubernetes.controlPlane.agentConfig" -}}
+{{- $agentDefaults := fromYaml ( include "newrelic.common.agentConfig.defaults" . ) -}}
+{{- $controlPlane := fromYaml ( include "nriKubernetes.controlPlane.agentConfig.defaults" . ) -}}
+{{- $agentConfig := fromYaml ( include "newrelic.compatibility.agentConfig" . ) -}}
+{{- $cpAgentConfig := .Values.controlPlane.agentConfig -}}
+{{- $customAttributes := dict "custom_attributes" (dict "clusterName" (include "newrelic.common.cluster" . )) -}}
+
+{{- mustMergeOverwrite $agentDefaults $controlPlane $agentConfig $cpAgentConfig $customAttributes | toYaml -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_host_network.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_host_network.tpl
new file mode 100644
index 000000000..2f3bdf2d9
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_host_network.tpl
@@ -0,0 +1,22 @@
+{{/* Returns whether the controlPlane scraper should run with hostNetwork: true based on the user configuration. */}}
+{{- define "nriKubernetes.controlPlane.hostNetwork" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if get .Values.controlPlane "hostNetwork" | kindIs "bool" -}}
+    {{- if .Values.controlPlane.hostNetwork -}}
+        {{- .Values.controlPlane.hostNetwork -}}
+    {{- end -}}
+{{- else if include "newrelic.common.hostNetwork" . -}}
+    {{- include "newrelic.common.hostNetwork" . -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/* Abstraction of "nriKubernetes.controlPlane.hostNetwork" that returns true of false directly */}}
+{{- define "nriKubernetes.controlPlane.hostNetwork.value" -}}
+{{- if include "nriKubernetes.controlPlane.hostNetwork" . -}}
+    true
+{{- else -}}
+    false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_naming.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_naming.tpl
new file mode 100644
index 000000000..4b9ef22e3
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_naming.tpl
@@ -0,0 +1,16 @@
+{{- /* Naming helpers*/ -}}
+{{- define "nriKubernetes.controlplane.fullname" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "nriKubernetes.naming.fullname" .) "suffix" "controlplane") -}}
+{{- end -}}
+
+{{- define "nriKubernetes.controlplane.fullname.agent" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "nriKubernetes.naming.fullname" .) "suffix" "agent-controlplane") -}}
+{{- end -}}
+
+{{- define "nriKubernetes.controlplane.fullname.serviceAccount" -}}
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+  {{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "nriKubernetes.naming.fullname" .) "suffix" "controlplane") -}}
+{{- else -}}
+  {{- include "newrelic.common.serviceAccount.name" . -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_rbac.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_rbac.tpl
new file mode 100644
index 000000000..a279df6b4
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_rbac.tpl
@@ -0,0 +1,40 @@
+{{/*
+Returns the list of namespaces where secrets need to be accessed by the controlPlane integration to do mTLS Auth
+*/}}
+{{- define "nriKubernetes.controlPlane.roleBindingNamespaces" -}}
+{{ $namespaceList := list }}
+{{- range $components := .Values.controlPlane.config }}
+  {{- if $components }}
+  {{- if kindIs "map" $components -}}
+  {{- if $components.staticEndpoint }}
+      {{- if $components.staticEndpoint.auth }}
+      {{- if $components.staticEndpoint.auth.mtls }}
+      {{- if $components.staticEndpoint.auth.mtls.secretNamespace }}
+      {{- $namespaceList = append $namespaceList $components.staticEndpoint.auth.mtls.secretNamespace -}}
+      {{- end }}
+      {{- end }}
+      {{- end }}
+  {{- end }}
+  {{- if $components.autodiscover }}
+    {{- range $autodiscover := $components.autodiscover }}
+      {{- if $autodiscover }}
+      {{- if $autodiscover.endpoints }}
+        {{- range $endpoint := $autodiscover.endpoints }}
+            {{- if $endpoint.auth }}
+            {{- if $endpoint.auth.mtls }}
+            {{- if $endpoint.auth.mtls.secretNamespace }}
+            {{- $namespaceList = append $namespaceList $endpoint.auth.mtls.secretNamespace -}}
+            {{- end }}
+            {{- end }}
+            {{- end }}
+        {{- end }}
+      {{- end }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+  {{- end }}
+  {{- end }}
+{{- end }}
+roleBindingNamespaces:
+  {{- uniq $namespaceList | toYaml | nindent 2 }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_tolerations_helper.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_tolerations_helper.tpl
new file mode 100644
index 000000000..3c82e82f5
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/_tolerations_helper.tpl
@@ -0,0 +1,11 @@
+{{- /*
+As this chart deploys what it should be three charts to maintain the transition to v3 as smooth as possible.
+This means that this chart has 3 tolerations so a helper should be done per scraper.
+*/ -}}
+{{- define "nriKubernetes.controlPlane.tolerations" -}}
+{{- if .Values.controlPlane.tolerations -}}
+    {{- toYaml .Values.controlPlane.tolerations -}}
+{{- else if include "newrelic.common.tolerations" . -}}
+    {{- include "newrelic.common.tolerations" . -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/agent-configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/agent-configmap.yaml
new file mode 100644
index 000000000..77f2e11dd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/agent-configmap.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.controlPlane.enabled -}}
+{{- if .Values.customAttributes | kindIs "string" }}
+{{- fail ( include "newrelic.compatibility.message.customAttributes" . ) -}}
+{{- else -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "nriKubernetes.controlplane.fullname.agent" . }}
+data:
+  newrelic-infra.yml: |-
+    # This is the configuration file for the infrastructure agent. See:
+    # https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+    {{- include "nriKubernetes.controlPlane.agentConfig" . | nindent 4 }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/clusterrole.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/clusterrole.yaml
new file mode 100644
index 000000000..57633e7f7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/clusterrole.yaml
@@ -0,0 +1,47 @@
+{{- if and (.Values.controlPlane.enabled) (.Values.rbac.create) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "nriKubernetes.controlplane.fullname" . }}
+rules:
+  - apiGroups: [""]
+    resources:
+      - "nodes/metrics"
+      - "nodes/stats"
+      - "nodes/proxy"
+    verbs: ["get", "list"]
+  - apiGroups: [ "" ]
+    resources:
+      - "pods"
+      - "nodes"
+    verbs: [ "get", "list", "watch" ]
+  - nonResourceURLs: ["/metrics"]
+    verbs: ["get", "head"]
+  {{- if .Values.rbac.pspEnabled }}
+  - apiGroups:
+      - extensions
+    resources:
+      - podsecuritypolicies
+    resourceNames:
+      - privileged-{{ include "newrelic.common.naming.fullname" . }}
+    verbs:
+      - use
+  {{- end -}}
+{{- $namespaces := include "nriKubernetes.controlPlane.roleBindingNamespaces" . | fromYaml -}}
+{{- if $namespaces.roleBindingNamespaces}}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "nriKubernetes.naming.secrets" . }}
+rules:
+  - apiGroups: [""]
+    resources:
+      - "secrets"
+    verbs: ["get", "list", "watch"]
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/clusterrolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/clusterrolebinding.yaml
new file mode 100644
index 000000000..4e3530094
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/clusterrolebinding.yaml
@@ -0,0 +1,16 @@
+{{- if and (.Values.controlPlane.enabled) (.Values.rbac.create) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "nriKubernetes.controlplane.fullname" . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "nriKubernetes.controlplane.fullname" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "nriKubernetes.controlplane.fullname.serviceAccount" . }}
+    namespace: {{ .Release.Namespace }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/daemonset.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/daemonset.yaml
new file mode 100644
index 000000000..938fc48d4
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/daemonset.yaml
@@ -0,0 +1,205 @@
+{{- if and (.Values.controlPlane.enabled) (not (include "newrelic.fargate" .)) }}
+apiVersion: apps/v1
+kind: {{ .Values.controlPlane.kind }}
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "nriKubernetes.labels" . | nindent 4 }}
+  name: {{ include "nriKubernetes.controlplane.fullname" . }}
+  {{- $legacyAnnotation:= fromYaml (include "newrelic.compatibility.annotations" .) -}}
+  {{- with  include "newrelic.compatibility.valueWithFallback" (dict "legacy" $legacyAnnotation "supported" .Values.controlPlane.annotations )}}
+  annotations: {{ . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if eq .Values.controlPlane.kind "DaemonSet"}}
+  {{- with .Values.updateStrategy }}
+  updateStrategy: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  {{- end }}
+  {{- if eq .Values.controlPlane.kind "Deployment"}}
+  {{- with .Values.strategy }}
+  strategy: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: controlplane
+  template:
+    metadata:
+      annotations:
+        checksum/nri-kubernetes: {{ include (print $.Template.BasePath "/controlplane/scraper-configmap.yaml") . | sha256sum }}
+        checksum/agent-config: {{ include (print $.Template.BasePath "/controlplane/agent-configmap.yaml") . | sha256sum }}
+        {{- if include "newrelic.common.license.secret" . }}{{- /* If the is secret to template */}}
+        checksum/license-secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        {{- end }}
+        {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      labels:
+        {{- include "nriKubernetes.labels.podLabels" . | nindent 8 }}
+        app.kubernetes.io/component: controlplane
+    spec:
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.images.pullSecrets) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.dnsConfig" . }}
+      dnsConfig:
+        {{- . | nindent 8 }}
+      {{- end }}
+      hostNetwork: {{ include "nriKubernetes.controlPlane.hostNetwork.value" . }}
+      {{- if include "nriKubernetes.controlPlane.hostNetwork" . }}
+      dnsPolicy: ClusterFirstWithHostNet
+      {{- end }}
+      {{- with include "newrelic.common.priorityClassName" . }}
+      priorityClassName: {{ . }}
+      {{- end }}
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "nriKubernetes.controlplane.fullname.serviceAccount" . }}
+
+      {{- if .Values.controlPlane.initContainers }}
+      initContainers: {{- tpl (.Values.controlPlane.initContainers | toYaml) . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: controlplane
+          image: {{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.integration "context" .) }}
+          imagePullPolicy: {{ .Values.images.integration.pullPolicy }}
+          {{- with include "nriKubernetes.securityContext.container" . | fromYaml }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          env:
+            - name: "NRI_KUBERNETES_SINK_HTTP_PORT"
+              value: {{ get (fromYaml (include "nriKubernetes.controlPlane.agentConfig" .)) "http_server_port" | quote }}
+            - name: "NRI_KUBERNETES_CLUSTERNAME"
+              value: {{ include "newrelic.common.cluster" . }}
+            - name: "NRI_KUBERNETES_VERBOSE"
+              value: {{ include "newrelic.common.verboseLog.valueAsBoolean" . | quote }}
+
+            - name: "NRI_KUBERNETES_NODENAME"
+              valueFrom:
+                fieldRef:
+                  apiVersion: "v1"
+                  fieldPath: "spec.nodeName"
+            - name: "NRI_KUBERNETES_NODEIP"
+              valueFrom:
+                fieldRef:
+                  apiVersion: "v1"
+                  fieldPath: "status.hostIP"
+
+            {{- with .Values.controlPlane.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.controlPlane.extraEnvFrom }}
+          envFrom: {{ toYaml . | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - name: nri-kubernetes-config
+              mountPath: /etc/newrelic-infra/nri-kubernetes.yml
+              subPath: nri-kubernetes.yml
+            {{- with .Values.controlPlane.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.controlPlane.resources }}
+          resources: {{ toYaml . | nindent 12 }}
+          {{- end }}
+        - name: forwarder
+          image: {{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.forwarder "context" .) }}
+          imagePullPolicy: {{ .Values.images.forwarder.pullPolicy }}
+          {{- with include "nriKubernetes.securityContext.container" . | fromYaml }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          ports:
+            - containerPort: {{ get (fromYaml (include "nriKubernetes.controlPlane.agentConfig" .)) "http_server_port" }}
+          env:
+            - name: "NRIA_LICENSE_KEY"
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "newrelic.common.license.secretName" . }}
+                  key: {{ include "newrelic.common.license.secretKeyName" . }}
+
+            - name: "NRIA_DNS_HOSTNAME_RESOLUTION"
+              value: "false"
+
+            - name: "K8S_NODE_NAME"
+              valueFrom:
+                fieldRef:
+                  apiVersion: "v1"
+                  fieldPath: "spec.nodeName"
+
+            {{- if .Values.useNodeNameAsDisplayName }}
+            - name: "NRIA_DISPLAY_NAME"
+            {{- if .Values.prefixDisplayNameWithCluster }}
+              value: "{{ include "newrelic.common.cluster" . }}:$(K8S_NODE_NAME)"
+            {{- else }}
+              valueFrom:
+                fieldRef:
+                  apiVersion: "v1"
+                  fieldPath: "spec.nodeName"
+            {{- end }}
+            {{- end }}
+
+            {{- with .Values.controlPlane.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.controlPlane.extraEnvFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - mountPath: /var/db/newrelic-infra/data
+              name: forwarder-tmpfs-data
+            - mountPath: /var/db/newrelic-infra/user_data
+              name: forwarder-tmpfs-user-data
+            - mountPath: /tmp
+              name: forwarder-tmpfs-tmp
+            - name: config
+              mountPath: /etc/newrelic-infra.yml
+              subPath: newrelic-infra.yml
+            {{- with .Values.controlPlane.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.controlPlane.resources }}
+          resources: {{ toYaml . | nindent 12 }}
+          {{- end }}
+      volumes:
+        - name: nri-kubernetes-config
+          configMap:
+            name: {{ include "nriKubernetes.controlplane.fullname" . }}
+            items:
+              - key: nri-kubernetes.yml
+                path: nri-kubernetes.yml
+        - name: forwarder-tmpfs-data
+          emptyDir: {}
+        - name: forwarder-tmpfs-user-data
+          emptyDir: {}
+        - name: forwarder-tmpfs-tmp
+          emptyDir: {}
+        - name: config
+          configMap:
+            name: {{ include "nriKubernetes.controlplane.fullname.agent" . }}
+            items:
+              - key: newrelic-infra.yml
+                path: newrelic-infra.yml
+        {{- with .Values.controlPlane.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- with include "nriKubernetes.controlPlane.affinity" . }}
+      affinity:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "nriKubernetes.controlPlane.tolerations" . }}
+      tolerations:
+        {{- . | nindent 8 }}
+      {{- end }}
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{- with .Values.controlPlane.nodeSelector | default (fromYaml (include "newrelic.common.nodeSelector" .)) }}
+        {{- toYaml . | nindent 8 }}
+        {{- end -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/rolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/rolebinding.yaml
new file mode 100644
index 000000000..d97fc181a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/rolebinding.yaml
@@ -0,0 +1,21 @@
+{{- if .Values.rbac.create }}
+{{- $namespaces := (include "nriKubernetes.controlPlane.roleBindingNamespaces" . | fromYaml) -}}
+{{- range $namespaces.roleBindingNamespaces }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" $ | nindent 4 }}
+  name: {{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "nriKubernetes.naming.fullname" $) "suffix" .) }}
+  namespace: {{ . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "nriKubernetes.naming.secrets" $ }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "nriKubernetes.controlplane.fullname.serviceAccount" $ }}
+  namespace: {{ $.Release.Namespace }}
+{{- end -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/scraper-configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/scraper-configmap.yaml
new file mode 100644
index 000000000..454665ded
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/scraper-configmap.yaml
@@ -0,0 +1,36 @@
+{{- if .Values.controlPlane.enabled -}}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "nriKubernetes.controlplane.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+data:
+  nri-kubernetes.yml: |-
+    {{- (merge .Values.common.config (include "newrelic.integrationConfigDefaults" . | fromYaml)) | toYaml | nindent 4 }}
+    controlPlane:
+      {{- omit .Values.controlPlane.config "etcd" "scheduler" "controllerManager" "apiServer" | toYaml | nindent 6 }}
+      enabled: true
+
+    {{- if  .Values.controlPlane.config.etcd.enabled }}
+      etcd:
+        {{- toYaml .Values.controlPlane.config.etcd | nindent 8 -}}
+    {{- end -}}
+
+    {{- if .Values.controlPlane.config.scheduler.enabled }}
+      scheduler:
+        {{- toYaml .Values.controlPlane.config.scheduler | nindent 8 -}}
+    {{- end -}}
+
+    {{- if  .Values.controlPlane.config.controllerManager.enabled }}
+      controllerManager:
+        {{- toYaml .Values.controlPlane.config.controllerManager | nindent 8 -}}
+    {{- end -}}
+
+    {{- if .Values.controlPlane.config.apiServer.enabled }}
+      apiServer:
+        {{- toYaml .Values.controlPlane.config.apiServer | nindent 8 -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/serviceaccount.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/serviceaccount.yaml
new file mode 100644
index 000000000..502e1c986
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/controlplane/serviceaccount.yaml
@@ -0,0 +1,13 @@
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- with (include "newrelic.common.serviceAccount.annotations" .) }}
+  annotations:
+    {{- . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "nriKubernetes.controlplane.fullname.serviceAccount" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_affinity_helper.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_affinity_helper.tpl
new file mode 100644
index 000000000..ce795708d
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_affinity_helper.tpl
@@ -0,0 +1,14 @@
+{{- /*
+As this chart deploys what it should be three charts to maintain the transition to v3 as smooth as possible.
+This means that this chart has 3 affinity so a helper should be done per scraper.
+*/ -}}
+{{- define "nriKubernetes.ksm.affinity" -}}
+{{- if or .Values.ksm.affinity .Values.nodeAffinity -}}
+    {{- $legacyNodeAffinity := fromYaml ( include "newrelic.compatibility.nodeAffinity" . ) | default dict -}}
+    {{- $valuesAffinity := .Values.ksm.affinity | default dict -}}
+    {{- $affinity := mustMergeOverwrite $legacyNodeAffinity $valuesAffinity -}}
+    {{- toYaml $affinity -}}
+{{- else if include "newrelic.common.affinity" . -}}
+    {{- include "newrelic.common.affinity" . -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_agent-config_helper.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_agent-config_helper.tpl
new file mode 100644
index 000000000..e7b55644c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_agent-config_helper.tpl
@@ -0,0 +1,20 @@
+{{- /*
+Defaults for ksm's agent config
+*/ -}}
+{{- define "nriKubernetes.ksm.agentConfig.defaults" -}}
+is_forward_only: true
+http_server_enabled: true
+http_server_port: 8002
+{{- end -}}
+
+
+
+{{- define "nriKubernetes.ksm.agentConfig" -}}
+{{- $agentDefaults := fromYaml ( include "newrelic.common.agentConfig.defaults" . ) -}}
+{{- $ksm := fromYaml ( include "nriKubernetes.ksm.agentConfig.defaults" . ) -}}
+{{- $agentConfig := fromYaml ( include "newrelic.compatibility.agentConfig" . ) -}}
+{{- $ksmAgentConfig := .Values.ksm.agentConfig -}}
+{{- $customAttributes := dict "custom_attributes" (dict "clusterName" (include "newrelic.common.cluster" . )) -}}
+
+{{- mustMergeOverwrite $agentDefaults $ksm $agentConfig $ksmAgentConfig $customAttributes | toYaml -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_host_network.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_host_network.tpl
new file mode 100644
index 000000000..59a6db7be
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_host_network.tpl
@@ -0,0 +1,22 @@
+{{/* Returns whether the ksm scraper should run with hostNetwork: true based on the user configuration. */}}
+{{- define "nriKubernetes.ksm.hostNetwork" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if get .Values.ksm "hostNetwork" | kindIs "bool" -}}
+    {{- if .Values.ksm.hostNetwork -}}
+        {{- .Values.ksm.hostNetwork -}}
+    {{- end -}}
+{{- else if include "newrelic.common.hostNetwork" . -}}
+    {{- include "newrelic.common.hostNetwork" . -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/* Abstraction of "nriKubernetes.ksm.hostNetwork" that returns true of false directly */}}
+{{- define "nriKubernetes.ksm.hostNetwork.value" -}}
+{{- if include "nriKubernetes.ksm.hostNetwork" . -}}
+    true
+{{- else -}}
+    false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_naming.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_naming.tpl
new file mode 100644
index 000000000..d8c283c43
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_naming.tpl
@@ -0,0 +1,8 @@
+{{- /* Naming helpers*/ -}}
+{{- define "nriKubernetes.ksm.fullname" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "nriKubernetes.naming.fullname" .) "suffix" "ksm") -}}
+{{- end -}}
+
+{{- define "nriKubernetes.ksm.fullname.agent" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "nriKubernetes.naming.fullname" .) "suffix" "agent-ksm") -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_tolerations_helper.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_tolerations_helper.tpl
new file mode 100644
index 000000000..e1a9fd80c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/_tolerations_helper.tpl
@@ -0,0 +1,11 @@
+{{- /*
+As this chart deploys what it should be three charts to maintain the transition to v3 as smooth as possible.
+This means that this chart has 3 tolerations so a helper should be done per scraper.
+*/ -}}
+{{- define "nriKubernetes.ksm.tolerations" -}}
+{{- if .Values.ksm.tolerations -}}
+    {{- toYaml .Values.ksm.tolerations -}}
+{{- else if include "newrelic.common.tolerations" . -}}
+    {{- include "newrelic.common.tolerations" . -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/agent-configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/agent-configmap.yaml
new file mode 100644
index 000000000..6a438e9a3
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/agent-configmap.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.ksm.enabled -}}
+{{- if .Values.customAttributes | kindIs "string" }}
+{{- fail ( include "newrelic.compatibility.message.customAttributes" . ) -}}
+{{- else -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "nriKubernetes.ksm.fullname.agent" . }}
+data:
+  newrelic-infra.yml: |-
+    # This is the configuration file for the infrastructure agent. See:
+    # https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+    {{- include "nriKubernetes.ksm.agentConfig" . | nindent 4 }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/deployment.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/deployment.yaml
new file mode 100644
index 000000000..fa2111591
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/deployment.yaml
@@ -0,0 +1,192 @@
+{{- if include "newrelic.compatibility.ksm.enabled" . -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "nriKubernetes.labels" . | nindent 4 }}
+  name: {{ include "nriKubernetes.ksm.fullname" . }}
+  {{- $legacyAnnotation:= fromYaml (include "newrelic.compatibility.annotations" .) -}}
+  {{- with  include "newrelic.compatibility.valueWithFallback" (dict "legacy" $legacyAnnotation "supported" .Values.ksm.annotations )}}
+  annotations: {{ . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- with .Values.strategy }}
+  strategy: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: ksm
+  template:
+    metadata:
+      annotations:
+        checksum/nri-kubernetes: {{ include (print $.Template.BasePath "/ksm/scraper-configmap.yaml") . | sha256sum }}
+        checksum/agent-config: {{ include (print $.Template.BasePath "/ksm/agent-configmap.yaml") . | sha256sum }}
+        {{- if include "newrelic.common.license.secret" . }}{{- /* If the is secret to template */}}
+        checksum/license-secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        {{- end }}
+        {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      labels:
+        {{- include "nriKubernetes.labels.podLabels" . | nindent 8 }}
+        app.kubernetes.io/component: ksm
+    spec:
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.images.pullSecrets) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.dnsConfig" . }}
+      dnsConfig:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.priorityClassName" . }}
+      priorityClassName: {{ . }}
+      {{- end }}
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "newrelic.common.serviceAccount.name" . }}
+      hostNetwork: {{ include "nriKubernetes.ksm.hostNetwork.value" . }}
+      {{- if include "nriKubernetes.ksm.hostNetwork" . }}
+      dnsPolicy: ClusterFirstWithHostNet
+      {{- end }}
+      
+      {{- if .Values.ksm.initContainers }}
+      initContainers: {{- tpl (.Values.ksm.initContainers | toYaml) . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: ksm
+          image: {{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.integration "context" .) }}
+          imagePullPolicy: {{ .Values.images.integration.pullPolicy }}
+          {{- with include "nriKubernetes.securityContext.container" . | fromYaml }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          env:
+            - name: "NRI_KUBERNETES_SINK_HTTP_PORT"
+              value: {{ get (fromYaml (include "nriKubernetes.ksm.agentConfig" .)) "http_server_port" | quote }}
+            - name: "NRI_KUBERNETES_CLUSTERNAME"
+              value: {{ include "newrelic.common.cluster" . }}
+            - name: "NRI_KUBERNETES_VERBOSE"
+              value: {{ include "newrelic.common.verboseLog.valueAsBoolean" . | quote }}
+
+            - name: "NRI_KUBERNETES_NODENAME"
+              valueFrom:
+                fieldRef:
+                  apiVersion: "v1"
+                  fieldPath: "spec.nodeName"
+
+            {{- with .Values.ksm.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.ksm.extraEnvFrom }}
+          envFrom: {{ toYaml . | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - name: nri-kubernetes-config
+              mountPath: /etc/newrelic-infra/nri-kubernetes.yml
+              subPath: nri-kubernetes.yml
+            {{- with .Values.ksm.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.ksm.ksm.resources }}
+          resources: {{ toYaml . | nindent 12 }}
+          {{- end }}
+        - name: forwarder
+          image: {{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.forwarder "context" .) }}
+          imagePullPolicy: {{ .Values.images.forwarder.pullPolicy }}
+          {{- with include "nriKubernetes.securityContext.container" . | fromYaml }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          ports:
+            - containerPort: {{ get (fromYaml (include "nriKubernetes.ksm.agentConfig" .)) "http_server_port" }}
+          env:
+            - name: NRIA_LICENSE_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "newrelic.common.license.secretName" . }}
+                  key: {{ include "newrelic.common.license.secretKeyName" . }}
+
+            - name: "NRIA_DNS_HOSTNAME_RESOLUTION"
+              value: "false"
+
+            - name: "K8S_NODE_NAME"
+              valueFrom:
+                fieldRef:
+                  apiVersion: "v1"
+                  fieldPath: "spec.nodeName"
+
+            {{- if .Values.useNodeNameAsDisplayName }}
+            - name: "NRIA_DISPLAY_NAME"
+              {{- if .Values.prefixDisplayNameWithCluster }}
+              value: "{{ include "newrelic.common.cluster" . }}:$(K8S_NODE_NAME)"
+              {{- else }}
+              valueFrom:
+                fieldRef:
+                  apiVersion: "v1"
+                  fieldPath: "spec.nodeName"
+            {{- end }}
+            {{- end }}
+
+            {{- with .Values.ksm.env }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.ksm.extraEnvFrom }}
+          envFrom: {{ toYaml . | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - mountPath: /var/db/newrelic-infra/data
+              name: forwarder-tmpfs-data
+            - mountPath: /var/db/newrelic-infra/user_data
+              name: forwarder-tmpfs-user-data
+            - mountPath: /tmp
+              name: forwarder-tmpfs-tmp
+            - name: config
+              mountPath: /etc/newrelic-infra.yml
+              subPath: newrelic-infra.yml
+            {{- with .Values.ksm.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.ksm.forwarder.resources }}
+          resources: {{ toYaml . | nindent 12 }}
+          {{- end }}
+      volumes:
+        - name: nri-kubernetes-config
+          configMap:
+            name: {{ include "nriKubernetes.ksm.fullname" . }}
+            items:
+              - key: nri-kubernetes.yml
+                path: nri-kubernetes.yml
+        - name: forwarder-tmpfs-data
+          emptyDir: {}
+        - name: forwarder-tmpfs-user-data
+          emptyDir: {}
+        - name: forwarder-tmpfs-tmp
+          emptyDir: {}
+        - name: config
+          configMap:
+            name: {{ include "nriKubernetes.ksm.fullname.agent" . }}
+            items:
+              - key: newrelic-infra.yml
+                path: newrelic-infra.yml
+        {{- with .Values.ksm.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- with include "nriKubernetes.ksm.affinity" . }}
+      affinity:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "nriKubernetes.ksm.tolerations" . }}
+      tolerations:
+        {{- . | nindent 8 }}
+      {{- end }}
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{- with .Values.ksm.nodeSelector | default (fromYaml (include "newrelic.common.nodeSelector" .)) }}
+        {{- toYaml . | nindent 8 }}
+        {{- end -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/scraper-configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/scraper-configmap.yaml
new file mode 100644
index 000000000..3314df9c7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/ksm/scraper-configmap.yaml
@@ -0,0 +1,15 @@
+{{- if include "newrelic.compatibility.ksm.enabled" .  -}}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "nriKubernetes.ksm.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+data:
+  nri-kubernetes.yml: |-
+    {{- (merge .Values.common.config (include "newrelic.integrationConfigDefaults" . | fromYaml)) | toYaml | nindent 4 }}
+    ksm:
+      {{- mustMergeOverwrite .Values.ksm.config  (include "newrelic.compatibility.ksm.legacyData" . | fromYaml) | toYaml | nindent 6 -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_affinity_helper.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_affinity_helper.tpl
new file mode 100644
index 000000000..a3abf0855
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_affinity_helper.tpl
@@ -0,0 +1,33 @@
+{{- /*
+Patch to add affinity in case we are running in fargate mode
+*/ -}}
+{{- define "nriKubernetes.kubelet.affinity.fargateDefaults" -}}
+nodeAffinity:
+  requiredDuringSchedulingIgnoredDuringExecution:
+    nodeSelectorTerms:
+      - matchExpressions:
+          - key: eks.amazonaws.com/compute-type
+            operator: NotIn
+            values:
+              - fargate
+{{- end -}}
+
+
+
+{{- /*
+As this chart deploys what it should be three charts to maintain the transition to v3 as smooth as possible.
+This means that this chart has 3 affinity so a helper should be done per scraper.
+*/ -}}
+{{- define "nriKubernetes.kubelet.affinity" -}}
+
+{{- if or .Values.kubelet.affinity .Values.nodeAffinity  -}}
+    {{- $legacyNodeAffinity := fromYaml ( include "newrelic.compatibility.nodeAffinity" . ) | default dict -}}
+    {{- $valuesAffinity := .Values.kubelet.affinity | default dict -}}
+    {{- $affinity := mustMergeOverwrite $legacyNodeAffinity $valuesAffinity -}}
+    {{- toYaml $affinity -}}
+{{- else if include "newrelic.common.affinity" . -}}
+    {{- include "newrelic.common.affinity" . -}}
+{{- else if include "newrelic.fargate" . -}}
+    {{- include "nriKubernetes.kubelet.affinity.fargateDefaults" . -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_agent-config_helper.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_agent-config_helper.tpl
new file mode 100644
index 000000000..ea6ffc25f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_agent-config_helper.tpl
@@ -0,0 +1,31 @@
+{{- /*
+Defaults for kubelet's agent config
+*/ -}}
+{{- define "nriKubernetes.kubelet.agentConfig.defaults" -}}
+http_server_enabled: true
+http_server_port: 8003
+features:
+  docker_enabled: false
+{{- if not ( include "newrelic.common.privileged" . ) }}
+is_secure_forward_only: true
+{{- end }}
+{{- /*
+`enableProcessMetrics` is commented in the values and we want to configure it when it is set to something
+either `true` or `false`. So we test if the variable is a boolean and in that case simply use it.
+*/}}
+{{- if (get .Values "enableProcessMetrics" | kindIs "bool") }}
+enable_process_metrics: {{ .Values.enableProcessMetrics }}
+{{- end }}
+{{- end -}}
+
+
+
+{{- define "nriKubernetes.kubelet.agentConfig" -}}
+{{- $agentDefaults := fromYaml ( include "newrelic.common.agentConfig.defaults" . ) -}}
+{{- $kubelet := fromYaml ( include "nriKubernetes.kubelet.agentConfig.defaults" . ) -}}
+{{- $agentConfig := fromYaml ( include "newrelic.compatibility.agentConfig" . ) -}}
+{{- $kubeletAgentConfig := .Values.kubelet.agentConfig -}}
+{{- $customAttributes := dict "custom_attributes" (dict "clusterName" (include "newrelic.common.cluster" . )) -}}
+
+{{- mustMergeOverwrite $agentDefaults $kubelet $agentConfig $kubeletAgentConfig $customAttributes | toYaml -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_host_network.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_host_network.tpl
new file mode 100644
index 000000000..7944f98a7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_host_network.tpl
@@ -0,0 +1,22 @@
+{{/* Returns whether the kubelet scraper should run with hostNetwork: true based on the user configuration. */}}
+{{- define "nriKubernetes.kubelet.hostNetwork" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if get .Values.kubelet "hostNetwork" | kindIs "bool" -}}
+    {{- if .Values.kubelet.hostNetwork -}}
+        {{- .Values.kubelet.hostNetwork -}}
+    {{- end -}}
+{{- else if include "newrelic.common.hostNetwork" . -}}
+    {{- include "newrelic.common.hostNetwork" . -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/* Abstraction of "nriKubernetes.kubelet.hostNetwork" that returns true of false directly */}}
+{{- define "nriKubernetes.kubelet.hostNetwork.value" -}}
+{{- if include "nriKubernetes.kubelet.hostNetwork" . -}}
+    true
+{{- else -}}
+    false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_naming.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_naming.tpl
new file mode 100644
index 000000000..71c142156
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_naming.tpl
@@ -0,0 +1,12 @@
+{{- /* Naming helpers*/ -}}
+{{- define "nriKubernetes.kubelet.fullname" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "nriKubernetes.naming.fullname" .) "suffix" "kubelet") -}}
+{{- end -}}
+
+{{- define "nriKubernetes.kubelet.fullname.agent" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "nriKubernetes.naming.fullname" .) "suffix" "agent-kubelet") -}}
+{{- end -}}
+
+{{- define "nriKubernetes.kubelet.fullname.integrations" -}}
+{{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "nriKubernetes.naming.fullname" .) "suffix" "integrations-cfg") -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_security_context_helper.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_security_context_helper.tpl
new file mode 100644
index 000000000..4e334466c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_security_context_helper.tpl
@@ -0,0 +1,32 @@
+{{- /*This defines the defaults that the privileged mode has for the agent's securityContext */ -}}
+{{- define "nriKubernetes.kubelet.securityContext.privileged" -}}
+runAsUser: 0
+runAsGroup: 0
+allowPrivilegeEscalation: true
+privileged: true
+readOnlyRootFilesystem: true
+{{- end -}}
+
+
+
+{{- /* This is the container security context for the agent */ -}}
+{{- define "nriKubernetes.kubelet.securityContext.agentContainer" -}}
+{{- $defaults := dict -}}
+{{- if include "newrelic.common.privileged" . -}}
+{{- $defaults = fromYaml ( include "nriKubernetes.kubelet.securityContext.privileged" . ) -}}
+{{- else -}}
+{{- $defaults = fromYaml ( include "nriKubernetes.securityContext.containerDefaults" . ) -}}
+{{- end -}}
+
+{{- $compatibilityLayer := include "newrelic.compatibility.securityContext" . | fromYaml -}}
+{{- $commonLibrary := include "newrelic.common.securityContext.container" . | fromYaml -}}
+
+{{- $finalSecurityContext := dict -}}
+{{- if $commonLibrary -}}
+    {{- $finalSecurityContext = mustMergeOverwrite $commonLibrary $compatibilityLayer -}}
+{{- else -}}
+    {{- $finalSecurityContext = mustMergeOverwrite $defaults $compatibilityLayer -}}
+{{- end -}}
+
+{{- toYaml $finalSecurityContext -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_tolerations_helper.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_tolerations_helper.tpl
new file mode 100644
index 000000000..e46d83d69
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/_tolerations_helper.tpl
@@ -0,0 +1,11 @@
+{{- /*
+As this chart deploys what it should be three charts to maintain the transition to v3 as smooth as possible.
+This means that this chart has 3 tolerations so a helper should be done per scraper.
+*/ -}}
+{{- define "nriKubernetes.kubelet.tolerations" -}}
+{{- if .Values.kubelet.tolerations -}}
+    {{- toYaml .Values.kubelet.tolerations -}}
+{{- else if include "newrelic.common.tolerations" . -}}
+    {{- include "newrelic.common.tolerations" . -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/agent-configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/agent-configmap.yaml
new file mode 100644
index 000000000..0f71f129a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/agent-configmap.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.kubelet.enabled -}}
+{{- if .Values.customAttributes | kindIs "string" }}
+{{- fail ( include "newrelic.compatibility.message.customAttributes" . ) -}}
+{{- else -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "nriKubernetes.kubelet.fullname.agent" . }}
+data:
+  newrelic-infra.yml: |-
+    # This is the configuration file for the infrastructure agent. See:
+    # https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+    {{- include "nriKubernetes.kubelet.agentConfig" . | nindent 4 }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/daemonset.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/daemonset.yaml
new file mode 100644
index 000000000..517079be7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/daemonset.yaml
@@ -0,0 +1,265 @@
+{{- if (.Values.kubelet.enabled) }}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "nriKubernetes.labels" . | nindent 4 }}
+  name: {{ include "nriKubernetes.kubelet.fullname" . }}
+  {{- $legacyAnnotation:= fromYaml (include "newrelic.compatibility.annotations" .) -}}
+  {{- with  include "newrelic.compatibility.valueWithFallback" (dict "legacy" $legacyAnnotation "supported" .Values.kubelet.annotations )}}
+  annotations: {{ . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- with .Values.updateStrategy }}
+  updateStrategy: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: kubelet
+  template:
+    metadata:
+      annotations:
+        checksum/nri-kubernetes: {{ include (print $.Template.BasePath "/kubelet/scraper-configmap.yaml") . | sha256sum }}
+        checksum/agent-config: {{ include (print $.Template.BasePath "/kubelet/agent-configmap.yaml") . | sha256sum }}
+        {{- if include "newrelic.common.license.secret" . }}{{- /* If the is secret to template */}}
+        checksum/license-secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        {{- end }}
+        checksum/integrations_config: {{ include (print $.Template.BasePath "/kubelet/integrations-configmap.yaml") . | sha256sum }}
+        {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      labels:
+        {{- include "nriKubernetes.labels.podLabels" . | nindent 8 }}
+        app.kubernetes.io/component: kubelet
+    spec:
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.images.pullSecrets) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.dnsConfig" . }}
+      dnsConfig:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.priorityClassName" . }}
+      priorityClassName: {{ . }}
+      {{- end }}
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "newrelic.common.serviceAccount.name" . }}
+      hostNetwork: {{ include "nriKubernetes.kubelet.hostNetwork.value" . }}
+      {{- if include "nriKubernetes.kubelet.hostNetwork" . }}
+      dnsPolicy: ClusterFirstWithHostNet
+      {{- end }}
+
+      {{- if .Values.kubelet.initContainers }}
+      initContainers: {{- tpl (.Values.kubelet.initContainers | toYaml) . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: kubelet
+          image: {{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.integration "context" .) }}
+          imagePullPolicy: {{ .Values.images.integration.pullPolicy }}
+          {{- with include "nriKubernetes.securityContext.container" . | fromYaml }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          env:
+            - name: "NRI_KUBERNETES_SINK_HTTP_PORT"
+              value: {{ get (fromYaml (include "nriKubernetes.kubelet.agentConfig" .)) "http_server_port" | quote }}
+            - name: "NRI_KUBERNETES_CLUSTERNAME"
+              value: {{ include "newrelic.common.cluster" . }}
+            - name: "NRI_KUBERNETES_VERBOSE"
+              value: {{ include "newrelic.common.verboseLog.valueAsBoolean" . | quote }}
+
+            - name: "NRI_KUBERNETES_NODENAME"
+              valueFrom:
+                fieldRef:
+                  apiVersion: "v1"
+                  fieldPath: "spec.nodeName"
+            # Required to connect to the kubelet
+            - name: "NRI_KUBERNETES_NODEIP"
+              valueFrom:
+                fieldRef:
+                  apiVersion: "v1"
+                  fieldPath: "status.hostIP"
+
+            {{- with .Values.kubelet.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.kubelet.extraEnvFrom }}
+          envFrom: {{ toYaml . | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - name: nri-kubernetes-config
+              mountPath: /etc/newrelic-infra/nri-kubernetes.yml
+              subPath: nri-kubernetes.yml
+            {{- with .Values.kubelet.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.kubelet.resources }}
+          resources: {{ toYaml . | nindent 12 }}
+          {{- end }}
+        - name: agent
+          image: {{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.agent "context" .) }}
+          args: [ "newrelic-infra" ]
+          imagePullPolicy: {{ .Values.images.agent.pullPolicy }}
+          {{- with include "nriKubernetes.kubelet.securityContext.agentContainer" . | fromYaml }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          ports:
+            - containerPort: {{ get (fromYaml (include "nriKubernetes.kubelet.agentConfig" .)) "http_server_port" }}
+          env:
+            - name: NRIA_LICENSE_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "newrelic.common.license.secretName" . }}
+                  key: {{ include "newrelic.common.license.secretKeyName" . }}
+
+            - name: "NRIA_OVERRIDE_HOSTNAME_SHORT"
+              valueFrom:
+                fieldRef:
+                  apiVersion: "v1"
+                  fieldPath: "spec.nodeName"
+
+            - name: "NRIA_OVERRIDE_HOSTNAME"
+              valueFrom:
+                fieldRef:
+                  apiVersion: "v1"
+                  fieldPath: "spec.nodeName"
+
+            {{- if not (include "newrelic.common.privileged" .) }}
+            # Override NRIA_OVERRIDE_HOST_ROOT to empty if unprivileged. This must be done as an env var as the
+            # `k8s-events-forwarder` and `infrastructure-bundle` images ship this very same env var set to /host.
+            - name: "NRIA_OVERRIDE_HOST_ROOT"
+              value: ""
+            {{- end }}
+
+            - name: "NRI_KUBERNETES_NODE_NAME"
+              valueFrom:
+                fieldRef:
+                  apiVersion: "v1"
+                  fieldPath: "spec.nodeName"
+
+            {{- if .Values.useNodeNameAsDisplayName }}
+            - name: "NRIA_DISPLAY_NAME"
+            {{- if .Values.prefixDisplayNameWithCluster }}
+              value: "{{ include "newrelic.common.cluster" . }}:$(NRI_KUBERNETES_NODE_NAME)"
+            {{- else }}
+              valueFrom:
+                fieldRef:
+                  apiVersion: "v1"
+                  fieldPath: "spec.nodeName"
+            {{- end }}
+            {{- end }}
+
+            {{- /* Needed to populate clustername in integration metrics */}}
+            - name: "CLUSTER_NAME"
+              value: {{ include "newrelic.common.cluster" . }}
+            - name: "NRIA_PASSTHROUGH_ENVIRONMENT"
+              value: "CLUSTER_NAME"
+
+            {{- /* Needed for autodiscovery since hostNetwork=false */}}
+            - name: "NRIA_HOST"
+              valueFrom:
+                fieldRef:
+                  apiVersion: "v1"
+                  fieldPath: "status.hostIP"
+
+            {{- with .Values.kubelet.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.kubelet.extraEnvFrom }}
+          envFrom: {{ toYaml . | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - name: config
+              mountPath: /etc/newrelic-infra.yml
+              subPath: newrelic-infra.yml
+            - name: nri-integrations-cfg-volume
+              mountPath: /etc/newrelic-infra/integrations.d/
+            {{- if include "newrelic.common.privileged" . }}
+            - name: dev
+              mountPath: /dev
+            - name: host-containerd-socket
+              mountPath: /run/containerd/containerd.sock
+            - name: host-docker-socket
+              mountPath: /var/run/docker.sock
+            - name: log
+              mountPath: /var/log
+            - name: host-volume
+              mountPath: /host
+              mountPropagation: HostToContainer
+              readOnly: true
+            {{- end }}
+            - mountPath: /var/db/newrelic-infra/data
+              name: agent-tmpfs-data
+            - mountPath: /var/db/newrelic-infra/user_data
+              name: agent-tmpfs-user-data
+            - mountPath: /tmp
+              name: agent-tmpfs-tmp
+            {{- with .Values.kubelet.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.kubelet.resources }}
+          resources: {{ toYaml . | nindent 12 }}
+          {{- end }}
+      volumes:
+        {{- if include "newrelic.common.privileged" . }}
+        - name: dev
+          hostPath:
+            path: /dev
+        - name: host-containerd-socket
+          hostPath:
+            path: /run/containerd/containerd.sock
+        - name: host-docker-socket
+          hostPath:
+            path: /var/run/docker.sock
+        - name: log
+          hostPath:
+            path: /var/log
+        - name: host-volume
+          hostPath:
+            path: /
+        {{- end }}
+        - name: agent-tmpfs-data
+          emptyDir: {}
+        - name: agent-tmpfs-user-data
+          emptyDir: {}
+        - name: agent-tmpfs-tmp
+          emptyDir: {}
+        - name: nri-kubernetes-config
+          configMap:
+            name: {{ include "nriKubernetes.kubelet.fullname" . }}
+            items:
+              - key: nri-kubernetes.yml
+                path: nri-kubernetes.yml
+        - name: config
+          configMap:
+            name: {{ include "nriKubernetes.kubelet.fullname.agent" . }}
+            items:
+              - key: newrelic-infra.yml
+                path: newrelic-infra.yml
+        - name: nri-integrations-cfg-volume
+          configMap:
+            name: {{ include "nriKubernetes.kubelet.fullname.integrations" . }}
+        {{- with .Values.kubelet.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- with include "nriKubernetes.kubelet.affinity" . }}
+      affinity:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "nriKubernetes.kubelet.tolerations" . }}
+      tolerations:
+        {{- . | nindent 8 }}
+      {{- end }}
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{- with .Values.kubelet.nodeSelector | default (fromYaml (include "newrelic.common.nodeSelector" .)) }}
+        {{- toYaml . | nindent 8 }}
+        {{- end -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/integrations-configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/integrations-configmap.yaml
new file mode 100644
index 000000000..abf381f38
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/integrations-configmap.yaml
@@ -0,0 +1,72 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "nriKubernetes.kubelet.fullname.integrations" . }}
+data:
+  # This ConfigMap holds config files for integrations. They should have the following format:
+  #redis-config.yml: |
+  #  # Run auto discovery to find pods with label "app=redis"
+  #  discovery:
+  #    command:
+  #      # Run discovery for Kubernetes. Use the following optional arguments:
+  #      # --namespaces: Comma separated list of namespaces to discover pods on
+  #      # --tls: Use secure (TLS) connection
+  #      # --port: Port used to connect to the kubelet. Default is 10255
+  #      exec: /var/db/newrelic-infra/nri-discovery-kubernetes --port PORT --tls
+  #      match:
+  #        label.app: redis
+  #  integrations:
+  #    - name: nri-redis
+  #      env:
+  #        # using the discovered IP as the hostname address
+  #        HOSTNAME: ${discovery.ip}
+  #        PORT: 6379
+  #        KEYS: '{"0":["<KEY_1>"],"1":["<KEY_2>"]}'
+  #        REMOTE_MONITORING: true
+  #      labels:
+  #        env: production
+  {{- if .Values.integrations -}}
+  {{- range $k, $v := .Values.integrations -}}
+  {{- $k | trimSuffix ".yaml" | trimSuffix ".yml" | nindent 2 -}}.yaml: |-
+  {{- $v | toYaml | nindent 4 -}}
+  {{- end }}
+  {{- end }}
+
+  {{- /* This template will add and template the integrations in the old .Values.integrations_config */}}
+  {{- include "newrelic.compatibility.integrations" . | nindent 2 }}
+
+  {{- /* This template will add Pixie Health check to the integrations */}}
+  {{- if .Values.selfMonitoring.pixie.enabled }}
+  pixie-health-check.yaml: |
+    ---
+    # This Flex config performs periodic checks of the Pixie
+    # /healthz and /statusz endpoints exposed by the Pixie Cloud Connector.
+    # A status for each endpoint is sent to New Relic in a pixieHealthCheck event.
+    #
+    # If Pixie is not installed in the cluster, no events will be generated.
+    # This can also be disabled with enablePixieHealthCheck: false in the values.yaml file.
+    discovery:
+      command:
+        exec: /var/db/newrelic-infra/nri-discovery-kubernetes --tls --port 10250
+        match:
+          label.name: vizier-cloud-connector
+    integrations:
+      - name: nri-flex
+        interval: 60s
+        config:
+          name: pixie-health-check
+          apis:
+            - event_type: pixieHealth
+              commands:
+                - run: curl --insecure -s https://${discovery.ip}:50800/healthz | xargs | awk '{print "cloud_connector_health:"$1}'
+                  split_by: ":"
+              merge: pixieHealthCheck
+            - event_type: pixieStatus
+              commands:
+                - run: curl --insecure -s https://${discovery.ip}:50800/statusz | awk '{if($1 == ""){ print "cloud_connector_status:OK" } else { print "cloud_connector_status:"$1 }}'
+                  split_by: ":"
+              merge: pixieHealthCheck
+  {{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/scraper-configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/scraper-configmap.yaml
new file mode 100644
index 000000000..e43b5227f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/kubelet/scraper-configmap.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.kubelet.enabled -}}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "nriKubernetes.kubelet.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+data:
+  nri-kubernetes.yml: |
+    {{- (merge .Values.common.config (include "newrelic.integrationConfigDefaults" . | fromYaml)) | toYaml | nindent 4 }}
+    kubelet:
+      enabled: true
+      {{- if .Values.kubelet.config }}
+      {{- toYaml .Values.kubelet.config | nindent 6 }}
+      {{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/podsecuritypolicy.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/podsecuritypolicy.yaml
new file mode 100644
index 000000000..5b5058511
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/podsecuritypolicy.yaml
@@ -0,0 +1,26 @@
+{{- if .Values.rbac.pspEnabled }}
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: privileged-{{ include "newrelic.common.naming.fullname" . }}
+spec:
+  allowedCapabilities:
+  - '*'
+  fsGroup:
+    rule: RunAsAny
+  privileged: true
+  runAsUser:
+    rule: RunAsAny
+  seLinux:
+    rule: RunAsAny
+  supplementalGroups:
+    rule: RunAsAny
+  volumes:
+  - '*'
+  hostPID: true
+  hostIPC: true
+  hostNetwork: true
+  hostPorts:
+  - min: 1
+    max: 65536
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/secret.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/secret.yaml
new file mode 100644
index 000000000..f558ee86c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/secret.yaml
@@ -0,0 +1,2 @@
+{{- /* Common library will take care of creating the secret or not. */}}
+{{- include "newrelic.common.license.secret" . }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/serviceaccount.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/serviceaccount.yaml
new file mode 100644
index 000000000..f987cc512
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/templates/serviceaccount.yaml
@@ -0,0 +1,13 @@
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- with (include "newrelic.common.serviceAccount.annotations" .) }}
+  annotations:
+    {{- . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/values.yaml
new file mode 100644
index 000000000..0760d2290
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-infrastructure/values.yaml
@@ -0,0 +1,610 @@
+# -- Override the name of the chart
+nameOverride: ""
+# -- Override the full name of the release
+fullnameOverride: ""
+
+# -- Name of the Kubernetes cluster monitored. Can be configured also with `global.cluster`
+cluster: ""
+# -- This set this license key to use. Can be configured also with `global.licenseKey`
+licenseKey: ""
+# -- In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there. Can be configured also with `global.customSecretName`
+customSecretName: ""
+# -- In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located. Can be configured also with `global.customSecretLicenseKey`
+customSecretLicenseKey: ""
+
+# -- Images used by the chart for the integration and agents.
+# @default -- See `values.yaml`
+images:
+  # -- The secrets that are needed to pull images from a custom registry.
+  pullSecrets: []
+  # - name: regsecret
+  # -- Image for the New Relic Infrastructure Agent sidecar.
+  # @default -- See `values.yaml`
+  forwarder:
+    registry: ""
+    repository: newrelic/k8s-events-forwarder
+    tag: 1.59.2
+    pullPolicy: IfNotPresent
+  # -- Image for the New Relic Infrastructure Agent plus integrations.
+  # @default -- See `values.yaml`
+  agent:
+    registry: ""
+    repository: newrelic/infrastructure-bundle
+    tag: 3.2.63
+    pullPolicy: IfNotPresent
+  # -- Image for the New Relic Kubernetes integration.
+  # @default -- See `values.yaml`
+  integration:
+    registry: ""
+    repository: newrelic/nri-kubernetes
+    tag:
+    pullPolicy: IfNotPresent
+
+# -- Config that applies to all instances of the solution: kubelet, ksm, control plane and sidecars.
+# @default -- See `values.yaml`
+common:
+  # Configuration entries that apply to all instances of the integration: kubelet, ksm and control plane.
+  config:
+    # common.config.interval -- (duration) Intervals larger than 40s are not supported and will cause the NR UI to not
+    # behave properly. Any non-nil value will override the `lowDataMode` default.
+    # @default -- `15s` (See [Low data mode](README.md#low-data-mode))
+    interval:
+    # -- Config for filtering ksm and kubelet metrics by namespace.
+    namespaceSelector: {}
+    # If you want to include only namespaces with a given label you could do so by adding:
+    # matchLabels:
+    #   newrelic.com/scrape: true
+    # Otherwise you can build more complex filters and include or exclude certain namespaces by adding one or multiple
+    # expressions that are added, for instance:
+    # matchExpressions:
+    #   - {key: newrelic.com/scrape, operator: NotIn, values: ["false"]}
+
+  # -- Config for the Infrastructure agent.
+  # Will be used by the forwarder sidecars and the agent running integrations.
+  # See: https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+  agentConfig: {}
+
+# lowDataMode -- (bool) Send less data by incrementing the interval from `15s` (the default when `lowDataMode` is `false` or `nil`) to `30s`.
+# Non-nil values of `common.config.interval` will override this value.
+# @default -- `false` (See [Low data mode](README.md#low-data-mode))
+lowDataMode:
+
+# sink - Configuration for the scraper sink.
+sink:
+  http:
+    # -- The amount of time the scraper container to probe infra agent sidecar container before giving up and restarting during pod starts.
+    probeTimeout: 90s
+    # -- The amount of time the scraper container to backoff when it fails to probe infra agent sidecar.
+    probeBackoff: 5s
+
+# kubelet -- Configuration for the DaemonSet that collects metrics from the Kubelet.
+# @default -- See `values.yaml`
+kubelet:
+  # -- Enable kubelet monitoring.
+  # Advanced users only. Setting this to `false` is not supported and will break the New Relic experience.
+  enabled: true
+  annotations: {}
+  # -- Tolerations for the control plane DaemonSet.
+  # @default -- Schedules in all tainted nodes
+  tolerations:
+    - operator: "Exists"
+      effect: "NoSchedule"
+    - operator: "Exists"
+      effect: "NoExecute"
+  nodeSelector: {}
+  # -- (bool) Sets pod's hostNetwork. When set bypasses global/common variable
+  # @default -- Not set
+  hostNetwork:
+  affinity: {}
+  # -- Config for the Infrastructure agent that will forward the metrics to the backend and will run the integrations in this cluster.
+  # It will be merged with the configuration in `.common.agentConfig`. You can see all the agent configurations in
+  # [New Relic docs](https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/)
+  # e.g. you can set `passthrough_environment` int the [config file](https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/configure-infrastructure-agent/#config-file)
+  # so the agent let use that environment variables to the integrations.
+  agentConfig: {}
+  # passthrough_environment:
+  #   - A_ENVIRONMENT_VARIABLE_SET_IN_extraEnv
+  #   - A_ENVIRONMENT_VARIABLE_SET_IN_A_CONFIG_MAP_SET_IN_entraEnvForm
+
+  # -- Add user environment variables to the agent
+  extraEnv: []
+  # -- Add user environment from configMaps or secrets as variables to the agent
+  extraEnvFrom: []
+  # -- Volumes to mount in the containers
+  extraVolumes: []
+  # -- Defines where to mount volumes specified with `extraVolumes`
+  extraVolumeMounts: []
+  initContainers: []
+  resources:
+    limits:
+      memory: 300M
+    requests:
+      cpu: 100m
+      memory: 150M
+  config:
+    # -- Timeout for the kubelet APIs contacted by the integration
+    timeout: 10s
+    # -- Number of retries after timeout expired
+    retries: 3
+    # -- Max number of scraper rerun when scraper runtime error happens
+    scraperMaxReruns: 4
+  # port:
+  # scheme:
+
+# ksm -- Configuration for the Deployment that collects state metrics from KSM (kube-state-metrics).
+# @default -- See `values.yaml`
+ksm:
+  # -- Enable cluster state monitoring.
+  # Advanced users only. Setting this to `false` is not supported and will break the New Relic experience.
+  enabled: true
+  annotations: {}
+  # -- Tolerations for the KSM Deployment.
+  # @default -- Schedules in all tainted nodes
+  tolerations:
+    - operator: "Exists"
+      effect: "NoSchedule"
+    - operator: "Exists"
+      effect: "NoExecute"
+  nodeSelector: {}
+  # -- (bool) Sets pod's hostNetwork. When set bypasses global/common variable
+  # @default -- Not set
+  hostNetwork:
+  # -- Affinity for the KSM Deployment.
+  # @default -- Deployed in the same node as KSM
+  affinity:
+    podAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - podAffinityTerm:
+            topologyKey: kubernetes.io/hostname
+            labelSelector:
+              matchLabels:
+                app.kubernetes.io/name: kube-state-metrics
+          weight: 100
+  # -- Config for the Infrastructure agent that will forward the metrics to the backend. It will be merged with the configuration in `.common.agentConfig`
+  # See: https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+  agentConfig: {}
+  extraEnv: []
+  extraEnvFrom: []
+  extraVolumes: []
+  extraVolumeMounts: []
+  initContainers: []
+  # -- Resources for the KSM scraper pod.
+  # Keep in mind that sharding is not supported at the moment, so memory usage for this component ramps up quickly on
+  # large clusters.
+  # @default -- 100m/150M -/850M
+  ksm:
+    resources:
+      limits:
+        memory: 850M  # Bump me up if KSM pod shows restarts.
+      requests:
+        cpu: 100m
+        memory: 150M
+  # -- Resources for the Frowarder pod.
+  # large clusters.
+  # @default -- 100m/150M -/850M
+  forwarder:
+    resources:
+      limits:
+        memory: 850M  # Bump me up if KSM pod shows restarts.
+      requests:
+        cpu: 100m
+        memory: 150M
+  config:
+    # -- Timeout for the ksm API contacted by the integration
+    timeout: 10s
+    # -- Number of retries after timeout expired
+    retries: 3
+    # -- if specified autodiscovery is not performed and the specified URL is used
+    # staticUrl: "http://test.io:8080/metrics"
+    # -- Label selector that will be used to automatically discover an instance of kube-state-metrics running in the cluster.
+    selector: "app.kubernetes.io/name=kube-state-metrics"
+    # -- Scheme to use to connect to kube-state-metrics. Supported values are `http` and `https`.
+    scheme: "http"
+    # -- Restrict autodiscovery of the kube-state-metrics endpoint to those using a specific port. If empty or `0`, all endpoints are considered regardless of their port (recommended).
+    # port: 8080
+    # -- Restrict autodiscovery of the kube-state-metrics service to a particular namespace.
+    # @default -- All namespaces are searched (recommended).
+    # namespace: "ksm-namespace"
+
+# controlPlane -- Configuration for the control plane scraper.
+# @default -- See `values.yaml`
+controlPlane:
+  # -- Deploy control plane monitoring component.
+  enabled: true
+  annotations: {}
+  # -- Tolerations for the control plane DaemonSet.
+  # @default -- Schedules in all tainted nodes
+  tolerations:
+    - operator: "Exists"
+      effect: "NoSchedule"
+    - operator: "Exists"
+      effect: "NoExecute"
+  nodeSelector: {}
+  # -- Affinity for the control plane DaemonSet.
+  # @default -- Deployed only in control plane nodes.
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: node-role.kubernetes.io/control-plane
+                operator: Exists
+          - matchExpressions:
+              - key: node-role.kubernetes.io/controlplane
+                operator: Exists
+          - matchExpressions:
+              - key: node-role.kubernetes.io/etcd
+                operator: Exists
+  # -- How to deploy the control plane scraper. If autodiscovery is in use, it should be `DaemonSet`.
+  # Advanced users using static endpoints set this to `Deployment` to avoid reporting metrics twice.
+  kind: DaemonSet
+  # -- Run Control Plane scraper with `hostNetwork`.
+  # `hostNetwork` is required for most control plane configurations, as they only accept connections from localhost.
+  hostNetwork: true
+  # -- Config for the Infrastructure agent that will forward the metrics to the backend. It will be merged with the configuration in `.common.agentConfig`
+  # See: https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+  agentConfig: {}
+  extraEnv: []
+  extraEnvFrom: []
+  extraVolumes: []
+  extraVolumeMounts: []
+  initContainers: []
+  resources:
+    limits:
+      memory: 300M
+    requests:
+      cpu: 100m
+      memory: 150M
+  config:
+    # -- Timeout for the Kubernetes APIs contacted by the integration
+    timeout: 10s
+    # -- Number of retries after timeout expired
+    retries: 3
+    # -- etcd monitoring configuration
+    # @default -- Common settings for most K8s distributions.
+    etcd:
+      # -- Enable etcd monitoring. Might require manual configuration in some environments.
+      enabled: true
+      # Discover etcd pods using the following namespaces and selectors.
+      # If a pod matches the selectors, the scraper will attempt to reach it through the `endpoints` defined below.
+      autodiscover:
+        - selector: "tier=control-plane,component=etcd"
+          namespace: kube-system
+          # Set to true to consider only pods sharing the node with the scraper pod.
+          # This should be set to `true` if Kind is Daemonset, `false` otherwise.
+          matchNode: true
+          # Try to reach etcd using the following endpoints.
+          endpoints:
+            - url: https://localhost:4001
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+            - url: http://localhost:2381
+        - selector: "k8s-app=etcd-manager-main"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:4001
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+        - selector: "k8s-app=etcd"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:4001
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+      # Openshift users might want to remove previous autodiscover entries and add this one instead.
+      # Manual steps are required to create a secret containing the required TLS certificates to connect to etcd.
+      # - selector: "app=etcd,etcd=true,k8s-app=etcd"
+      #   namespace: openshift-etcd
+      #   matchNode: true
+      #   endpoints:
+      #     - url: https://localhost:9979
+      #       insecureSkipVerify: true
+      #       auth:
+      #         type: mTLS
+      #         mtls:
+      #           secretName: secret-name
+      #           secretNamespace: secret-namespace
+
+      # -- staticEndpoint configuration.
+      # It is possible to specify static endpoint to scrape. If specified 'autodiscover' section is ignored.
+      # If set the static endpoint should be reachable, otherwise an error will be returned and the integration stops.
+      # Notice that if deployed as a daemonSet and not as a Deployment setting static URLs could lead to duplicate data
+      # staticEndpoint:
+      #   url: https://url:port
+      #   insecureSkipVerify: true
+      #   auth: {}
+
+    # -- Scheduler monitoring configuration
+    # @default -- Common settings for most K8s distributions.
+    scheduler:
+      # -- Enable scheduler monitoring.
+      enabled: true
+      autodiscover:
+        - selector: "tier=control-plane,component=kube-scheduler"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:10259
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+        - selector: "k8s-app=kube-scheduler"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:10259
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+        - selector: "app=openshift-kube-scheduler,scheduler=true"
+          namespace: openshift-kube-scheduler
+          matchNode: true
+          endpoints:
+            - url: https://localhost:10259
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+        - selector: "app=openshift-kube-scheduler,scheduler=true"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:10259
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+      # -- staticEndpoint configuration.
+      # It is possible to specify static endpoint to scrape. If specified 'autodiscover' section is ignored.
+      # If set the static endpoint should be reachable, otherwise an error will be returned and the integration stops.
+      # Notice that if deployed as a daemonSet and not as a Deployment setting static URLs could lead to duplicate data
+      # staticEndpoint:
+      #   url: https://url:port
+      #   insecureSkipVerify: true
+      #   auth: {}
+
+    # -- Controller manager monitoring configuration
+    # @default -- Common settings for most K8s distributions.
+    controllerManager:
+      # -- Enable controller manager monitoring.
+      enabled: true
+      autodiscover:
+        - selector: "tier=control-plane,component=kube-controller-manager"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:10257
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+        - selector: "k8s-app=kube-controller-manager"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:10257
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+        - selector: "app=kube-controller-manager,kube-controller-manager=true"
+          namespace: openshift-kube-controller-manager
+          matchNode: true
+          endpoints:
+            - url: https://localhost:10257
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+        - selector: "app=kube-controller-manager,kube-controller-manager=true"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:10257
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+        - selector: "app=controller-manager,controller-manager=true"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:10257
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+             #  mtls:
+             #    secretName: secret-name
+             #    secretNamespace: secret-namespace
+      # -- staticEndpoint configuration.
+      # It is possible to specify static endpoint to scrape. If specified 'autodiscover' section is ignored.
+      # If set the static endpoint should be reachable, otherwise an error will be returned and the integration stops.
+      # Notice that if deployed as a daemonSet and not as a Deployment setting static URLs could lead to duplicate data
+      # staticEndpoint:
+      #   url: https://url:port
+      #   insecureSkipVerify: true
+      #   auth: {}
+
+    # -- API Server monitoring configuration
+    # @default -- Common settings for most K8s distributions.
+    apiServer:
+      # -- Enable API Server monitoring
+      enabled: true
+      autodiscover:
+        - selector: "tier=control-plane,component=kube-apiserver"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:8443
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+            # Endpoint distributions target: Kind(v1.22.1)
+            - url: https://localhost:6443
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+            - url: http://localhost:8080
+        - selector: "k8s-app=kube-apiserver"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:8443
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+            - url: http://localhost:8080
+        - selector: "app=openshift-kube-apiserver,apiserver=true"
+          namespace: openshift-kube-apiserver
+          matchNode: true
+          endpoints:
+            - url: https://localhost:8443
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+            - url: https://localhost:6443
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+        - selector: "app=openshift-kube-apiserver,apiserver=true"
+          namespace: kube-system
+          matchNode: true
+          endpoints:
+            - url: https://localhost:8443
+              insecureSkipVerify: true
+              auth:
+                type: bearer
+      # -- staticEndpoint configuration.
+      # It is possible to specify static endpoint to scrape. If specified 'autodiscover' section is ignored.
+      # If set the static endpoint should be reachable, otherwise an error will be returned and the integration stops.
+      # Notice that if deployed as a daemonSet and not as a Deployment setting static URLs could lead to duplicate data
+      # staticEndpoint:
+      #   url: https://url:port
+      #   insecureSkipVerify: true
+      #   auth: {}
+
+# -- Update strategy for the deployed DaemonSets.
+# @default -- See `values.yaml`
+updateStrategy:
+  type: RollingUpdate
+  rollingUpdate:
+    maxUnavailable: 1
+
+# -- Update strategy for the deployed Deployments.
+# @default -- `type: Recreate`
+strategy:
+  type: Recreate
+
+# -- Adds extra attributes to the cluster and all the metrics emitted to the backend. Can be configured also with `global.customAttributes`
+customAttributes: {}
+
+# -- Settings controlling ServiceAccount creation.
+# @default -- See `values.yaml`
+serviceAccount:
+  # -- (bool) Whether the chart should automatically create the ServiceAccount objects required to run.
+  # @default -- `true`
+  create:
+  annotations: {}
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+# -- Additional labels for chart objects. Can be configured also with `global.labels`
+labels: {}
+# -- Annotations to be added to all pods created by the integration.
+podAnnotations: {}
+# -- Additional labels for chart pods. Can be configured also with `global.podLabels`
+podLabels: {}
+
+# -- Run the integration with full access to the host filesystem and network.
+# Running in this mode allows reporting fine-grained cpu, memory, process and network metrics for your nodes.
+privileged: true
+# -- Sets pod's priorityClassName. Can be configured also with `global.priorityClassName`
+priorityClassName: ""
+# -- (bool) Sets pod's hostNetwork. Can be configured also with `global.hostNetwork`
+# @default -- `false`
+hostNetwork:
+# -- Sets security context (at pod level). Can be configured also with `global.podSecurityContext`
+podSecurityContext: {}
+# -- Sets security context (at container level). Can be configured also with `global.containerSecurityContext`
+containerSecurityContext: {}
+
+# -- Sets pod's dnsConfig. Can be configured also with `global.dnsConfig`
+dnsConfig: {}
+
+# Settings controlling RBAC objects creation.
+rbac:
+  # rbac.create -- Whether the chart should automatically create the RBAC objects required to run.
+  create: true
+  # rbac.pspEnabled -- Whether the chart should create Pod Security Policy objects.
+  pspEnabled: false
+
+# -- Sets pod/node affinities set almost globally. (See [Affinities and tolerations](README.md#affinities-and-tolerations))
+affinity: {}
+# -- Sets pod's node selector almost globally. (See [Affinities and tolerations](README.md#affinities-and-tolerations))
+nodeSelector: {}
+# -- Sets pod's tolerations to node taints almost globally. (See [Affinities and tolerations](README.md#affinities-and-tolerations))
+tolerations: []
+
+# -- Config files for other New Relic integrations that should run in this cluster.
+integrations: {}
+# If you wish to monitor services running on Kubernetes you can provide integrations
+# configuration under `integrations`. You just need to create a new entry where
+# the key is the filename of the configuration file and the value is the content of
+# the integration configuration.
+# The data is the actual integration configuration as described in the spec here:
+# https://docs.newrelic.com/docs/integrations/integrations-sdk/file-specifications/integration-configuration-file-specifications-agent-v180
+# For example, if you wanted to monitor a Redis instance that has a label "app=sampleapp"
+# you could do so by adding following entry:
+#  nri-redis-sampleapp:
+#    discovery:
+#      command:
+#        # Run NRI Discovery for Kubernetes
+#        # https://github.com/newrelic/nri-discovery-kubernetes
+#        exec: /var/db/newrelic-infra/nri-discovery-kubernetes
+#        match:
+#          label.app: sampleapp
+#    integrations:
+#      - name: nri-redis
+#        env:
+#          # using the discovered IP as the hostname address
+#          HOSTNAME: ${discovery.ip}
+#          PORT: 6379
+#        labels:
+#          env: test
+
+# -- (bool) Collect detailed metrics from processes running in the host.
+# This defaults to true for accounts created before July 20, 2020.
+# ref: https://docs.newrelic.com/docs/release-notes/infrastructure-release-notes/infrastructure-agent-release-notes/new-relic-infrastructure-agent-1120
+# @default -- `false`
+enableProcessMetrics:
+
+# Prefix nodes display name with cluster to reduce chances of collisions
+# prefixDisplayNameWithCluster: false
+
+# 'true' will use the node name as the name for the "host",
+#  note that it may cause data collision if the node name is the same in different clusters
+#  and prefixDisplayNameWithCluster is not set to true.
+# 'false' will use the host name as the name for the "host".
+# useNodeNameAsDisplayName: true
+
+selfMonitoring:
+  pixie:
+    # selfMonitoring.pixie.enabled -- Enables the Pixie Health Check nri-flex config.
+    # This Flex config performs periodic checks of the Pixie /healthz and /statusz endpoints exposed by the Pixie
+    # Cloud Connector. A status for each endpoint is sent to New Relic in a pixieHealthCheck event.
+    enabled: false
+
+
+# -- Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port`. Can be configured also with `global.proxy`
+proxy: ""
+
+# -- (bool) Send the metrics to the staging backend. Requires a valid staging license key. Can be configured also with `global.nrStaging`
+# @default -- `false`
+nrStaging:
+fedramp:
+  # -- (bool) Enables FedRAMP. Can be configured also with `global.fedramp.enabled`
+  # @default -- `false`
+  enabled:
+
+# -- (bool) Sets the debug logs to this integration or all integrations if it is set globally. Can be configured also with `global.verboseLog`
+# @default -- `false`
+verboseLog:
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/.helmignore
new file mode 100644
index 000000000..1ed4e226e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/.helmignore
@@ -0,0 +1,25 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+
+templates/apiservice/job-patch/README.md
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/Chart.lock b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/Chart.lock
new file mode 100644
index 000000000..a320193e0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.1
+digest: sha256:cfa7bfb136b9bcfe87e37d3556c3fedecc58f42685c4ce39485da106408b6619
+generated: "2025-01-16T00:00:40.020470804Z"
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/Chart.yaml
new file mode 100644
index 000000000..e81a6c3ba
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/Chart.yaml
@@ -0,0 +1,25 @@
+apiVersion: v2
+appVersion: 0.15.5
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.1
+description: A Helm chart to deploy the New Relic Kubernetes Metrics Adapter.
+home: https://hub.docker.com/r/newrelic/newrelic-k8s-metrics-adapter
+icon: https://newrelic.com/assets/newrelic/source/NewRelic-logo-square.svg
+keywords:
+- infrastructure
+- newrelic
+- monitoring
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+name: newrelic-k8s-metrics-adapter
+sources:
+- https://github.com/newrelic/newrelic-k8s-metrics-adapter
+- https://github.com/newrelic/newrelic-k8s-metrics-adapter/tree/main/charts/newrelic-k8s-metrics-adapter
+version: 1.13.5
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/README.md
new file mode 100644
index 000000000..2a8394ea7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/README.md
@@ -0,0 +1,139 @@
+[![New Relic Experimental header](https://github.com/newrelic/opensource-website/raw/master/src/images/categories/Experimental.png)](https://opensource.newrelic.com/oss-category/#new-relic-experimental)
+
+# newrelic-k8s-metrics-adapter
+
+A Helm chart to deploy the New Relic Kubernetes Metrics Adapter.
+
+**Homepage:** <https://hub.docker.com/r/newrelic/newrelic-k8s-metrics-adapter>
+
+## Source Code
+
+* <https://github.com/newrelic/newrelic-k8s-metrics-adapter>
+* <https://github.com/newrelic/newrelic-k8s-metrics-adapter/tree/main/charts/newrelic-k8s-metrics-adapter>
+
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://helm-charts.newrelic.com | common-library | 1.3.1 |
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` | Node affinity to use for scheduling. |
+| apiServicePatchJob.image | object | See `values.yaml`. | Registry, repository, tag, and pull policy for the job container image. |
+| apiServicePatchJob.volumeMounts | list | `[]` | Additional Volume mounts for Cert Job, you might want to mount tmp if Pod Security Policies. |
+| apiServicePatchJob.volumes | list | `[]` | Additional Volumes for Cert Job. |
+| certManager.enabled | bool | `false` | Use cert manager for APIService certs, rather than the built-in patch job. |
+| config.accountID | string | `nil` | New Relic [Account ID](https://docs.newrelic.com/docs/accounts/accounts-billing/account-structure/account-id/) where the configured metrics are sourced from. (**Required**) |
+| config.cacheTTLSeconds | int | `30` | Period of time in seconds in which a cached value of a metric is consider valid. |
+| config.externalMetrics | string | See `values.yaml` | Contains all the external metrics definition of the adapter. Each key of the externalMetric entry represents the metric name and contains the parameters that defines it. |
+| config.nrdbClientTimeoutSeconds | int | 30 | Defines the NRDB client timeout. The maximum allowed value is 120. |
+| config.region | string | Automatically detected from `licenseKey`. | New Relic account region. If not set, it will be automatically derived from the License Key. |
+| containerSecurityContext | string | `nil` | Configure containerSecurityContext |
+| extraEnv | list | `[]` | Array to add extra environment variables |
+| extraEnvFrom | list | `[]` | Array to add extra envFrom |
+| extraVolumeMounts | list | `[]` | Add extra volume mounts |
+| extraVolumes | list | `[]` | Array to add extra volumes |
+| fullnameOverride | string | `""` | To fully override common.naming.fullname |
+| image | object | See `values.yaml`. | Registry, repository, tag, and pull policy for the container image. |
+| image.pullSecrets | list | `[]` | The image pull secrets. |
+| nodeSelector | object | `{}` | Node label to use for scheduling. |
+| personalAPIKey | string | `nil` | New Relic [Personal API Key](https://docs.newrelic.com/docs/apis/intro-apis/new-relic-api-keys/#user-api-key) (stored in a secret). Used to connect to NerdGraph in order to fetch the configured metrics. (**Required**) |
+| podAnnotations | string | `nil` | Additional annotations to apply to the pod(s). |
+| podSecurityContext | string | `nil` | Configure podSecurityContext |
+| proxy | string | `nil` | Configure proxy for the metrics-adapter. |
+| rbac.pspEnabled | bool | `false` | Whether the chart should create Pod Security Policy objects. |
+| replicas | int | `1` | Number of replicas in the deployment. |
+| resources | object | See `values.yaml` | Resources you wish to assign to the pod. |
+| serviceAccount.create | string | `true` | Specifies whether a ServiceAccount should be created for the job and the deployment. false avoids creation, true or empty will create the ServiceAccount |
+| serviceAccount.name | string | Automatically generated. | If `serviceAccount.create` this will be the name of the ServiceAccount to use. If not set and create is true, a name is generated using the fullname template. If create is false, a serviceAccount with the given name must exist |
+| tolerations | list | `[]` | List of node taints to tolerate (requires Kubernetes >= 1.6) |
+| verboseLog | bool | `false` | Enable metrics adapter verbose logs. |
+
+## Example
+
+Make sure you have [added the New Relic chart repository.](../../README.md#install)
+
+Because of metrics configuration, we recommend to use an external values file to deploy the chart. An example with the required parameters looks like:
+
+```yaml
+cluster: ClusterName
+personalAPIKey: <Personal API Key>
+config:
+  accountID: <Account ID>
+  externalMetrics:
+    nginx_average_requests:
+      query: "FROM Metric SELECT average(nginx.server.net.requestsPerSecond) SINCE 2 MINUTES AGO"
+```
+
+Then, to install this chart, run the following command:
+
+```sh
+helm upgrade --install [release-name] newrelic-k8s-metrics-adapter/newrelic-k8s-metrics-adapter --values [values file path]
+```
+
+Once deployed the metric `nginx_average_requests` will be available to use by any HPA. This is and example of an HPA yaml using this metric:
+
+```yaml
+kind: HorizontalPodAutoscaler
+apiVersion: autoscaling/v2beta2
+metadata:
+  name: nginx-scaler
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: nginx
+  minReplicas: 1
+  maxReplicas: 10
+  metrics:
+    - type: External
+      external:
+        metric:
+          name: nginx_average_requests
+          selector:
+            matchLabels:
+              k8s.namespaceName: nginx
+        target:
+          type: Value
+          value: 10000
+```
+
+The NRQL query that will be run to get the `nginx_average_requests` value will be:
+
+```sql
+FROM Metric SELECT average(nginx.server.net.requestsPerSecond) WHERE clusterName='ClusterName' AND `k8s.namespaceName`='nginx' SINCE 2 MINUTES AGO
+```
+
+## External Metrics
+
+An example of multiple external metrics defined:
+
+```yaml
+externalMetrics:
+    nginx_average_requests:
+      query: "FROM Metric SELECT average(nginx.server.net.requestsPerSecond) SINCE 2 MINUTES AGO"
+    container_average_cores_utilization:
+      query: "FROM Metric SELECT average(`k8s.container.cpuCoresUtilization`) SINCE 2 MINUTES AGO"
+```
+
+## Resources
+
+The default set of resources assigned to the newrelic-k8s-metrics-adapter pods is shown below:
+
+```yaml
+resources:
+  limits:
+    memory: 80M
+  requests:
+    cpu: 100m
+    memory: 30M
+```
+
+## Maintainers
+
+* [juanjjaramillo](https://github.com/juanjjaramillo)
+* [csongnr](https://github.com/csongnr)
+* [dbudziwojskiNR](https://github.com/dbudziwojskiNR)
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/README.md.gotmpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/README.md.gotmpl
new file mode 100644
index 000000000..1de8c9553
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/README.md.gotmpl
@@ -0,0 +1,107 @@
+[![New Relic Experimental header](https://github.com/newrelic/opensource-website/raw/master/src/images/categories/Experimental.png)](https://opensource.newrelic.com/oss-category/#new-relic-experimental)
+
+{{ template "chart.header" . }}
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+## Example
+
+Make sure you have [added the New Relic chart repository.](../../README.md#install)
+
+Because of metrics configuration, we recommend to use an external values file to deploy the chart. An example with the required parameters looks like:
+
+```yaml
+cluster: ClusterName
+personalAPIKey: <Personal API Key>
+config:
+  accountID: <Account ID>
+  externalMetrics:
+    nginx_average_requests:
+      query: "FROM Metric SELECT average(nginx.server.net.requestsPerSecond) SINCE 2 MINUTES AGO"
+```
+
+Then, to install this chart, run the following command:
+
+```sh
+helm upgrade --install [release-name] newrelic-k8s-metrics-adapter/newrelic-k8s-metrics-adapter --values [values file path]
+```
+
+Once deployed the metric `nginx_average_requests` will be available to use by any HPA. This is and example of an HPA yaml using this metric:
+
+```yaml
+kind: HorizontalPodAutoscaler
+apiVersion: autoscaling/v2beta2
+metadata:
+  name: nginx-scaler
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: nginx
+  minReplicas: 1
+  maxReplicas: 10
+  metrics:
+    - type: External
+      external:
+        metric:
+          name: nginx_average_requests
+          selector:
+            matchLabels:
+              k8s.namespaceName: nginx
+        target:
+          type: Value
+          value: 10000
+```
+
+The NRQL query that will be run to get the `nginx_average_requests` value will be:
+
+```sql
+FROM Metric SELECT average(nginx.server.net.requestsPerSecond) WHERE clusterName='ClusterName' AND `k8s.namespaceName`='nginx' SINCE 2 MINUTES AGO
+```
+
+## External Metrics
+
+An example of multiple external metrics defined:
+
+```yaml
+externalMetrics:
+    nginx_average_requests:
+      query: "FROM Metric SELECT average(nginx.server.net.requestsPerSecond) SINCE 2 MINUTES AGO"
+    container_average_cores_utilization:
+      query: "FROM Metric SELECT average(`k8s.container.cpuCoresUtilization`) SINCE 2 MINUTES AGO"
+```
+
+## Resources
+
+The default set of resources assigned to the newrelic-k8s-metrics-adapter pods is shown below:
+
+```yaml
+resources:
+  limits:
+    memory: 80M
+  requests:
+    cpu: 100m
+    memory: 30M
+```
+
+{{ if .Maintainers }}
+## Maintainers
+{{ range .Maintainers }}
+{{- if .Name }}
+{{- if .Url }}
+* [{{ .Name }}]({{ .Url }})
+{{- else }}
+* {{ .Name }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/Chart.yaml
new file mode 100644
index 000000000..adfc765bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/Chart.yaml
@@ -0,0 +1,17 @@
+apiVersion: v2
+description: Provides helpers to provide consistency on all the charts
+keywords:
+- newrelic
+- chart-library
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+- name: kang-makes
+  url: https://github.com/kang-makes
+name: common-library
+type: library
+version: 1.3.1
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/DEVELOPERS.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/DEVELOPERS.md
new file mode 100644
index 000000000..7208c673e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/DEVELOPERS.md
@@ -0,0 +1,747 @@
+# Functions/templates documented for chart writers
+Here is some rough documentation separated by the file that contains the function, the function
+name and how to use it. We are not covering functions that start with `_` (e.g.
+`newrelic.common.license._licenseKey`) because they are used internally by this library for
+other helpers. Helm does not have the concept of "public" or "private" functions/templates so
+this is a convention of ours.
+
+## _naming.tpl
+These functions are used to name objects.
+
+### `newrelic.common.naming.name`
+This is the same as the idiomatic `CHART-NAME.name` that is created when you use `helm create`.
+
+It honors `.Values.nameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.name" . }}
+```
+
+### `newrelic.common.naming.fullname`
+This is the same as the idiomatic `CHART-NAME.fullname` that is created when you use `helm create`
+
+It honors `.Values.fullnameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.fullname" . }}
+```
+
+### `newrelic.common.naming.chart`
+This is the same as the idiomatic `CHART-NAME.chart` that is created when you use `helm create`.
+
+It is mostly useless for chart writers. It is used internally for templating the labels but there
+is no reason to keep it "private".
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.chart" . }}
+```
+
+### `newrelic.common.naming.truncateToDNS`
+This is a useful template that could be used to trim a string to 63 chars and does not end with a dash (`-`).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $truncatedName := include "newrelic.common.naming.truncateToDNS" $nameToTruncate }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-string-that-should-be */ -}}
+```
+
+### `newrelic.common.naming.truncateToDNSWithSuffix`
+This template function is the same as the above but instead of receiving a string you should give a `dict`
+with a `name` and a `suffix`. This function will join them with a dash (`-`) and trim the `name` so the
+result of `name-suffix` is no more than 63 chars
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $suffix := "A-NOT-SO-LONG-SUFFIX" }}
+{{- $truncatedName := include "truncateToDNSWithSuffix" (dict "name" $nameToTruncate "suffix" $suffix) }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-A-NOT-SO-LONG-SUFFIX */ -}}
+```
+
+
+
+## _labels.tpl
+### `newrelic.common.labels`, `newrelic.common.labels.selectorLabels` and `newrelic.common.labels.podLabels`
+These are functions that are used to label objects. They are configured by this `values.yaml`
+```yaml
+global:
+  podLabels: {}  # included in all the pods of all the charts that implement this library
+  labels: {}  # included in all the objects of all the charts that implement this library
+podLabels: {}  # included in all the pods of this chart
+labels: {}  # included in all the objects of this chart
+```
+
+label maps are merged from global to local values.
+
+And chart writer should use them like this:
+```mustache
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+```
+
+`newrelic.common.labels.podLabels` includes `newrelic.common.labels.selectorLabels` automatically.
+
+
+
+## _priority-class-name.tpl
+### `newrelic.common.priorityClassName`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  priorityClassName: ""
+priorityClassName: ""
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `priorityClassName` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.priorityClassName" . }}
+  priorityClassName: {{ . }}
+  {{- end }}
+```
+
+
+
+## _hostnetwork.tpl
+### `newrelic.common.hostNetwork`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  hostNetwork:  # Note that this is empty (nil)
+hostNetwork:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `hostNetwork` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.hostNetwork" . }}
+  hostNetwork: {{ . }}
+  {{- end }}
+```
+
+### `newrelic.common.hostNetwork.value`
+This function is an abstraction of the function above but this returns directly "true" or "false".
+
+Be careful with using this with an `if` as Helm does evaluate "false" (string) as `true`.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+```
+
+
+
+## _dnsconfig.tpl
+### `newrelic.common.dnsConfig`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  dnsConfig: {}
+dnsConfig: {}
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `dnsConfig` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.dnsConfig" . }}
+  dnsConfig:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _images.tpl
+These functions help us to deal with how images are templated. This allows setting `registries`
+where to fetch images globally while being flexible enough to fit in different maps of images
+and deployments with one or more images. This is the example of a complex `values.yaml` that
+we are going to use during the documentation of these functions:
+
+```yaml
+global:
+  images:
+    registry: nexus-3-instance.internal.clients-domain.tld
+jobImage:
+  registry: # defaults to "example.tld" when empty in these examples
+  repository: ingress-nginx/kube-webhook-certgen
+  tag: v1.1.1
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+images:
+  integration:
+    registry:
+    repository: newrelic/nri-kube-events
+    tag: 1.8.0
+    pullPolicy: IfNotPresent
+  agent:
+    registry:
+    repository: newrelic/k8s-events-forwarder
+    tag: 1.22.0
+    pullPolicy: IfNotPresent
+  pullSecrets: []
+```
+
+### `newrelic.common.images.image`
+This will return a string with the image ready to be downloaded that includes the registry, the image and the tag.
+`defaultRegistry` is used to keep `registry` field empty in `values.yaml` so you can override the image using
+`global.images.registry`, your local `jobImage.registry` and be able to fallback to a registry that is not `docker.io`
+(Or the default repository that the client could have set in the CRI).
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.image" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.registry`
+It returns the registry from the global or local values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.registry" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.repository`
+It returns the image from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.tag`
+It returns the image's tag from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.renderPullSecrets`
+If returns a merged map that contains the pull secrets from the global configuration and the local one.  
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.jobImage.pullSecrets "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+```
+
+
+
+## _serviceaccount.tpl
+These functions are used to evaluate if the service account should be created, with which name and add annotations to it.
+
+The functions that the common library has implemented for service accounts are:
+* `newrelic.common.serviceAccount.create`
+* `newrelic.common.serviceAccount.name`
+* `newrelic.common.serviceAccount.annotations`
+
+Usage:
+```mustache
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- with (include "newrelic.common.serviceAccount.annotations" .) }}
+  annotations:
+    {{- . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
+```
+
+
+
+## _affinity.tpl, _nodeselector.tpl and _tolerations.tpl
+These three files are almost the same and they follow the idiomatic way of `helm create`.
+
+Each function also looks if there is a global value like the other helpers.
+```yaml
+global:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+affinity: {}
+nodeSelector: {}
+tolerations: []
+```
+
+The values here are replaced instead of be merged. If a value at root level is found, the global one is ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.nodeSelector" . }}
+  nodeSelector:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.affinity" . }}
+  affinity:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.tolerations" . }}
+  tolerations:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _agent-config.tpl
+### `newrelic.common.agentConfig.defaults`
+This returns a YAML that the agent can use directly as a config that includes other options from the values file like verbose mode,
+custom attributes, FedRAMP and such.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include newrelic.common.naming.truncateToDNSWithSuffix (dict "name" (include "newrelic.common.naming.fullname" .) suffix "agent-config") }}
+  namespace: {{ .Release.Namespace }}
+data:
+  newrelic-infra.yml: |-
+    # This is the configuration file for the infrastructure agent. See:
+    # https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+    {{- include "newrelic.common.agentConfig.defaults" . | nindent 4 }}
+```
+
+
+
+## _cluster.tpl
+### `newrelic.common.cluster`
+Returns the cluster name
+
+Usage:
+```mustache
+{{ include "newrelic.common.cluster" . }}
+```
+
+
+
+## _custom-attributes.tpl
+### `newrelic.common.customAttributes`
+Return custom attributes in YAML format.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example
+data:
+  custom-attributes.yaml: |
+    {{- include "newrelic.common.customAttributes" . | nindent 4 }}
+  custom-attributes.json: |
+    {{- include "newrelic.common.customAttributes" . | fromYaml | toJson | nindent 4 }}
+```
+
+
+
+## _fedramp.tpl
+### `newrelic.common.fedramp.enabled`
+Returns true if FedRAMP is enabled or an empty string if not. It can be safely used in conditionals as an empty string is a Helm falsiness.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled" . }}
+```
+
+### `newrelic.common.fedramp.enabled.value`
+Returns true if FedRAMP is enabled or false if not. This is to have the value of FedRAMP ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled.value" . }}
+```
+
+
+
+## _license.tpl
+### `newrelic.common.license.secretName` and ### `newrelic.common.license.secretKeyName`
+Returns the secret and key inside the secret where to read the license key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the license key.
+
+To create the secret use `newrelic.common.license.secret`.
+
+Usage:
+```mustache
+{{- if and (.Values.controlPlane.enabled) (not (include "newrelic.fargate" .)) }}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+  containers:
+  - name: agent
+    env:
+    - name: "NRIA_LICENSE_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.license.secretName" . }}
+          key: {{ include "newrelic.common.license.secretKeyName" . }}
+```
+
+
+
+## _license_secret.tpl
+### `newrelic.common.license.secret`
+This function templates the secret that is used by agents and integrations with the license Key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any license key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.license.secret" . -}}
+```
+
+
+
+## _insights.tpl
+### `newrelic.common.insightsKey.secretName` and ### `newrelic.common.insightsKey.secretKeyName`
+Returns the secret and key inside the secret where to read the insights key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.insightsKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "INSIGHTS_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.insightsKey.secretName" . }}
+          key: {{ include "newrelic.common.insightsKey.secretKeyName" . }}
+```
+
+
+
+## _insights_secret.tpl
+### `newrelic.common.insightsKey.secret`
+This function templates the secret that is used by agents and integrations with the insights key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any insights key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.insightsKey.secret" . -}}
+```
+
+
+
+## _userkey.tpl
+### `newrelic.common.userKey.secretName` and ### `newrelic.common.userKey.secretKeyName`
+Returns the secret and key inside the secret where to read a user key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.userKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "API_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.userKey.secretName" . }}
+          key: {{ include "newrelic.common.userKey.secretKeyName" . }}
+```
+
+
+
+## _userkey_secret.tpl
+### `newrelic.common.userKey.secret`
+This function templates the secret that is used by agents and integrations with a user key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any API key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.userKey.secret" . -}}
+```
+
+
+
+## _region.tpl
+### `newrelic.common.region.validate`
+Given a string, return a normalized name for the region if valid.
+
+This function does not need the context of the chart, only the value to be validated. The region returned
+honors the region [definition of the newrelic-client-go implementation](https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21)
+so (as of 2024/09/14) it returns the region as "US", "EU", "Staging", or "Local".
+
+In case the region provided does not match these 4, the helper calls `fail` and abort the templating.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region.validate" "us" }}
+```
+
+### `newrelic.common.region`
+It reads global and local variables for `region`:
+```yaml
+global:
+  region:  # Note that this can be empty (nil) or "" (empty string)
+region:  # Note that this can be empty (nil) or "" (empty string)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in your
+values a `region` is defined, the global one is going to be always ignored.
+
+This function gives protection so it enforces users to give the license key as a value in their
+`values.yaml` or specify a global or local `region` value. To understand how the `region` value
+works, read the documentation of `newrelic.common.region.validate`.
+
+The function will change the region from US, EU or Staging based of the license key and the
+`nrStaging` toggle. Whichever region is computed from the license/toggle can be overridden by
+the `region` value.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region" . }}
+```
+
+
+
+## _low-data-mode.tpl
+### `newrelic.common.lowDataMode`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  lowDataMode:  # Note that this is empty (nil)
+lowDataMode:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `lowdataMode` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.lowDataMode" . }}
+```
+
+
+
+## _privileged.tpl
+### `newrelic.common.privileged`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  privileged:  # Note that this is empty (nil)
+privileged:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `privileged` is defined, the global one is going to be always ignored.
+
+Chart writers could override this and put directly a `true` in the `values.yaml` to override the
+default of the common library.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged" . }}
+```
+
+### `newrelic.common.privileged.value`
+Returns true if privileged mode is enabled or false if not. This is to have the value of privileged ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged.value" . }}
+```
+
+
+
+## _proxy.tpl
+### `newrelic.common.proxy`
+Returns the proxy URL configured by the user. 
+
+Usage:
+```mustache
+{{ include "newrelic.common.proxy" . }}
+```
+
+
+
+## _security-context.tpl
+Use these functions to share the security context among all charts. Useful in clusters that have security enforcing not to
+use the root user (like OpenShift) or users that have an admission webhooks.
+
+The functions are:
+* `newrelic.common.securityContext.container`
+* `newrelic.common.securityContext.pod`
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+    spec:
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+
+      containers:
+        - name: example
+          {{- with include "nriKubernetes.securityContext.container" . }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+```
+
+
+
+## _staging.tpl
+### `newrelic.common.nrStaging`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  nrStaging:  # Note that this is empty (nil)
+nrStaging:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `nrStaging` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging" . }}
+```
+
+### `newrelic.common.nrStaging.value`
+Returns true if staging is enabled or false if not. This is to have the staging value ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging.value" . }}
+```
+
+
+
+## _verbose-log.tpl
+### `newrelic.common.verboseLog`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  verboseLog:  # Note that this is empty (nil)
+verboseLog:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `verboseLog` is defined, the global one is going to be always ignored.
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsBoolean`
+Returns true if verbose is enabled or false if not. This is to have the verbose value ready to be templated as a boolean
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsBoolean" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsInt`
+Returns 1 if verbose is enabled or 0 if not. This is to have the verbose value ready to be templated as an integer
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsInt" . }}
+```
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/README.md
new file mode 100644
index 000000000..10f08ca67
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/README.md
@@ -0,0 +1,106 @@
+# Helm Common library
+
+The common library is a way to unify the UX through all the Helm charts that implement it.
+
+The tooling suite that New Relic is huge and growing and this allows to set things globally
+and locally for a single chart.
+
+## Documentation for chart writers
+
+If you are writing a chart that is going to use this library you can check the [developers guide](/library/common-library/DEVELOPERS.md) to see all
+the functions/templates that we have implemented, what they do and how to use them.
+
+## Values managed globally
+
+We want to have a seamless experience through all the charts so we created this library that tries to standardize the behaviour
+of all the charts. Sadly, because of the complexity of all these integrations, not all the charts behave exactly as expected.
+
+An example is `newrelic-infrastructure` that ignores `hostNetwork` in the control plane scraper because most of the users has the
+control plane listening in the node to `localhost`.
+
+For each chart that has a special behavior (or further information of the behavior) there is a "chart particularities" section
+in its README.md that explains which is the expected behavior.
+
+At the time of writing this, all the charts from `nri-bundle` except `newrelic-logging` and `synthetics-minion` implements this
+library and honors global options as described in this document.
+
+Here is a list of global options:
+
+| Global keys | Local keys | Default | Merged[<sup>1</sup>](#values-managed-globally-1) | Description |
+|-------------|------------|---------|--------------------------------------------------|-------------|
+| global.cluster | cluster | `""` |  | Name of the Kubernetes cluster monitored |
+| global.licenseKey | licenseKey | `""` |  | This set this license key to use |
+| global.customSecretName | customSecretName | `""` |  | In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there |
+| global.customSecretLicenseKey | customSecretLicenseKey | `""` |  | In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located |
+| global.podLabels | podLabels | `{}` | yes | Additional labels for chart pods |
+| global.labels | labels | `{}` | yes | Additional labels for chart objects |
+| global.priorityClassName | priorityClassName | `""` |  | Sets pod's priorityClassName |
+| global.hostNetwork | hostNetwork | `false` |  | Sets pod's hostNetwork |
+| global.dnsConfig | dnsConfig | `{}` |  | Sets pod's dnsConfig |
+| global.images.registry | See [Further information](#values-managed-globally-2) | `""` |  | Changes the registry where to get the images. Useful when there is an internal image cache/proxy |
+| global.images.pullSecrets | See [Further information](#values-managed-globally-2) | `[]` | yes | Set secrets to be able to fetch images |
+| global.podSecurityContext | podSecurityContext | `{}` |  | Sets security context (at pod level) |
+| global.containerSecurityContext | containerSecurityContext | `{}` |  | Sets security context (at container level) |
+| global.affinity | affinity | `{}` |  | Sets pod/node affinities |
+| global.nodeSelector | nodeSelector | `{}` |  | Sets pod's node selector |
+| global.tolerations | tolerations | `[]` |  | Sets pod's tolerations to node taints |
+| global.serviceAccount.create | serviceAccount.create | `true` |  | Configures if the service account should be created or not |
+| global.serviceAccount.name | serviceAccount.name | name of the release |  | Change the name of the service account. This is honored if you disable on this cahrt the creation of the service account so you can use your own. |
+| global.serviceAccount.annotations | serviceAccount.annotations | `{}` | yes | Add these annotations to the service account we create |
+| global.customAttributes | customAttributes | `{}` |  | Adds extra attributes to the cluster and all the metrics emitted to the backend |
+| global.fedramp | fedramp | `false` |  | Enables FedRAMP |
+| global.lowDataMode | lowDataMode | `false` |  | Reduces number of metrics sent in order to reduce costs |
+| global.privileged | privileged | Depends on the chart |  | In each integration it has different behavior. See [Further information](#values-managed-globally-3) but all aims to send less metrics to the backend to try to save costs |
+| global.proxy | proxy | `""` |  | Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port` |
+| global.nrStaging | nrStaging | `false` |  | Send the metrics to the staging backend. Requires a valid staging license key |
+| global.verboseLog | verboseLog | `false` |  | Sets the debug/trace logs to this integration or all integrations if it is set globally |
+
+### Further information
+<a name="values-managed-globally-1"></a>
+#### 1. Merged
+
+Merged means that the values from global are not replaced by the local ones. Think in this example:
+```yaml
+global:
+  labels:
+    global: global
+  hostNetwork: true
+  nodeSelector:
+    global: global
+
+labels:
+  local: local
+nodeSelector:
+  local: local
+hostNetwork: false
+```
+
+This values will template `hostNetwork` to `false`, a map of labels `{ "global": "global", "local": "local" }` and a `nodeSelector` with
+`{ "local": "local" }`.
+
+As Helm by default merges all the maps it could be confusing that we have two behaviors (merging `labels` and replacing `nodeSelector`)
+the `values` from global to local. This is the rationale behind this:
+* `hostNetwork` is templated to `false` because is overriding the value defined globally.
+* `labels` are merged because the user may want to label all the New Relic pods at once and label other solution pods differently for
+  clarity' sake.
+* `nodeSelector` does not merge as `labels` because could make it harder to overwrite/delete a selector that comes from global because
+  of the logic that Helm follows merging maps.
+
+<a name="values-managed-globally-2"></a>
+#### 2. Fine grain registries
+
+Some charts only have 1 image while others that can have 2 or more images. The local path for the registry can change depending
+on the chart itself.
+
+As this is mostly unique per helm chart, you should take a look to the chart's values table (or directly to the `values.yaml` file to see all the
+images that you can change.
+
+This should only be needed if you have an advanced setup that forces you to have granularity enough to force a proxy/cache registry per integration.
+
+
+<a name="values-managed-globally-3"></a>
+#### 3. Privileged mode
+
+By default, from the common library, the privileged mode is set to false. But most of the helm charts require this to be true to fetch more
+metrics so could see a true in some charts. The consequences of the privileged mode differ from one chart to another so for each chart that
+honors the privileged mode toggle should be a section in the README explaining which is the behavior with it enabled or disabled.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_affinity.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_affinity.tpl
new file mode 100644
index 000000000..1b2636754
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_affinity.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod affinity */ -}}
+{{- define "newrelic.common.affinity" -}}
+    {{- if .Values.affinity -}}
+        {{- toYaml .Values.affinity -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.affinity -}}
+            {{- toYaml .Values.global.affinity -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_agent-config.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_agent-config.tpl
new file mode 100644
index 000000000..9c32861a0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_agent-config.tpl
@@ -0,0 +1,26 @@
+{{/*
+This helper should return the defaults that all agents should have
+*/}}
+{{- define "newrelic.common.agentConfig.defaults" -}}
+{{- if include "newrelic.common.verboseLog" . }}
+log:
+  level: trace
+{{- end }}
+
+{{- if (include "newrelic.common.nrStaging" . ) }}
+staging: true
+{{- end }}
+
+{{- with include "newrelic.common.proxy" . }}
+proxy: {{ . | quote }}
+{{- end }}
+
+{{- with include "newrelic.common.fedramp.enabled" . }}
+fedramp: {{ . }}
+{{- end }}
+
+{{- with fromYaml ( include "newrelic.common.customAttributes" . ) }}
+custom_attributes:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_cluster.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_cluster.tpl
new file mode 100644
index 000000000..0197dd35a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_cluster.tpl
@@ -0,0 +1,15 @@
+{{/*
+Return the cluster
+*/}}
+{{- define "newrelic.common.cluster" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.cluster -}}
+    {{- .Values.cluster -}}
+{{- else if $global.cluster -}}
+    {{- $global.cluster -}}
+{{- else -}}
+    {{ fail "There is not cluster name definition set neither in `.global.cluster' nor `.cluster' in your values.yaml. Cluster name is required." }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_custom-attributes.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_custom-attributes.tpl
new file mode 100644
index 000000000..92020719c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_custom-attributes.tpl
@@ -0,0 +1,17 @@
+{{/*
+This will render custom attributes as a YAML ready to be templated or be used with `fromYaml`.
+*/}}
+{{- define "newrelic.common.customAttributes" -}}
+{{- $customAttributes := dict -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- if $global.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes $global.customAttributes -}}
+{{- end -}}
+
+{{- if .Values.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes .Values.customAttributes -}}
+{{- end -}}
+
+{{- toYaml $customAttributes -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_dnsconfig.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_dnsconfig.tpl
new file mode 100644
index 000000000..d4e40aa8a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_dnsconfig.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod dnsConfig */ -}}
+{{- define "newrelic.common.dnsConfig" -}}
+    {{- if .Values.dnsConfig -}}
+        {{- toYaml .Values.dnsConfig -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.dnsConfig -}}
+            {{- toYaml .Values.global.dnsConfig -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_fedramp.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_fedramp.tpl
new file mode 100644
index 000000000..9df8d6b5e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_fedramp.tpl
@@ -0,0 +1,25 @@
+{{- /* Defines the fedRAMP flag */ -}}
+{{- define "newrelic.common.fedramp.enabled" -}}
+    {{- if .Values.fedramp -}}
+        {{- if .Values.fedramp.enabled -}}
+            {{- .Values.fedramp.enabled -}}
+        {{- end -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.fedramp -}}
+             {{- if .Values.global.fedramp.enabled -}}
+                {{- .Values.global.fedramp.enabled -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return FedRAMP value directly ready to be templated */ -}}
+{{- define "newrelic.common.fedramp.enabled.value" -}}
+{{- if include "newrelic.common.fedramp.enabled" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_hostnetwork.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_hostnetwork.tpl
new file mode 100644
index 000000000..4cf017ef7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_hostnetwork.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper allows to override the global `.global.hostNetwork` with the value of `.hostNetwork`.
+Returns "true" if `hostNetwork` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.hostNetwork" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- /*
+`get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs
+
+We also want only to return when this is true, returning `false` here will template "false" (string) when doing
+an `(include "newrelic.common.hostNetwork" .)`, which is not an "empty string" so it is `true` if it is used
+as an evaluation somewhere else.
+*/ -}}
+{{- if get .Values "hostNetwork" | kindIs "bool" -}}
+    {{- if .Values.hostNetwork -}}
+        {{- .Values.hostNetwork -}}
+    {{- end -}}
+{{- else if get $global "hostNetwork" | kindIs "bool" -}}
+    {{- if $global.hostNetwork -}}
+        {{- $global.hostNetwork -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper abstracts the function "newrelic.common.hostNetwork" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.hostNetwork.value" -}}
+{{- if include "newrelic.common.hostNetwork" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_images.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_images.tpl
new file mode 100644
index 000000000..d4fb43290
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_images.tpl
@@ -0,0 +1,94 @@
+{{- /*
+Return the proper image name
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.image" -}}
+    {{- $registryName := include "newrelic.common.images.registry" ( dict "imageRoot" .imageRoot "defaultRegistry" .defaultRegistry "context" .context ) -}}
+    {{- $repositoryName := include "newrelic.common.images.repository" .imageRoot -}}
+    {{- $tag := include "newrelic.common.images.tag" ( dict "imageRoot" .imageRoot "context" .context) -}}
+
+    {{- if $registryName -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag | quote -}}
+    {{- else -}}
+        {{- printf "%s:%s" $repositoryName $tag | quote -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image registry
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.registry" -}}
+{{- $globalRegistry := "" -}}
+{{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+        {{- with .context.Values.global.images.registry -}}
+            {{- $globalRegistry = . -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $localRegistry := "" -}}
+{{- if .imageRoot.registry -}}
+    {{- $localRegistry = .imageRoot.registry -}}
+{{- end -}}
+
+{{- $registry := $localRegistry | default $globalRegistry | default .defaultRegistry -}}
+{{- if $registry -}}
+    {{- $registry -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image repository
+{{ include "newrelic.common.images.repository" .Values.path.to.the.image }}
+*/ -}}
+{{- define "newrelic.common.images.repository" -}}
+    {{- .repository -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image tag
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.path.to.the.image "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.tag" -}}
+    {{- .imageRoot.tag | default .context.Chart.AppVersion | toString -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper Image Pull Registry Secret Names evaluating values as templates
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.path.to.the.images.pullSecrets1, .Values.path.to.the.images.pullSecrets2) "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.renderPullSecrets" -}}
+  {{- $flatlist := list }}
+
+  {{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+      {{- if .context.Values.global.images.pullSecrets -}}
+        {{- range .context.Values.global.images.pullSecrets -}}
+          {{- $flatlist = append $flatlist . -}}
+        {{- end -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- range .pullSecrets -}}
+    {{- if not (empty .) -}}
+      {{- range . -}}
+        {{- $flatlist = append $flatlist . -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if $flatlist -}}
+    {{- toYaml $flatlist -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_insights.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_insights.tpl
new file mode 100644
index 000000000..895c37732
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_insights.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the Insights Key.
+*/}}
+{{- define "newrelic.common.insightsKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "insightskey" ) -}}
+{{- include "newrelic.common.insightsKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secretKeyName" -}}
+{{- include "newrelic.common.insightsKey._customSecretKey" . | default "insightsKey" -}}
+{{- end -}}
+
+{{/*
+Return local insightsKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._licenseKey" -}}
+{{- if .Values.insightsKey -}}
+  {{- .Values.insightsKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.insightsKey -}}
+    {{- .Values.global.insightsKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the Insights Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretName" -}}
+{{- if .Values.customInsightsKeySecretName -}}
+  {{- .Values.customInsightsKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretName -}}
+    {{- .Values.global.customInsightsKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretKey" -}}
+{{- if .Values.customInsightsKeySecretKey -}}
+  {{- .Values.customInsightsKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretKey }}
+    {{- .Values.global.customInsightsKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_insights_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_insights_secret.yaml.tpl
new file mode 100644
index 000000000..556caa6ca
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_insights_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the insights key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secret" }}
+{{- if not (include "newrelic.common.insightsKey._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.insightsKey._licenseKey" .) }}
+    {{- fail "You must specify a insightsKey or a customInsightsSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.insightsKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.insightsKey.secretKeyName" . }}: {{ include "newrelic.common.insightsKey._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_labels.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_labels.tpl
new file mode 100644
index 000000000..1cc1e792b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_labels.tpl
@@ -0,0 +1,58 @@
+{{/*
+This will render the labels that should be used in all the manifests used by the helm chart.
+*/}}
+{{- define "newrelic.common.labels" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- $chart := dict "helm.sh/chart" (include "newrelic.common.naming.chart" . ) -}}
+{{- $managedBy := dict "app.kubernetes.io/managed-by" .Release.Service -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $labels := mustMergeOverwrite $chart $managedBy $selectorLabels -}}
+{{- if .Chart.AppVersion -}}
+{{- $labels = mustMergeOverwrite $labels (dict "app.kubernetes.io/version" .Chart.AppVersion) -}}
+{{- end -}}
+
+{{- $globalUserLabels := $global.labels | default dict -}}
+{{- $localUserLabels := .Values.labels | default dict -}}
+
+{{- $labels = mustMergeOverwrite $labels $globalUserLabels $localUserLabels -}}
+
+{{- range $k, $v := $labels -}}
+  {{- $_ := set $labels $k (include "newrelic.common.naming.truncateToDNS" $v ) -}}
+{{- end -}}
+
+{{- toYaml $labels -}}
+{{- end -}}
+
+
+
+{{/*
+This will render the labels that should be used in deployments/daemonsets template pods as a selector.
+*/}}
+{{- define "newrelic.common.labels.selectorLabels" -}}
+{{- $name := dict "app.kubernetes.io/name" ( include "newrelic.common.naming.name" . ) -}}
+{{- $instance := dict "app.kubernetes.io/instance" .Release.Name -}}
+
+{{- $selectorLabels := mustMergeOverwrite $name $instance -}}
+
+{{- toYaml $selectorLabels -}}
+{{- end }}
+
+
+
+{{/*
+Pod labels
+*/}}
+{{- define "newrelic.common.labels.podLabels" -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- $globalPodLabels := $global.podLabels | default dict }}
+
+{{- $localPodLabels := .Values.podLabels | default dict }}
+
+{{- $podLabels := mustMergeOverwrite $selectorLabels $globalPodLabels $localPodLabels -}}
+
+{{- toYaml $podLabels -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_license.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_license.tpl
new file mode 100644
index 000000000..cb349f6bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_license.tpl
@@ -0,0 +1,68 @@
+{{/*
+Return the name of the secret holding the License Key.
+*/}}
+{{- define "newrelic.common.license.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "license" ) -}}
+{{- include "newrelic.common.license._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+*/}}
+{{- define "newrelic.common.license.secretKeyName" -}}
+{{- include "newrelic.common.license._customSecretKey" . | default "licenseKey" -}}
+{{- end -}}
+
+{{/*
+Return local licenseKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._licenseKey" -}}
+{{- if .Values.licenseKey -}}
+  {{- .Values.licenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.licenseKey -}}
+    {{- .Values.global.licenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the License Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretName" -}}
+{{- if .Values.customSecretName -}}
+  {{- .Values.customSecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretName -}}
+    {{- .Values.global.customSecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretKey" -}}
+{{- if .Values.customSecretLicenseKey -}}
+  {{- .Values.customSecretLicenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretLicenseKey }}
+    {{- .Values.global.customSecretLicenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the user set a custom secret for the license.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._usesCustomSecret" -}}
+{{- if or (include "newrelic.common.license._customSecretName" .) (include "newrelic.common.license._customSecretKey" .) -}}
+true
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_license_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_license_secret.yaml.tpl
new file mode 100644
index 000000000..610a0a337
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_license_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the license key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.license.secret" }}
+{{- if not (include "newrelic.common.license._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.license._licenseKey" .) }}
+    {{- fail "You must specify a licenseKey or a customSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.license.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.license.secretKeyName" . }}: {{ include "newrelic.common.license._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_low-data-mode.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_low-data-mode.tpl
new file mode 100644
index 000000000..3dd55ef2f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_low-data-mode.tpl
@@ -0,0 +1,26 @@
+{{- /*
+Abstraction of the lowDataMode toggle.
+This helper allows to override the global `.global.lowDataMode` with the value of `.lowDataMode`.
+Returns "true" if `lowDataMode` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.lowDataMode" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "lowDataMode" | kindIs "bool") -}}
+    {{- if .Values.lowDataMode -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.lowDataMode" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.lowDataMode -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "lowDataMode" | kindIs "bool" -}}
+    {{- if $global.lowDataMode -}}
+        {{- $global.lowDataMode -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_naming.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_naming.tpl
new file mode 100644
index 000000000..19fa92648
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_naming.tpl
@@ -0,0 +1,73 @@
+{{/*
+This is an function to be called directly with a string just to truncate strings to
+63 chars because some Kubernetes name fields are limited to that.
+*/}}
+{{- define "newrelic.common.naming.truncateToDNS" -}}
+{{- . | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+
+
+{{- /*
+Given a name and a suffix returns a 'DNS Valid' which always include the suffix, truncating the name if needed.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If suffix is too long it gets truncated but it always takes precedence over name, so a 63 chars suffix would suppress the name.
+Usage:
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" "<my-name>" "suffix" "my-suffix" ) }}
+*/ -}}
+{{- define "newrelic.common.naming.truncateToDNSWithSuffix" -}}
+{{- $suffix := (include "newrelic.common.naming.truncateToDNS" .suffix) -}}
+{{- $maxLen := (max (sub 63 (add1 (len $suffix))) 0) -}} {{- /* We prepend "-" to the suffix so an additional character is needed */ -}}
+
+{{- $newName := .name | trunc ($maxLen | int) | trimSuffix "-"  -}}
+{{- if $newName -}}
+{{- printf "%s-%s" $newName $suffix -}}
+{{- else -}}
+{{ $suffix }}
+{{- end -}}
+
+{{- end -}}
+
+
+
+{{/*
+Expand the name of the chart.
+Uses the Chart name by default if nameOverride is not set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.name" -}}
+{{- $name := .Values.nameOverride | default .Chart.Name -}}
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+{{- end }}
+
+
+
+{{/*
+Create a default fully qualified app name.
+By default the full name will be "<release_name>" just in if it has the chart name included in that, if not
+it will be concatenated like "<release_name>-<chart_chart>". This could change if fullnameOverride or
+nameOverride are set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.fullname" -}}
+{{- $name := include "newrelic.common.naming.name" . -}}
+
+{{- if .Values.fullnameOverride -}}
+    {{- $name = .Values.fullnameOverride  -}}
+{{- else if not (contains $name .Release.Name) -}}
+    {{- $name = printf "%s-%s" .Release.Name $name -}}
+{{- end -}}
+
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+
+{{- end -}}
+
+
+
+{{/*
+Create chart name and version as used by the chart label.
+This function should not be used for naming objects. Use "common.naming.{name,fullname}" instead.
+*/}}
+{{- define "newrelic.common.naming.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_nodeselector.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_nodeselector.tpl
new file mode 100644
index 000000000..d48887341
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_nodeselector.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod nodeSelector */ -}}
+{{- define "newrelic.common.nodeSelector" -}}
+    {{- if .Values.nodeSelector -}}
+        {{- toYaml .Values.nodeSelector -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.nodeSelector -}}
+            {{- toYaml .Values.global.nodeSelector -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_priority-class-name.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_priority-class-name.tpl
new file mode 100644
index 000000000..50182b734
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_priority-class-name.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the pod priorityClassName */ -}}
+{{- define "newrelic.common.priorityClassName" -}}
+    {{- if .Values.priorityClassName -}}
+        {{- .Values.priorityClassName -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.priorityClassName -}}
+            {{- .Values.global.priorityClassName -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_privileged.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_privileged.tpl
new file mode 100644
index 000000000..f3ae814dd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_privileged.tpl
@@ -0,0 +1,28 @@
+{{- /*
+This is a helper that returns whether the chart should assume the user is fine deploying privileged pods.
+*/ -}}
+{{- define "newrelic.common.privileged" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists. */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if get .Values "privileged" | kindIs "bool" -}}
+    {{- if .Values.privileged -}}
+        {{- .Values.privileged -}}
+    {{- end -}}
+{{- else if get $global "privileged" | kindIs "bool" -}}
+    {{- if $global.privileged -}}
+        {{- $global.privileged -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return directly "true" or "false" based in the exist of "newrelic.common.privileged" */ -}}
+{{- define "newrelic.common.privileged.value" -}}
+{{- if include "newrelic.common.privileged" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_proxy.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_proxy.tpl
new file mode 100644
index 000000000..60f34c7ec
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_proxy.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the proxy */ -}}
+{{- define "newrelic.common.proxy" -}}
+    {{- if .Values.proxy -}}
+        {{- .Values.proxy -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.proxy -}}
+            {{- .Values.global.proxy -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_region.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_region.tpl
new file mode 100644
index 000000000..bdcacf323
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_region.tpl
@@ -0,0 +1,74 @@
+{{/*
+Return the region that is being used by the user
+*/}}
+{{- define "newrelic.common.region" -}}
+{{- if and (include "newrelic.common.license._usesCustomSecret" .) (not (include "newrelic.common.region._fromValues" .)) -}}
+  {{- fail "This Helm Chart is not able to compute the region. You must specify a .global.region or .region if the license is set using a custom secret." -}}
+{{- end -}}
+
+{{- /* Defaults */ -}}
+{{- $region := "us" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+  {{- $region = "staging" -}}
+{{- else if include "newrelic.common.region._isEULicenseKey" . -}}
+  {{- $region = "eu" -}}
+{{- end -}}
+
+{{- include "newrelic.common.region.validate" (include "newrelic.common.region._fromValues" . | default $region ) -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values if valid. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+
+Usage: `include "newrelic.common.region.validate" "us"`
+*/}}
+{{- define "newrelic.common.region.validate" -}}
+{{- /* Ref: https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21 */ -}}
+{{- $region := . | lower -}}
+{{- if eq $region "us" -}}
+  US
+{{- else if eq $region "eu" -}}
+  EU
+{{- else if eq $region "staging" -}}
+  Staging
+{{- else if eq $region "local" -}}
+  Local
+{{- else -}}
+  {{- fail (printf "the region provided is not valid: %s not in \"US\" \"EU\" \"Staging\" \"Local\"" .) -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._fromValues" -}}
+{{- if .Values.region -}}
+  {{- .Values.region -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.region -}}
+    {{- .Values.global.region -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the license is for EU region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._isEULicenseKey" -}}
+{{- if not (include "newrelic.common.license._usesCustomSecret" .) -}}
+  {{- $license := include "newrelic.common.license._licenseKey" . -}}
+  {{- if hasPrefix "eu" $license -}}
+    true
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_security-context.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_security-context.tpl
new file mode 100644
index 000000000..9edfcabfd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_security-context.tpl
@@ -0,0 +1,23 @@
+{{- /* Defines the container securityContext context */ -}}
+{{- define "newrelic.common.securityContext.container" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.containerSecurityContext -}}
+    {{- toYaml .Values.containerSecurityContext -}}
+{{- else if $global.containerSecurityContext -}}
+    {{- toYaml $global.containerSecurityContext -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the pod securityContext context */ -}}
+{{- define "newrelic.common.securityContext.pod" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.podSecurityContext -}}
+    {{- toYaml .Values.podSecurityContext -}}
+{{- else if $global.podSecurityContext -}}
+    {{- toYaml $global.podSecurityContext -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_serviceaccount.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_serviceaccount.tpl
new file mode 100644
index 000000000..2d352f6ea
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_serviceaccount.tpl
@@ -0,0 +1,90 @@
+{{- /* Defines if the service account has to be created or not */ -}}
+{{- define "newrelic.common.serviceAccount.create" -}}
+{{- $valueFound := false -}}
+
+{{- /* Look for a global creation of a service account */ -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "create" | kindIs "bool") -}}
+        {{- $valueFound = true -}}
+        {{- if .Values.serviceAccount.create -}}
+            {{- /*
+                We want only to return when this is true, returning `false` here will template "false" (string) when doing
+                an `(include "newrelic.common.serviceAccount.name" .)`, which is not an "empty string" so it is `true` if it is used
+                as an evaluation somewhere else.
+            */ -}}
+            {{- .Values.serviceAccount.create -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* Look for a local creation of a service account */ -}}
+{{- if not $valueFound -}}
+    {{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+    {{- $global := index .Values "global" | default dict -}}
+    {{- if get $global "serviceAccount" | kindIs "map" -}}
+        {{- if get $global.serviceAccount "create" | kindIs "bool" -}}
+            {{- $valueFound = true -}}
+            {{- if $global.serviceAccount.create -}}
+                {{- $global.serviceAccount.create -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* In case no serviceAccount value has been found, default to "true" */ -}}
+{{- if not $valueFound -}}
+true
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the name of the service account */ -}}
+{{- define "newrelic.common.serviceAccount.name" -}}
+{{- $localServiceAccount := "" -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "name" | kindIs "string") -}}
+        {{- $localServiceAccount = .Values.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := "" -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "name" | kindIs "string" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- if (include "newrelic.common.serviceAccount.create" .) -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default (include "newrelic.common.naming.fullname" .) -}}
+{{- else -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default "default" -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Merge the global and local annotations for the service account */ -}}
+{{- define "newrelic.common.serviceAccount.annotations" -}}
+{{- $localServiceAccount := dict -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if get .Values.serviceAccount "annotations" -}}
+        {{- $localServiceAccount = .Values.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := dict -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "annotations" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $merged := mustMergeOverwrite $globalServiceAccount $localServiceAccount -}}
+
+{{- if $merged -}}
+    {{- toYaml $merged -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_staging.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_staging.tpl
new file mode 100644
index 000000000..bd9ad09bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_staging.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the nrStaging toggle.
+This helper allows to override the global `.global.nrStaging` with the value of `.nrStaging`.
+Returns "true" if `nrStaging` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.nrStaging" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "nrStaging" | kindIs "bool") -}}
+    {{- if .Values.nrStaging -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.nrStaging" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.nrStaging -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "nrStaging" | kindIs "bool" -}}
+    {{- if $global.nrStaging -}}
+        {{- $global.nrStaging -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Returns "true" of "false" directly instead of empty string (Helm falsiness) based on the exit of "newrelic.common.nrStaging"
+*/ -}}
+{{- define "newrelic.common.nrStaging.value" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_tolerations.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_tolerations.tpl
new file mode 100644
index 000000000..e016b38e2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_tolerations.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod tolerations */ -}}
+{{- define "newrelic.common.tolerations" -}}
+    {{- if .Values.tolerations -}}
+        {{- toYaml .Values.tolerations -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.tolerations -}}
+            {{- toYaml .Values.global.tolerations -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_userkey.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_userkey.tpl
new file mode 100644
index 000000000..982ea8e09
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_userkey.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the API Key.
+*/}}
+{{- define "newrelic.common.userKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "userkey" ) -}}
+{{- include "newrelic.common.userKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+*/}}
+{{- define "newrelic.common.userKey.secretKeyName" -}}
+{{- include "newrelic.common.userKey._customSecretKey" . | default "userKey" -}}
+{{- end -}}
+
+{{/*
+Return local API Key if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._userKey" -}}
+{{- if .Values.userKey -}}
+  {{- .Values.userKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.userKey -}}
+    {{- .Values.global.userKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the API Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretName" -}}
+{{- if .Values.customUserKeySecretName -}}
+  {{- .Values.customUserKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretName -}}
+    {{- .Values.global.customUserKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretKey" -}}
+{{- if .Values.customUserKeySecretKey -}}
+  {{- .Values.customUserKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretKey }}
+    {{- .Values.global.customUserKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_userkey_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_userkey_secret.yaml.tpl
new file mode 100644
index 000000000..b97985654
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_userkey_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the user key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.userKey.secret" }}
+{{- if not (include "newrelic.common.userKey._customSecretName" .) }}
+{{- /* Fail if user key is empty and required: */ -}}
+{{- if not (include "newrelic.common.userKey._userKey" .) }}
+    {{- fail "You must specify a userKey or a customUserKeySecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.userKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.userKey.secretKeyName" . }}: {{ include "newrelic.common.userKey._userKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_verbose-log.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_verbose-log.tpl
new file mode 100644
index 000000000..2286d4681
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/templates/_verbose-log.tpl
@@ -0,0 +1,54 @@
+{{- /*
+Abstraction of the verbose toggle.
+This helper allows to override the global `.global.verboseLog` with the value of `.verboseLog`.
+Returns "true" if `verbose` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.verboseLog" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "verboseLog" | kindIs "bool") -}}
+    {{- if .Values.verboseLog -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.verboseLog" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.verboseLog -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "verboseLog" | kindIs "bool" -}}
+    {{- if $global.verboseLog -}}
+        {{- $global.verboseLog -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsBoolean" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return 1 or 0 directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsInt" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+1
+{{- else -}}
+0
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/values.yaml
new file mode 100644
index 000000000..75e2d112a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/charts/common-library/values.yaml
@@ -0,0 +1 @@
+# values are not needed for the library chart, however this file is still needed for helm lint to work.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/ci/test-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/ci/test-values.yaml
new file mode 100644
index 000000000..f0f9be1f9
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/ci/test-values.yaml
@@ -0,0 +1,14 @@
+global:
+  cluster: test-cluster
+
+personalAPIKey: "a21321"
+verboseLog: false
+
+config:
+  accountID: 111
+  region: EU
+  nrdbClientTimeoutSeconds: 30
+
+image:
+  repository: e2e/newrelic-metrics-adapter
+  tag: "test"  # Defaults to AppVersion
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/_helpers.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/_helpers.tpl
new file mode 100644
index 000000000..6a5f76503
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/_helpers.tpl
@@ -0,0 +1,57 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{- /* Allow to change pod defaults dynamically based if we are running in privileged mode or not */ -}}
+{{- define "newrelic-k8s-metrics-adapter.securityContext.pod" -}}
+{{- if include "newrelic.common.securityContext.pod" . -}}
+{{- include "newrelic.common.securityContext.pod" . -}}
+{{- else -}}
+fsGroup: 1001
+runAsUser: 1001
+runAsGroup: 1001
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Select a value for the region
+When this value is empty the New Relic client region will be the default 'US'
+*/}}
+{{- define "newrelic-k8s-metrics-adapter.region" -}}
+{{- if .Values.config.region -}}
+  {{- .Values.config.region | upper -}}
+{{- else if (include "newrelic.common.nrStaging" .)  -}}
+Staging
+{{- else if hasPrefix "eu" (include "newrelic.common.license._licenseKey" .) -}}
+EU
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Naming helpers
+*/ -}}
+{{- define "newrelic-k8s-metrics-adapter.name.apiservice" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "apiservice") }}
+{{- end -}}
+
+{{- define "newrelic-k8s-metrics-adapter.name.apiservice.serviceAccount" -}}
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+  {{- include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "apiservice") -}}
+{{- else -}}
+  {{- include "newrelic.common.serviceAccount.name" . -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "newrelic-k8s-metrics-adapter.name.apiservice-create" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "apiservice-create") }}
+{{- end -}}
+
+{{- define "newrelic-k8s-metrics-adapter.name.apiservice-patch" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "apiservice-patch") }}
+{{- end -}}
+
+{{- define "newrelic-k8s-metrics-adapter.name.hpa-controller" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "hpa-controller") }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/adapter-clusterrolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/adapter-clusterrolebinding.yaml
new file mode 100644
index 000000000..40bcba8b6
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/adapter-clusterrolebinding.yaml
@@ -0,0 +1,14 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}:system:auth-delegator
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:auth-delegator
+subjects:
+- kind: ServiceAccount
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/adapter-rolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/adapter-rolebinding.yaml
new file mode 100644
index 000000000..afb5d2d55
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/adapter-rolebinding.yaml
@@ -0,0 +1,15 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  namespace: kube-system
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: extension-apiserver-authentication-reader
+subjects:
+- kind: ServiceAccount
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/apiservice.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/apiservice.yaml
new file mode 100644
index 000000000..8f01b6407
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/apiservice.yaml
@@ -0,0 +1,19 @@
+apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata:
+  name: v1beta1.external.metrics.k8s.io
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+{{- if .Values.certManager.enabled }}
+  annotations:
+    certmanager.k8s.io/inject-ca-from: {{ printf "%s/%s-root-cert" .Release.Namespace (include "newrelic.common.naming.fullname" .) | quote }}
+    cert-manager.io/inject-ca-from: {{ printf "%s/%s-root-cert" .Release.Namespace (include "newrelic.common.naming.fullname" .) | quote }}
+{{- end }}
+spec:
+  service:
+    name: {{ include "newrelic.common.naming.fullname" . }}
+    namespace: {{ .Release.Namespace }}
+  group: external.metrics.k8s.io
+  version: v1beta1
+  groupPriorityMinimum: 100
+  versionPriority: 100
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/clusterrole.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/clusterrole.yaml
new file mode 100644
index 000000000..5c364eb37
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/clusterrole.yaml
@@ -0,0 +1,26 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "newrelic-k8s-metrics-adapter.name.apiservice" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - apiregistration.k8s.io
+    resources:
+      - apiservices
+    verbs:
+      - get
+      - update
+{{- if .Values.rbac.pspEnabled }}
+  - apiGroups: ['policy']
+    resources: ['podsecuritypolicies']
+    verbs: ['use']
+    resourceNames:
+    - {{ include "newrelic-k8s-metrics-adapter.name.apiservice" . }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/clusterrolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/clusterrolebinding.yaml
new file mode 100644
index 000000000..8aa95792e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/clusterrolebinding.yaml
@@ -0,0 +1,19 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "newrelic-k8s-metrics-adapter.name.apiservice" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "newrelic-k8s-metrics-adapter.name.apiservice" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "newrelic-k8s-metrics-adapter.name.apiservice.serviceAccount" . }}
+    namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/job-createSecret.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/job-createSecret.yaml
new file mode 100644
index 000000000..6cf89b79e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/job-createSecret.yaml
@@ -0,0 +1,55 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-k8s-metrics-adapter.name.apiservice-create" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  template:
+    metadata:
+      name: {{ include "newrelic-k8s-metrics-adapter.name.apiservice-create" . }}
+      labels:
+        {{- include "newrelic.common.labels" . | nindent 8 }}
+    spec:
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.image.pullSecrets) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: create
+          image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "registry.k8s.io" "imageRoot" .Values.apiServicePatchJob.image "context" .) }}
+          imagePullPolicy: {{ .Values.apiServicePatchJob.image.pullPolicy }}
+          args:
+            - create
+            - --host={{ include "newrelic.common.naming.fullname" . }},{{ include "newrelic.common.naming.fullname" . }}.{{ .Release.Namespace }}.svc
+            - --namespace={{ .Release.Namespace }}
+            - --secret-name={{ include "newrelic-k8s-metrics-adapter.name.apiservice" . }}
+            - --cert-name=tls.crt
+            - --key-name=tls.key
+          {{- with .Values.apiServicePatchJob.volumeMounts }}
+          volumeMounts:
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
+      {{- with .Values.apiServicePatchJob.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      restartPolicy: OnFailure
+      serviceAccountName: {{ include "newrelic-k8s-metrics-adapter.name.apiservice.serviceAccount" . }}
+      securityContext:
+        runAsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 2000
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{ include "newrelic.common.nodeSelector" . | nindent 8 }}
+      {{- with include "newrelic.common.tolerations" . }}
+      tolerations:
+        {{- . | nindent 8 }}
+      {{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/job-patchAPIService.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/job-patchAPIService.yaml
new file mode 100644
index 000000000..9d651c210
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/job-patchAPIService.yaml
@@ -0,0 +1,53 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-k8s-metrics-adapter.name.apiservice-patch" . }}
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  template:
+    metadata:
+      name: {{ include "newrelic-k8s-metrics-adapter.name.apiservice-patch" . }}
+      labels:
+        {{- include "newrelic.common.labels" . | nindent 8 }}
+    spec:
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.image.pullSecrets) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: patch
+          image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "registry.k8s.io" "imageRoot" .Values.apiServicePatchJob.image "context" .) }}
+          imagePullPolicy: {{ .Values.apiServicePatchJob.image.pullPolicy }}
+          args:
+            - patch
+            - --namespace={{ .Release.Namespace }}
+            - --secret-name={{ include "newrelic-k8s-metrics-adapter.name.apiservice" . }}
+            - --apiservice-name=v1beta1.external.metrics.k8s.io
+            {{- with .Values.apiServicePatchJob.volumeMounts }}
+          volumeMounts:
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
+      {{- with .Values.apiServicePatchJob.volumes }}
+      volumes:
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+      restartPolicy: OnFailure
+      serviceAccountName: {{ include "newrelic-k8s-metrics-adapter.name.apiservice.serviceAccount" . }}
+      securityContext:
+        runAsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 2000
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{ include "newrelic.common.nodeSelector" . | nindent 8 }}
+      {{- with include "newrelic.common.tolerations" . }}
+      tolerations:
+        {{- . | nindent 8 }}
+      {{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/psp.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/psp.yaml
new file mode 100644
index 000000000..1dd6bc1a6
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/psp.yaml
@@ -0,0 +1,49 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled) (.Values.rbac.pspEnabled)) }}
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ include "newrelic-k8s-metrics-adapter.name.apiservice" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  privileged: false
+  # Required to prevent escalations to root.
+  # allowPrivilegeEscalation: false
+  # This is redundant with non-root + disallow privilege escalation,
+  # but we can provide it for defense in depth.
+  # requiredDropCapabilities:
+  #   - ALL
+  # Allow core volume types.
+  volumes:
+    - 'configMap'
+    - 'emptyDir'
+    - 'projected'
+    - 'secret'
+    - 'downwardAPI'
+    - 'persistentVolumeClaim'
+  hostNetwork: false
+  hostIPC: false
+  hostPID: false
+  runAsUser:
+    # Permits the container to run with root privileges as well.
+    rule: 'RunAsAny'
+  seLinux:
+    # This policy assumes the nodes are using AppArmor rather than SELinux.
+    rule: 'RunAsAny'
+  supplementalGroups:
+    rule: 'MustRunAs'
+    ranges:
+      # Forbid adding the root group.
+      - min: 0
+        max: 65535
+  fsGroup:
+    rule: 'MustRunAs'
+    ranges:
+      # Forbid adding the root group.
+      - min: 0
+        max: 65535
+  readOnlyRootFilesystem: false
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/role.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/role.yaml
new file mode 100644
index 000000000..1e870e082
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/role.yaml
@@ -0,0 +1,20 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-k8s-metrics-adapter.name.apiservice" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+    verbs:
+      - get
+      - create
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/rolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/rolebinding.yaml
new file mode 100644
index 000000000..cbe8bdb72
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/rolebinding.yaml
@@ -0,0 +1,20 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-k8s-metrics-adapter.name.apiservice" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "newrelic-k8s-metrics-adapter.name.apiservice" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "newrelic-k8s-metrics-adapter.name.apiservice.serviceAccount" . }}
+    namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/serviceaccount.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/serviceaccount.yaml
new file mode 100644
index 000000000..68a3cfd73
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/apiservice/job-patch/serviceaccount.yaml
@@ -0,0 +1,18 @@
+{{- $createServiceAccount := include "newrelic.common.serviceAccount.create" . -}}
+{{- if (and $createServiceAccount (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic-k8s-metrics-adapter.name.apiservice.serviceAccount" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    # When hooks are sorted by weight and name, kind order gets overwritten,
+    # then this serviceAccount doesn't get created before dependent objects causing a failure.
+    # This weight is set, forcing it always to get created before the other objects.
+    # We submitted this PR to fix the issue: https://github.com/helm/helm/pull/10787
+    "helm.sh/hook-weight": "-1"
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/configmap.yaml
new file mode 100644
index 000000000..8e88ad59e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/configmap.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  config.yaml: |
+    accountID: {{ .Values.config.accountID | required "config.accountID is required" }}
+    {{- with (include "newrelic-k8s-metrics-adapter.region" .) }}
+    region: {{ . }}
+    {{- end }}
+    cacheTTLSeconds: {{ .Values.config.cacheTTLSeconds | default "0" }}
+    {{- with .Values.config.externalMetrics }}
+    externalMetrics:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    nrdbClientTimeoutSeconds: {{ .Values.config.nrdbClientTimeoutSeconds | default "30" }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/deployment.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/deployment.yaml
new file mode 100644
index 000000000..1b96459a5
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/deployment.yaml
@@ -0,0 +1,113 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicas }}
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        {{- if .Values.podAnnotations }}
+        {{- toYaml .Values.podAnnotations | nindent 8 }}
+        {{- end }}
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+    spec:
+      serviceAccountName: {{ include "newrelic.common.serviceAccount.name" . }}
+      {{- with include "newrelic-k8s-metrics-adapter.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.image.pullSecrets) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 }}
+      {{- end }}
+      containers:
+      - name: {{ include "newrelic.common.naming.name" . }}
+        image: {{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.image "context" .) }}
+        imagePullPolicy: "{{ .Values.image.pullPolicy }}"
+        {{- with include "newrelic.common.securityContext.container" . }}
+        securityContext:
+          {{- . | nindent 10 }}
+        {{- end }}
+        args:
+        - --tls-cert-file=/tmp/k8s-metrics-adapter/serving-certs/tls.crt
+        - --tls-private-key-file=/tmp/k8s-metrics-adapter/serving-certs/tls.key
+        {{- if .Values.verboseLog }}
+        - --v=10
+        {{- else }}
+        - --v=1
+        {{- end }}
+        readinessProbe:
+          httpGet:
+            scheme: HTTPS
+            path: /healthz
+            port: 6443
+          initialDelaySeconds: 1
+        {{- if .Values.resources }}
+        resources:
+          {{- toYaml .Values.resources | nindent 10 }}
+        {{- end }}
+        env:
+        - name: CLUSTER_NAME
+          value: {{ include "newrelic.common.cluster" . }}
+        - name: NEWRELIC_API_KEY
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "newrelic.common.naming.fullname" . }}
+              key: personalAPIKey
+        {{- with (include "newrelic.common.proxy" .) }}
+        - name: HTTPS_PROXY
+          value: {{ . }}
+        {{- end }}
+        {{- with .Values.extraEnv }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- with .Values.extraEnvFrom }}
+        envFrom: {{ toYaml . | nindent 8 }}
+        {{- end }}
+        volumeMounts:
+        - name: tls-key-cert-pair
+          mountPath: /tmp/k8s-metrics-adapter/serving-certs/
+        - name: config
+          mountPath: /etc/newrelic/adapter/
+        {{- with .Values.extraVolumeMounts }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      volumes:
+      - name: tls-key-cert-pair
+        secret:
+          secretName: {{ include "newrelic-k8s-metrics-adapter.name.apiservice" . }}
+      - name: config
+        configMap:
+          name: {{ include "newrelic.common.naming.fullname" .  }}
+      {{- with .Values.extraVolumes }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+      {{- with include "newrelic.common.priorityClassName" . }}
+      priorityClassName: {{ . }}
+      {{- end }}
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{ include "newrelic.common.nodeSelector" . | nindent 8 }}
+      {{- with include "newrelic.common.tolerations" . }}
+      tolerations:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.affinity" . }}
+      affinity:
+        {{- . | nindent 8 }}
+      {{- end }}
+      hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+      {{- with include "newrelic.common.dnsConfig" . }}
+      dnsConfig:
+        {{- . | nindent 8 }}
+      {{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/hpa-clusterrole.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/hpa-clusterrole.yaml
new file mode 100644
index 000000000..402fece01
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/hpa-clusterrole.yaml
@@ -0,0 +1,15 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}:external-metrics
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+- apiGroups:
+  - external.metrics.k8s.io
+  resources:
+  - "*"
+  verbs:
+  - list
+  - get
+  - watch
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/hpa-clusterrolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/hpa-clusterrolebinding.yaml
new file mode 100644
index 000000000..390fab452
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/hpa-clusterrolebinding.yaml
@@ -0,0 +1,14 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "newrelic-k8s-metrics-adapter.name.hpa-controller" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "newrelic.common.naming.fullname" .  }}:external-metrics
+subjects:
+- kind: ServiceAccount
+  name: horizontal-pod-autoscaler
+  namespace: kube-system
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/secret.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/secret.yaml
new file mode 100644
index 000000000..09a70ab65
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/secret.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+type: Opaque
+stringData:
+  personalAPIKey: {{ .Values.personalAPIKey | required "personalAPIKey must be set" | quote }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/service.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/service.yaml
new file mode 100644
index 000000000..82015830c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  ports:
+  - port: 443
+    targetPort: 6443
+  selector:
+    {{- include "newrelic.common.labels.selectorLabels" . | nindent 4 }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/serviceaccount.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/serviceaccount.yaml
new file mode 100644
index 000000000..b1e74523e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/templates/serviceaccount.yaml
@@ -0,0 +1,13 @@
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- if include "newrelic.common.serviceAccount.annotations" . }}
+  annotations:
+    {{- include "newrelic.common.serviceAccount.annotations" . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/apiservice_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/apiservice_test.yaml
new file mode 100644
index 000000000..086160edc
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/apiservice_test.yaml
@@ -0,0 +1,22 @@
+suite: test naming helper for APIService's certmanager annotations and service name
+templates:
+  - templates/apiservice/apiservice.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: Annotations are correctly defined
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 11111111
+      certManager:
+        enabled: true
+    asserts:
+      - matchRegex:
+          path: metadata.annotations["certmanager.k8s.io/inject-ca-from"]
+          pattern: ^my-namespace\/.*-root-cert
+      - matchRegex:
+          path: metadata.annotations["cert-manager.io/inject-ca-from"]
+          pattern: ^my-namespace\/.*-root-cert
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/common_extra_naming_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/common_extra_naming_test.yaml
new file mode 100644
index 000000000..82098ba1c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/common_extra_naming_test.yaml
@@ -0,0 +1,27 @@
+suite: test naming helpers
+templates:
+  - templates/adapter-clusterrolebinding.yaml
+  - templates/hpa-clusterrole.yaml
+  - templates/hpa-clusterrolebinding.yaml
+  - templates/apiservice/job-patch/clusterrole.yaml
+  - templates/apiservice/job-patch/clusterrolebinding.yaml
+  - templates/apiservice/job-patch/job-createSecret.yaml
+  - templates/apiservice/job-patch/job-patchAPIService.yaml
+  - templates/apiservice/job-patch/psp.yaml
+  - templates/apiservice/job-patch/rolebinding.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: default values has its name correctly defined
+    set:
+      cluster: test-cluster
+      personalAPIKey: 21321
+      config:
+        accountID: 11111111
+      rbac:
+        pspEnabled: true
+    asserts:
+      - matchRegex:
+          path: metadata.name
+          pattern: ^.*(-apiservice|-hpa-controller|:external-metrics|:system:auth-delegator)
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/configmap_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/configmap_test.yaml
new file mode 100644
index 000000000..90b8798a7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/configmap_test.yaml
@@ -0,0 +1,104 @@
+suite: test configmap region helper and externalMetrics
+templates:
+  - templates/configmap.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: has the correct region when defined in local values
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |
+            accountID: 111
+            region: A-REGION
+            cacheTTLSeconds: 30
+            nrdbClientTimeoutSeconds: 30
+  - it: has the correct region when global staging
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+      global:
+        nrStaging: true
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |
+            accountID: 111
+            region: Staging
+            cacheTTLSeconds: 30
+            nrdbClientTimeoutSeconds: 30
+  - it: has the correct region when global values and licenseKey is from eu
+    set:
+      personalAPIKey: 21321
+      licenseKey: eu-whatever
+      cluster: test-cluster
+      config:
+        accountID: 111
+      global:
+        aRandomGlobalValue: true
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |
+            accountID: 111
+            region: EU
+            cacheTTLSeconds: 30
+            nrdbClientTimeoutSeconds: 30
+  - it: has the correct region when no global values exist and licenseKey is from eu
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      licenseKey: eu-whatever
+      config:
+        accountID: 111
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |
+            accountID: 111
+            region: EU
+            cacheTTLSeconds: 30
+            nrdbClientTimeoutSeconds: 30
+  - it: has no region when not defined and licenseKey is not from eu
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      licenseKey: us-whatever
+      config:
+        accountID: 111
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |
+            accountID: 111
+            cacheTTLSeconds: 30
+            nrdbClientTimeoutSeconds: 30
+  - it: has externalMetrics when defined
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      licenseKey: us-whatever
+      config:
+        accountID: 111
+        externalMetrics:
+          nginx_average_requests:
+            query: "FROM Metric SELECT average(nginx.server.net.requestsPerSecond)"
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |
+            accountID: 111
+            cacheTTLSeconds: 30
+            externalMetrics:
+              nginx_average_requests:
+                query: FROM Metric SELECT average(nginx.server.net.requestsPerSecond)
+            nrdbClientTimeoutSeconds: 30
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/deployment_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/deployment_test.yaml
new file mode 100644
index 000000000..7a1898790
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/deployment_test.yaml
@@ -0,0 +1,99 @@
+suite: test deployent images
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: has the correct image
+    set:
+      global:
+        cluster: test-cluster
+      personalAPIKey: 21321
+      image:
+        repository: newrelic/newrelic-k8s-metrics-adapter
+        tag: "latest"
+        pullSecrets:
+          - name: regsecret
+      config:
+        accountID: 111
+        region: A-REGION
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^.*newrelic/newrelic-k8s-metrics-adapter:latest
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.template.spec.imagePullSecrets
+          value:
+            - name: regsecret
+        template: templates/deployment.yaml
+  - it: correctly uses the cluster helper
+    set:
+      personalAPIKey: 21321
+      config:
+        accountID: 111
+        region: A-REGION
+      cluster: a-cluster
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[0].value
+          value: a-cluster
+        template: templates/deployment.yaml
+  - it: correctly uses common.securityContext.podDefaults
+    set:
+      personalAPIKey: 21321
+      config:
+        accountID: 111
+        region: A-REGION
+      cluster: a-cluster
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext
+          value:
+            fsGroup: 1001
+            runAsGroup: 1001
+            runAsUser: 1001
+        template: templates/deployment.yaml
+  - it: correctly uses common.proxy
+    set:
+      personalAPIKey: 21321
+      config:
+        accountID: 111
+        region: A-REGION
+      cluster: a-cluster
+      proxy: localhost:1234
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[2].value
+          value: localhost:1234
+        template: templates/deployment.yaml
+
+  - it: has a linux node selector by default
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+        template: templates/deployment.yaml
+
+  - it: has a linux node selector and additional selectors
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+      nodeSelector:
+        aCoolTestLabel: aCoolTestValue
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+            aCoolTestLabel: aCoolTestValue
+        template: templates/deployment.yaml
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/hpa_clusterrolebinding_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/hpa_clusterrolebinding_test.yaml
new file mode 100644
index 000000000..4fba87fbe
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/hpa_clusterrolebinding_test.yaml
@@ -0,0 +1,18 @@
+suite: test naming helper for clusterRolebBinding roleRef
+templates:
+  - templates/hpa-clusterrolebinding.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: roleRef.name has its name correctly defined
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+    asserts:
+      - matchRegex:
+          path: roleRef.name
+          pattern: ^.*:external-metrics
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_cluster_rolebinding_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_cluster_rolebinding_test.yaml
new file mode 100644
index 000000000..dd582313e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_cluster_rolebinding_test.yaml
@@ -0,0 +1,22 @@
+suite: test job-patch RoleBinding and ClusterRoleBinding rendering and roleRef/Subjects names
+templates:
+  - templates/apiservice/job-patch/rolebinding.yaml
+  - templates/apiservice/job-patch/clusterrolebinding.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: roleRef apiGroup and Subjets are correctly defined
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+    asserts:
+      - matchRegex:
+          path: roleRef.name
+          pattern: ^.*-apiservice
+      - matchRegex:
+          path: subjects[0].name
+          pattern: ^.*-apiservice
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_clusterrole_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_clusterrole_test.yaml
new file mode 100644
index 000000000..33a1eaa73
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_clusterrole_test.yaml
@@ -0,0 +1,20 @@
+suite: test job-patch clusterRole rule resourceName and rendering
+templates:
+  - templates/apiservice/job-patch/clusterrole.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: PodSecurityPolicy rule resourceName is correctly defined
+    set:
+      rbac:
+        pspEnabled: true
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+    asserts:
+      - matchRegex:
+          path: rules[1].resourceNames[0]
+          pattern: ^.*-apiservice
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_common_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_common_test.yaml
new file mode 100644
index 000000000..91cd791d1
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_common_test.yaml
@@ -0,0 +1,27 @@
+suite: test labels and rendering for job-batch objects
+templates:
+  - templates/apiservice/job-patch/clusterrole.yaml
+  - templates/apiservice/job-patch/clusterrolebinding.yaml
+  - templates/apiservice/job-patch/job-createSecret.yaml
+  - templates/apiservice/job-patch/job-patchAPIService.yaml
+  - templates/apiservice/job-patch/psp.yaml
+  - templates/apiservice/job-patch/role.yaml
+  - templates/apiservice/job-patch/rolebinding.yaml
+  - templates/apiservice/job-patch/serviceaccount.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: If customTLSCertificate and Certmanager enabled do not render
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+      customTLSCertificate: a-tls-cert
+      certManager:
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_job_createsecret_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_job_createsecret_test.yaml
new file mode 100644
index 000000000..6db79234f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_job_createsecret_test.yaml
@@ -0,0 +1,47 @@
+suite: test naming helper for job-createSecret
+templates:
+  - templates/apiservice/job-patch/job-createSecret.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: spec metadata name is is correctly defined
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+    asserts:
+      - equal:
+          path: spec.template.metadata.name
+          value: my-release-newrelic-k8s-metrics-adapter-apiservice-create
+  - it: container args are correctly defined
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[1]
+          pattern: --host=.*,.*\.my-namespace.svc
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[3]
+          pattern: --secret-name=.*-apiservice
+  - it: has the correct image
+    set:
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+      personalAPIKey: 21321
+      apiServicePatchJob:
+        image:
+          repository: registry.k8s.io/ingress-nginx/kube-webhook-certgen
+          tag: "latest"
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^.*registry.k8s.io/ingress-nginx/kube-webhook-certgen:latest
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_job_patchapiservice_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_job_patchapiservice_test.yaml
new file mode 100644
index 000000000..0be083313
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_patch_job_patchapiservice_test.yaml
@@ -0,0 +1,56 @@
+suite: test naming helper for job-patchAPIService
+templates:
+  - templates/apiservice/job-patch/job-patchAPIService.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: spec metadata name is is correctly defined
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+    asserts:
+      - matchRegex:
+          path: spec.template.metadata.name
+          pattern: .*-apiservice-patch$
+  - it: container args are correctly defined
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[2]
+          pattern: ^--secret-name=.*-apiservice
+
+  - it: serviceAccountName is correctly defined
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.serviceAccountName
+          pattern: .*-apiservice$
+  - it: has the correct image
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+      apiServicePatchJob:
+        image:
+          repository: registry.k8s.io/ingress-nginx/kube-webhook-certgen
+          tag: "latest"
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: .*registry.k8s.io/ingress-nginx/kube-webhook-certgen:latest$
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_serviceaccount_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_serviceaccount_test.yaml
new file mode 100644
index 000000000..9b6207c35
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/job_serviceaccount_test.yaml
@@ -0,0 +1,79 @@
+suite: test job' serviceAccount
+templates:
+  - templates/apiservice/job-patch/job-createSecret.yaml
+  - templates/apiservice/job-patch/job-patchAPIService.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: RBAC points to the service account that is created by default
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+      rbac.create: true
+      serviceAccount.create: true
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: my-release-newrelic-k8s-metrics-adapter-apiservice
+
+  - it: RBAC points to the service account the user supplies when serviceAccount is disabled
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+      rbac.create: true
+      serviceAccount.create: false
+      serviceAccount.name: sa-test
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: sa-test
+
+  - it: RBAC points to the service account the user supplies when serviceAccount is disabled
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+      rbac.create: true
+      serviceAccount.create: false
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: default
+
+  - it: has a linux node selector by default
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+
+  - it: has a linux node selector and additional selectors
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+      nodeSelector:
+        aCoolTestLabel: aCoolTestValue
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+            aCoolTestLabel: aCoolTestValue
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/rbac_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/rbac_test.yaml
new file mode 100644
index 000000000..78884c022
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/tests/rbac_test.yaml
@@ -0,0 +1,50 @@
+suite: test RBAC creation
+templates:
+  - templates/apiservice/job-patch/rolebinding.yaml
+  - templates/apiservice/job-patch/clusterrolebinding.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: RBAC points to the service account that is created by default
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+      rbac.create: true
+      serviceAccount.create: true
+    asserts:
+      - equal:
+          path: subjects[0].name
+          value: my-release-newrelic-k8s-metrics-adapter-apiservice
+
+  - it: RBAC points to the service account the user supplies when serviceAccount is disabled
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+      rbac.create: true
+      serviceAccount.create: false
+      serviceAccount.name: sa-test
+    asserts:
+      - equal:
+          path: subjects[0].name
+          value: sa-test
+
+  - it: RBAC points to the service account the user supplies when serviceAccount is disabled
+    set:
+      personalAPIKey: 21321
+      cluster: test-cluster
+      config:
+        accountID: 111
+        region: A-REGION
+      rbac.create: true
+      serviceAccount.create: false
+    asserts:
+      - equal:
+          path: subjects[0].name
+          value: default
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/values.yaml
new file mode 100644
index 000000000..5c610f792
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-k8s-metrics-adapter/values.yaml
@@ -0,0 +1,156 @@
+# IMPORTANT: The Kubernetes cluster name
+# https://docs.newrelic.com/docs/kubernetes-monitoring-integration
+#
+# licenseKey:
+# cluster:
+# IMPORTANT: the previous values can also be set as global so that they
+# can be shared by other newrelic product's charts.
+#
+# global:
+#   licenseKey:
+#   cluster:
+#   nrStaging:
+
+# -- New Relic [Personal API Key](https://docs.newrelic.com/docs/apis/intro-apis/new-relic-api-keys/#user-api-key) (stored in a secret). Used to connect to NerdGraph in order to fetch the configured metrics. (**Required**)
+personalAPIKey:
+
+# -- Enable metrics adapter verbose logs.
+verboseLog: false
+
+config:
+  # -- New Relic [Account ID](https://docs.newrelic.com/docs/accounts/accounts-billing/account-structure/account-id/) where the configured metrics are sourced from. (**Required**)
+  accountID:
+
+  # config.region -- New Relic account region. If not set, it will be automatically derived from the License Key.
+  # @default -- Automatically detected from `licenseKey`.
+  region:
+  # For US-based accounts, the region is: `US`.
+  # For EU-based accounts, the region is: `EU`.
+  # For Staging accounts, the region is: 'Staging' this is also automatically derived form `global.nrStaging`
+
+
+  # config.cacheTTLSeconds -- Period of time in seconds in which a cached value of a metric is consider valid.
+  cacheTTLSeconds: 30
+  # Not setting it or setting it to '0' disables the cache.
+
+  # config.externalMetrics -- Contains all the external metrics definition of the adapter. Each key of the externalMetric entry represents the metric name and contains the parameters that defines it.
+  # @default -- See `values.yaml`
+  externalMetrics:
+  # Names cannot contain uppercase characters and
+  # "/" or "%" characters.
+  # my_external_metric_name_example:
+  #
+  # NRQL query that will executed to obtain the metric value.
+  # The query must return just one value so is recommended to use aggregator functions like average or latest.
+  # Default time span for aggregator func is 1h so is recommended to use the SINCE clause to reduce the time span.
+  #   query: "FROM Metric SELECT average(`k8s.container.cpuCoresUtilization`) SINCE 2 MINUTES AGO"
+  #
+  # By default a cluster filter is added to the query to ensure no cross cluster metrics are taking into account.
+  # The added filter is equivalent to WHERE `clusterName`=<cluster>.
+  # If metrics are not from the cluster use removeClusterFilter. Default value for this parameter is false.
+  #   removeClusterFilter: false
+
+  # config.nrdbClientTimeoutSeconds -- Defines the NRDB client timeout. The maximum allowed value is 120.
+  # @default -- 30
+  nrdbClientTimeoutSeconds: 30
+
+# image -- Registry, repository, tag, and pull policy for the container image.
+# @default -- See `values.yaml`.
+image:
+  registry:
+  repository: newrelic/newrelic-k8s-metrics-adapter
+  tag: ""
+  pullPolicy: IfNotPresent
+  # It is possible to specify docker registry credentials.
+  # See https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
+  # image.pullSecrets -- The image pull secrets.
+  pullSecrets: []
+  # - name: regsecret
+
+# -- Number of replicas in the deployment.
+replicas: 1
+
+# -- Resources you wish to assign to the pod.
+# @default -- See `values.yaml`
+resources:
+  limits:
+    memory: 80M
+  requests:
+    cpu: 100m
+    memory: 30M
+
+serviceAccount:
+  # -- Specifies whether a ServiceAccount should be created for the job and the deployment.
+  # false avoids creation, true or empty will create the ServiceAccount
+  # @default -- `true`
+  create:
+  # -- If `serviceAccount.create` this will be the name of the ServiceAccount to use.
+  # If not set and create is true, a name is generated using the fullname template.
+  # If create is false, a serviceAccount with the given name must exist
+  # @default -- Automatically generated.
+  name:
+
+# -- Configure podSecurityContext
+podSecurityContext:
+
+# -- Configure containerSecurityContext
+containerSecurityContext:
+
+# -- Array to add extra environment variables
+extraEnv: []
+# -- Array to add extra envFrom
+extraEnvFrom: []
+# -- Array to add extra volumes
+extraVolumes: []
+# -- Add extra volume mounts
+extraVolumeMounts: []
+
+# -- Additional annotations to apply to the pod(s).
+podAnnotations:
+
+# Due to security restrictions, some users might require to use a https proxy to route traffic over the internet.
+# In this specific case, when the metrics adapter sends a request to the New Relic backend. If this is the case
+# for you, set this value to your http proxy endpoint.
+# -- Configure proxy for the metrics-adapter.
+proxy:
+
+# Pod scheduling priority
+# Ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
+# priorityClassName: high-priority
+
+# fullnameOverride -- To fully override common.naming.fullname
+fullnameOverride: ""
+# -- Node affinity to use for scheduling.
+affinity: {}
+# -- Node label to use for scheduling.
+nodeSelector: {}
+# -- List of node taints to tolerate (requires Kubernetes >= 1.6)
+tolerations: []
+
+apiServicePatchJob:
+  # apiServicePatchJob.image -- Registry, repository, tag, and pull policy for the job container image.
+  # @default -- See `values.yaml`.
+  image:
+    registry:  # defaults to registry.k8s.io
+    repository: ingress-nginx/kube-webhook-certgen
+    tag: v1.3.0
+    pullPolicy: IfNotPresent
+
+  # -- Additional Volumes for Cert Job.
+  volumes: []
+  # - name: tmp
+  #   emptyDir: {}
+
+  # -- Additional Volume mounts for Cert Job, you might want to mount tmp if Pod Security Policies.
+  volumeMounts: []
+  # - name: tmp
+  #   mountPath: /tmp
+  # Enforce a read-only root.
+
+certManager:
+  # -- Use cert manager for APIService certs, rather than the built-in patch job.
+  enabled: false
+
+rbac:
+  # rbac.pspEnabled -- Whether the chart should create Pod Security Policy objects.
+  pspEnabled: false
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/Chart.lock b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/Chart.lock
new file mode 100644
index 000000000..97b3528db
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.0
+digest: sha256:2e1da613fd8a52706bde45af077779c5d69e9e1641bdf5c982eaf6d1ac67a443
+generated: "2024-10-28T11:23:44.493524-07:00"
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/Chart.yaml
new file mode 100644
index 000000000..98de7c24d
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/Chart.yaml
@@ -0,0 +1,20 @@
+apiVersion: v2
+appVersion: 2.1.0
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.0
+description: A Helm chart to deploy New Relic Kubernetes Logging as a DaemonSet, supporting
+  both Linux and Windows nodes and containers
+home: https://github.com/newrelic/kubernetes-logging
+icon: https://newrelic.com/assets/newrelic/source/NewRelic-logo-square.svg
+keywords:
+- logging
+- newrelic
+maintainers:
+- email: logging-team@newrelic.com
+  name: jsubirat
+- name: danybmx
+- name: sdaubin
+name: newrelic-logging
+version: 1.23.5
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/README.md
new file mode 100644
index 000000000..1635b0d86
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/README.md
@@ -0,0 +1,268 @@
+# newrelic-logging
+
+
+## Chart Details
+New Relic offers a [Fluent Bit](https://fluentbit.io/) output [plugin](https://github.com/newrelic/newrelic-fluent-bit-output) to easily forward your logs to [New Relic Logs](https://docs.newrelic.com/docs/logs/new-relic-logs/get-started/introduction-new-relic-logs). This plugin is also provided in a standalone Docker image that can be installed in a [Kubernetes](https://kubernetes.io/) cluster in the form of a [DaemonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/), which we refer as the Kubernetes plugin.
+
+This document explains how to install it in your cluster using our [Helm](https://helm.sh/) chart.
+
+
+## Install / Upgrade / Uninstall instructions
+Despite the `newrelic-logging` chart being able to work standalone, we recommend installing it as part of the [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) chart. The best way of doing so is through the guided installation process documented [here](https://docs.newrelic.com//docs/kubernetes-pixie/kubernetes-integration/installation/kubernetes-integration-install-configure/). This guided install can generate the Helm 3 commands required to install it (select "Helm 3" in Step 3 from the previous documentation link). You can also opt to install it manually using Helm by following [these steps](https://docs.newrelic.com//docs/kubernetes-pixie/kubernetes-integration/installation/install-kubernetes-integration-using-helm/#install-k8-helm). To uninstall it, refer to the steps outlined in [this page](https://docs.newrelic.com/docs/kubernetes-pixie/kubernetes-integration/uninstall-kubernetes/).
+
+### Installing or updating the helm New Relic repository
+
+To install the repo you can run:
+```
+helm repo add newrelic https://helm-charts.newrelic.com
+```
+
+To update the repo you can run:
+```
+helm repo update newrelic
+```
+
+## Configuration
+
+### How to configure the chart
+The `newrelic-logging` chart can be installed either alone or as part of the [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) chart (recommended). The chart default settings should be suitable for most users. Nevertheless, you may be interested in overriding the defaults, either by passing them through a `values-newrelic.yaml` file or via the command line when installing the chart. Depending on how you installed it, you'll need to specify the `newrelic-logging`-specific configuration values using the chart name (`newrelic-logging`) as a prefix. In the table below, you can find a quick reference of how to configure the chart in these scenarios. The example depicts how you'd specify the mandatory `licenseKey` and `cluster` settings and how you'd override the `fluentBit.retryLimit` setting to `10`.
+
+<table>
+    <tr>
+        <td><b>Installation method</b></td>
+        <td><b>Configuration via <i>values.yaml</i></b></td>
+        <td><b>Configuration via command line</b></td>
+    </tr>
+    <tr>
+        <td>Standalone <i>newrelic-logging</i></td>
+        <td>
+
+
+```
+# values-newrelic.yaml configuration contents
+
+licenseKey: _YOUR_NEW_RELIC_LICENSE_KEY_
+cluster: _K8S_CLUSTER_NAME_
+
+fluentBit:
+  retryLimit: 10
+```
+
+```
+# Install / upgrade command
+
+helm upgrade --install newrelic-logging newrelic/newrelic-logging \
+--namespace newrelic \
+--create-namespace \
+-f values-newrelic.yaml
+```
+</td>
+        <td>
+
+```
+# Install / upgrade command
+
+helm upgrade --install newrelic-logging newrelic/newrelic-logging \
+--namespace=newrelic \
+--set licenseKey=_YOUR_NEW_RELIC_LICENSE_KEY_ \
+--set cluster=_K8S_CLUSTER_NAME_ \
+--set fluentBit.retryLimit=10
+```
+</td>
+    </tr>
+    <tr>
+        <td>As part of <i>nri-bundle</i></td>
+        <td>
+
+```
+# values-newrelic.yaml configuration contents
+
+# General settings that apply to all the child charts
+global:
+  licenseKey: _YOUR_NEW_RELIC_LICENSE_KEY_
+  cluster: _K8S_CLUSTER_NAME_
+
+# Specific configuration for the newrelic-logging child chart
+newrelic-logging:
+  fluentBit:
+    retryLimit: 10
+```
+
+```
+# Install / upgrade command
+
+helm upgrade --install newrelic-bundle newrelic/nri-bundle \
+  --namespace newrelic \
+  --create-namespace \
+  -f values-newrelic.yaml \
+```
+</td>
+        <td>
+
+```
+# Install / upgrade command
+
+helm upgrade --install newrelic-bundle newrelic/nri-bundle \
+--namespace=newrelic \
+--set global.licenseKey=_YOUR_NEW_RELIC_LICENSE_KEY_ \
+--set global.cluster=_K8S_CLUSTER_NAME_ \
+--set newrelic-logging.fluentBit.retryLimit=10
+```
+</td>
+    </tr>
+</table>
+
+
+### Supported configuration parameters
+See [values.yaml](values.yaml) for the default values
+
+| Parameter                                                    | Description                                                                                                                                                                                                                                                                                                                                                                          | Default                                                                         |
+| ------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------- |
+| `global.cluster` - `cluster`                                 | The cluster name for the Kubernetes cluster.                                                                                                                                                                                                                                                                                                                                         |                                                                                 |
+| `global.licenseKey` - `licenseKey`                           | The [license key](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/license-key) for your New Relic Account. This will be the preferred configuration option if both `licenseKey` and `customSecret*` values are specified.                                                                                                                                    |                                                                                 |
+| `global.customSecretName` - `customSecretName`               | Name of the Secret object where the license key is stored                                                                                                                                                                                                                                                                                                                            |                                                                                 |
+| `global.customSecretLicenseKey` - `customSecretLicenseKey`   | Key in the Secret object where the license key is stored.                                                                                                                                                                                                                                                                                                                            |                                                                                 |
+| `global.fargate`                                             | Must be set to `true` when deploying in an EKS Fargate environment. Prevents DaemonSet pods from being scheduled in Fargate nodes.                                                                                                                                                                                                                                                   |                                                                                 |
+| `global.lowDataMode` - `lowDataMode`                         | If `true`, send minimal attributes on Kubernetes logs. Labels and annotations are not sent when lowDataMode is enabled.                                                                                                                                                                                                                                                              | `false`                                                                         |
+| `rbac.create`                                                | Enable Role-based authentication                                                                                                                                                                                                                                                                                                                                                     | `true`                                                                          |
+| `rbac.pspEnabled`                                            | Enable pod security policy support                                                                                                                                                                                                                                                                                                                                                   | `false`                                                                         |
+| `image.repository`                                           | The container to pull.                                                                                                                                                                                                                                                                                                                                                               | `newrelic/newrelic-fluentbit-output`                                            |
+| `image.pullPolicy`                                           | The pull policy.                                                                                                                                                                                                                                                                                                                                                                     | `IfNotPresent`                                                                  |
+| `image.pullSecrets`                                          | Image pull secrets.                                                                                                                                                                                                                                                                                                                                                                  | `nil`                                                                           |
+| `image.tag`                                                  | The version of the container to pull.                                                                                                                                                                                                                                                                                                                                                | See value in [values.yaml]`                                                     |
+| `exposedPorts`                                               | Any ports you wish to expose from the pod.  Ex. 2020 for metrics                                                                                                                                                                                                                                                                                                                     | `[]`                                                                            |
+| `resources`                                                  | Any resources you wish to assign to the pod.                                                                                                                                                                                                                                                                                                                                         | See Resources below                                                             |
+| `priorityClassName`                                          | Scheduling priority of the pod                                                                                                                                                                                                                                                                                                                                                       | `nil`                                                                           |
+| `nodeSelector`                                               | Node label to use for scheduling on Linux nodes                                                                                                                                                                                                                                                                                                                                      | `{ kubernetes.io/os: linux }`                                                   |
+| `windowsNodeSelector`                                        | Node label to use for scheduling on Windows nodes                                                                                                                                                                                                                                                                                                                                    | `{ kubernetes.io/os: windows, node.kubernetes.io/windows-build: BUILD_NUMBER }` |
+| `tolerations`                                                | List of node taints to tolerate (requires Kubernetes >= 1.6)                                                                                                                                                                                                                                                                                                                         | See Tolerations below                                                           |
+| `updateStrategy`                                             | Strategy for DaemonSet updates (requires Kubernetes >= 1.6)                                                                                                                                                                                                                                                                                                                          | `RollingUpdate`                                                                 |
+| `extraVolumeMounts`                                          | Additional DaemonSet volume mounts                                                                                                                                                                                                                                                                                                                                                   | `[]`                                                                            |
+| `extraVolumes`                                               | Additional DaemonSet volumes                                                                                                                                                                                                                                                                                                                                                         | `[]`                                                                            |
+| `initContainers`                                             | [Init containers](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/) that will be executed before the actual container in charge of shipping logs to New Relic is initialized. Use this if you are using a custom Fluent Bit configuration that requires downloading certain files inside the volumes being accessed by the log-shipping pod.                      | `[]`                                                                            |
+| `windows.initContainers`                                     | [Init containers](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/) that will be executed before the actual container in charge of shipping logs to New Relic is initialized. Use this if you are using a custom Fluent Bit configuration that requires downloading certain files inside the volumes being accessed by the log-shipping pod.                      | `[]`                                                                            |
+| `serviceAccount.create`                                      | If true, a service account would be created and assigned to the deployment                                                                                                                                                                                                                                                                                                           | `true`                                                                          |
+| `serviceAccount.name`                                        | The service account to assign to the deployment. If `serviceAccount.create` is true then this name will be used when creating the service account                                                                                                                                                                                                                                    |                                                                                 |
+| `serviceAccount.annotations`                                 | The annotations to add to the service account if `serviceAccount.create` is set to true.                                                                                                                                                                                                                                                                                             |                                                                                 |
+| `global.nrStaging` - `nrStaging`                             | Send data to staging (requires a staging license key)                                                                                                                                                                                                                                                                                                                                | `false`                                                                         |
+| `fluentBit.path`                                             | Node path logs are forwarded from. Patterns are supported, as well as specifying multiple paths/patterns separated by commas.                                                                                                                                                                                                                                                        | `/var/log/containers/*.log`                                                     |
+| `fluentBit.linuxMountPath`                                   | The path mounted on linux Fluent-Bit pods to read logs from. Defaults to /var because some engines write the logs to /var/log and others to /var/lib (symlinked to /var/log) so Fluent-Bit need access to both in those cases                                                                                                                                                        | `/var`                                                                          |
+| `fluentBit.db`                                               | Node path used by Fluent Bit to store a database file to keep track of monitored files and offsets.                                                                                                                                                                                                                                                                                  | `/var/log/containers/*.log`                                                     |
+| `fluentBit.k8sBufferSize`                                    | Set the buffer size for HTTP client when reading responses from Kubernetes API server. A value of 0 results in no limit and the buffer will expand as needed.                                                                                                                                                                                                                        | `32k`                                                                           |
+| `fluentBit.k8sLoggingExclude`                                | Set to "true" to allow excluding pods by adding the annotation `fluentbit.io/exclude: "true"` to pods you wish to exclude.                                                                                                                                                                                                                                                             | `false`                                                                           |
+| `fluentBit.additionalEnvVariables`                           | Additional environmental variables for fluentbit pods                                                                                                                                                                                                                                                                                                                                | `[]]`                                                                           |
+| `fluentBit.persistence.mode`                                 | The [persistence mode](#Fluent-Bit-persistence-modes) you want to use, options are "hostPath", "none" or "persistentVolume" (this last one available only for linux)                                                                                                                                                                                                                 |
+| `fluentBit.persistence.persistentVolume.storageClass`        | On "persistentVolume" [persistence mode](#Fluent-Bit-persistence-modes), indicates the storage class that will be used for create the PersistentVolume and PersistentVolumeClaim.                                                                                                                                                                                                    |                                                                                 |
+| `fluentBit.persistence.persistentVolume.size`                | On "persistentVolume" [persistence mode](#Fluent-Bit-persistence-modes), indicates the capacity for the PersistentVolume and PersistentVolumeClaim                                                                                                                                                                                                                                   | 10Gi                                                                            |
+| `fluentBit.persistence.persistentVolume.dynamicProvisioning` | On "persistentVolume" [persistence mode](#Fluent-Bit-persistence-modes), indicates if  the storage class used provide dynamic provisioning. If it does, only the PersistentVolumeClaim will be created.                                                                                                                                                                              | true                                                                            |
+| `fluentBit.persistence.persistentVolume.existingVolume`      | On "persistentVolume" [persistence mode](#Fluent-Bit-persistence-modes), indicates and existing volume in case you want to reuse one, bear in mind that it should allow ReadWriteMany access mode. A PersistentVolumeClaim will be created using it.                                                                                                                                 |                                                                                 |
+| `fluentBit.persistence.persistentVolume.existingVolumeClaim` | On "persistentVolume" [persistence mode](#Fluent-Bit-persistence-modes), indicates and existing volume claim that will be used on the daemonset. It should allow ReadWriteMany access mode.                                                                                                                                                                                          |                                                                                 |
+| `fluentBit.persistence.persistentVolume.annotations.volume`  | On "persistentVolume" [persistence mode](#Fluent-Bit-persistence-modes), allows to add annotations to the PersistentVolume (if created).                                                                                                                                                                                                                                             |                                                                                 |
+| `fluentBit.persistence.persistentVolume.annotations.claim`   | On "persistentVolume" [persistence mode](#Fluent-Bit-persistence-modes), allows to add annotations to the PersistentVolumeClaim (if created).                                                                                                                                                                                                                                        |                                                                                 |
+| `fluentBit.persistence.persistentVolume.extra.volume`        | On "persistentVolume" [persistence mode](#Fluent-Bit-persistence-modes), allows to add extra properties to the PersistentVolume (if created).                                                                                                                                                                                                                                        |                                                                                 |
+| `fluentBit.persistence.persistentVolume.extra.claim`         | On "persistentVolume" [persistence mode](#Fluent-Bit-persistence-modes), allows to add extra properties to the PersistentVolumeClaim (if created).                                                                                                                                                                                                                                   |                                                                                 |
+| `daemonSet.annotations`                                      | The annotations to add to the `DaemonSet`.                                                                                                                                                                                                                                                                                                                                           |                                                                                 |
+| `podAnnotations`                                             | The annotations to add to the `DaemonSet` created `Pod`s.                                                                                                                                                                                                                                                                                                                            |                                                                                 |
+| `hostNetwork`                                                | Set the hostNetwork property for fluentbit pods.                                                                                                                                                                                                                                                                                                                                     |                                                                                 |
+| `enableLinux`                                                | Enable log collection from Linux containers. This is the default behavior. In case you are only interested of collecting logs from Windows containers, set this to `false`.                                                                                                                                                                                                          | `true`                                                                          |
+| `enableWindows`                                              | Enable log collection from Windows containers. Please refer to the [Windows support](#windows-support) section for more details.                                                                                                                                                                                                                                                     | `false`                                                                         |
+| `fluentBit.config.service`                                   | Contains fluent-bit.conf Service config                                                                                                                                                                                                                                                                                                                                              |                                                                                 |
+| `fluentBit.config.inputs`                                    | Contains fluent-bit.conf Inputs config                                                                                                                                                                                                                                                                                                                                               |                                                                                 |
+| `fluentBit.config.extraInputs`                               | Contains extra fluent-bit.conf Inputs config                                                                                                                                                                                                                                                                                                                                         |                                                                                 |
+| `fluentBit.config.filters`                                   | Contains fluent-bit.conf Filters config                                                                                                                                                                                                                                                                                                                                              |                                                                                 |
+| `fluentBit.config.extraFilters`                              | Contains extra fluent-bit.conf Filters config                                                                                                                                                                                                                                                                                                                                        |                                                                                 |
+| `fluentBit.config.lowDataModeFilters`                        | Contains fluent-bit.conf Filters config for lowDataMode                                                                                                                                                                                                                                                                                                                              |                                                                                 |
+| `fluentBit.config.outputs`                                   | Contains fluent-bit.conf Outputs config                                                                                                                                                                                                                                                                                                                                              |                                                                                 |
+| `fluentBit.config.extraOutputs`                              | Contains extra fluent-bit.conf Outputs config                                                                                                                                                                                                                                                                                                                                        |                                                                                 |
+| `fluentBit.config.parsers`                                   | Contains parsers.conf Parsers config                                                                                                                                                                                                                                                                                                                                                 |                                                                                 |
+| `fluentBit.retryLimit`                                       | Amount of times to retry sending a given batch of logs to New Relic. This prevents data loss if there is a temporary network disruption, if a request to the Logs API is lost or when receiving a recoverable HTTP response. Set it to "False" for unlimited retries.                                                                                                                | 5                                                                               |
+| `fluentBit.sendMetrics`                                      | Enable the collection of Fluent Bit internal metrics in Prometheus format as well as newrelic-fluent-bit-output internal plugin metrics. See [this documentation page](https://docs.newrelic.com/docs/logs/forward-logs/kubernetes-plugin-log-forwarding/#troubleshoot-installation) for more details.                                                                               | `false`                                                                         |
+| `dnsConfig`                                                  | [DNS configuration](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config) that will be added to the pods. Can be configured also with `global.dnsConfig`.                                                                                                                                                                                         | `{}`                                                                            |
+| `fluentBit.criEnabled`                                       | We assume that `kubelet`directly communicates with the container engine using the [CRI](https://kubernetes.io/docs/concepts/overview/components/#container-runtime) specification. Set this to `false` if your K8s installation uses [dockershim](https://kubernetes.io/docs/tasks/administer-cluster/migrating-from-dockershim/) instead, in order to get the logs properly parsed. | `true`                                                                          |
+
+### Fluent Bit persistence modes
+
+Fluent Bit uses a database file to keep track of log lines read from files (offsets). This database file is stored in the host node by default, using a `hostPath` mount. It's specifically stored (by default) in `/var/log/flb_kube.db` to keep things simple, as we're already mounting `/var` for accessing container logs.
+
+Sometimes the security constraints of some clusters don't allow mounting `hostPath`s in read-write mode. That's why you can chose among the following
+persistence modes. Each one has their pros and cons.
+
+- `hostPath` (default) will use a `hostPath` mount to store the DB file on the node disk. This is the easiest, cheapest an most reliable option, but prohibited by some cloud vendor security policies.
+- `none` will disable the Fluent Bit DB file. This can cause log duplication or data loss in case Fluent Bit gets restarted.
+- `persistentVolume` (Linux only) will use a `ReadWriteMany` persistent volume to store the DB file. This will override the `fluentBit.db` path and use `/db/${NODE_NAME}-fb.db` instead. If you use this option in a Windows cluster it will default to `none` on Windows nodes.
+
+#### GKE Autopilot example
+
+If you're using the `persistentVolume` persistence mode you need to provide at least the `storageClass`, and it should be `ReadWriteMany`. This is an example of the configuration for persistence in [GKE Autopilot](https://cloud.google.com/kubernetes-engine/docs/concepts/autopilot-overview).
+
+```
+fluentBit:
+  persistence:
+    mode: persistentVolume
+    persistentVolume:
+      storageClass: standard-rwx
+  linuxMountPath: /var/log
+```
+
+### Proxy support
+
+Since Fluent Bit Kubernetes plugin is using [newrelic-fluent-bit-output](https://github.com/newrelic/newrelic-fluent-bit-output) we can configure the [proxy support](https://github.com/newrelic/newrelic-fluent-bit-output#proxy-support) in order to set up the proxy configuration.
+
+#### As environment variables
+
+The easiest way to configure the proxy is by means of specifying the `HTTP_PROXY` or `HTTPS_PROXY` variables as follows:
+
+```
+# values-newrelic.yml
+
+fluentBit:
+   additionalEnvVariables:
+     - name: HTTPS_PROXY
+       value: https://your-https-proxy-hostname:3129
+```
+
+
+#### Custom proxy configuration (for proxies using self-signed certificates)
+
+If you need to use a proxy using self-signed certificates, you'll need to mount a volume with the Certificate Authority 
+bundle file and reference it from the Fluent Bit configuration as follows:
+
+```
+# values-newrelic.yaml
+extraVolumes: []
+ - name: proxyConfig
+   # Example using hostPath. You can also place the caBundleFile.pem contents in a ConfigMap and reference it here instead,
+   # as explained here: https://kubernetes.io/docs/concepts/storage/volumes/#configmap
+   hostPath:
+     path: /path/in/node/to/your/caBundleFile.pem
+
+extraVolumeMounts: []
+ - name: proxyConfig
+   mountPath: /proxyConfig/caBundleFile.pem
+
+fluentBit:
+   config:
+     outputs: |
+       [OUTPUT]
+           Name           newrelic
+           Match          *
+           licenseKey     ${LICENSE_KEY}
+           endpoint       ${ENDPOINT}
+           lowDataMode    ${LOW_DATA_MODE}
+           Retry_Limit    ${RETRY_LIMIT}
+           proxy          https://your-https-proxy-hostname:3129
+           caBundleFile   /proxyConfig/caBundleFile.pem
+```
+
+
+## Windows support
+
+Since version `1.7.0`, this Helm chart supports shipping logs from Windows containers. To this end, you need to set the `enableWindows` configuration parameter to `true`.
+
+Windows containers have some constraints regarding Linux containers. The main one being that they can only be executed on _hosts_ using the exact same Windows version and build number. On the other hand, Kubernetes nodes only supports the Windows versions listed [here](https://kubernetes.io/docs/setup/production-environment/windows/intro-windows-in-kubernetes/#windows-os-version-support).
+
+This Helm chart deploys one `DaemonSet` for each of the Windows versions it supports, while ensuring that only containers matching the host operating system will be deployed in each host.
+
+This Helm chart currently supports the following Windows versions:
+-  Windows Server LTSC 2019, build 10.0.17763
+-  Windows Server LTSC 2022, build 10.0.20348
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/Chart.yaml
new file mode 100644
index 000000000..f2ee5497e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/Chart.yaml
@@ -0,0 +1,17 @@
+apiVersion: v2
+description: Provides helpers to provide consistency on all the charts
+keywords:
+- newrelic
+- chart-library
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+- name: kang-makes
+  url: https://github.com/kang-makes
+name: common-library
+type: library
+version: 1.3.0
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/DEVELOPERS.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/DEVELOPERS.md
new file mode 100644
index 000000000..7208c673e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/DEVELOPERS.md
@@ -0,0 +1,747 @@
+# Functions/templates documented for chart writers
+Here is some rough documentation separated by the file that contains the function, the function
+name and how to use it. We are not covering functions that start with `_` (e.g.
+`newrelic.common.license._licenseKey`) because they are used internally by this library for
+other helpers. Helm does not have the concept of "public" or "private" functions/templates so
+this is a convention of ours.
+
+## _naming.tpl
+These functions are used to name objects.
+
+### `newrelic.common.naming.name`
+This is the same as the idiomatic `CHART-NAME.name` that is created when you use `helm create`.
+
+It honors `.Values.nameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.name" . }}
+```
+
+### `newrelic.common.naming.fullname`
+This is the same as the idiomatic `CHART-NAME.fullname` that is created when you use `helm create`
+
+It honors `.Values.fullnameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.fullname" . }}
+```
+
+### `newrelic.common.naming.chart`
+This is the same as the idiomatic `CHART-NAME.chart` that is created when you use `helm create`.
+
+It is mostly useless for chart writers. It is used internally for templating the labels but there
+is no reason to keep it "private".
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.chart" . }}
+```
+
+### `newrelic.common.naming.truncateToDNS`
+This is a useful template that could be used to trim a string to 63 chars and does not end with a dash (`-`).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $truncatedName := include "newrelic.common.naming.truncateToDNS" $nameToTruncate }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-string-that-should-be */ -}}
+```
+
+### `newrelic.common.naming.truncateToDNSWithSuffix`
+This template function is the same as the above but instead of receiving a string you should give a `dict`
+with a `name` and a `suffix`. This function will join them with a dash (`-`) and trim the `name` so the
+result of `name-suffix` is no more than 63 chars
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $suffix := "A-NOT-SO-LONG-SUFFIX" }}
+{{- $truncatedName := include "truncateToDNSWithSuffix" (dict "name" $nameToTruncate "suffix" $suffix) }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-A-NOT-SO-LONG-SUFFIX */ -}}
+```
+
+
+
+## _labels.tpl
+### `newrelic.common.labels`, `newrelic.common.labels.selectorLabels` and `newrelic.common.labels.podLabels`
+These are functions that are used to label objects. They are configured by this `values.yaml`
+```yaml
+global:
+  podLabels: {}  # included in all the pods of all the charts that implement this library
+  labels: {}  # included in all the objects of all the charts that implement this library
+podLabels: {}  # included in all the pods of this chart
+labels: {}  # included in all the objects of this chart
+```
+
+label maps are merged from global to local values.
+
+And chart writer should use them like this:
+```mustache
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+```
+
+`newrelic.common.labels.podLabels` includes `newrelic.common.labels.selectorLabels` automatically.
+
+
+
+## _priority-class-name.tpl
+### `newrelic.common.priorityClassName`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  priorityClassName: ""
+priorityClassName: ""
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `priorityClassName` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.priorityClassName" . }}
+  priorityClassName: {{ . }}
+  {{- end }}
+```
+
+
+
+## _hostnetwork.tpl
+### `newrelic.common.hostNetwork`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  hostNetwork:  # Note that this is empty (nil)
+hostNetwork:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `hostNetwork` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.hostNetwork" . }}
+  hostNetwork: {{ . }}
+  {{- end }}
+```
+
+### `newrelic.common.hostNetwork.value`
+This function is an abstraction of the function above but this returns directly "true" or "false".
+
+Be careful with using this with an `if` as Helm does evaluate "false" (string) as `true`.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+```
+
+
+
+## _dnsconfig.tpl
+### `newrelic.common.dnsConfig`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  dnsConfig: {}
+dnsConfig: {}
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `dnsConfig` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.dnsConfig" . }}
+  dnsConfig:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _images.tpl
+These functions help us to deal with how images are templated. This allows setting `registries`
+where to fetch images globally while being flexible enough to fit in different maps of images
+and deployments with one or more images. This is the example of a complex `values.yaml` that
+we are going to use during the documentation of these functions:
+
+```yaml
+global:
+  images:
+    registry: nexus-3-instance.internal.clients-domain.tld
+jobImage:
+  registry: # defaults to "example.tld" when empty in these examples
+  repository: ingress-nginx/kube-webhook-certgen
+  tag: v1.1.1
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+images:
+  integration:
+    registry:
+    repository: newrelic/nri-kube-events
+    tag: 1.8.0
+    pullPolicy: IfNotPresent
+  agent:
+    registry:
+    repository: newrelic/k8s-events-forwarder
+    tag: 1.22.0
+    pullPolicy: IfNotPresent
+  pullSecrets: []
+```
+
+### `newrelic.common.images.image`
+This will return a string with the image ready to be downloaded that includes the registry, the image and the tag.
+`defaultRegistry` is used to keep `registry` field empty in `values.yaml` so you can override the image using
+`global.images.registry`, your local `jobImage.registry` and be able to fallback to a registry that is not `docker.io`
+(Or the default repository that the client could have set in the CRI).
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.image" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.registry`
+It returns the registry from the global or local values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.registry" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.repository`
+It returns the image from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.tag`
+It returns the image's tag from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.renderPullSecrets`
+If returns a merged map that contains the pull secrets from the global configuration and the local one.  
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.jobImage.pullSecrets "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+```
+
+
+
+## _serviceaccount.tpl
+These functions are used to evaluate if the service account should be created, with which name and add annotations to it.
+
+The functions that the common library has implemented for service accounts are:
+* `newrelic.common.serviceAccount.create`
+* `newrelic.common.serviceAccount.name`
+* `newrelic.common.serviceAccount.annotations`
+
+Usage:
+```mustache
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- with (include "newrelic.common.serviceAccount.annotations" .) }}
+  annotations:
+    {{- . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
+```
+
+
+
+## _affinity.tpl, _nodeselector.tpl and _tolerations.tpl
+These three files are almost the same and they follow the idiomatic way of `helm create`.
+
+Each function also looks if there is a global value like the other helpers.
+```yaml
+global:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+affinity: {}
+nodeSelector: {}
+tolerations: []
+```
+
+The values here are replaced instead of be merged. If a value at root level is found, the global one is ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.nodeSelector" . }}
+  nodeSelector:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.affinity" . }}
+  affinity:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.tolerations" . }}
+  tolerations:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _agent-config.tpl
+### `newrelic.common.agentConfig.defaults`
+This returns a YAML that the agent can use directly as a config that includes other options from the values file like verbose mode,
+custom attributes, FedRAMP and such.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include newrelic.common.naming.truncateToDNSWithSuffix (dict "name" (include "newrelic.common.naming.fullname" .) suffix "agent-config") }}
+  namespace: {{ .Release.Namespace }}
+data:
+  newrelic-infra.yml: |-
+    # This is the configuration file for the infrastructure agent. See:
+    # https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+    {{- include "newrelic.common.agentConfig.defaults" . | nindent 4 }}
+```
+
+
+
+## _cluster.tpl
+### `newrelic.common.cluster`
+Returns the cluster name
+
+Usage:
+```mustache
+{{ include "newrelic.common.cluster" . }}
+```
+
+
+
+## _custom-attributes.tpl
+### `newrelic.common.customAttributes`
+Return custom attributes in YAML format.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example
+data:
+  custom-attributes.yaml: |
+    {{- include "newrelic.common.customAttributes" . | nindent 4 }}
+  custom-attributes.json: |
+    {{- include "newrelic.common.customAttributes" . | fromYaml | toJson | nindent 4 }}
+```
+
+
+
+## _fedramp.tpl
+### `newrelic.common.fedramp.enabled`
+Returns true if FedRAMP is enabled or an empty string if not. It can be safely used in conditionals as an empty string is a Helm falsiness.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled" . }}
+```
+
+### `newrelic.common.fedramp.enabled.value`
+Returns true if FedRAMP is enabled or false if not. This is to have the value of FedRAMP ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled.value" . }}
+```
+
+
+
+## _license.tpl
+### `newrelic.common.license.secretName` and ### `newrelic.common.license.secretKeyName`
+Returns the secret and key inside the secret where to read the license key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the license key.
+
+To create the secret use `newrelic.common.license.secret`.
+
+Usage:
+```mustache
+{{- if and (.Values.controlPlane.enabled) (not (include "newrelic.fargate" .)) }}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+  containers:
+  - name: agent
+    env:
+    - name: "NRIA_LICENSE_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.license.secretName" . }}
+          key: {{ include "newrelic.common.license.secretKeyName" . }}
+```
+
+
+
+## _license_secret.tpl
+### `newrelic.common.license.secret`
+This function templates the secret that is used by agents and integrations with the license Key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any license key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.license.secret" . -}}
+```
+
+
+
+## _insights.tpl
+### `newrelic.common.insightsKey.secretName` and ### `newrelic.common.insightsKey.secretKeyName`
+Returns the secret and key inside the secret where to read the insights key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.insightsKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "INSIGHTS_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.insightsKey.secretName" . }}
+          key: {{ include "newrelic.common.insightsKey.secretKeyName" . }}
+```
+
+
+
+## _insights_secret.tpl
+### `newrelic.common.insightsKey.secret`
+This function templates the secret that is used by agents and integrations with the insights key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any insights key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.insightsKey.secret" . -}}
+```
+
+
+
+## _userkey.tpl
+### `newrelic.common.userKey.secretName` and ### `newrelic.common.userKey.secretKeyName`
+Returns the secret and key inside the secret where to read a user key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.userKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "API_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.userKey.secretName" . }}
+          key: {{ include "newrelic.common.userKey.secretKeyName" . }}
+```
+
+
+
+## _userkey_secret.tpl
+### `newrelic.common.userKey.secret`
+This function templates the secret that is used by agents and integrations with a user key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any API key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.userKey.secret" . -}}
+```
+
+
+
+## _region.tpl
+### `newrelic.common.region.validate`
+Given a string, return a normalized name for the region if valid.
+
+This function does not need the context of the chart, only the value to be validated. The region returned
+honors the region [definition of the newrelic-client-go implementation](https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21)
+so (as of 2024/09/14) it returns the region as "US", "EU", "Staging", or "Local".
+
+In case the region provided does not match these 4, the helper calls `fail` and abort the templating.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region.validate" "us" }}
+```
+
+### `newrelic.common.region`
+It reads global and local variables for `region`:
+```yaml
+global:
+  region:  # Note that this can be empty (nil) or "" (empty string)
+region:  # Note that this can be empty (nil) or "" (empty string)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in your
+values a `region` is defined, the global one is going to be always ignored.
+
+This function gives protection so it enforces users to give the license key as a value in their
+`values.yaml` or specify a global or local `region` value. To understand how the `region` value
+works, read the documentation of `newrelic.common.region.validate`.
+
+The function will change the region from US, EU or Staging based of the license key and the
+`nrStaging` toggle. Whichever region is computed from the license/toggle can be overridden by
+the `region` value.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region" . }}
+```
+
+
+
+## _low-data-mode.tpl
+### `newrelic.common.lowDataMode`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  lowDataMode:  # Note that this is empty (nil)
+lowDataMode:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `lowdataMode` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.lowDataMode" . }}
+```
+
+
+
+## _privileged.tpl
+### `newrelic.common.privileged`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  privileged:  # Note that this is empty (nil)
+privileged:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `privileged` is defined, the global one is going to be always ignored.
+
+Chart writers could override this and put directly a `true` in the `values.yaml` to override the
+default of the common library.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged" . }}
+```
+
+### `newrelic.common.privileged.value`
+Returns true if privileged mode is enabled or false if not. This is to have the value of privileged ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged.value" . }}
+```
+
+
+
+## _proxy.tpl
+### `newrelic.common.proxy`
+Returns the proxy URL configured by the user. 
+
+Usage:
+```mustache
+{{ include "newrelic.common.proxy" . }}
+```
+
+
+
+## _security-context.tpl
+Use these functions to share the security context among all charts. Useful in clusters that have security enforcing not to
+use the root user (like OpenShift) or users that have an admission webhooks.
+
+The functions are:
+* `newrelic.common.securityContext.container`
+* `newrelic.common.securityContext.pod`
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+    spec:
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+
+      containers:
+        - name: example
+          {{- with include "nriKubernetes.securityContext.container" . }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+```
+
+
+
+## _staging.tpl
+### `newrelic.common.nrStaging`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  nrStaging:  # Note that this is empty (nil)
+nrStaging:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `nrStaging` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging" . }}
+```
+
+### `newrelic.common.nrStaging.value`
+Returns true if staging is enabled or false if not. This is to have the staging value ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging.value" . }}
+```
+
+
+
+## _verbose-log.tpl
+### `newrelic.common.verboseLog`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  verboseLog:  # Note that this is empty (nil)
+verboseLog:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `verboseLog` is defined, the global one is going to be always ignored.
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsBoolean`
+Returns true if verbose is enabled or false if not. This is to have the verbose value ready to be templated as a boolean
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsBoolean" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsInt`
+Returns 1 if verbose is enabled or 0 if not. This is to have the verbose value ready to be templated as an integer
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsInt" . }}
+```
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/README.md
new file mode 100644
index 000000000..10f08ca67
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/README.md
@@ -0,0 +1,106 @@
+# Helm Common library
+
+The common library is a way to unify the UX through all the Helm charts that implement it.
+
+The tooling suite that New Relic is huge and growing and this allows to set things globally
+and locally for a single chart.
+
+## Documentation for chart writers
+
+If you are writing a chart that is going to use this library you can check the [developers guide](/library/common-library/DEVELOPERS.md) to see all
+the functions/templates that we have implemented, what they do and how to use them.
+
+## Values managed globally
+
+We want to have a seamless experience through all the charts so we created this library that tries to standardize the behaviour
+of all the charts. Sadly, because of the complexity of all these integrations, not all the charts behave exactly as expected.
+
+An example is `newrelic-infrastructure` that ignores `hostNetwork` in the control plane scraper because most of the users has the
+control plane listening in the node to `localhost`.
+
+For each chart that has a special behavior (or further information of the behavior) there is a "chart particularities" section
+in its README.md that explains which is the expected behavior.
+
+At the time of writing this, all the charts from `nri-bundle` except `newrelic-logging` and `synthetics-minion` implements this
+library and honors global options as described in this document.
+
+Here is a list of global options:
+
+| Global keys | Local keys | Default | Merged[<sup>1</sup>](#values-managed-globally-1) | Description |
+|-------------|------------|---------|--------------------------------------------------|-------------|
+| global.cluster | cluster | `""` |  | Name of the Kubernetes cluster monitored |
+| global.licenseKey | licenseKey | `""` |  | This set this license key to use |
+| global.customSecretName | customSecretName | `""` |  | In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there |
+| global.customSecretLicenseKey | customSecretLicenseKey | `""` |  | In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located |
+| global.podLabels | podLabels | `{}` | yes | Additional labels for chart pods |
+| global.labels | labels | `{}` | yes | Additional labels for chart objects |
+| global.priorityClassName | priorityClassName | `""` |  | Sets pod's priorityClassName |
+| global.hostNetwork | hostNetwork | `false` |  | Sets pod's hostNetwork |
+| global.dnsConfig | dnsConfig | `{}` |  | Sets pod's dnsConfig |
+| global.images.registry | See [Further information](#values-managed-globally-2) | `""` |  | Changes the registry where to get the images. Useful when there is an internal image cache/proxy |
+| global.images.pullSecrets | See [Further information](#values-managed-globally-2) | `[]` | yes | Set secrets to be able to fetch images |
+| global.podSecurityContext | podSecurityContext | `{}` |  | Sets security context (at pod level) |
+| global.containerSecurityContext | containerSecurityContext | `{}` |  | Sets security context (at container level) |
+| global.affinity | affinity | `{}` |  | Sets pod/node affinities |
+| global.nodeSelector | nodeSelector | `{}` |  | Sets pod's node selector |
+| global.tolerations | tolerations | `[]` |  | Sets pod's tolerations to node taints |
+| global.serviceAccount.create | serviceAccount.create | `true` |  | Configures if the service account should be created or not |
+| global.serviceAccount.name | serviceAccount.name | name of the release |  | Change the name of the service account. This is honored if you disable on this cahrt the creation of the service account so you can use your own. |
+| global.serviceAccount.annotations | serviceAccount.annotations | `{}` | yes | Add these annotations to the service account we create |
+| global.customAttributes | customAttributes | `{}` |  | Adds extra attributes to the cluster and all the metrics emitted to the backend |
+| global.fedramp | fedramp | `false` |  | Enables FedRAMP |
+| global.lowDataMode | lowDataMode | `false` |  | Reduces number of metrics sent in order to reduce costs |
+| global.privileged | privileged | Depends on the chart |  | In each integration it has different behavior. See [Further information](#values-managed-globally-3) but all aims to send less metrics to the backend to try to save costs |
+| global.proxy | proxy | `""` |  | Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port` |
+| global.nrStaging | nrStaging | `false` |  | Send the metrics to the staging backend. Requires a valid staging license key |
+| global.verboseLog | verboseLog | `false` |  | Sets the debug/trace logs to this integration or all integrations if it is set globally |
+
+### Further information
+<a name="values-managed-globally-1"></a>
+#### 1. Merged
+
+Merged means that the values from global are not replaced by the local ones. Think in this example:
+```yaml
+global:
+  labels:
+    global: global
+  hostNetwork: true
+  nodeSelector:
+    global: global
+
+labels:
+  local: local
+nodeSelector:
+  local: local
+hostNetwork: false
+```
+
+This values will template `hostNetwork` to `false`, a map of labels `{ "global": "global", "local": "local" }` and a `nodeSelector` with
+`{ "local": "local" }`.
+
+As Helm by default merges all the maps it could be confusing that we have two behaviors (merging `labels` and replacing `nodeSelector`)
+the `values` from global to local. This is the rationale behind this:
+* `hostNetwork` is templated to `false` because is overriding the value defined globally.
+* `labels` are merged because the user may want to label all the New Relic pods at once and label other solution pods differently for
+  clarity' sake.
+* `nodeSelector` does not merge as `labels` because could make it harder to overwrite/delete a selector that comes from global because
+  of the logic that Helm follows merging maps.
+
+<a name="values-managed-globally-2"></a>
+#### 2. Fine grain registries
+
+Some charts only have 1 image while others that can have 2 or more images. The local path for the registry can change depending
+on the chart itself.
+
+As this is mostly unique per helm chart, you should take a look to the chart's values table (or directly to the `values.yaml` file to see all the
+images that you can change.
+
+This should only be needed if you have an advanced setup that forces you to have granularity enough to force a proxy/cache registry per integration.
+
+
+<a name="values-managed-globally-3"></a>
+#### 3. Privileged mode
+
+By default, from the common library, the privileged mode is set to false. But most of the helm charts require this to be true to fetch more
+metrics so could see a true in some charts. The consequences of the privileged mode differ from one chart to another so for each chart that
+honors the privileged mode toggle should be a section in the README explaining which is the behavior with it enabled or disabled.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_affinity.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_affinity.tpl
new file mode 100644
index 000000000..1b2636754
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_affinity.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod affinity */ -}}
+{{- define "newrelic.common.affinity" -}}
+    {{- if .Values.affinity -}}
+        {{- toYaml .Values.affinity -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.affinity -}}
+            {{- toYaml .Values.global.affinity -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_agent-config.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_agent-config.tpl
new file mode 100644
index 000000000..9c32861a0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_agent-config.tpl
@@ -0,0 +1,26 @@
+{{/*
+This helper should return the defaults that all agents should have
+*/}}
+{{- define "newrelic.common.agentConfig.defaults" -}}
+{{- if include "newrelic.common.verboseLog" . }}
+log:
+  level: trace
+{{- end }}
+
+{{- if (include "newrelic.common.nrStaging" . ) }}
+staging: true
+{{- end }}
+
+{{- with include "newrelic.common.proxy" . }}
+proxy: {{ . | quote }}
+{{- end }}
+
+{{- with include "newrelic.common.fedramp.enabled" . }}
+fedramp: {{ . }}
+{{- end }}
+
+{{- with fromYaml ( include "newrelic.common.customAttributes" . ) }}
+custom_attributes:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_cluster.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_cluster.tpl
new file mode 100644
index 000000000..0197dd35a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_cluster.tpl
@@ -0,0 +1,15 @@
+{{/*
+Return the cluster
+*/}}
+{{- define "newrelic.common.cluster" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.cluster -}}
+    {{- .Values.cluster -}}
+{{- else if $global.cluster -}}
+    {{- $global.cluster -}}
+{{- else -}}
+    {{ fail "There is not cluster name definition set neither in `.global.cluster' nor `.cluster' in your values.yaml. Cluster name is required." }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_custom-attributes.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_custom-attributes.tpl
new file mode 100644
index 000000000..92020719c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_custom-attributes.tpl
@@ -0,0 +1,17 @@
+{{/*
+This will render custom attributes as a YAML ready to be templated or be used with `fromYaml`.
+*/}}
+{{- define "newrelic.common.customAttributes" -}}
+{{- $customAttributes := dict -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- if $global.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes $global.customAttributes -}}
+{{- end -}}
+
+{{- if .Values.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes .Values.customAttributes -}}
+{{- end -}}
+
+{{- toYaml $customAttributes -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_dnsconfig.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_dnsconfig.tpl
new file mode 100644
index 000000000..d4e40aa8a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_dnsconfig.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod dnsConfig */ -}}
+{{- define "newrelic.common.dnsConfig" -}}
+    {{- if .Values.dnsConfig -}}
+        {{- toYaml .Values.dnsConfig -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.dnsConfig -}}
+            {{- toYaml .Values.global.dnsConfig -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_fedramp.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_fedramp.tpl
new file mode 100644
index 000000000..9df8d6b5e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_fedramp.tpl
@@ -0,0 +1,25 @@
+{{- /* Defines the fedRAMP flag */ -}}
+{{- define "newrelic.common.fedramp.enabled" -}}
+    {{- if .Values.fedramp -}}
+        {{- if .Values.fedramp.enabled -}}
+            {{- .Values.fedramp.enabled -}}
+        {{- end -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.fedramp -}}
+             {{- if .Values.global.fedramp.enabled -}}
+                {{- .Values.global.fedramp.enabled -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return FedRAMP value directly ready to be templated */ -}}
+{{- define "newrelic.common.fedramp.enabled.value" -}}
+{{- if include "newrelic.common.fedramp.enabled" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_hostnetwork.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_hostnetwork.tpl
new file mode 100644
index 000000000..4cf017ef7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_hostnetwork.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper allows to override the global `.global.hostNetwork` with the value of `.hostNetwork`.
+Returns "true" if `hostNetwork` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.hostNetwork" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- /*
+`get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs
+
+We also want only to return when this is true, returning `false` here will template "false" (string) when doing
+an `(include "newrelic.common.hostNetwork" .)`, which is not an "empty string" so it is `true` if it is used
+as an evaluation somewhere else.
+*/ -}}
+{{- if get .Values "hostNetwork" | kindIs "bool" -}}
+    {{- if .Values.hostNetwork -}}
+        {{- .Values.hostNetwork -}}
+    {{- end -}}
+{{- else if get $global "hostNetwork" | kindIs "bool" -}}
+    {{- if $global.hostNetwork -}}
+        {{- $global.hostNetwork -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper abstracts the function "newrelic.common.hostNetwork" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.hostNetwork.value" -}}
+{{- if include "newrelic.common.hostNetwork" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_images.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_images.tpl
new file mode 100644
index 000000000..d4fb43290
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_images.tpl
@@ -0,0 +1,94 @@
+{{- /*
+Return the proper image name
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.image" -}}
+    {{- $registryName := include "newrelic.common.images.registry" ( dict "imageRoot" .imageRoot "defaultRegistry" .defaultRegistry "context" .context ) -}}
+    {{- $repositoryName := include "newrelic.common.images.repository" .imageRoot -}}
+    {{- $tag := include "newrelic.common.images.tag" ( dict "imageRoot" .imageRoot "context" .context) -}}
+
+    {{- if $registryName -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag | quote -}}
+    {{- else -}}
+        {{- printf "%s:%s" $repositoryName $tag | quote -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image registry
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.registry" -}}
+{{- $globalRegistry := "" -}}
+{{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+        {{- with .context.Values.global.images.registry -}}
+            {{- $globalRegistry = . -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $localRegistry := "" -}}
+{{- if .imageRoot.registry -}}
+    {{- $localRegistry = .imageRoot.registry -}}
+{{- end -}}
+
+{{- $registry := $localRegistry | default $globalRegistry | default .defaultRegistry -}}
+{{- if $registry -}}
+    {{- $registry -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image repository
+{{ include "newrelic.common.images.repository" .Values.path.to.the.image }}
+*/ -}}
+{{- define "newrelic.common.images.repository" -}}
+    {{- .repository -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image tag
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.path.to.the.image "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.tag" -}}
+    {{- .imageRoot.tag | default .context.Chart.AppVersion | toString -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper Image Pull Registry Secret Names evaluating values as templates
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.path.to.the.images.pullSecrets1, .Values.path.to.the.images.pullSecrets2) "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.renderPullSecrets" -}}
+  {{- $flatlist := list }}
+
+  {{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+      {{- if .context.Values.global.images.pullSecrets -}}
+        {{- range .context.Values.global.images.pullSecrets -}}
+          {{- $flatlist = append $flatlist . -}}
+        {{- end -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- range .pullSecrets -}}
+    {{- if not (empty .) -}}
+      {{- range . -}}
+        {{- $flatlist = append $flatlist . -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if $flatlist -}}
+    {{- toYaml $flatlist -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_insights.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_insights.tpl
new file mode 100644
index 000000000..895c37732
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_insights.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the Insights Key.
+*/}}
+{{- define "newrelic.common.insightsKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "insightskey" ) -}}
+{{- include "newrelic.common.insightsKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secretKeyName" -}}
+{{- include "newrelic.common.insightsKey._customSecretKey" . | default "insightsKey" -}}
+{{- end -}}
+
+{{/*
+Return local insightsKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._licenseKey" -}}
+{{- if .Values.insightsKey -}}
+  {{- .Values.insightsKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.insightsKey -}}
+    {{- .Values.global.insightsKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the Insights Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretName" -}}
+{{- if .Values.customInsightsKeySecretName -}}
+  {{- .Values.customInsightsKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretName -}}
+    {{- .Values.global.customInsightsKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretKey" -}}
+{{- if .Values.customInsightsKeySecretKey -}}
+  {{- .Values.customInsightsKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretKey }}
+    {{- .Values.global.customInsightsKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_insights_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_insights_secret.yaml.tpl
new file mode 100644
index 000000000..556caa6ca
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_insights_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the insights key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secret" }}
+{{- if not (include "newrelic.common.insightsKey._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.insightsKey._licenseKey" .) }}
+    {{- fail "You must specify a insightsKey or a customInsightsSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.insightsKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.insightsKey.secretKeyName" . }}: {{ include "newrelic.common.insightsKey._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_labels.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_labels.tpl
new file mode 100644
index 000000000..b02594828
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_labels.tpl
@@ -0,0 +1,54 @@
+{{/*
+This will render the labels that should be used in all the manifests used by the helm chart.
+*/}}
+{{- define "newrelic.common.labels" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- $chart := dict "helm.sh/chart" (include "newrelic.common.naming.chart" . ) -}}
+{{- $managedBy := dict "app.kubernetes.io/managed-by" .Release.Service -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $labels := mustMergeOverwrite $chart $managedBy $selectorLabels -}}
+{{- if .Chart.AppVersion -}}
+{{- $labels = mustMergeOverwrite $labels (dict "app.kubernetes.io/version" .Chart.AppVersion) -}}
+{{- end -}}
+
+{{- $globalUserLabels := $global.labels | default dict -}}
+{{- $localUserLabels := .Values.labels | default dict -}}
+
+{{- $labels = mustMergeOverwrite $labels $globalUserLabels $localUserLabels -}}
+
+{{- toYaml $labels -}}
+{{- end -}}
+
+
+
+{{/*
+This will render the labels that should be used in deployments/daemonsets template pods as a selector.
+*/}}
+{{- define "newrelic.common.labels.selectorLabels" -}}
+{{- $name := dict "app.kubernetes.io/name" ( include "newrelic.common.naming.name" . ) -}}
+{{- $instance := dict "app.kubernetes.io/instance" .Release.Name -}}
+
+{{- $selectorLabels := mustMergeOverwrite $name $instance -}}
+
+{{- toYaml $selectorLabels -}}
+{{- end }}
+
+
+
+{{/*
+Pod labels
+*/}}
+{{- define "newrelic.common.labels.podLabels" -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- $globalPodLabels := $global.podLabels | default dict }}
+
+{{- $localPodLabels := .Values.podLabels | default dict }}
+
+{{- $podLabels := mustMergeOverwrite $selectorLabels $globalPodLabels $localPodLabels -}}
+
+{{- toYaml $podLabels -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_license.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_license.tpl
new file mode 100644
index 000000000..cb349f6bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_license.tpl
@@ -0,0 +1,68 @@
+{{/*
+Return the name of the secret holding the License Key.
+*/}}
+{{- define "newrelic.common.license.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "license" ) -}}
+{{- include "newrelic.common.license._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+*/}}
+{{- define "newrelic.common.license.secretKeyName" -}}
+{{- include "newrelic.common.license._customSecretKey" . | default "licenseKey" -}}
+{{- end -}}
+
+{{/*
+Return local licenseKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._licenseKey" -}}
+{{- if .Values.licenseKey -}}
+  {{- .Values.licenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.licenseKey -}}
+    {{- .Values.global.licenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the License Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretName" -}}
+{{- if .Values.customSecretName -}}
+  {{- .Values.customSecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretName -}}
+    {{- .Values.global.customSecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretKey" -}}
+{{- if .Values.customSecretLicenseKey -}}
+  {{- .Values.customSecretLicenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretLicenseKey }}
+    {{- .Values.global.customSecretLicenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the user set a custom secret for the license.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._usesCustomSecret" -}}
+{{- if or (include "newrelic.common.license._customSecretName" .) (include "newrelic.common.license._customSecretKey" .) -}}
+true
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_license_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_license_secret.yaml.tpl
new file mode 100644
index 000000000..610a0a337
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_license_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the license key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.license.secret" }}
+{{- if not (include "newrelic.common.license._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.license._licenseKey" .) }}
+    {{- fail "You must specify a licenseKey or a customSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.license.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.license.secretKeyName" . }}: {{ include "newrelic.common.license._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_low-data-mode.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_low-data-mode.tpl
new file mode 100644
index 000000000..3dd55ef2f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_low-data-mode.tpl
@@ -0,0 +1,26 @@
+{{- /*
+Abstraction of the lowDataMode toggle.
+This helper allows to override the global `.global.lowDataMode` with the value of `.lowDataMode`.
+Returns "true" if `lowDataMode` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.lowDataMode" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "lowDataMode" | kindIs "bool") -}}
+    {{- if .Values.lowDataMode -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.lowDataMode" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.lowDataMode -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "lowDataMode" | kindIs "bool" -}}
+    {{- if $global.lowDataMode -}}
+        {{- $global.lowDataMode -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_naming.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_naming.tpl
new file mode 100644
index 000000000..19fa92648
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_naming.tpl
@@ -0,0 +1,73 @@
+{{/*
+This is an function to be called directly with a string just to truncate strings to
+63 chars because some Kubernetes name fields are limited to that.
+*/}}
+{{- define "newrelic.common.naming.truncateToDNS" -}}
+{{- . | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+
+
+{{- /*
+Given a name and a suffix returns a 'DNS Valid' which always include the suffix, truncating the name if needed.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If suffix is too long it gets truncated but it always takes precedence over name, so a 63 chars suffix would suppress the name.
+Usage:
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" "<my-name>" "suffix" "my-suffix" ) }}
+*/ -}}
+{{- define "newrelic.common.naming.truncateToDNSWithSuffix" -}}
+{{- $suffix := (include "newrelic.common.naming.truncateToDNS" .suffix) -}}
+{{- $maxLen := (max (sub 63 (add1 (len $suffix))) 0) -}} {{- /* We prepend "-" to the suffix so an additional character is needed */ -}}
+
+{{- $newName := .name | trunc ($maxLen | int) | trimSuffix "-"  -}}
+{{- if $newName -}}
+{{- printf "%s-%s" $newName $suffix -}}
+{{- else -}}
+{{ $suffix }}
+{{- end -}}
+
+{{- end -}}
+
+
+
+{{/*
+Expand the name of the chart.
+Uses the Chart name by default if nameOverride is not set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.name" -}}
+{{- $name := .Values.nameOverride | default .Chart.Name -}}
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+{{- end }}
+
+
+
+{{/*
+Create a default fully qualified app name.
+By default the full name will be "<release_name>" just in if it has the chart name included in that, if not
+it will be concatenated like "<release_name>-<chart_chart>". This could change if fullnameOverride or
+nameOverride are set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.fullname" -}}
+{{- $name := include "newrelic.common.naming.name" . -}}
+
+{{- if .Values.fullnameOverride -}}
+    {{- $name = .Values.fullnameOverride  -}}
+{{- else if not (contains $name .Release.Name) -}}
+    {{- $name = printf "%s-%s" .Release.Name $name -}}
+{{- end -}}
+
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+
+{{- end -}}
+
+
+
+{{/*
+Create chart name and version as used by the chart label.
+This function should not be used for naming objects. Use "common.naming.{name,fullname}" instead.
+*/}}
+{{- define "newrelic.common.naming.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_nodeselector.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_nodeselector.tpl
new file mode 100644
index 000000000..d48887341
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_nodeselector.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod nodeSelector */ -}}
+{{- define "newrelic.common.nodeSelector" -}}
+    {{- if .Values.nodeSelector -}}
+        {{- toYaml .Values.nodeSelector -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.nodeSelector -}}
+            {{- toYaml .Values.global.nodeSelector -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_priority-class-name.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_priority-class-name.tpl
new file mode 100644
index 000000000..50182b734
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_priority-class-name.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the pod priorityClassName */ -}}
+{{- define "newrelic.common.priorityClassName" -}}
+    {{- if .Values.priorityClassName -}}
+        {{- .Values.priorityClassName -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.priorityClassName -}}
+            {{- .Values.global.priorityClassName -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_privileged.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_privileged.tpl
new file mode 100644
index 000000000..f3ae814dd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_privileged.tpl
@@ -0,0 +1,28 @@
+{{- /*
+This is a helper that returns whether the chart should assume the user is fine deploying privileged pods.
+*/ -}}
+{{- define "newrelic.common.privileged" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists. */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if get .Values "privileged" | kindIs "bool" -}}
+    {{- if .Values.privileged -}}
+        {{- .Values.privileged -}}
+    {{- end -}}
+{{- else if get $global "privileged" | kindIs "bool" -}}
+    {{- if $global.privileged -}}
+        {{- $global.privileged -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return directly "true" or "false" based in the exist of "newrelic.common.privileged" */ -}}
+{{- define "newrelic.common.privileged.value" -}}
+{{- if include "newrelic.common.privileged" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_proxy.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_proxy.tpl
new file mode 100644
index 000000000..60f34c7ec
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_proxy.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the proxy */ -}}
+{{- define "newrelic.common.proxy" -}}
+    {{- if .Values.proxy -}}
+        {{- .Values.proxy -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.proxy -}}
+            {{- .Values.global.proxy -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_region.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_region.tpl
new file mode 100644
index 000000000..bdcacf323
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_region.tpl
@@ -0,0 +1,74 @@
+{{/*
+Return the region that is being used by the user
+*/}}
+{{- define "newrelic.common.region" -}}
+{{- if and (include "newrelic.common.license._usesCustomSecret" .) (not (include "newrelic.common.region._fromValues" .)) -}}
+  {{- fail "This Helm Chart is not able to compute the region. You must specify a .global.region or .region if the license is set using a custom secret." -}}
+{{- end -}}
+
+{{- /* Defaults */ -}}
+{{- $region := "us" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+  {{- $region = "staging" -}}
+{{- else if include "newrelic.common.region._isEULicenseKey" . -}}
+  {{- $region = "eu" -}}
+{{- end -}}
+
+{{- include "newrelic.common.region.validate" (include "newrelic.common.region._fromValues" . | default $region ) -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values if valid. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+
+Usage: `include "newrelic.common.region.validate" "us"`
+*/}}
+{{- define "newrelic.common.region.validate" -}}
+{{- /* Ref: https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21 */ -}}
+{{- $region := . | lower -}}
+{{- if eq $region "us" -}}
+  US
+{{- else if eq $region "eu" -}}
+  EU
+{{- else if eq $region "staging" -}}
+  Staging
+{{- else if eq $region "local" -}}
+  Local
+{{- else -}}
+  {{- fail (printf "the region provided is not valid: %s not in \"US\" \"EU\" \"Staging\" \"Local\"" .) -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._fromValues" -}}
+{{- if .Values.region -}}
+  {{- .Values.region -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.region -}}
+    {{- .Values.global.region -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the license is for EU region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._isEULicenseKey" -}}
+{{- if not (include "newrelic.common.license._usesCustomSecret" .) -}}
+  {{- $license := include "newrelic.common.license._licenseKey" . -}}
+  {{- if hasPrefix "eu" $license -}}
+    true
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_security-context.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_security-context.tpl
new file mode 100644
index 000000000..9edfcabfd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_security-context.tpl
@@ -0,0 +1,23 @@
+{{- /* Defines the container securityContext context */ -}}
+{{- define "newrelic.common.securityContext.container" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.containerSecurityContext -}}
+    {{- toYaml .Values.containerSecurityContext -}}
+{{- else if $global.containerSecurityContext -}}
+    {{- toYaml $global.containerSecurityContext -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the pod securityContext context */ -}}
+{{- define "newrelic.common.securityContext.pod" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.podSecurityContext -}}
+    {{- toYaml .Values.podSecurityContext -}}
+{{- else if $global.podSecurityContext -}}
+    {{- toYaml $global.podSecurityContext -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_serviceaccount.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_serviceaccount.tpl
new file mode 100644
index 000000000..2d352f6ea
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_serviceaccount.tpl
@@ -0,0 +1,90 @@
+{{- /* Defines if the service account has to be created or not */ -}}
+{{- define "newrelic.common.serviceAccount.create" -}}
+{{- $valueFound := false -}}
+
+{{- /* Look for a global creation of a service account */ -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "create" | kindIs "bool") -}}
+        {{- $valueFound = true -}}
+        {{- if .Values.serviceAccount.create -}}
+            {{- /*
+                We want only to return when this is true, returning `false` here will template "false" (string) when doing
+                an `(include "newrelic.common.serviceAccount.name" .)`, which is not an "empty string" so it is `true` if it is used
+                as an evaluation somewhere else.
+            */ -}}
+            {{- .Values.serviceAccount.create -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* Look for a local creation of a service account */ -}}
+{{- if not $valueFound -}}
+    {{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+    {{- $global := index .Values "global" | default dict -}}
+    {{- if get $global "serviceAccount" | kindIs "map" -}}
+        {{- if get $global.serviceAccount "create" | kindIs "bool" -}}
+            {{- $valueFound = true -}}
+            {{- if $global.serviceAccount.create -}}
+                {{- $global.serviceAccount.create -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* In case no serviceAccount value has been found, default to "true" */ -}}
+{{- if not $valueFound -}}
+true
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the name of the service account */ -}}
+{{- define "newrelic.common.serviceAccount.name" -}}
+{{- $localServiceAccount := "" -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "name" | kindIs "string") -}}
+        {{- $localServiceAccount = .Values.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := "" -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "name" | kindIs "string" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- if (include "newrelic.common.serviceAccount.create" .) -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default (include "newrelic.common.naming.fullname" .) -}}
+{{- else -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default "default" -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Merge the global and local annotations for the service account */ -}}
+{{- define "newrelic.common.serviceAccount.annotations" -}}
+{{- $localServiceAccount := dict -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if get .Values.serviceAccount "annotations" -}}
+        {{- $localServiceAccount = .Values.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := dict -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "annotations" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $merged := mustMergeOverwrite $globalServiceAccount $localServiceAccount -}}
+
+{{- if $merged -}}
+    {{- toYaml $merged -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_staging.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_staging.tpl
new file mode 100644
index 000000000..bd9ad09bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_staging.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the nrStaging toggle.
+This helper allows to override the global `.global.nrStaging` with the value of `.nrStaging`.
+Returns "true" if `nrStaging` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.nrStaging" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "nrStaging" | kindIs "bool") -}}
+    {{- if .Values.nrStaging -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.nrStaging" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.nrStaging -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "nrStaging" | kindIs "bool" -}}
+    {{- if $global.nrStaging -}}
+        {{- $global.nrStaging -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Returns "true" of "false" directly instead of empty string (Helm falsiness) based on the exit of "newrelic.common.nrStaging"
+*/ -}}
+{{- define "newrelic.common.nrStaging.value" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_tolerations.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_tolerations.tpl
new file mode 100644
index 000000000..e016b38e2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_tolerations.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod tolerations */ -}}
+{{- define "newrelic.common.tolerations" -}}
+    {{- if .Values.tolerations -}}
+        {{- toYaml .Values.tolerations -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.tolerations -}}
+            {{- toYaml .Values.global.tolerations -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_userkey.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_userkey.tpl
new file mode 100644
index 000000000..982ea8e09
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_userkey.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the API Key.
+*/}}
+{{- define "newrelic.common.userKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "userkey" ) -}}
+{{- include "newrelic.common.userKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+*/}}
+{{- define "newrelic.common.userKey.secretKeyName" -}}
+{{- include "newrelic.common.userKey._customSecretKey" . | default "userKey" -}}
+{{- end -}}
+
+{{/*
+Return local API Key if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._userKey" -}}
+{{- if .Values.userKey -}}
+  {{- .Values.userKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.userKey -}}
+    {{- .Values.global.userKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the API Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretName" -}}
+{{- if .Values.customUserKeySecretName -}}
+  {{- .Values.customUserKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretName -}}
+    {{- .Values.global.customUserKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretKey" -}}
+{{- if .Values.customUserKeySecretKey -}}
+  {{- .Values.customUserKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretKey }}
+    {{- .Values.global.customUserKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_userkey_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_userkey_secret.yaml.tpl
new file mode 100644
index 000000000..b97985654
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_userkey_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the user key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.userKey.secret" }}
+{{- if not (include "newrelic.common.userKey._customSecretName" .) }}
+{{- /* Fail if user key is empty and required: */ -}}
+{{- if not (include "newrelic.common.userKey._userKey" .) }}
+    {{- fail "You must specify a userKey or a customUserKeySecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.userKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.userKey.secretKeyName" . }}: {{ include "newrelic.common.userKey._userKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_verbose-log.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_verbose-log.tpl
new file mode 100644
index 000000000..2286d4681
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/templates/_verbose-log.tpl
@@ -0,0 +1,54 @@
+{{- /*
+Abstraction of the verbose toggle.
+This helper allows to override the global `.global.verboseLog` with the value of `.verboseLog`.
+Returns "true" if `verbose` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.verboseLog" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "verboseLog" | kindIs "bool") -}}
+    {{- if .Values.verboseLog -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.verboseLog" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.verboseLog -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "verboseLog" | kindIs "bool" -}}
+    {{- if $global.verboseLog -}}
+        {{- $global.verboseLog -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsBoolean" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return 1 or 0 directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsInt" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+1
+{{- else -}}
+0
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/values.yaml
new file mode 100644
index 000000000..75e2d112a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/charts/common-library/values.yaml
@@ -0,0 +1 @@
+# values are not needed for the library chart, however this file is still needed for helm lint to work.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-enable-windows-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-enable-windows-values.yaml
new file mode 100644
index 000000000..870bc082a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-enable-windows-values.yaml
@@ -0,0 +1,2 @@
+enableLinux: false
+enableWindows: true
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-lowdatamode-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-lowdatamode-values.yaml
new file mode 100644
index 000000000..7740338b0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-lowdatamode-values.yaml
@@ -0,0 +1 @@
+lowDataMode: true
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-override-global-lowdatamode.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-override-global-lowdatamode.yaml
new file mode 100644
index 000000000..22dd7e05e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-override-global-lowdatamode.yaml
@@ -0,0 +1,3 @@
+global:
+  lowDataMode: true
+lowDataMode: false
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-staging-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-staging-values.yaml
new file mode 100644
index 000000000..efbdccaf8
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-staging-values.yaml
@@ -0,0 +1 @@
+nrStaging: true
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-with-empty-global.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-with-empty-global.yaml
new file mode 100644
index 000000000..490a0b7ed
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-with-empty-global.yaml
@@ -0,0 +1 @@
+global: {}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-with-empty-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/ci/test-with-empty-values.yaml
new file mode 100644
index 000000000..e69de29bb
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/fluent-bit-and-plugin-metrics-dashboard-template.json b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/fluent-bit-and-plugin-metrics-dashboard-template.json
new file mode 100644
index 000000000..cafdaf85c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/fluent-bit-and-plugin-metrics-dashboard-template.json
@@ -0,0 +1,2237 @@
+{
+  "name": "Kubernetes Fluent Bit monitoring",
+  "description": null,
+  "permissions": "PUBLIC_READ_WRITE",
+  "pages": [
+    {
+      "name": "Fluent Bit metrics: General",
+      "description": null,
+      "widgets": [
+        {
+          "title": "",
+          "layout": {
+            "column": 1,
+            "row": 1,
+            "width": 6,
+            "height": 6
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.markdown"
+          },
+          "rawConfiguration": {
+            "text": "# README\n\n## About this page\nThis page represents most of [Fluent Bit's internal metrics](https://docs.fluentbit.io/manual/administration/monitoring#for-v2-metrics). The metric representations are grouped by categories and faceted by each plugin instance where appropriate.\n\n## How to filter\n1. Select the Kubernetes cluster you want to troubleshoot in the \"Cluster Name\" variable above.\n2. [OPTIONAL] You can use any of the values in the `Node name` and `Pod name` columns on the \"Fluent Bit version\" table to further filter the metrics displayed in the graphs below. To do so, you need to enable [facet filtering](https://docs.newrelic.com/docs/query-your-data/explore-query-data/dashboards/filter-new-relic-one-dashboards-facets/) on that table by clicking on the \"Edit\" submenu and select \"Filter the current dashboard\" under \"Facet Linking\". \n\n## Legend\n### Metric dimensions\n- **name**: the name of the Fluent Bit plugin. Version 1.21.0 of our Helm chart names them according to the plugin names described in the following section.\n- **pod_name**: the `newrelic-logging` pod (Fluent Bit instance) that emitted this metric.\n- **node_name**: physical Kubernetes node where the `newrelic-logging` pod is running.\n\n### Plugin names\n- **pod-logs-tailer**: `tail` *INPUT* plugin normally reading from `/var/log/containers/*.log`\n- **kubernetes-enricher**: `kubernetes` *FILTER* plugin that queries the Kubernetes API to enrich the logs with pod/container metadata.\n- **node-attributes-enricher**: `record_modifier` *FILTER* plugin that enriches logs with `cluster_name`.\n- **kubernetes-attribute-lifter** (only when in low data mode): `nest` *FILTER* plugin that lifts all the keys under `kubernetes`. This plugin is transparent to the final shape of the log.\n- **node-attributes-enricher-filter** (only when in low data mode): same as  node-attributes-enricher`, but it also removes attributes that are not strictly necessary for correct platform functioning.\n- **newrelic-logs-forwarder**: `newrelic` *OUTPUT* plugin that sends logs to the New Relic Logs API"
+          }
+        },
+        {
+          "title": "Fluent Bit version",
+          "layout": {
+            "column": 7,
+            "row": 1,
+            "width": 6,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.table"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT latest(os) as 'OS', latest(version) as 'FB version', latest(cluster_name)  FROM Metric where metricName = 'fluentbit_build_info' AND cluster_name IN ({{cluster_name}}) since 1 hour ago facet pod_name, node_name limit max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            }
+          }
+        },
+        {
+          "title": "Fluent Bit uptime",
+          "layout": {
+            "column": 7,
+            "row": 4,
+            "width": 6,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT latest(fluentbit_uptime) FROM Metric where cluster_name IN ({{cluster_name}}) facet pod_name timeseries"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "",
+          "layout": {
+            "column": 1,
+            "row": 7,
+            "width": 12,
+            "height": 1
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.markdown"
+          },
+          "rawConfiguration": {
+            "text": "# INPUTS"
+          }
+        },
+        {
+          "title": "Input byte rate (bytes/minute)",
+          "layout": {
+            "column": 1,
+            "row": 8,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_input_bytes_total), 1 minute) as 'bytes/minute' FROM Metric where name != 'fb-metrics-collector' and cluster_name IN ({{cluster_name}}) timeseries max facet name, pod_name"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Input log rate (records/minute)",
+          "layout": {
+            "column": 5,
+            "row": 8,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_input_records_total), 1 minute) as 'logs/minute' FROM Metric where name != 'fb-metrics-collector' and cluster_name IN ({{cluster_name}}) facet name, pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Average incoming record size (bytes)",
+          "layout": {
+            "column": 9,
+            "row": 8,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT sum(fluentbit_input_bytes_total)/sum(fluentbit_input_records_total) as 'Average incoming record size (bytes)' FROM Metric where name != 'fb-metrics-collector' and cluster_name IN ({{cluster_name}}) facet name, pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "units": {
+              "unit": "BYTES"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "",
+          "layout": {
+            "column": 1,
+            "row": 11,
+            "width": 12,
+            "height": 1
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.markdown"
+          },
+          "rawConfiguration": {
+            "text": "# FILTERS"
+          }
+        },
+        {
+          "title": "Filter byte rate (bytes/minute)",
+          "layout": {
+            "column": 1,
+            "row": 12,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_filter_bytes_total), 1 minute) FROM Metric WHERE cluster_name IN ({{cluster_name}}) facet name, pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Filter log rate (records/minute)",
+          "layout": {
+            "column": 5,
+            "row": 12,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_filter_records_total), 1 minute) FROM Metric WHERE cluster_name IN ({{cluster_name}}) facet name, pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Average filtered record size (bytes)",
+          "layout": {
+            "column": 9,
+            "row": 12,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT sum(fluentbit_filter_bytes_total)/sum(fluentbit_filter_records_total) AS 'Average filtered record size (bytes)' FROM Metric WHERE cluster_name IN ({{cluster_name}}) facet name, pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "units": {
+              "unit": "BYTES"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Record add/drop rate per FILTER plugin",
+          "layout": {
+            "column": 1,
+            "row": 15,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_filter_add_records_total), 1 minute) as 'Added back to pipeline', rate(sum(fluentbit_filter_drop_records_total), 1 minute) as 'Removed from pipeline' FROM Metric WHERE cluster_name IN ({{cluster_name}}) facet name, pod_name timeseries MAX"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "units": {
+              "unit": "REQUESTS_PER_MINUTE"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "",
+          "layout": {
+            "column": 1,
+            "row": 18,
+            "width": 12,
+            "height": 1
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.markdown"
+          },
+          "rawConfiguration": {
+            "text": "# OUTPUTS"
+          }
+        },
+        {
+          "title": "Output byte rate (bytes/minute)",
+          "layout": {
+            "column": 1,
+            "row": 19,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_output_proc_bytes_total), 1 minute) as 'bytes/minute' FROM Metric where cluster_name IN ({{cluster_name}}) AND name != 'fb-metrics-forwarder' facet name, pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Output log rate (records/minute)",
+          "layout": {
+            "column": 5,
+            "row": 19,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_output_proc_records_total), 1 minute) as 'records/minute' FROM Metric where cluster_name IN ({{cluster_name}}) AND name != 'fb-metrics-forwarder' facet name, pod_name timeseries MAX "
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Average outgoing record size (bytes)",
+          "layout": {
+            "column": 9,
+            "row": 19,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT sum(fluentbit_output_proc_bytes_total)/sum(fluentbit_output_proc_records_total) as 'bytes' FROM Metric where cluster_name IN ({{cluster_name}}) AND name != 'fb-metrics-forwarder' facet name, pod_name timeseries MAX"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "units": {
+              "unit": "BYTES"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "newrelic plugin statistics (records/minute)",
+          "layout": {
+            "column": 1,
+            "row": 22,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_output_proc_records_total), 1 minute) as 'Processed', rate(sum(fluentbit_output_dropped_records_total), 1 minute) as 'Dropped', rate(sum(fluentbit_output_retried_records_total), 1 minute) as 'Retried' FROM Metric where cluster_name IN ({{cluster_name}}) AND name = 'newrelic-logs-forwarder' facet pod_name  timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Other OUTPUT plugin statistics (records/minute)",
+          "layout": {
+            "column": 5,
+            "row": 22,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_output_proc_records_total), 1 minute) as 'Processed', rate(sum(fluentbit_output_dropped_records_total), 1 minute) as 'Dropped', rate(sum(fluentbit_output_retried_records_total), 1 minute) as 'Retried' FROM Metric where cluster_name IN ({{cluster_name}}) AND name != 'newrelic-logs-forwarder' and name != 'fb-metrics-forwarder' facet name, pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Connections per OUTPUT plugin",
+          "layout": {
+            "column": 9,
+            "row": 22,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT max(fluentbit_output_upstream_total_connections) as 'Total', max(fluentbit_output_upstream_busy_connections) as 'Busy' FROM Metric where cluster_name IN ({{cluster_name}}) AND name != 'fb-metrics-forwarder' facet name, pod_name timeseries MAX"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "newrelic plugin errors (errors/minute)",
+          "layout": {
+            "column": 1,
+            "row": 25,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_output_errors_total), 1 minute) AS 'Errors/minute' FROM Metric where cluster_name IN ({{cluster_name}}) AND name = 'newrelic-logs-forwarder' facet pod_name timeseries MAX "
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "newrelic plugin chunk retry statistics (retries/minute)",
+          "layout": {
+            "column": 5,
+            "row": 25,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_output_retries_total), 1 minute) as 'Retries', rate(sum(fluentbit_output_retries_failed_total), 1 minute) as 'Expirations' FROM Metric where cluster_name IN ({{cluster_name}}) AND name = 'newrelic-logs-forwarder' facet pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "",
+          "layout": {
+            "column": 1,
+            "row": 28,
+            "width": 12,
+            "height": 1
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.markdown"
+          },
+          "rawConfiguration": {
+            "text": "# MEMORY USAGE"
+          }
+        },
+        {
+          "title": "Input plugin memory usage",
+          "layout": {
+            "column": 1,
+            "row": 29,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT max(fluentbit_input_storage_memory_bytes) as 'Max' FROM Metric where cluster_name IN ({{cluster_name}}) and name != 'fb-metrics-collector' timeseries max facet name, pod_name "
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "units": {
+              "unit": "BYTES"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "INPUT memory buffer over limit",
+          "layout": {
+            "column": 5,
+            "row": 29,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "colors": {
+              "seriesOverrides": [
+                {
+                  "color": "#013ef4",
+                  "seriesName": "pod-logs-tailer"
+                }
+              ]
+            },
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT max(fluentbit_input_storage_overlimit) FROM Metric where cluster_name IN ({{cluster_name}}) and name != 'fb-metrics-collector' timeseries max facet name, pod_name"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true,
+              "thresholds": [
+                {
+                  "from": 0.95,
+                  "name": "Mem buf overlimit",
+                  "severity": "critical",
+                  "to": 1.05
+                }
+              ]
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Chunk statistics per INPUT plugin",
+          "layout": {
+            "column": 9,
+            "row": 29,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT average(fluentbit_input_storage_chunks_up) AS 'Up (in memory)', average(fluentbit_input_storage_chunks_down) AS 'Down (in fs)', average(fluentbit_input_storage_chunks_busy) AS 'Busy', average(fluentbit_input_storage_chunks) as 'Total'  FROM Metric where name != 'fb-metrics-collector' since 1 hour ago timeseries MAX facet name, pod_name "
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Buffered chunks",
+          "layout": {
+            "column": 1,
+            "row": 32,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT max(fluentbit_input_storage_chunks) AS 'Total', max(fluentbit_storage_mem_chunks) AS 'Memory', max(fluentbit_storage_fs_chunks) AS 'Filesystem'  FROM Metric where cluster_name IN ({{cluster_name}}) facet pod_name timeseries MAX "
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Busy chunks' size",
+          "layout": {
+            "column": 5,
+            "row": 32,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT max(fluentbit_input_storage_chunks_busy_bytes) FROM Metric where name != 'fb-metrics-collector' facet name, pod_name timeseries MAX since 1 hour ago"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "units": {
+              "unit": "BYTES"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Filesystem chunks state",
+          "layout": {
+            "column": 9,
+            "row": 32,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT average(fluentbit_storage_fs_chunks_up) AS 'Up (in memory)', average(fluentbit_storage_fs_chunks_down) AS 'Down (fs only)'  FROM Metric since '2024-02-29 13:22:00+0000' UNTIL '2024-02-29 14:31:00+0000' timeseries MAX "
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "name": "Fluent Bit metrics: Pipeline View",
+      "description": null,
+      "widgets": [
+        {
+          "title": "",
+          "layout": {
+            "column": 1,
+            "row": 1,
+            "width": 6,
+            "height": 6
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.markdown"
+          },
+          "rawConfiguration": {
+            "text": "# README\n\n## About this page\nThis page represents the same metrics that are displayed in the \"Fluent Bit metrics: General\" page. Nevertheless, they are grouped differently to allow you to visualize a given metric across the whole pipeline with a single glance.\n\n## How to filter\n1. Select the Kubernetes cluster you want to troubleshoot in the \"Cluster Name\" variable above.\n2. [OPTIONAL] You can use any of the values in the `Node name` and `Pod name` columns on the \"Fluent Bit version\" table to further filter the metrics displayed in the graphs below. To do so, you need to enable [facet filtering](https://docs.newrelic.com/docs/query-your-data/explore-query-data/dashboards/filter-new-relic-one-dashboards-facets/) on that table by clicking on the \"Edit\" submenu and select \"Filter the current dashboard\" under \"Facet Linking\". \n\n## Legend\n### Metric dimensions\n- **name**: the name of the Fluent Bit plugin. Version 1.21.0 of our Helm chart names them according to the plugin names described in the following section.\n- **pod_name**: the `newrelic-logging` pod (Fluent Bit instance) that emitted this metric.\n- **node_name**: physical Kubernetes node where the `newrelic-logging` pod is running.\n\n### Plugin names\n- **pod-logs-tailer**: `tail` *INPUT* plugin normally reading from `/var/log/containers/*.log`\n- **kubernetes-enricher**: `kubernetes` *FILTER* plugin that queries the Kubernetes API to enrich the logs with pod/container metadata.\n- **node-attributes-enricher**: `record_modifier` *FILTER* plugin that enriches logs with `cluster_name`.\n- **kubernetes-attribute-lifter** (only when in low data mode): `nest` *FILTER* plugin that lifts all the keys under `kubernetes`. This plugin is transparent to the final shape of the log.\n- **node-attributes-enricher-filter** (only when in low data mode): same as  node-attributes-enricher`, but it also removes attributes that are not strictly necessary for correct platform functioning.\n- **newrelic-logs-forwarder**: `newrelic` *OUTPUT* plugin that sends logs to the New Relic Logs API"
+          }
+        },
+        {
+          "title": "Fluent Bit version",
+          "layout": {
+            "column": 7,
+            "row": 1,
+            "width": 6,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.table"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT latest(os) as 'OS', latest(version) as 'FB version', latest(cluster_name)  FROM Metric where metricName = 'fluentbit_build_info' AND cluster_name IN ({{cluster_name}}) since 1 hour ago facet pod_name, node_name limit max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            }
+          }
+        },
+        {
+          "title": "Fluent Bit uptime",
+          "layout": {
+            "column": 7,
+            "row": 4,
+            "width": 6,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT latest(fluentbit_uptime) FROM Metric where cluster_name IN ({{cluster_name}}) timeseries facet pod_name "
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "units": {
+              "unit": "SECONDS"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "",
+          "layout": {
+            "column": 1,
+            "row": 7,
+            "width": 12,
+            "height": 1
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.markdown"
+          },
+          "rawConfiguration": {
+            "text": "# BYTE RATES"
+          }
+        },
+        {
+          "title": "Input byte rate (bytes/minute)",
+          "layout": {
+            "column": 1,
+            "row": 8,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_input_bytes_total), 1 minute) as 'bytes/minute' FROM Metric where name != 'fb-metrics-collector' and cluster_name IN ({{cluster_name}}) timeseries max facet name, pod_name"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Filter byte rate (bytes/minute)",
+          "layout": {
+            "column": 5,
+            "row": 8,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_filter_bytes_total), 1 minute) FROM Metric WHERE cluster_name IN ({{cluster_name}}) facet name, pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Output byte rate (bytes/minute)",
+          "layout": {
+            "column": 9,
+            "row": 8,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_output_proc_bytes_total), 1 minute) as 'bytes/minute' FROM Metric where cluster_name IN ({{cluster_name}}) AND name != 'fb-metrics-forwarder' facet name, pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "",
+          "layout": {
+            "column": 1,
+            "row": 11,
+            "width": 12,
+            "height": 1
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.markdown"
+          },
+          "rawConfiguration": {
+            "text": "# LOG RECORD RATES"
+          }
+        },
+        {
+          "title": "Input log rate (records/minute)",
+          "layout": {
+            "column": 1,
+            "row": 12,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_input_records_total), 1 minute) as 'logs/minute' FROM Metric where name != 'fb-metrics-collector' and cluster_name IN ({{cluster_name}}) facet name, pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Filter log rate (records/minute)",
+          "layout": {
+            "column": 5,
+            "row": 12,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_filter_records_total), 1 minute) FROM Metric WHERE cluster_name IN ({{cluster_name}}) facet name, pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Output log rate (records/minute)",
+          "layout": {
+            "column": 9,
+            "row": 12,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_output_proc_records_total), 1 minute) as 'records/minute' FROM Metric where cluster_name IN ({{cluster_name}}) AND name != 'fb-metrics-forwarder' facet name, pod_name timeseries MAX "
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Record add/drop rate per FILTER plugin",
+          "layout": {
+            "column": 5,
+            "row": 15,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_filter_add_records_total), 1 minute) as 'Added back to pipeline', rate(sum(fluentbit_filter_drop_records_total), 1 minute) as 'Removed from pipeline' FROM Metric WHERE cluster_name IN ({{cluster_name}}) facet name, pod_name timeseries MAX"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "units": {
+              "unit": "REQUESTS_PER_MINUTE"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "",
+          "layout": {
+            "column": 1,
+            "row": 18,
+            "width": 12,
+            "height": 1
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.markdown"
+          },
+          "rawConfiguration": {
+            "text": "# AVERAGE LOG RECORD SIZES AT THE END OF EACH STAGE"
+          }
+        },
+        {
+          "title": "Average incoming record size (bytes)",
+          "layout": {
+            "column": 1,
+            "row": 19,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT sum(fluentbit_input_bytes_total)/sum(fluentbit_input_records_total) as 'Average incoming record size (bytes)' FROM Metric where name != 'fb-metrics-collector' and cluster_name IN ({{cluster_name}}) facet name, pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "units": {
+              "unit": "BYTES"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Average filtered record size (bytes)",
+          "layout": {
+            "column": 5,
+            "row": 19,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT sum(fluentbit_filter_bytes_total)/sum(fluentbit_filter_records_total) AS 'Average filtered record size (bytes)' FROM Metric WHERE cluster_name IN ({{cluster_name}}) facet name, pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "units": {
+              "unit": "BYTES"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Average outgoing record size (bytes)",
+          "layout": {
+            "column": 9,
+            "row": 19,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT sum(fluentbit_output_proc_bytes_total)/sum(fluentbit_output_proc_records_total) as 'bytes' FROM Metric where cluster_name IN ({{cluster_name}}) AND name != 'fb-metrics-forwarder' facet name, pod_name timeseries MAX"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "units": {
+              "unit": "BYTES"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "",
+          "layout": {
+            "column": 1,
+            "row": 22,
+            "width": 12,
+            "height": 1
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.markdown"
+          },
+          "rawConfiguration": {
+            "text": "# MEMORY USAGE AND BACKPRESSURE"
+          }
+        },
+        {
+          "title": "Input plugin memory usage",
+          "layout": {
+            "column": 1,
+            "row": 23,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT max(fluentbit_input_storage_memory_bytes) as 'Max' FROM Metric where cluster_name IN ({{cluster_name}}) and name != 'fb-metrics-collector' timeseries max facet name, pod_name "
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "units": {
+              "unit": "BYTES"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Busy chunks' size",
+          "layout": {
+            "column": 5,
+            "row": 23,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT max(fluentbit_input_storage_chunks_busy_bytes) FROM Metric where name != 'fb-metrics-collector' facet name, pod_name timeseries MAX since 1 hour ago"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "units": {
+              "unit": "BYTES"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "newrelic plugin chunk retry statistics (retries/minute)",
+          "layout": {
+            "column": 9,
+            "row": 23,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_output_retries_total), 1 minute) as 'Retries', rate(sum(fluentbit_output_retries_failed_total), 1 minute) as 'Expirations' FROM Metric where cluster_name IN ({{cluster_name}}) AND name = 'newrelic-logs-forwarder' facet pod_name timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "INPUT memory buffer over limit",
+          "layout": {
+            "column": 1,
+            "row": 26,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "colors": {
+              "seriesOverrides": [
+                {
+                  "color": "#013ef4",
+                  "seriesName": "pod-logs-tailer"
+                }
+              ]
+            },
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT max(fluentbit_input_storage_overlimit) FROM Metric where cluster_name IN ({{cluster_name}}) and name != 'fb-metrics-collector' timeseries max facet name, pod_name"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true,
+              "thresholds": [
+                {
+                  "from": 0.95,
+                  "name": "Mem buf overlimit",
+                  "severity": "critical",
+                  "to": 1.05
+                }
+              ]
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Chunk statistics per INPUT plugin",
+          "layout": {
+            "column": 5,
+            "row": 26,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT average(fluentbit_input_storage_chunks_up) AS 'Up (in memory)', average(fluentbit_input_storage_chunks_down) AS 'Down (in fs)', average(fluentbit_input_storage_chunks_busy) AS 'Busy', average(fluentbit_input_storage_chunks) as 'Total'  FROM Metric where name != 'fb-metrics-collector' since 1 hour ago timeseries MAX facet name, pod_name "
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "newrelic plugin errors (errors/minute)",
+          "layout": {
+            "column": 9,
+            "row": 26,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(fluentbit_output_errors_total), 1 minute) AS 'Errors/minute' FROM Metric where cluster_name IN ({{cluster_name}}) AND name = 'newrelic-logs-forwarder' facet pod_name timeseries MAX "
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": {
+              "isLabelVisible": true
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "name": "newrelic-fluent-bit-output plugin metrics",
+      "description": null,
+      "widgets": [
+        {
+          "title": "",
+          "layout": {
+            "column": 1,
+            "row": 1,
+            "width": 4,
+            "height": 9
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.markdown"
+          },
+          "rawConfiguration": {
+            "text": "# README\n## About this page\nThis page displays metrics collected internally in the [New Relic Fluent Bit output plugin](https://github.com/newrelic/newrelic-fluent-bit-output) (in short, **NR FB plugin**). These metrics are independent of Fluent Bit's, and **must not be considered as a stable API: they can change its naming or dimensions at any time in newer plugin versions**.\n\nPlease note that **the NR FB plugin does not include the `pod_name` nor the `node_name` dimensions**. Therefore, the graphs below represent an aggregation of all your running Fluent Bit instances across one or more clusters. You can use the `cluster_name` dimension (or dashboard variable above) to narrow down the troubleshooting to one or more clusters.\n\n## Basic naming conventions\n- Fluent Bit aggregates logs in batches, also referred as **[chunks](https://docs.fluentbit.io/manual/administration/buffering-and-storage#chunks-memory-filesystem-and-backpressure)**. Each chunk therefore contains an unknown amount of logs.\n- Chunks are received sequentially at the NR FB plugin, which takes care of reading the logs they contain and splitting them into the so-called New Relic *payloads*.\n- Each **payload** is a compressed stream of bytes that can be [at most 1MB long](https://docs.newrelic.com/docs/logs/log-api/introduction-log-api/#limits), and follows the [data format required by the Logs API](https://docs.newrelic.com/docs/logs/log-api/introduction-log-api/#json-content).\n\n\n## Error-detection graphs and recommended actions\n\nThe following are the main graphs used to detect potential problems in your log forwarding setup. Refer to each section to learn the recommended actions for each graph.\n\n### Payload packaging errors\nRepresents the percentage of Fluent Bit chunks that threw an error when they were attempted to be packaged as New Relic payloads. Such errors are never expected to happen. Therefore, **any value greater than 0% should be thoroughly investigated**.\n\nIf you find errors in this graph, please open a support ticket and include a  sample of your logs for further investigation.\n\n### Payload sending errors\nRepresents the percentage of New Relic payloads that threw an unexpected error when they were attempted to be sent to New Relic. Such errors can happen sporadically: timeouts due to poor network performance or sudden network changes can cause them from time to time. Observing **values greater than 0% can sometimes be normal, but any value above 10% should be considered as an annomalous situation and should be thoroughly investigated**.\n\nIf you find errors in this graph, please ensure that you don't have any weak spots in your network path to New Relic: are you using a proxy? Is it or any network hop introducing too much latency due to being saturated? If you can't find anything on you side, please open a support ticket and include as much information as possible from your network setup.\n\n### Payload send results\nRepresents the amount of API requests that were performed to send logs to New Relic. **Ideally, you should only observe 202 responses here**. Sometimes, intermediary CDN providers can introduce some errors (503 error codes) from time to time, in which case your logs will not be lost and reattempted to be sent.\n\nIf you find a considerable amount of non-202 responses in this graph, please open a customer support ticket.\n\n## Additional troubleshooting graphs\n\nThe following graphs include additional fine-grained information that will be useful for New Relic to troubleshoot your potential installation issues.\n\n### Average timings\nRepresents the average amount of time the plugin spent packaging the log payloads and sending them to New Relic, respectively.\n\n### Accumulated time per minute\nRepresents the amount of time per minute the plugin spent packaging the log payloads and sending them to New Relic, respectively.\n\n### Payload size\nRepresents the size in bytes of the individual compressed payloads sent to New Relic.\n\n### Payload packets per Fluent Bit chunk\nRepresents the amount of payloads sent to New Relic per each Fluent Bit chunk."
+          }
+        },
+        {
+          "title": "Payload packaging errors",
+          "layout": {
+            "column": 5,
+            "row": 1,
+            "width": 2,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.billboard"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "FROM Metric SELECT percentage(count(`logs.fb.packaging.time`), WHERE hasError = true) AS 'packaging errors'"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": [
+              {
+                "alertSeverity": "CRITICAL",
+                "value": 0
+              }
+            ]
+          }
+        },
+        {
+          "title": "Payload sending errors",
+          "layout": {
+            "column": 7,
+            "row": 1,
+            "width": 2,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.billboard"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "FROM Metric SELECT percentage(count(`logs.fb.payload.send.time`), WHERE hasError = true) AS 'send errors'"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "thresholds": [
+              {
+                "alertSeverity": "WARNING",
+                "value": 0
+              },
+              {
+                "alertSeverity": "CRITICAL",
+                "value": 0.1
+              }
+            ]
+          }
+        },
+        {
+          "title": "Payload send results",
+          "layout": {
+            "column": 9,
+            "row": 1,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(count(logs.fb.payload.send.time), 1 minute) AS 'Status Code' FROM Metric FACET CASES(WHERE statusCode = 0 AS 'Send error') OR statusCode timeseries max"
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "units": {
+              "unit": "REQUESTS_PER_MINUTE"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Average timings",
+          "layout": {
+            "column": 5,
+            "row": 4,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT average(logs.fb.payload.send.time) AS 'Payload sending', average(logs.fb.packaging.time) AS 'Payload packaging' FROM Metric timeseries max"
+              }
+            ],
+            "nullValues": {
+              "nullValue": "zero"
+            },
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "units": {
+              "unit": "MS"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Accumulated time per minute",
+          "layout": {
+            "column": 9,
+            "row": 4,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.area"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT rate(sum(logs.fb.total.send.time), 1 minute) AS 'Sending', rate(sum(logs.fb.packaging.time), 1 minute) AS 'Packaging' FROM Metric TIMESERIES max"
+              }
+            ],
+            "nullValues": {
+              "nullValue": "zero"
+            },
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "units": {
+              "unit": "MS"
+            }
+          }
+        },
+        {
+          "title": "Payload size",
+          "layout": {
+            "column": 5,
+            "row": 7,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT min(logs.fb.payload.size) AS 'Minimum', average(logs.fb.payload.size) AS 'Average', max(logs.fb.payload.size) AS 'Maximum' FROM Metric timeseries MAX "
+              }
+            ],
+            "nullValues": {
+              "nullValue": "default"
+            },
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "units": {
+              "unit": "BYTES"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        },
+        {
+          "title": "Payload packets per Fluent Bit chunk",
+          "layout": {
+            "column": 9,
+            "row": 7,
+            "width": 4,
+            "height": 3
+          },
+          "linkedEntityGuids": null,
+          "visualization": {
+            "id": "viz.line"
+          },
+          "rawConfiguration": {
+            "facet": {
+              "showOtherSeries": false
+            },
+            "legend": {
+              "enabled": true
+            },
+            "nrqlQueries": [
+              {
+                "accountIds": [
+                  YOUR_ACCOUNT_ID
+                ],
+                "query": "SELECT min(logs.fb.payload.count) AS 'Minimum', average(logs.fb.payload.count) AS 'Average', max(logs.fb.payload.count) AS 'Maximum' FROM Metric timeseries MAX "
+              }
+            ],
+            "platformOptions": {
+              "ignoreTimeRange": false
+            },
+            "units": {
+              "unit": "COUNT"
+            },
+            "yAxisLeft": {
+              "zero": true
+            },
+            "yAxisRight": {
+              "zero": true
+            }
+          }
+        }
+      ]
+    }
+  ],
+  "variables": [
+    {
+      "name": "cluster_name",
+      "items": null,
+      "defaultValues": [
+        {
+          "value": {
+            "string": "*"
+          }
+        }
+      ],
+      "nrqlQuery": {
+        "accountIds": [
+          YOUR_ACCOUNT_ID
+        ],
+        "query": "SELECT uniques(cluster_name) FROM Metric where metricName = 'fluentbit_input_storage_overlimit'"
+      },
+      "options": {
+        "ignoreTimeRange": false
+      },
+      "title": "Cluster Name",
+      "type": "NRQL",
+      "isMultiSelection": true,
+      "replacementStrategy": "STRING"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/NOTES.txt b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/NOTES.txt
new file mode 100644
index 000000000..289f2157f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/NOTES.txt
@@ -0,0 +1,18 @@
+{{- if (include "newrelic-logging.areValuesValid" .) }}
+Your deployment of the New Relic Kubernetes Logging is complete. You can check on the progress of this by running the following command:
+
+    kubectl get daemonset -o wide -w --namespace {{ .Release.Namespace }} {{ template "newrelic-logging.fullname" . }}
+{{- else -}}
+##############################################################################
+####     ERROR: You did not set a license key.                            ####
+##############################################################################
+
+This deployment will be incomplete until you get your API key from New Relic.
+
+Then run:
+
+    helm upgrade {{ .Release.Name }} \
+        --set licenseKey=(your-license-key) \
+        newrelic/newrelic-logging
+
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/_helpers.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/_helpers.tpl
new file mode 100644
index 000000000..a02ff74b2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/_helpers.tpl
@@ -0,0 +1,217 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "newrelic-logging.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic-logging.fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if ne $name .Release.Name -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+
+
+{{/* Generate basic labels */}}
+{{- define "newrelic-logging.labels" }}
+app: {{ template "newrelic-logging.name" . }}
+chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+heritage: {{.Release.Service }}
+release: {{.Release.Name }}
+app.kubernetes.io/name: {{ template "newrelic-logging.name" . }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "newrelic-logging.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{/*
+Create the name of the fluent bit config
+*/}}
+{{- define "newrelic-logging.fluentBitConfig" -}}
+{{ template "newrelic-logging.fullname" . }}-fluent-bit-config
+{{- end -}}
+
+{{/*
+Return the licenseKey
+*/}}
+{{- define "newrelic-logging.licenseKey" -}}
+{{- if .Values.global}}
+  {{- if .Values.global.licenseKey }}
+      {{- .Values.global.licenseKey -}}
+  {{- else -}}
+      {{- .Values.licenseKey | default "" -}}
+  {{- end -}}
+{{- else -}}
+    {{- .Values.licenseKey | default "" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the cluster name
+*/}}
+{{- define "newrelic-logging.cluster" -}}
+{{- if .Values.global}}
+  {{- if .Values.global.cluster }}
+    {{- .Values.global.cluster -}}
+  {{- else -}}
+    {{- .Values.cluster | default "" -}}
+  {{- end -}}
+{{- else -}}
+    {{- .Values.cluster | default "" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the customSecretName
+*/}}
+{{- define "newrelic-logging.customSecretName" -}}
+{{- if .Values.global }}
+  {{- if .Values.global.customSecretName }}
+      {{- .Values.global.customSecretName -}}
+  {{- else -}}
+      {{- .Values.customSecretName | default "" -}}
+  {{- end -}}
+{{- else -}}
+    {{- .Values.customSecretName | default "" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the customSecretLicenseKey
+*/}}
+{{- define "newrelic-logging.customSecretKey" -}}
+{{- if .Values.global }}
+  {{- if .Values.global.customSecretLicenseKey }}
+      {{- .Values.global.customSecretLicenseKey -}}
+  {{- else -}}
+    {{- if .Values.global.customSecretKey }}
+        {{- .Values.global.customSecretKey -}}
+    {{- else -}}
+        {{- .Values.customSecretKey | default "" -}}
+    {{- end -}}
+  {{- end -}}
+{{- else -}}
+  {{- if .Values.customSecretLicenseKey }}
+      {{- .Values.customSecretLicenseKey -}}
+  {{- else -}}
+      {{- .Values.customSecretKey | default "" -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns nrStaging
+*/}}
+{{- define "newrelic.nrStaging" -}}
+{{- if .Values.global }}
+  {{- if .Values.global.nrStaging }}
+    {{- .Values.global.nrStaging -}}
+  {{- end -}}
+{{- else if .Values.nrStaging }}
+  {{- .Values.nrStaging -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns fargate
+*/}}
+{{- define "newrelic.fargate" -}}
+{{- if .Values.global }}
+  {{- if .Values.global.fargate }}
+    {{- .Values.global.fargate -}}
+  {{- end -}}
+{{- else if .Values.fargate }}
+  {{- .Values.fargate -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns lowDataMode
+*/}}
+{{- define "newrelic-logging.lowDataMode" -}}
+{{/* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */}}
+{{- if (get .Values "lowDataMode" | kindIs "bool") -}}
+  {{- if .Values.lowDataMode -}}
+    {{/*
+        We want only to return when this is true, returning `false` here will template "false" (string) when doing
+        an `(include "newrelic-logging.lowDataMode" .)`, which is not an "empty string" so it is `true` if it is used
+        as an evaluation somewhere else.
+    */}}
+    {{- .Values.lowDataMode -}}
+  {{- end -}}
+{{- else -}}
+{{/* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "lowDataMode" | kindIs "bool" -}}
+  {{- if $global.lowDataMode -}}
+    {{- $global.lowDataMode -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns logsEndpoint
+*/}}
+{{- define "newrelic-logging.logsEndpoint" -}}
+{{- if (include "newrelic.nrStaging" .) -}}
+https://staging-log-api.newrelic.com/log/v1
+{{- else if .Values.endpoint -}}
+{{ .Values.endpoint -}}
+{{- else if eq (substr 0 2 (include "newrelic-logging.licenseKey" .)) "eu" -}}
+https://log-api.eu.newrelic.com/log/v1
+{{- else -}}
+https://log-api.newrelic.com/log/v1
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns metricsHost
+*/}}
+{{- define "newrelic-logging.metricsHost" -}}
+{{- if (include "newrelic.nrStaging" .) -}}
+staging-metric-api.newrelic.com
+{{- else if .Values.metricsEndpoint -}}
+{{ .Values.metricsEndpoint -}}
+{{- else if eq (substr 0 2 (include "newrelic-logging.licenseKey" .)) "eu" -}}
+metric-api.eu.newrelic.com
+{{- else -}}
+metric-api.newrelic.com
+{{- end -}}
+{{- end -}}
+
+{{/*
+Returns if the template should render, it checks if the required values are set.
+*/}}
+{{- define "newrelic-logging.areValuesValid" -}}
+{{- $licenseKey := include "newrelic-logging.licenseKey" . -}}
+{{- $customSecretName := include "newrelic-logging.customSecretName" . -}}
+{{- $customSecretKey := include "newrelic-logging.customSecretKey" . -}}
+{{- and (or $licenseKey (and $customSecretName $customSecretKey))}}
+{{- end -}}
+
+{{/*
+If additionalEnvVariables is set, renames to extraEnv. Returns extraEnv.
+*/}}
+{{- define "newrelic-logging.extraEnv" -}}
+{{- if .Values.fluentBit }}
+  {{- if .Values.fluentBit.additionalEnvVariables }}
+    {{- toYaml .Values.fluentBit.additionalEnvVariables -}}
+  {{- else if .Values.fluentBit.extraEnv }}
+    {{- toYaml .Values.fluentBit.extraEnv  -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/clusterrole.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/clusterrole.yaml
new file mode 100644
index 000000000..b36340fe6
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/clusterrole.yaml
@@ -0,0 +1,23 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels: {{ include "newrelic-logging.labels" . | indent 4 }}
+  name: {{ template "newrelic-logging.fullname" . }}
+rules:
+  - apiGroups: [""]
+    resources:
+      - namespaces
+      - pods
+    verbs: ["get", "list", "watch"]
+{{- if .Values.rbac.pspEnabled }}
+  - apiGroups:
+      - extensions
+    resources:
+      - podsecuritypolicies
+    resourceNames:
+      - privileged-{{ template "newrelic-logging.fullname" . }}
+    verbs:
+      - use
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/clusterrolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/clusterrolebinding.yaml
new file mode 100644
index 000000000..6b258f697
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/clusterrolebinding.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels: {{ include "newrelic-logging.labels" . | indent 4 }}
+  name: {{ template "newrelic-logging.fullname" . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ template "newrelic-logging.fullname" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/configmap.yaml
new file mode 100644
index 000000000..4b1d89014
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/configmap.yaml
@@ -0,0 +1,38 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "newrelic-logging.labels" . | indent 4 }}
+  name: {{ template "newrelic-logging.fluentBitConfig" . }}
+data:
+  fluent-bit.conf: |
+    {{- if .Values.fluentBit.config.service }}
+      {{- .Values.fluentBit.config.service | nindent 4 }}
+    {{- end }}
+    {{- if .Values.fluentBit.config.inputs }}
+      {{- .Values.fluentBit.config.inputs | nindent 4 }}
+    {{- end }}
+    {{- if .Values.fluentBit.config.extraInputs }}
+      {{- .Values.fluentBit.config.extraInputs | nindent 4}}
+    {{- end }}
+    {{- if and (include "newrelic-logging.lowDataMode" .) (.Values.fluentBit.config.lowDataModeFilters) }}
+      {{- .Values.fluentBit.config.lowDataModeFilters | nindent 4 }}
+    {{- else }}
+      {{- .Values.fluentBit.config.filters | nindent 4 }}
+    {{- end }}
+    {{- if .Values.fluentBit.config.extraFilters }}
+      {{- .Values.fluentBit.config.extraFilters | nindent 4}}
+    {{- end }}
+    {{- if .Values.fluentBit.config.outputs }}
+      {{- .Values.fluentBit.config.outputs | nindent 4 }}
+    {{- end }}
+    {{- if .Values.fluentBit.config.extraOutputs }}
+      {{- .Values.fluentBit.config.extraOutputs | nindent 4}}
+    {{- end }}
+    {{- if and (.Values.fluentBit.sendMetrics) (.Values.fluentBit.config.metricInstrumentation) }}
+      {{- .Values.fluentBit.config.metricInstrumentation | nindent 4}}
+    {{- end }}
+  parsers.conf: |
+  {{- if .Values.fluentBit.config.parsers }}
+    {{- .Values.fluentBit.config.parsers | nindent 4}}
+  {{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/daemonset-windows.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/daemonset-windows.yaml
new file mode 100644
index 000000000..6a3145d13
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/daemonset-windows.yaml
@@ -0,0 +1,174 @@
+{{- if and (include "newrelic-logging.areValuesValid" $)  $.Values.enableWindows }}
+{{- range .Values.windowsOsList }}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  namespace: {{ $.Release.Namespace }}
+  labels:
+    kubernetes.io/os: windows
+{{ include "newrelic-logging.labels" $ | indent 4 }}
+  name: {{ template "newrelic-logging.fullname" $ }}-windows-{{ .version }}
+  annotations:
+  {{- if $.Values.daemonSet.annotations }}
+{{ toYaml $.Values.daemonSet.annotations | indent 4 }}
+  {{- end }}
+spec:
+  updateStrategy:
+    type: {{ $.Values.updateStrategy }}
+  selector:
+    matchLabels:
+      app: {{ template "newrelic-logging.name" $ }}
+      release: {{ $.Release.Name }}
+      kubernetes.io/os: windows
+  template:
+    metadata:
+      annotations:
+        checksum/fluent-bit-config: {{ include (print $.Template.BasePath "/configmap.yaml") $ | sha256sum }}
+    {{- if $.Values.podAnnotations }}
+{{ toYaml $.Values.podAnnotations | indent 8}}
+    {{- end }}
+      labels:
+        app: {{ template "newrelic-logging.name" $ }}
+        release: {{ $.Release.Name }}
+        kubernetes.io/os: windows
+        app.kubernetes.io/name: {{ template "newrelic-logging.name" $ }}
+        {{- if $.Values.podLabels}}
+{{ toYaml $.Values.podLabels | indent 8 }}
+        {{- end }}
+    spec:
+      serviceAccountName: {{ include "newrelic.common.serviceAccount.name" $ }}
+      {{- with include "newrelic.common.dnsConfig" $ }}
+      dnsConfig:
+        {{- . | nindent 8 }}
+      {{- end }}
+      dnsPolicy: ClusterFirst
+      terminationGracePeriodSeconds: 10
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list $.Values.image.pullSecrets) "context" $) }}
+      imagePullSecrets:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- if $.Values.hostNetwork }}
+      hostNetwork: {{ $.Values.hostNetwork }}
+      {{- end }}
+      {{- if $.Values.windows.initContainers }}
+      initContainers:
+{{ toYaml $.Values.windows.initContainers | indent 8 }}
+      {{- end }}
+      containers:
+        - name: {{ template "newrelic-logging.name" $ }}
+          # We have to use 'replace' to remove the double-quotes that "newrelic.common.images.image" has, so that
+          # we can append the Windows image tag suffix (and then re-quote that value)
+          image: "{{ include "newrelic.common.images.image" ( dict "imageRoot" $.Values.image "context" $) | replace "\"" ""}}-{{ .imageTagSuffix }}"
+          imagePullPolicy: "{{ $.Values.image.pullPolicy }}"
+          securityContext: {}
+          env:
+            - name: ENDPOINT
+              value: {{ include "newrelic-logging.logsEndpoint" $ | quote }}
+            - name: SOURCE
+              value: {{ if (include "newrelic-logging.lowDataMode" $) }} "k8s" {{- else }} "kubernetes" {{- end }}
+            - name: LICENSE_KEY
+              valueFrom:
+                secretKeyRef:
+                  {{- if (include "newrelic-logging.licenseKey" $) }}
+                  name: {{ template "newrelic-logging.fullname" $ }}-config
+                  key: license
+                  {{- else }}
+                  name: {{ include "newrelic-logging.customSecretName" $ }}
+                  key: {{ include "newrelic-logging.customSecretKey" $ }}
+              {{- end }}
+            - name: CLUSTER_NAME
+              value: {{ include "newrelic-logging.cluster" $ }}
+            - name: LOG_LEVEL
+              value: {{ $.Values.fluentBit.logLevel | quote }}
+            - name: LOG_PARSER
+              {{- if $.Values.fluentBit.criEnabled }}
+              value: "cri,docker"
+              {{- else }}
+              value: "docker,cri"
+              {{- end }}
+            {{- if or (not $.Values.fluentBit.persistence) (eq $.Values.fluentBit.persistence.mode "hostPath") }}
+            - name: FB_DB
+              value: {{ $.Values.fluentBit.windowsDb | quote }}
+            {{- else }}
+            - name: FB_DB
+              value: ""
+            {{- end }}
+            - name: PATH
+              value: {{ $.Values.fluentBit.windowsPath | quote }}
+            - name: K8S_BUFFER_SIZE
+              value: {{ $.Values.fluentBit.k8sBufferSize | quote }}
+            - name: K8S_LOGGING_EXCLUDE
+              value: {{ $.Values.fluentBit.k8sLoggingExclude | default "false" | quote }}
+            - name: LOW_DATA_MODE
+              value: {{ include "newrelic-logging.lowDataMode" $ | default "false" | quote }}
+            - name: RETRY_LIMIT
+              value: {{ $.Values.fluentBit.retryLimit | quote }}
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            - name: HOSTNAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: SEND_OUTPUT_PLUGIN_METRICS
+              value: {{ $.Values.fluentBit.sendMetrics | default "false" | quote }}
+            - name: METRICS_HOST
+              value: {{ include "newrelic-logging.metricsHost" $ | quote }}
+            {{- include "newrelic-logging.extraEnv" $ | nindent 12 }}
+          command:
+            - C:\fluent-bit\bin\fluent-bit.exe
+            - -c
+            - c:\fluent-bit\etc\fluent-bit.conf
+            - -e
+            - C:\fluent-bit\bin\out_newrelic.dll
+          {{- if $.Values.exposedPorts }}
+          ports: {{ toYaml $.Values.exposedPorts | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - mountPath: C:\fluent-bit\etc
+              name: fluent-bit-config
+            - mountPath: C:\var\log
+              name: logs
+              {{- if and ($.Values.fluentBit.persistence) (ne $.Values.fluentBit.persistence.mode "hostPath") }}
+              readOnly: true
+              {{- end }}
+              # We need to also mount this because the logs in C:\var\logs are actually symlinks to C:\ProgramData.
+              # So, in order to be able to read these logs, the reading process needs to also have access to C:\ProgramData.
+            - mountPath: C:\ProgramData
+              name: progdata
+              {{- if and ($.Values.fluentBit.persistence) (ne $.Values.fluentBit.persistence.mode "hostPath") }}
+              readOnly: true
+              {{- end }}
+          {{- if $.Values.resources }}
+          resources:
+{{ toYaml $.Values.resources | indent 12 }}
+          {{- end }}
+      volumes:
+        - name: fluent-bit-config
+          configMap:
+            name: {{ template "newrelic-logging.fluentBitConfig" $ }}
+        - name: logs
+          hostPath:
+            path: C:\var\log
+        - name: progdata
+          hostPath:
+            path: C:\ProgramData
+      {{- if $.Values.priorityClassName }}
+      priorityClassName: {{ $.Values.priorityClassName }}
+      {{- end }}
+      nodeSelector:
+        {{- if $.Values.windowsNodeSelector }}
+{{ toYaml $.Values.windowsNodeSelector | indent 8 }}
+        {{- else }}
+        kubernetes.io/os: windows
+        # Windows containers can only be executed on hosts running the exact same Windows version and build number
+        node.kubernetes.io/windows-build: {{ .buildNumber }}
+        {{- end }}
+      {{- if $.Values.tolerations }}
+      tolerations:
+{{ toYaml $.Values.tolerations | indent 8 }}
+      {{- end }}
+---
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/daemonset.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/daemonset.yaml
new file mode 100644
index 000000000..1e087b6cb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/daemonset.yaml
@@ -0,0 +1,212 @@
+{{- if and (include "newrelic-logging.areValuesValid" .) .Values.enableLinux }}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "newrelic-logging.labels" . | indent 4 }}
+  name: {{ template "newrelic-logging.fullname" . }}
+  annotations:
+  {{- if .Values.daemonSet.annotations }}
+{{ toYaml .Values.daemonSet.annotations | indent 4 }}
+  {{- end }}
+spec:
+  updateStrategy:
+    type: {{ .Values.updateStrategy }}
+  selector:
+    matchLabels:
+      app: {{ template "newrelic-logging.name" . }}
+      release: {{.Release.Name }}
+  template:
+    metadata:
+      annotations:
+        checksum/fluent-bit-config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+    {{- if .Values.podAnnotations }}
+{{ toYaml .Values.podAnnotations | indent 8}}
+    {{- end }}
+      labels:
+        app: {{ template "newrelic-logging.name" . }}
+        release: {{.Release.Name }}
+        kubernetes.io/os: linux
+        app.kubernetes.io/name: {{ template "newrelic-logging.name" . }}
+        {{- if .Values.podLabels}}
+{{ toYaml .Values.podLabels | indent 8 }}
+        {{- end }}
+    spec:
+      serviceAccountName: {{ include "newrelic.common.serviceAccount.name" . }}
+      {{- with include "newrelic.common.dnsConfig" . }}
+      dnsConfig:
+        {{- . | nindent 8 }}
+      {{- end }}
+      dnsPolicy: ClusterFirstWithHostNet
+      terminationGracePeriodSeconds: 10
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.image.pullSecrets) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.hostNetwork }}
+      hostNetwork: {{ .Values.hostNetwork }}
+      {{- end }}
+      initContainers:
+      {{- if and (.Values.fluentBit.persistence) (eq .Values.fluentBit.persistence.mode "persistentVolume") }}
+        - name: init
+          image: busybox:1.36
+          command: ["/bin/sh", "-c"]
+          args: ["/bin/find /db -type f -mtime +1 -delete"] # Delete all db files not updated in the last 24h
+          volumeMounts:
+            - name: fb-db-pvc
+              mountPath: /db
+      {{- end }}
+      {{- if .Values.initContainers }}
+{{ toYaml .Values.initContainers | indent 8 }}
+      {{- end }}
+      containers:
+        - name: {{ template "newrelic-logging.name" . }}
+          {{- with include "newrelic.common.securityContext.container" . }}
+          securityContext:
+            {{- . | nindent 12 }}
+          {{- end }}
+          image: {{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.image "context" .) }}
+          imagePullPolicy: "{{ .Values.image.pullPolicy }}"
+          env:
+            - name: ENDPOINT
+              value: {{ include "newrelic-logging.logsEndpoint" . | quote }}
+            - name: SOURCE
+              value: {{ if (include "newrelic-logging.lowDataMode" .) }} "k8s" {{- else }} "kubernetes" {{- end }}
+            - name: LICENSE_KEY
+              valueFrom:
+                secretKeyRef:
+                  {{- if (include "newrelic-logging.licenseKey" .) }}
+                  name: {{ template "newrelic-logging.fullname" . }}-config
+                  key: license
+                  {{- else }}
+                  name: {{ include "newrelic-logging.customSecretName" . }}
+                  key: {{ include "newrelic-logging.customSecretKey" . }}
+                  {{- end }}
+            - name: CLUSTER_NAME
+              value: {{ include "newrelic-logging.cluster" . }}
+            - name: LOG_LEVEL
+              value: {{ .Values.fluentBit.logLevel | quote }}
+            - name: LOG_PARSER
+              {{- if .Values.fluentBit.criEnabled }}
+              value: "cri,docker"
+              {{- else }}
+              value: "docker,cri"
+              {{- end }}
+            # NODE_NAME needs to be defined before FB_DB, because FB_DB references NODE_NAME in its value when using persistentVolume
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            {{- if or (not .Values.fluentBit.persistence) (eq .Values.fluentBit.persistence.mode "hostPath") }}
+            - name: FB_DB
+              value: {{ .Values.fluentBit.db | quote }}
+            {{- else if eq .Values.fluentBit.persistence.mode "persistentVolume" }}
+            - name: FB_DB
+              value: "/db/$(NODE_NAME)-fb.db"
+            {{- else }}
+            - name: FB_DB
+              value: ""
+            {{- end }}
+            - name: PATH
+              value: {{ .Values.fluentBit.path | quote }}
+            - name: K8S_BUFFER_SIZE
+              value: {{ .Values.fluentBit.k8sBufferSize | quote }}
+            - name: K8S_LOGGING_EXCLUDE
+              value: {{ .Values.fluentBit.k8sLoggingExclude | default "false" | quote }}
+            - name: LOW_DATA_MODE
+              value: {{ include "newrelic-logging.lowDataMode" . | default "false" | quote }}
+            - name: RETRY_LIMIT
+              value: {{ .Values.fluentBit.retryLimit | quote }}
+            - name: HOSTNAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: SEND_OUTPUT_PLUGIN_METRICS
+              value: {{ $.Values.fluentBit.sendMetrics | default "false" | quote }}
+            - name: METRICS_HOST
+              value: {{ include "newrelic-logging.metricsHost" . | quote }}
+            {{- include "newrelic-logging.extraEnv" . | nindent 12 }}
+          command:
+            - /fluent-bit/bin/fluent-bit
+            - -c
+            - /fluent-bit/etc/fluent-bit.conf
+            - -e
+            - /fluent-bit/bin/out_newrelic.so
+          volumeMounts:
+            - name: fluent-bit-config
+              mountPath: /fluent-bit/etc
+            - name: logs
+              # We mount /var by default because container logs could be on /var/log or /var/lib/docker/containers (symlinked to /var/log)
+              mountPath: {{ .Values.fluentBit.linuxMountPath | default "/var" }}
+              {{- if and (.Values.fluentBit.persistence) (ne .Values.fluentBit.persistence.mode "hostPath") }}
+              readOnly: true
+              {{- end }}
+            {{- if and (.Values.fluentBit.persistence) (eq .Values.fluentBit.persistence.mode "persistentVolume") }}
+            - name: fb-db-pvc
+              mountPath: /db
+            {{- end }}
+          {{- if .Values.extraVolumeMounts }}
+              {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
+          {{- end }}
+          {{- if .Values.exposedPorts }}
+          ports: {{ toYaml .Values.exposedPorts | nindent 12 }}
+          {{- end }}
+          {{- if .Values.resources }}
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+          {{- end }}
+      volumes:
+        - name: fluent-bit-config
+          configMap:
+            name: {{ template "newrelic-logging.fluentBitConfig" . }}
+        - name: logs
+          hostPath:
+            path: {{ .Values.fluentBit.linuxMountPath | default "/var" }}
+        {{- if and (.Values.fluentBit.persistence) (eq .Values.fluentBit.persistence.mode "persistentVolume") }}
+        - name: fb-db-pvc
+          persistentVolumeClaim:
+            {{- if .Values.fluentBit.persistence.persistentVolume.existingVolumeClaim }}
+            claimName: {{ .Values.fluentBit.persistence.persistentVolume.existingVolumeClaim }}
+            {{- else }}
+            claimName: {{ template "newrelic-logging.fullname" . }}-pvc
+            {{- end }}
+        {{- end }}
+      {{- if .Values.extraVolumes }}
+        {{- toYaml .Values.extraVolumes | nindent 8 }}
+      {{- end }}
+      {{- if $.Values.priorityClassName }}
+      priorityClassName: {{ $.Values.priorityClassName }}
+      {{- end }}
+      {{- if .Values.nodeAffinity }}
+      affinity:
+        nodeAffinity: {{ .Values.nodeAffinity | toYaml | nindent 10 }}
+      {{- else if include "newrelic.fargate" . }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: eks.amazonaws.com/compute-type
+                    operator: NotIn
+                    values:
+                      - fargate
+      {{- end }}
+      nodeSelector:
+        {{- if .Values.nodeSelector }}
+{{ toYaml .Values.nodeSelector | indent 8 }}
+        {{- else if $.Values.enableWindows }}
+        # We add this only if Windows is enabled to keep backwards-compatibility. Prior to version 1.14, this label was
+        # named beta.kubernetes.io/os. In version 1.14, it was deprecated and replaced by this one. Version 1.14 also
+        # introduces Windows support. Therefore, anyone wishing to use Windows containers must bet at version >=1.14 and
+        # are going to need this label, in order to avoid placing a linux container on a windows node, and vice-versa.
+        kubernetes.io/os: linux
+        {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+      {{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/persistentvolume.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/persistentvolume.yaml
new file mode 100644
index 000000000..f2fb93d77
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/persistentvolume.yaml
@@ -0,0 +1,57 @@
+{{- if (not (empty .Values.fluentBit.persistence)) }}
+
+{{- if and (eq .Values.fluentBit.persistence.mode "persistentVolume") (not .Values.fluentBit.persistence.persistentVolume.storageClass) (not .Values.fluentBit.persistence.persistentVolume.existingVolumeClaim) }}
+{{ fail "You should provide a ReadWriteMany storageClass or an existingVolumeClaim if using persitentVolume as Fluent Bit persistence mode." }}
+{{- end }}
+
+{{- if and (eq .Values.fluentBit.persistence.mode "persistentVolume") (not .Values.fluentBit.persistence.persistentVolume.existingVolumeClaim) }}
+{{- if and (not .Values.fluentBit.persistence.persistentVolume.dynamicProvisioning) (not .Values.fluentBit.persistence.persistentVolume.existingVolume) }}
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "newrelic-logging.labels" . | indent 4 }}
+  name: {{ template "newrelic-logging.fullname" . }}-pv
+  annotations:
+  {{- if .Values.fluentBit.persistence.persistentVolume.annotations.volume }}
+{{ toYaml .Values.fluentBit.persistence.persistentVolume.annotations.volume | indent 4 }}
+  {{- end }}
+spec: 
+  accessModes:
+    - ReadWriteMany
+  capacity:
+    storage: {{ .Values.fluentBit.persistence.persistentVolume.size }}
+  storageClassName: {{ .Values.fluentBit.persistence.persistentVolume.storageClass }}
+  persistentVolumeReclaimPolicy: Delete
+  {{- if .Values.fluentBit.persistence.persistentVolume.extra.volume }}
+{{ toYaml .Values.fluentBit.persistence.persistentVolume.extra.volume | indent 2 }}
+  {{- end }}
+---
+{{- end }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "newrelic-logging.labels" . | indent 4 }}
+  name: {{ template "newrelic-logging.fullname" . }}-pvc
+  annotations:
+  {{- if .Values.fluentBit.persistence.persistentVolume.annotations.claim }}
+{{ toYaml .Values.fluentBit.persistence.persistentVolume.annotations.claim | indent 4 }}
+  {{- end }}
+spec:
+  storageClassName: {{ .Values.fluentBit.persistence.persistentVolume.storageClass }}
+  accessModes:
+    - ReadWriteMany
+{{- if .Values.fluentBit.persistence.persistentVolume.existingVolume }}
+  volumeName: {{ .Values.fluentBit.persistence.persistentVolume.existingVolume }}
+{{- else if not .Values.fluentBit.persistence.persistentVolume.dynamicProvisioning }}
+  volumeName: {{ template "newrelic-logging.fullname" . }}-pv
+{{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.fluentBit.persistence.persistentVolume.size }}
+  {{- if .Values.fluentBit.persistence.persistentVolume.extra.claim }}
+{{ toYaml .Values.fluentBit.persistence.persistentVolume.extra.claim | indent 2 }}
+  {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/podsecuritypolicy.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/podsecuritypolicy.yaml
new file mode 100644
index 000000000..2c8c598e2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/podsecuritypolicy.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.rbac.pspEnabled }}
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: privileged-{{ template "newrelic-logging.fullname" . }}
+spec:
+  allowedCapabilities:
+  - '*'
+  fsGroup:
+    rule: RunAsAny
+  runAsUser:
+    rule: RunAsAny
+  seLinux:
+    rule: RunAsAny
+  supplementalGroups:
+    rule: RunAsAny
+  volumes:
+  - '*'
+  hostPID: true
+  hostIPC: true
+  hostPorts:
+  - min: 1
+    max: 65536
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/secret.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/secret.yaml
new file mode 100644
index 000000000..47a56e573
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/secret.yaml
@@ -0,0 +1,12 @@
+{{- $licenseKey := include "newrelic-logging.licenseKey" . -}}
+{{- if $licenseKey }}
+apiVersion: v1
+kind: Secret
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels: {{ include "newrelic-logging.labels" . | indent 4 }}
+  name: {{ template "newrelic-logging.fullname" . }}-config
+type: Opaque
+data:
+  license: {{ $licenseKey | b64enc }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/serviceaccount.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/serviceaccount.yaml
new file mode 100644
index 000000000..51da56a3e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/templates/serviceaccount.yaml
@@ -0,0 +1,17 @@
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- if include "newrelic.common.serviceAccount.annotations" . }}
+  annotations:
+    {{- include "newrelic.common.serviceAccount.annotations" . | nindent 4 }}
+  {{- end }}
+  labels:
+    app: {{ template "newrelic-logging.name" . }}
+    chart: {{ template "newrelic-logging.chart" . }}
+    heritage: "{{ .Release.Service }}"
+    release: "{{ .Release.Name }}"
+    {{- /*include "newrelic.common.labels" . | nindent 4  /!\ Breaking change /!\ */}}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/cri_parser_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/cri_parser_test.yaml
new file mode 100644
index 000000000..f4a1d01d0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/cri_parser_test.yaml
@@ -0,0 +1,37 @@
+suite: test cri, docker parser options in daemonsets
+templates:
+  - templates/configmap.yaml
+  - templates/daemonset.yaml
+  - templates/daemonset-windows.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: cri enabled by default and docker as fallback
+    templates:
+      - templates/daemonset.yaml
+      - templates/daemonset-windows.yaml
+    set:
+      licenseKey: nr_license_key
+      enableWindows: true
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: LOG_PARSER
+            value: "cri,docker"
+  - it: docker is set if enabled by and cri as fallback
+    templates:
+      - templates/daemonset.yaml
+      - templates/daemonset-windows.yaml
+    set:
+      licenseKey: nr_license_key
+      enableWindows: true
+      fluentBit:
+        criEnabled: false
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: LOG_PARSER
+            value: "docker,cri"
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/dns_config_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/dns_config_test.yaml
new file mode 100644
index 000000000..76d24eac5
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/dns_config_test.yaml
@@ -0,0 +1,62 @@
+suite: test dnsConfig options in daemonsets
+templates:
+  - templates/configmap.yaml
+  - templates/daemonset.yaml
+  - templates/daemonset-windows.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: daemonsets contain dnsConfig block when provided
+    set:
+      licenseKey: nr_license_key
+      enableWindows: true
+      dnsConfig:
+        nameservers:
+          - 192.0.2.1
+    asserts:
+      - exists:
+          path: spec.template.spec.dnsConfig
+        template: templates/daemonset.yaml
+      - exists:
+          path: spec.template.spec.dnsConfig
+        template: templates/daemonset-windows.yaml
+
+  - it: daemonsets do not contain dnsConfig block when not provided
+    set:
+      licenseKey: nr_license_key
+      enableWindows: true
+      dnsConfig: {}
+    asserts:
+      - notExists:
+          path: spec.template.spec.dnsConfig
+        template: templates/daemonset.yaml
+      - notExists:
+          path: spec.template.spec.dnsConfig
+        template: templates/daemonset-windows.yaml
+
+  - it: daemonsets contain provided dnsConfig options
+    set:
+      licenseKey: nr_license_key
+      enableWindows: true
+      dnsConfig:
+        options:
+          - name: ndots
+            value: "1"
+    asserts:
+      - equal:
+          path: spec.template.spec.dnsConfig.options[0].name
+          value: ndots
+        template: templates/daemonset.yaml
+      - equal:
+          path: spec.template.spec.dnsConfig.options[0].value
+          value: "1"
+        template: templates/daemonset.yaml
+      - equal:
+          path: spec.template.spec.dnsConfig.options[0].name
+          value: ndots
+        template: templates/daemonset-windows.yaml
+      - equal:
+          path: spec.template.spec.dnsConfig.options[0].value
+          value: "1"
+        template: templates/daemonset-windows.yaml
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/endpoint_region_selection_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/endpoint_region_selection_test.yaml
new file mode 100644
index 000000000..b60981405
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/endpoint_region_selection_test.yaml
@@ -0,0 +1,241 @@
+suite: test endpoint selection based on region settings
+templates:
+  - templates/configmap.yaml
+  - templates/daemonset.yaml
+  - templates/daemonset-windows.yaml
+release:
+  name: endpoint-selection-release
+  namespace: endpoint-selection-namespace
+tests:
+
+  - it: selects staging endpoints if nrStaging is enabled
+    set:
+      licenseKey: nr_license_key
+      nrStaging: true
+      enableWindows: true
+    asserts:
+      # Linux
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: "https://staging-log-api.newrelic.com/log/v1"
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+            value: "staging-metric-api.newrelic.com"
+        template: templates/daemonset.yaml
+      # Windows
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: "https://staging-log-api.newrelic.com/log/v1"
+        template: templates/daemonset-windows.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+            value: "staging-metric-api.newrelic.com"
+        template: templates/daemonset-windows.yaml
+
+  - it: selects US endpoints for a US license key
+    set:
+      licenseKey: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaFFFFNRAL
+      enableWindows: true
+    asserts:
+      # Linux
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: "https://log-api.newrelic.com/log/v1"
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+            value: "metric-api.newrelic.com"
+        template: templates/daemonset.yaml
+      # Windows
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: "https://log-api.newrelic.com/log/v1"
+        template: templates/daemonset-windows.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+            value: "metric-api.newrelic.com"
+        template: templates/daemonset-windows.yaml
+  
+  - it: selects EU endpoints for a EU license key
+    set:
+      licenseKey: euaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaFFFFNRAL
+      enableWindows: true
+    asserts:
+      # Linux
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: "https://log-api.eu.newrelic.com/log/v1"
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+            value: "metric-api.eu.newrelic.com"
+        template: templates/daemonset.yaml
+      # Windows
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: "https://log-api.eu.newrelic.com/log/v1"
+        template: templates/daemonset-windows.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+            value: "metric-api.eu.newrelic.com"
+        template: templates/daemonset-windows.yaml
+
+
+  - it: selects custom logs endpoint if provided
+    set:
+      licenseKey: euaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaFFFFNRAL
+      endpoint: custom
+      enableWindows: true
+    asserts:
+      # Linux
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: "custom"
+        template: templates/daemonset.yaml
+      # Windows
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: "custom"
+        template: templates/daemonset-windows.yaml
+  - it: selects custom metrics endpoint if provided
+    set:
+      licenseKey: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaFFFFNRAL
+      metricsEndpoint: custom-metric-endpoint
+      enableWindows: true
+    asserts:
+      # Linux
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+            value: "custom-metric-endpoint"
+        template: templates/daemonset.yaml
+      # Windows
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+            value: "custom-metric-endpoint"
+        template: templates/daemonset-windows.yaml
+
+  - it: selects default endpoints when no conditions match
+    set:
+      licenseKey: default
+      enableWindows: true
+    asserts:
+      # Linux
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: "https://log-api.newrelic.com/log/v1"
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+            value: "metric-api.newrelic.com"
+        template: templates/daemonset.yaml
+      # Windows
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: "https://log-api.newrelic.com/log/v1"
+        template: templates/daemonset-windows.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+            value: "metric-api.newrelic.com"
+        template: templates/daemonset-windows.yaml
+
+  - it: fails with invalid license key
+    set:
+      licenseKey: invalid
+      enableWindows: true
+    asserts:
+      # Linux
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+        template: templates/daemonset.yaml
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+        template: templates/daemonset.yaml
+      # Windows
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+        template: templates/daemonset-windows.yaml
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+        template: templates/daemonset-windows.yaml
+
+  - it: selects endpoints with mixed EU key and custom endpoint 
+    set:
+      licenseKey: euaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaFFFFNRAL
+      metricsEndpoint: custom-metric-endpoint
+      enableWindows: true
+    asserts:
+      # Linux
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: "https://log-api.eu.newrelic.com/log/v1"
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+            value: "custom-metric-endpoint"
+        template: templates/daemonset.yaml
+      # Windows
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: "https://log-api.eu.newrelic.com/log/v1"
+        template: templates/daemonset-windows.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+            value: "custom-metric-endpoint"
+        template: templates/daemonset-windows.yaml
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/fluentbit_k8logging_exclude_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/fluentbit_k8logging_exclude_test.yaml
new file mode 100644
index 000000000..446f829b0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/fluentbit_k8logging_exclude_test.yaml
@@ -0,0 +1,45 @@
+suite: test fluent-bit exclude logging
+templates:
+  - templates/daemonset.yaml
+  - templates/configmap.yaml
+  - templates/persistentvolume.yaml   
+release:
+  name: my-release
+  namespace: my-namespace
+tests:  
+  - it: K8S_LOGGING_EXCLUDE set true
+    templates:
+      - templates/daemonset.yaml
+    set:
+      licenseKey: nr_license_key
+      fluentBit:
+        k8sLoggingExclude: true
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[?(@.name=="K8S_LOGGING_EXCLUDE")].value
+          value: "true"
+        template: templates/daemonset.yaml
+  - it: K8S_LOGGING_EXCLUDE set false
+    templates:
+      - templates/daemonset.yaml
+    set:
+      licenseKey: nr_license_key
+      fluentBit:
+        k8sLoggingExclude: false
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[?(@.name=="K8S_LOGGING_EXCLUDE")].value
+          value: "false"
+        template: templates/daemonset.yaml        
+  - it: K8S_LOGGING_EXCLUDE set value xyz and expect it to be set
+    templates:
+      - templates/daemonset.yaml
+    set:
+      licenseKey: nr_license_key
+      fluentBit:
+        k8sLoggingExclude: xyz
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[?(@.name=="K8S_LOGGING_EXCLUDE")].value
+          value: "xyz"
+        template: templates/daemonset.yaml
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/fluentbit_persistence_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/fluentbit_persistence_test.yaml
new file mode 100644
index 000000000..67d14c795
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/fluentbit_persistence_test.yaml
@@ -0,0 +1,317 @@
+suite: test fluent-bit persistence options
+templates:
+  - templates/daemonset.yaml
+  - templates/configmap.yaml
+  - templates/persistentvolume.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: default persistence is hostPath, DB is set properly and logs volume is read/write
+    set:
+      licenseKey: nr_license_key
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: logs
+            mountPath: /var
+        template: templates/daemonset.yaml
+      - notContains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: fb-db-pvc
+            mountPath: /db
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: logs
+            hostPath:
+              path: /var
+        template: templates/daemonset.yaml
+      - notContains:
+          path: spec.template.spec.volumes
+          content:
+            name: fb-db-pvc
+            persistentVolumeClaim:
+              claimName: my-release-newrelic-logging-pvc
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: FB_DB
+            value: /var/log/flb_kube.db
+        template: templates/daemonset.yaml
+      - hasDocuments:
+          count: 0
+        template: templates/persistentvolume.yaml
+  - it: fluentBit.persistence set to none should keep FB_DB env empty and mount logs volume as read-only
+    set:
+      licenseKey: nr_license_key
+      fluentBit:
+        persistence:
+          mode: none
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: FB_DB
+            value: ""
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: logs
+            mountPath: /var
+            readOnly: true
+        template: templates/daemonset.yaml
+      - notContains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: fb-db-pvc
+            mountPath: /db
+        template: templates/daemonset.yaml
+      - notContains:
+          path: spec.template.spec.volumes
+          content:
+            name: fb-db-pvc
+            persistentVolumeClaim:
+              claimName: my-release-newrelic-logging-pvc
+        template: templates/daemonset.yaml
+      - hasDocuments:
+          count: 0
+        template: templates/persistentvolume.yaml
+  - it: fluentBit.persistence set to persistentVolume should create volume, add it to daemonset, add an initContainer to cleanup and set the FB_DB. Dynamic provisioning is enabled by default.
+    set:
+      licenseKey: nr_license_key
+      fluentBit:
+        persistence:
+          mode: persistentVolume
+          persistentVolume:
+            storageClass: sample-rwx
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: FB_DB
+            value: "/db/$(NODE_NAME)-fb.db"
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: NODE_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: spec.nodeName
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: logs
+            mountPath: /var
+            readOnly: true
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: fb-db-pvc
+            mountPath: /db
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: fb-db-pvc
+            persistentVolumeClaim:
+              claimName: my-release-newrelic-logging-pvc
+        template: templates/daemonset.yaml
+      - isNotNullOrEmpty:
+          path: spec.template.spec.initContainers
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.initContainers[0].volumeMounts
+          content:
+            name: fb-db-pvc
+            mountPath: /db
+        template: templates/daemonset.yaml
+      - hasDocuments:
+          count: 1
+        template: templates/persistentvolume.yaml
+      - isKind:
+          of: PersistentVolumeClaim
+        template: templates/persistentvolume.yaml
+      - equal:
+          path: spec.accessModes
+          value:
+            - ReadWriteMany
+        template: templates/persistentvolume.yaml
+  - it: fluentBit.persistence.persistentVolume with non dynamic provisioning should create the PV and PVC
+    set:
+      licenseKey: nr_license_key
+      fluentBit:
+        persistence:
+          mode: persistentVolume
+          persistentVolume:
+            storageClass: sample-rwx
+            dynamicProvisioning: false
+    asserts:
+      - hasDocuments:
+          count: 2
+        template: templates/persistentvolume.yaml
+      - isKind:
+          of: PersistentVolume
+        documentIndex: 0
+        template: templates/persistentvolume.yaml
+      - isKind:
+          of: PersistentVolumeClaim
+        documentIndex: 1
+        template: templates/persistentvolume.yaml
+      - equal:
+          path: spec.accessModes
+          value:
+            - ReadWriteMany
+        documentIndex: 0
+        template: templates/persistentvolume.yaml
+      - equal:
+          path: spec.accessModes
+          value:
+            - ReadWriteMany
+        documentIndex: 1
+        template: templates/persistentvolume.yaml
+  - it: fluentBit.persistence storage class should be set properly on PV and PVC
+    set:
+      licenseKey: nr_license_key
+      fluentBit:
+        persistence:
+          mode: persistentVolume
+          persistentVolume:
+            dynamicProvisioning: false
+            storageClass: sample-storage-rwx
+    asserts:
+      - equal:
+          path: spec.storageClassName
+          value: sample-storage-rwx
+        documentIndex: 0
+        template: templates/persistentvolume.yaml
+      - equal:
+          path: spec.storageClassName
+          value: sample-storage-rwx
+        documentIndex: 1
+        template: templates/persistentvolume.yaml
+  - it: fluentBit.persistence.persistentVolume size should be set properly on PV and PVC
+    set:
+      licenseKey: nr_license_key
+      fluentBit:
+        persistence:
+          mode: persistentVolume
+          persistentVolume:
+            storageClass: sample-rwx
+            dynamicProvisioning: false
+            size: 100Gi
+    asserts:
+      - equal:
+          path: spec.capacity.storage
+          value: 100Gi
+        documentIndex: 0
+        template: templates/persistentvolume.yaml
+      - equal:
+          path: spec.resources.requests.storage
+          value: 100Gi
+        documentIndex: 1
+        template: templates/persistentvolume.yaml
+  - it: fluentBit.persistence.persistentVolume not dynamic provisioned but volumeName provided should use the volumeName and do not create a PV
+    set:
+      licenseKey: nr_license_key
+      fluentBit:
+        persistence:
+          mode: persistentVolume
+          persistentVolume:
+            storageClass: sample-rwx
+            dynamicProvisioning: false
+            existingVolume: existing-volume
+    asserts:
+      - hasDocuments:
+          count: 1
+        template: templates/persistentvolume.yaml
+      - isKind:
+          of: PersistentVolumeClaim
+        template: templates/persistentvolume.yaml
+      - equal:
+          path: spec.volumeName
+          value: existing-volume
+        template: templates/persistentvolume.yaml
+  - it: fluentBit.persistence.persistentVolume if a existing claim is provided it's used and PV/PVC are not created
+    set:
+      licenseKey: nr_license_key
+      fluentBit:
+        persistence:
+          mode: persistentVolume
+          persistentVolume:
+            storageClass: sample-rwx
+            dynamicProvisioning: false
+            existingVolumeClaim: existing-claim
+    asserts:
+      - hasDocuments:
+          count: 0
+        template: templates/persistentvolume.yaml
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: fb-db-pvc
+            persistentVolumeClaim:
+              claimName: existing-claim
+        template: templates/daemonset.yaml
+  - it: fluentBit.persistence.persistentVolume annotations for PV and PVC are used
+    set:
+      licenseKey: nr_license_key
+      fluentBit:
+        persistence:
+          mode: persistentVolume
+          persistentVolume:
+            storageClass: sample-rwx
+            annotations:
+              volume:
+                foo: bar
+              claim:
+                baz: qux
+            dynamicProvisioning: false
+    asserts:
+      - equal:
+          path: metadata.annotations.foo
+          value: bar
+        documentIndex: 0
+        template: templates/persistentvolume.yaml
+      - equal:
+          path: metadata.annotations.baz
+          value: qux
+        documentIndex: 1
+        template: templates/persistentvolume.yaml
+  - it: fluentBit.persistence.persistentVolume extra for PV and PVC are used
+    set:
+      licenseKey: nr_license_key
+      fluentBit:
+        persistence:
+          mode: persistentVolume
+          persistentVolume:
+            storageClass: sample-rwx
+            extra:
+              volume:
+                nfs:
+                  path: /tmp/
+                  server: 1.1.1.1
+              claim:
+                some: property
+            dynamicProvisioning: false
+    asserts:
+      - equal:
+          path: spec.nfs
+          value:
+            path: /tmp/
+            server: 1.1.1.1
+        documentIndex: 0
+        template: templates/persistentvolume.yaml
+      - equal:
+          path: spec.some
+          value: property
+        documentIndex: 1
+        template: templates/persistentvolume.yaml
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/fluentbit_pod_label_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/fluentbit_pod_label_test.yaml
new file mode 100644
index 000000000..86edd7ccd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/fluentbit_pod_label_test.yaml
@@ -0,0 +1,48 @@
+suite: test fluent-bit pods labels
+templates:
+  - templates/daemonset.yaml
+  - templates/configmap.yaml
+  - templates/persistentvolume.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+- it: multiple pod labels are set properly
+  templates:
+    - templates/daemonset.yaml
+  set:
+    licenseKey: nr_license_key
+    podLabels:
+      key1: value1
+      key2: value2
+  asserts:
+    - equal:
+        path: spec.template.metadata.labels.key1
+        value: value1
+      template: templates/daemonset.yaml
+    - equal:
+        path: spec.template.metadata.labels.key2
+        value: value2
+      template: templates/daemonset.yaml
+- it: single pod label set properly
+  templates:
+    - templates/daemonset.yaml
+  set:
+    licenseKey: nr_license_key
+    podLabels:
+      key1: value1       
+  asserts:
+    - equal:
+        path: spec.template.metadata.labels.key1
+        value: value1
+      template: templates/daemonset.yaml
+- it: pod labels are not set
+  templates:
+    - templates/daemonset.yaml
+  set:
+    licenseKey: nr_license_key  
+  asserts:
+    - notExists:
+        path: spec.template.metadata.labels.key1
+    - notExists:
+        path: spec.template.metadata.labels.key2
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/fluentbit_sendmetrics_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/fluentbit_sendmetrics_test.yaml
new file mode 100644
index 000000000..f320172cb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/fluentbit_sendmetrics_test.yaml
@@ -0,0 +1,74 @@
+suite: test fluentbit send metrics
+templates:
+  - templates/configmap.yaml
+  - templates/daemonset.yaml
+  - templates/daemonset-windows.yaml
+release:
+  name: sendmetrics-release
+  namespace: sendmetrics-namespace
+tests:
+
+  - it: sets requirement environment variables to send metrics
+    set:
+      licenseKey: nr_license_key
+      enableWindows: true
+      fluentBit.sendMetrics: true
+    asserts:
+      # Linux
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: NODE_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: spec.nodeName
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: HOSTNAME
+            valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: SEND_OUTPUT_PLUGIN_METRICS
+            value: "true"
+        template: templates/daemonset.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+            value: "metric-api.newrelic.com"
+        template: templates/daemonset.yaml
+      # Windows
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: NODE_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: spec.nodeName
+        template: templates/daemonset-windows.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: HOSTNAME
+            valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+        template: templates/daemonset-windows.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: SEND_OUTPUT_PLUGIN_METRICS
+            value: "true"
+        template: templates/daemonset-windows.yaml
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: METRICS_HOST
+            value: "metric-api.newrelic.com"
+        template: templates/daemonset-windows.yaml
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/host_network_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/host_network_test.yaml
new file mode 100644
index 000000000..612d1d9a5
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/host_network_test.yaml
@@ -0,0 +1,46 @@
+suite: test hostNetwork options in fluent-bit pods
+templates:
+  - templates/configmap.yaml
+  - templates/daemonset.yaml
+  - templates/daemonset-windows.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: daemonsets does not contain hostNetwork block when not provided
+    set:
+      licenseKey: nr_license_key
+      enableWindows: true
+    asserts:
+      - notExists:
+          path: spec.template.spec.hostNetwork
+        template: templates/daemonset.yaml
+      - notExists:
+          path: spec.template.spec.hostNetwork
+        template: templates/daemonset-windows.yaml
+  - it: daemonsets does not contain hostNetwork block when provided as false
+    set:
+      licenseKey: nr_license_key
+      enableWindows: true
+      hostNetwork: false
+    asserts:
+      - notExists:
+          path: spec.template.spec.hostNetwork
+        template: templates/daemonset.yaml
+      - notExists:
+          path: spec.template.spec.hostNetwork
+        template: templates/daemonset-windows.yaml
+  - it: daemonsets does contain hostNetwork=true when provided as true
+    set:
+      licenseKey: nr_license_key
+      enableWindows: true
+      hostNetwork: true
+    asserts:
+      - equal:
+          path: spec.template.spec.hostNetwork
+          value: true
+        template: templates/daemonset.yaml
+      - equal:
+          path: spec.template.spec.hostNetwork
+          value: true
+        template: templates/daemonset-windows.yaml
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/images_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/images_test.yaml
new file mode 100644
index 000000000..b7ff8ac7b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/images_test.yaml
@@ -0,0 +1,96 @@
+suite: test images settings
+templates:
+  - templates/configmap.yaml
+  - templates/daemonset.yaml
+  - templates/daemonset-windows.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: image names are correct
+    templates:
+      - templates/daemonset.yaml
+      - templates/daemonset-windows.yaml
+    set:
+      licenseKey: nr_license_key
+      enableWindows: true
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: newrelic/newrelic-fluentbit-output:2.1.0
+        template: templates/daemonset.yaml
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: newrelic/newrelic-fluentbit-output:2.1.0-windows-ltsc-2019
+        template: templates/daemonset-windows.yaml
+        documentIndex: 0
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: newrelic/newrelic-fluentbit-output:2.1.0-windows-ltsc-2022
+        template: templates/daemonset-windows.yaml
+        documentIndex: 1
+  - it: global registry is used if set
+    templates:
+      - templates/daemonset.yaml
+      - templates/daemonset-windows.yaml
+    set:
+      licenseKey: nr_license_key
+      enableWindows: true
+      global:
+        images:
+          registry: global_registry
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: global_registry/.*
+  - it: local registry overrides global
+    templates:
+      - templates/daemonset.yaml
+      - templates/daemonset-windows.yaml
+    set:
+      licenseKey: nr_license_key
+      enableWindows: true
+      global:
+        images:
+          registry: global_registry
+      image:
+        registry: local_registry
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: local_registry/.*
+  - it: pullSecrets is used if defined
+    templates:
+      - templates/daemonset.yaml
+      - templates/daemonset-windows.yaml
+    set:
+      licenseKey: nr_license_key
+      enableWindows: true
+      image:
+        pullSecrets:
+          - name: regsecret
+    asserts:
+      - equal:
+          path: spec.template.spec.imagePullSecrets[0].name
+          value: regsecret
+  - it: pullSecrets are merged
+    templates:
+      - templates/daemonset.yaml
+      - templates/daemonset-windows.yaml
+    set:
+      licenseKey: nr_license_key
+      enableWindows: true
+      global:
+        images:
+          pullSecrets:
+            - name: global_regsecret
+      image:
+        pullSecrets:
+          - name: regsecret
+    asserts:
+      - equal:
+          path: spec.template.spec.imagePullSecrets[0].name
+          value: global_regsecret
+      - equal:
+          path: spec.template.spec.imagePullSecrets[1].name
+          value: regsecret
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/linux_volume_mount_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/linux_volume_mount_test.yaml
new file mode 100644
index 000000000..83d2a2c11
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/linux_volume_mount_test.yaml
@@ -0,0 +1,37 @@
+suite: test fluent-bit linux mount for logs
+templates:
+  - templates/configmap.yaml
+  - templates/daemonset.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: is set to /var by default an
+    set:
+      licenseKey: nr_license_key
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].volumeMounts[1].mountPath
+          value: /var
+        template: templates/daemonset.yaml
+      - equal:
+          path: spec.template.spec.volumes[1].hostPath.path
+          value: /var
+        template: templates/daemonset.yaml
+        documentIndex: 0
+  - it: is set to linuxMountPath if set
+    templates:
+      - templates/daemonset.yaml
+    set:
+      licenseKey: nr_license_key
+      fluentBit.linuxMountPath: /var/log
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].volumeMounts[1].mountPath
+          value: /var/log
+        template: templates/daemonset.yaml
+      - equal:
+          path: spec.template.spec.volumes[1].hostPath.path
+          value: /var/log
+        template: templates/daemonset.yaml
+        documentIndex: 0
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/rbac_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/rbac_test.yaml
new file mode 100644
index 000000000..a8d85da98
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/tests/rbac_test.yaml
@@ -0,0 +1,48 @@
+suite: test RBAC creation
+templates:
+  - templates/clusterrolebinding.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: template rbac if it is configured to do it
+    set:
+      rbac.create: true
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  - it: don't template rbac if it is disabled
+    set:
+      rbac.create: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: RBAC points to the service account that is created by default
+    set:
+      rbac.create: true
+      serviceAccount.create: true
+    asserts:
+      - equal:
+          path: subjects[0].name
+          value: my-release-newrelic-logging
+
+  - it: RBAC points to the service account the user supplies when serviceAccount is disabled
+    set:
+      rbac.create: true
+      serviceAccount.create: false
+      serviceAccount.name: sa-test
+    asserts:
+      - equal:
+          path: subjects[0].name
+          value: sa-test
+
+  - it: RBAC points to the default service account when serviceAccount is disabled
+    set:
+      rbac.create: true
+      serviceAccount.create: false
+    asserts:
+      - equal:
+          path: subjects[0].name
+          value: default
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/values.yaml
new file mode 100644
index 000000000..ca6336cb6
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-logging/values.yaml
@@ -0,0 +1,362 @@
+# IMPORTANT: Specify your New Relic API key here.
+# licenseKey:
+#
+# Optionally, specify a cluster name and log records can
+# be filtered by cluster.
+# cluster:
+#
+# or Specify secret which contains New Relic API key
+# customSecretName: secret_name
+# customSecretLicenseKey: secret_key
+#
+# The previous values can also be set as global so that they
+# can be shared by other newrelic product's charts
+#
+# global:
+#   licenseKey:
+#   cluster:
+#   customSecretName:
+#   customSecretLicenseKey:
+#
+# IMPORTANT: if you use a kubernetes secret to specify the license,
+# you have to manually provide the correct endpoint depending on
+# whether your account is for the EU region or not.
+#
+# endpoint: https://log-api.newrelic.com/log/v1
+# metricsEndpoint: metric-api.newrelic.com
+
+fluentBit:
+  logLevel: "info"
+  path: "/var/log/containers/*.log"
+  linuxMountPath: /var
+  windowsPath: "C:\\var\\log\\containers\\*.log"
+  db: "/var/log/flb_kube.db"
+  windowsDb: "C:\\var\\log\\flb_kube.db"
+  criEnabled: true
+  k8sBufferSize: "32k"
+  k8sLoggingExclude: "false"
+  retryLimit: 5
+  sendMetrics: false
+  extraEnv: []
+  # extraEnv:
+  # - name: HTTPS_PROXY
+  #   value: http://example.com:3128
+  # - name: METADATA_NAME
+  #   valueFrom:
+  #     fieldRef:
+  #       fieldPath: metadata.name
+
+  # Indicates how fluent-bit database is persisted
+  persistence:
+    # Define the persistent mode for fluent-bit db, allowed options are `hostPath` (default), `none`, `persistentVolume`.
+    # - `hostPath` will use hostPath to store the db file on the node disk.
+    # - `none` will disable the fluent-bit db file, this could cause log duplication or data loss in case fluent-bit gets restarted.
+    # - `persistentVolume` will use a ReadWriteMany persistent volume to store the db file. This will override `fluentBit.db` path and use `/db/${NODE_NAME}-fb.db` file instead.
+    mode: "hostPath"
+
+    # In case persistence.mode is set to persistentVolume this will be needed
+    persistentVolume:
+      # The storage class should allow ReadWriteMany mode
+      storageClass:
+      # Volume and claim size.
+      size: 10Gi
+      # If dynamicProvisioning is enabled the chart will create only the PersistentVolumeClaim
+      dynamicProvisioning: true
+      # If an existingVolume is provided, we'll use it instead creating a new one
+      existingVolume:
+      # If an existingVolumeClaim is provided, we'll use it instead creating a new one
+      existingVolumeClaim:
+      # In case you need to add annotations to the created volume or claim
+      annotations:
+        volume: {}
+        claim: {}
+      # In case you need to specify any other option to your volume or claim
+      extra:
+        volume:
+        #  nfs:
+        #    path: /tmp/
+        #    server: 1.1.1.1
+        claim: {}
+
+
+  # New Relic default configuration for fluent-bit.conf (service, inputs, filters, outputs)
+  # and parsers.conf (parsers). The configuration below is not configured for lowDataMode and will
+  # send all attributes.  If custom configuration is required, update these variables.
+  config:
+    # Note that Prometheus metric collection needs the HTTP server to be online at port 2020 (see fluentBit.config.metricInstrumentation)
+    service: |
+      [SERVICE]
+          Flush         1
+          Log_Level     ${LOG_LEVEL}
+          Daemon        off
+          Parsers_File  parsers.conf
+          HTTP_Server   On
+          HTTP_Listen   0.0.0.0
+          HTTP_Port     2020
+
+    inputs: |
+      [INPUT]
+          Name              tail
+          Alias             pod-logs-tailer
+          Tag               kube.*
+          Path              ${PATH}
+          multiline.parser  ${LOG_PARSER}
+          DB                ${FB_DB}
+          Mem_Buf_Limit     7MB
+          Skip_Long_Lines   On
+          Refresh_Interval  10
+
+#    extraInputs: |
+#      [INPUT]
+#          Name   dummy
+#          Tag    dummy.log
+
+    filters: |
+      [FILTER]
+          Name                kubernetes
+          Alias               kubernetes-enricher
+          Match               kube.*
+          # We need the full DNS suffix as Windows only supports resolving names with this suffix
+          # See: https://kubernetes.io/docs/setup/production-environment/windows/intro-windows-in-kubernetes/#dns-limitations
+          Kube_URL            https://kubernetes.default.svc.cluster.local:443
+          Buffer_Size         ${K8S_BUFFER_SIZE}
+          K8S-Logging.Exclude ${K8S_LOGGING_EXCLUDE}
+
+      [FILTER]
+          Name           record_modifier
+          Alias          node-attributes-enricher
+          Match          *
+          Record         cluster_name "${CLUSTER_NAME}"
+
+#    extraFilters: |
+#      [FILTER]
+#          Name   grep
+#          Match  *
+#          Exclude log lvl=debug*
+
+    lowDataModeFilters: |
+      [FILTER]
+          Name           kubernetes
+          Match          kube.*
+          Alias          kubernetes-enricher
+          # We need the full DNS suffix as Windows only supports resolving names with this suffix
+          # See: https://kubernetes.io/docs/setup/production-environment/windows/intro-windows-in-kubernetes/#dns-limitations
+          Kube_URL       https://kubernetes.default.svc.cluster.local:443
+          Buffer_Size    ${K8S_BUFFER_SIZE}
+          K8S-Logging.Exclude ${K8S_LOGGING_EXCLUDE}
+          Labels         Off
+          Annotations    Off
+
+      [FILTER]
+          Name           nest
+          Match          *
+          Alias          kubernetes-attribute-lifter
+          Operation      lift
+          Nested_under   kubernetes
+
+      [FILTER]
+          Name           record_modifier
+          Match          *
+          Alias          node-attributes-enricher-filter
+          Record         cluster_name "${CLUSTER_NAME}"
+          Allowlist_key  container_name
+          Allowlist_key  namespace_name
+          Allowlist_key  pod_name
+          Allowlist_key  stream
+          Allowlist_key  message
+          Allowlist_key  log
+
+    outputs: |
+      [OUTPUT]
+          Name           newrelic
+          Match          *
+          Alias          newrelic-logs-forwarder
+          licenseKey     ${LICENSE_KEY}
+          endpoint       ${ENDPOINT}
+          lowDataMode    ${LOW_DATA_MODE}
+          sendMetrics    ${SEND_OUTPUT_PLUGIN_METRICS}
+          Retry_Limit    ${RETRY_LIMIT}
+
+#    extraOutputs: |
+#      [OUTPUT]
+#          Name null
+#          Match *
+
+#    parsers: |
+#      [PARSER]
+#          Name         my_custom_parser
+#          Format       json
+#          Time_Key     time
+#          Time_Format  %Y-%m-%dT%H:%M:%S.%L
+#          Time_Keep    On
+    metricInstrumentation: |
+      [INPUT]
+          name prometheus_scrape
+          Alias fb-metrics-collector
+          host 127.0.0.1
+          port 2020
+          tag fb_metrics
+          metrics_path /api/v2/metrics/prometheus
+          scrape_interval 10s
+
+      [OUTPUT]
+          Name                 prometheus_remote_write
+          Match                fb_metrics
+          Alias                fb-metrics-forwarder
+          Host                 ${METRICS_HOST}
+          Port                 443
+          Uri                  /prometheus/v1/write?prometheus_server=${CLUSTER_NAME}
+          Header               Authorization Bearer ${LICENSE_KEY}
+          Tls                  On
+          # Windows pods using prometheus_remote_write currently have issues if TLS verify is On
+          Tls.verify           Off
+          # User-defined labels
+          add_label            app fluent-bit
+          add_label            cluster_name "${CLUSTER_NAME}"
+          add_label            pod_name ${HOSTNAME}
+          add_label            node_name ${NODE_NAME}
+          add_label            source kubernetes
+
+image:
+  repository: newrelic/newrelic-fluentbit-output
+#  registry: my_registry
+  tag: ""
+  pullPolicy: IfNotPresent
+  ## See https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
+  pullSecrets: []
+#    - name: regsecret
+
+# By default, the Linux DaemonSet will always be deployed, while the Windows DaemonSet(s) won't.
+enableLinux: true
+enableWindows: false
+# For every entry in this Windows OS list, we will create an independent DaemonSet which will get deployed
+# on Windows nodes running each specific Windows version and build number. Note that
+# Windows containers can only be executed on hosts running the exact same Windows version and build number,
+# because Kubernetes only supports process isolation and not Hyper-V isolation (as of September 2021)
+windowsOsList:
+  # We aim to support (limited to LTSC2019/LTSC2022 using GitHub actions, see https://github.com/actions/runner-images/tree/main/images/win):
+  # https://kubernetes.io/docs/setup/production-environment/windows/intro-windows-in-kubernetes/#windows-os-version-support
+  - version: ltsc2019
+    imageTagSuffix: windows-ltsc-2019
+    buildNumber: 10.0.17763
+  - version: ltsc2022
+    imageTagSuffix: windows-ltsc-2022
+    buildNumber: 10.0.20348
+
+# Default set of resources assigned to the DaemonSet pods
+resources:
+  limits:
+    cpu: 500m
+    memory: 128Mi
+  requests:
+    cpu: 250m
+    memory: 64Mi
+
+rbac:
+  # Specifies whether RBAC resources should be created
+  create: true
+  pspEnabled: false
+
+serviceAccount:
+  # Specifies whether a ServiceAccount should be created
+  create:
+  # The name of the ServiceAccount to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name:
+  # Specify any annotations to add to the ServiceAccount
+  annotations: {}
+
+# Optionally configure ports to expose metrics on /api/v1/metrics/prometheus
+# See - https://docs.fluentbit.io/manual/administration/monitoring
+exposedPorts: []
+#  - containerPort: 2020
+#    hostPort: 2020
+#    name: metrics
+#    protocol: TCP
+
+# If you wish to provide additional labels to apply to the pod(s), specify
+# them here
+# podLabels:
+
+# Pod scheduling priority
+# Ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
+# priorityClassName: high-priority
+
+# Node affinity rules
+# Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
+#
+# IMPORTANT #
+# ######### #
+# When .Values.global.fargate == true, the chart will automatically add the required affinity rules to exclude
+# the DaemonSet from Fargate nodes. There is no need to manually touch this property achieve this.
+# This automatic exclusion will, however, not take place if this value is overridden: Setting this to a
+# non-empty value WHEN deploying in EKS Fargate (global.fargate == true) requires the user to manually
+# include in their custom ruleset an exclusion for nodes with "eks.amazonaws.com/compute-type: fargate", as
+# the New Relic DaemonSet MUST NOT be deployed on fargate nodes, as the operator takes care of injecting it
+# as a sidecar instead.
+# Please refer to the daemonset.yaml template for more details on how to achieve this.
+nodeAffinity: {}
+
+# Node labels for pod assignment
+# Ref: https://kubernetes.io/docs/user-guide/node-selection/
+# Note that the Linux DaemonSet already contains a node selector label based on their OS (kubernetes.io/os: linux).
+nodeSelector: {}
+
+# Note that the Windows DaemonSet already contains a node selector label based on their OS (kubernetes.io/os: windows).
+# and build number (node.kubernetes.io/windows-build: {{ .buildNumber }}, to ensure that each version of the DaemonSet
+# gets deployed only on those Windows nodes running the exact same Windows version and build number. Note that
+# Windows containers can only be executed on hosts running the exact same Windows version and build number.
+windowsNodeSelector: {}
+
+# These are default tolerations to be able to run the New Relic Kubernetes integration.
+tolerations:
+  - operator: "Exists"
+    effect: "NoSchedule"
+  - operator: "Exists"
+    effect: "NoExecute"
+
+updateStrategy: RollingUpdate
+
+# Sends data to staging, can be set as a global.
+# global.nrStaging
+nrStaging: false
+
+daemonSet:
+  # Annotations to add to the DaemonSet.
+  annotations: {}
+
+# Annotations to add to the resulting Pods of the DaemonSet.
+podAnnotations: {}
+
+# If host network should be enabled for fluentbit pods.
+# There are some inputs like UDP which will require this setting to be true as they need to bind to the host network.
+hostNetwork:
+
+# When low data mode is enabled only minimal attributes are added to the logs. Kubernetes labels and
+# annotations are not included. The plugin.type, plugin.version and plugin.source attributes are minified
+# into the plugin.source attribute.
+# Can be set as a global: global.lowDataMode
+# lowDataMode: false
+
+extraVolumes: []
+# - name: systemdlog
+#   hostPath:
+#     path: /run/log/journal
+
+extraVolumeMounts: []
+# - name: systemdlog
+#   mountPath: /run/log/journal
+
+initContainers:
+#  - name: init
+#    image: busybox
+#    command: ["sh", "-c", 'echo "hello world"']
+
+windows:
+  initContainers:
+#    - name: init
+#       image: ...
+#       command: [...]
+
+# -- Sets pod dnsConfig. Can also be configured with `global.dnsConfig`
+dnsConfig: {}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/Chart.yaml
new file mode 100644
index 000000000..99b75c589
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/Chart.yaml
@@ -0,0 +1,18 @@
+apiVersion: v1
+appVersion: 2.2.1
+description: A Helm chart for the New Relic Pixie integration.
+home: https://hub.docker.com/u/newrelic
+icon: https://newrelic.com/assets/newrelic/source/NewRelic-logo-square.svg
+keywords:
+- newrelic
+- pixie
+- monitoring
+maintainers:
+- name: nserrino
+- name: philkuz
+- name: htroisi
+- name: vuqtran88
+name: newrelic-pixie
+sources:
+- https://github.com/newrelic/
+version: 2.1.6
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/README.md
new file mode 100644
index 000000000..228a3676d
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/README.md
@@ -0,0 +1,166 @@
+# newrelic-pixie
+
+## Chart Details
+
+This chart will deploy the New Relic Pixie Integration.
+
+IMPORTANT: In order to retrieve the Pixie cluster id from the `pl-cluster-secrets` the integration needs to be deployed in the same namespace as Pixie. By default, Pixie is installed in the `pl` namespace. Alternatively the `clusterId` can be configured manually when installing the chart. In this case the integration can be deployed to any namespace.
+
+## Configuration
+
+| Parameter                                                  | Description                                                                                                                                                                                        | Default               |
+| ---------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- |
+| `global.cluster` - `cluster`                               | The cluster name for the Kubernetes cluster. Required.                                                                                                                                             |                       |
+| `global.licenseKey` - `licenseKey`                         | The New Relic license key (stored in a secret). Required.                                                                                                                                          |                       |
+| `global.lowDataMode` - `lowDataMode`                       | If `true`, the integration performs heavier sampling on the Pixie span data and sets the collect interval to 15 seconds instead of 10 seconds.                                                     | false                 |
+| `global.nrStaging` - `nrStaging`                           | Send data to staging (requires a staging license key).                                                                                                                                             | false                 |
+| `apiKey`                                                   | The Pixie API key (stored in a secret). Required.                                                                                                                                                  |                       |
+| `clusterId`                                                | The Pixie cluster id. Optional. Read from the `pl-cluster-secrets` secret if empty.                                                                                                                |                       |
+| `endpoint`                                                 | The Pixie endpoint. Required when using Pixie Open Source.                                                                                                                                         |                       |
+| `verbose`                                                  | Whether the integration should run in verbose mode or not.                                                                                                                                         | false                 |
+| `global.customSecretName` - `customSecretName`             | Name of an existing Secret object, not created by this chart, where the New Relic license is stored                                                                                                |                       |
+| `global.customSecretLicenseKey` - `customSecretLicenseKey` | Key in the existing Secret object, indicated by `customSecretName`, where the New Relic license key is stored.                                                                                     |                       |
+| `image.pullSecrets`                                        | Image pull secrets.                                                                                                                                                                                | `nil`                 |
+| `customSecretApiKeyName`                                   | Name of an existing Secret object, not created by this chart, where the Pixie API key is stored.                                                                                                   |                       |
+| `customSecretApiKeyKey`                                    | Key in the existing Secret object, indicated by `customSecretApiKeyName`, where the Pixie API key is stored.                                                                                       |                       |
+| `podLabels`                                             | Labels added to each Job pod                                                                                                              | `{}`                  |
+| `podAnnotations`                                             | Annotations added to each Job pod                                                                                                              | `{}`                  |
+| `job.annotations`                                             | Annotations added to the `newrelic-pixie` Job resource                                                                                                              | `{}`                  |
+| `job.labels`                                             | Annotations added to the `newrelic-pixie` Job resource                                                                                                              | `{}`                  |
+| `nodeSelector`                                             | Node label to use for scheduling.                                                                                                                                                                  | `{}`                  |
+| `tolerations`                                              | List of node taints to tolerate (requires Kubernetes >= 1.6).                                                                                                                                      | `[]`                  |
+| `affinity`                                                 | Node affinity to use for scheduling.                                                                                                                                                               | `{}`                  |
+| `proxy`                                                    | Set proxy to connect to Pixie Cloud and New Relic.                                                                                                                                                 |                       |
+| `customScripts`                                            | YAML containing custom scripts for long-term data retention. The results of the custom scripts will be stored in New Relic. See [custom scripts](#custom-scripts) for YAML format.                 | `{}`                  |
+| `customScriptsConfigMap`                                   | Name of an existing ConfigMap object containing custom script for long-term data retention. This configuration takes precedence over `customScripts`.                                              |                       |
+| `excludeNamespacesRegex`                                   | Observability data for namespaces matching this RE2 regex is not sent to New Relic. If empty, observability data for all namespaces is sent to New Relic.                                          |                       |
+| `excludePodsRegex`                                         | Observability data for pods (across all namespaces) matching this RE2 regex is not sent to New Relic. If empty, observability data for all pods (in non-excluded namespaces) is sent to New Relic. |                       |
+
+## Example
+
+Make sure you have [added the New Relic chart repository.](../../README.md#installing-charts)
+
+Then, to install this chart, run the following command:
+
+```sh
+helm install newrelic/newrelic-pixie \
+  --set cluster=<Kubernetes cluster name> \
+  --set licenseKey=<Your New Relic license key> \
+  --set apiKey=<Your Pixie API key> \ 
+  --namespace pl \
+  --generate-name
+```
+
+## Globals
+
+**Important:** global parameters have higher precedence than locals with the same name.
+
+These are meant to be used when you are writing a chart with subcharts. It helps to avoid
+setting values multiple times on different subcharts.
+
+More information on globals and subcharts can be found at [Helm's official documentation](https://helm.sh/docs/topics/chart_template_guide/subcharts_and_globals/).
+
+| Parameter                       |
+| ------------------------------- |
+| `global.cluster`                |
+| `global.licenseKey`             |
+| `global.customSecretName`       |
+| `global.customSecretLicenseKey` |
+| `global.lowDataMode`            |
+| `global.nrStaging`              |
+
+## Custom scripts
+
+Custom scripts can either be configured directly in `customScripts` or be provided through an existing ConfigMap `customScriptsConfigMap`.
+
+The entries in the ConfigMap should contain file-like keys with the `.yaml` extension. Each file in the ConfigMap should be valid YAML and contain the following keys:
+
+ * name (string): the name of the script
+ * description (string): description of the script
+ * frequencyS (int): frequency to execute the script in seconds
+ * scripts (string): the actual PXL script to execute
+ * addExcludes (optional boolean, `false` by default): add pod and namespace excludes to the custom script
+
+For more detailed information about the custom scripts see [the New Relic Pixie integration repo](https://github.com/newrelic/newrelic-pixie-integration/).
+
+```yaml
+customScripts:
+  custom1.yaml: |
+    name: "custom1"
+    description: "Custom script 1"
+    frequencyS: 60
+    script: |
+      import px
+
+      df = px.DataFrame(table='http_events', start_time=px.plugin.start_time)
+
+      ns_prefix = df.ctx['namespace'] + '/'
+      df.container = df.ctx['container_name']
+      df.pod = px.strip_prefix(ns_prefix, df.ctx['pod'])
+      df.service = px.strip_prefix(ns_prefix, df.ctx['service'])
+      df.namespace = df.ctx['namespace']
+
+      df.status_code = df.resp_status
+
+      df = df.groupby(['status_code', 'pod', 'container','service', 'namespace']).agg(
+          latency_min=('latency', px.min),
+          latency_max=('latency', px.max),
+          latency_sum=('latency', px.sum),
+          latency_count=('latency', px.count),
+          time_=('time_', px.max),
+      )
+
+      df.latency_min = df.latency_min / 1000000
+      df.latency_max = df.latency_max / 1000000
+      df.latency_sum = df.latency_sum / 1000000
+
+      df.cluster_name = px.vizier_name()
+      df.cluster_id = px.vizier_id()
+      df.pixie = 'pixie'
+
+      px.export(
+        df, px.otel.Data(
+          resource={
+            'service.name': df.service,
+            'k8s.container.name': df.container,
+            'service.instance.id': df.pod,
+            'k8s.pod.name': df.pod,
+            'k8s.namespace.name': df.namespace,
+            'px.cluster.id': df.cluster_id,
+            'k8s.cluster.name': df.cluster_name,
+            'instrumentation.provider': df.pixie,
+          },
+          data=[
+            px.otel.metric.Summary(
+              name='http.server.duration',
+              description='measures the duration of the inbound HTTP request',
+              # Unit is not supported yet
+              # unit='ms',
+              count=df.latency_count,
+              sum=df.latency_sum,
+              quantile_values={
+                0.0: df.latency_min,
+                1.0: df.latency_max,
+              },
+              attributes={
+                'http.status_code': df.status_code,
+              },
+          )],
+        ),
+      )
+```
+
+
+## Resources
+
+The default set of resources assigned to the pods is shown below:
+
+```yaml
+resources:
+  limits:
+    memory: 250M
+  requests:
+    cpu: 100m
+    memory: 250M
+```
+
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/ci/test-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/ci/test-values.yaml
new file mode 100644
index 000000000..580f9b0ba
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/ci/test-values.yaml
@@ -0,0 +1,5 @@
+global:
+  licenseKey: 1234567890abcdef1234567890abcdef12345678
+  apiKey: 1234567890abcdef
+  cluster: test-cluster
+clusterId: foobar
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/NOTES.txt b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/NOTES.txt
new file mode 100644
index 000000000..d54283889
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/NOTES.txt
@@ -0,0 +1,27 @@
+{{- if (include "newrelic-pixie.areValuesValid" .) }}
+
+Your deployment of the New Relic Pixie integration is complete.
+
+Please ensure this integration is deployed in the same namespace
+as Pixie or manually specify the clusterId.
+{{- else -}}
+###############################################################
+####    ERROR: You did not set all the required values.    ####
+###############################################################
+
+This deployment will be incomplete until you set all the required values:
+
+* Cluster name
+* New Relic license key
+* Pixie API key
+
+For a simple installation to be fixed, run:
+
+    helm upgrade {{ .Release.Name }} \
+        --set cluster=YOUR-CLUSTER-NAME \
+        --set licenseKey=YOUR-LICENSE-KEY \
+        --set apiKey=YOUR-API-KEY \
+        -n {{ .Release.Namespace }} \
+        newrelic/newrelic-pixie
+
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/_helpers.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/_helpers.tpl
new file mode 100644
index 000000000..40b9c68df
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/_helpers.tpl
@@ -0,0 +1,172 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "newrelic-pixie.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "newrelic-pixie.namespace" -}}
+{{- if .Values.namespace -}}
+    {{- .Values.namespace -}}
+{{- else -}}
+    {{- .Release.Namespace | default "pl" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic-pixie.fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if ne $name .Release.Name -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+
+{{/* Generate basic labels */}}
+{{- define "newrelic-pixie.labels" }}
+app: {{ template "newrelic-pixie.name" . }}
+app.kubernetes.io/name: {{ include "newrelic-pixie.name" . }}
+chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+heritage: {{.Release.Service }}
+release: {{.Release.Name }}
+{{- end }}
+
+{{- define "newrelic-pixie.cluster" -}}
+{{- if .Values.global -}}
+  {{- if .Values.global.cluster -}}
+      {{- .Values.global.cluster -}}
+  {{- else -}}
+      {{- .Values.cluster | default "" -}}
+  {{- end -}}
+{{- else -}}
+  {{- .Values.cluster | default "" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "newrelic-pixie.nrStaging" -}}
+{{- if .Values.global }}
+  {{- if .Values.global.nrStaging }}
+    {{- .Values.global.nrStaging -}}
+  {{- end -}}
+{{- else if .Values.nrStaging }}
+  {{- .Values.nrStaging -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "newrelic-pixie.licenseKey" -}}
+{{- if .Values.global}}
+  {{- if .Values.global.licenseKey }}
+      {{- .Values.global.licenseKey -}}
+  {{- else -}}
+      {{- .Values.licenseKey | default "" -}}
+  {{- end -}}
+{{- else -}}
+    {{- .Values.licenseKey | default "" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "newrelic-pixie.apiKey" -}}
+{{- if .Values.global}}
+  {{- if .Values.global.apiKey }}
+      {{- .Values.global.apiKey -}}
+  {{- else -}}
+      {{- .Values.apiKey | default "" -}}
+  {{- end -}}
+{{- else -}}
+    {{- .Values.apiKey | default "" -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+adapted from https://github.com/newrelic/helm-charts/blob/af747af93fb5b912374196adc59b552965b6e133/library/common-library/templates/_low-data-mode.tpl
+TODO: actually use common-library chart dep
+*/ -}}
+{{- /*
+Abstraction of the lowDataMode toggle.
+This helper allows to override the global `.global.lowDataMode` with the value of `.lowDataMode`.
+Returns "true" if `lowDataMode` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic-pixie.lowDataMode" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "lowDataMode" | kindIs "bool") -}}
+    {{- if .Values.lowDataMode -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.lowDataMode" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.lowDataMode -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "lowDataMode" | kindIs "bool" -}}
+    {{- if $global.lowDataMode -}}
+        {{- $global.lowDataMode -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the customSecretName where the New Relic license is being stored.
+*/}}
+{{- define "newrelic-pixie.customSecretName" -}}
+{{- if .Values.global }}
+  {{- if .Values.global.customSecretName }}
+      {{- .Values.global.customSecretName -}}
+  {{- else -}}
+      {{- .Values.customSecretName | default "" -}}
+  {{- end -}}
+{{- else -}}
+    {{- .Values.customSecretName | default "" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the customSecretApiKeyName where the Pixie API key is being stored.
+*/}}
+{{- define "newrelic-pixie.customSecretApiKeyName" -}}
+    {{- .Values.customSecretApiKeyName | default "" -}}
+{{- end -}}
+
+{{/*
+Return the customSecretLicenseKey
+*/}}
+{{- define "newrelic-pixie.customSecretLicenseKey" -}}
+{{- if .Values.global }}
+  {{- if .Values.global.customSecretLicenseKey }}
+      {{- .Values.global.customSecretLicenseKey -}}
+  {{- else -}}
+      {{- .Values.customSecretLicenseKey | default "" -}}
+  {{- end -}}
+{{- else -}}
+    {{- .Values.customSecretLicenseKey | default "" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the customSecretApiKeyKey
+*/}}
+{{- define "newrelic-pixie.customSecretApiKeyKey" -}}
+    {{- .Values.customSecretApiKeyKey | default "" -}}
+{{- end -}}
+
+{{/*
+Returns if the template should render, it checks if the required values
+licenseKey and cluster are set.
+*/}}
+{{- define "newrelic-pixie.areValuesValid" -}}
+{{- $cluster := include "newrelic-pixie.cluster" . -}}
+{{- $licenseKey := include "newrelic-pixie.licenseKey" . -}}
+{{- $apiKey := include "newrelic-pixie.apiKey" . -}}
+{{- $customSecretName := include "newrelic-pixie.customSecretName" . -}}
+{{- $customSecretLicenseKey := include "newrelic-pixie.customSecretLicenseKey" . -}}
+{{- $customSecretApiKeyKey := include "newrelic-pixie.customSecretApiKeyKey" . -}}
+{{- and (or (and $licenseKey $apiKey) (and $customSecretName $customSecretLicenseKey $customSecretApiKeyKey)) $cluster}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/configmap.yaml
new file mode 100644
index 000000000..19f7fe61a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/configmap.yaml
@@ -0,0 +1,12 @@
+{{- if (include "newrelic-pixie.areValuesValid" .) }}
+{{- if .Values.customScripts }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: {{ template "newrelic-pixie.namespace" . }}
+  labels: {{ include "newrelic-pixie.labels" . | indent 4 }}
+  name: {{ template "newrelic-pixie.fullname" . }}-scripts
+data:
+{{- toYaml .Values.customScripts | nindent 2 }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/job.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/job.yaml
new file mode 100644
index 000000000..25c9ba5ed
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/job.yaml
@@ -0,0 +1,165 @@
+{{- if (include "newrelic-pixie.areValuesValid" .) }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ template "newrelic-pixie.fullname" . }}
+  namespace: {{ template "newrelic-pixie.namespace" . }}
+  labels: 
+  {{- include "newrelic-pixie.labels" . | trim | nindent 4}}
+  {{- if ((.Values.job).labels) }}
+    {{- toYaml .Values.job.labels | nindent 4 }}
+  {{- end }}
+  {{- if ((.Values.job).annotations) }}
+  annotations:
+    {{ toYaml .Values.job.annotations | nindent 4 | trim }}
+  {{- end }}
+spec:
+  backoffLimit: 4
+  ttlSecondsAfterFinished: 600
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ template "newrelic-pixie.name" . }}
+        release: {{.Release.Name }}
+        {{- if .Values.podLabels }}
+          {{- toYaml .Values.podLabels | nindent 8 }}
+        {{- end }}
+      {{- if .Values.podAnnotations }}
+      annotations:
+          {{- toYaml .Values.podAnnotations | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- if .Values.image.pullSecrets }}
+      imagePullSecrets:
+        {{- toYaml .Values.image.pullSecrets | nindent 8 }}
+      {{- end }}
+      restartPolicy: Never
+      initContainers:
+      - name: cluster-registration-wait
+        image: "{{ (.Values.clusterRegistrationWaitImage).repository | default "gcr.io/pixie-oss/pixie-dev-public/curl" }}:{{ (.Values.clusterRegistrationWaitImage).tag | default "1.0" }}"
+        imagePullPolicy: "{{ (.Values.clusterRegistrationWaitImage).pullPolicy | default "IfNotPresent" }}"
+        command: ['sh', '-c', 'set -x;
+          URL="https://${SERVICE_NAME}:${SERVICE_PORT}/readyz";
+          until [ $(curl -m 0.5 -s -o /dev/null -w "%{http_code}" -k ${URL}) -eq 200 ]; do
+            echo "Waiting for cluster registration. If this takes too long check the vizier-cloud-connector logs."
+            sleep 2;
+          done;
+        ']
+        env:
+          # The name of the Pixie service which connects to Pixie Cloud for cluster registration. 
+        - name: SERVICE_NAME
+          value: "vizier-cloud-connector-svc"
+        - name: SERVICE_PORT
+          value: "50800"
+      containers:
+      - name: {{ template "newrelic-pixie.name" . }}
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+        imagePullPolicy: "{{ .Values.image.pullPolicy }}"
+        env:
+        - name: CLUSTER_NAME
+          value: {{ template "newrelic-pixie.cluster" . }}
+        - name: NR_LICENSE_KEY
+          valueFrom:
+            secretKeyRef:
+              {{- if (include "newrelic-pixie.licenseKey" .) }}
+              name: {{ template "newrelic-pixie.fullname" . }}-secrets
+              key: newrelicLicenseKey
+              {{- else }}
+              name: {{ include "newrelic-pixie.customSecretName" . }}
+              key: {{ include "newrelic-pixie.customSecretLicenseKey" . }}
+              {{- end }}
+        - name: PIXIE_API_KEY
+          valueFrom:
+            secretKeyRef:
+              {{- if (include "newrelic-pixie.apiKey" .) }}
+              name: {{ template "newrelic-pixie.fullname" . }}-secrets
+              key: pixieApiKey
+              {{- else }}
+              name: {{ include "newrelic-pixie.customSecretApiKeyName" . }}
+              key: {{ include "newrelic-pixie.customSecretApiKeyKey" . }}
+          {{- end }}
+        - name: PIXIE_CLUSTER_ID
+          {{- if .Values.clusterId }}
+          value: {{ .Values.clusterId -}}
+          {{- else }}
+          valueFrom:
+            secretKeyRef:
+              key: cluster-id
+              name: pl-cluster-secrets
+          {{- end }}
+        {{- if .Values.verbose }}
+        - name: VERBOSE
+          value: "true"
+        {{- end }}
+        {{- if (include "newrelic-pixie.lowDataMode" .) }}
+        - name: COLLECT_INTERVAL_SEC
+          value: "15"
+        - name: HTTP_SPAN_LIMIT
+          value: "750"
+        - name: DB_SPAN_LIMIT
+          value: "250"
+        {{- else }}
+        - name: COLLECT_INTERVAL_SEC
+          value: "10"
+        - name: HTTP_SPAN_LIMIT
+          value: "1500"
+        - name: DB_SPAN_LIMIT
+          value: "500"
+        {{- end }}
+        {{- if (include "newrelic-pixie.nrStaging" .) }}
+        - name: NR_OTLP_HOST
+          value: "staging-otlp.nr-data.net:4317"
+        {{- end }}
+        {{- if or .Values.endpoint (include "newrelic-pixie.nrStaging" .) }}
+        - name: PIXIE_ENDPOINT
+          {{- if .Values.endpoint }}
+          value: {{ .Values.endpoint | quote }}
+          {{- else }}
+          value: "staging.withpixie.dev:443"
+          {{- end }}
+        {{- end }}
+        {{- if .Values.proxy }}
+        - name: HTTP_PROXY
+          value: {{ .Values.proxy | quote }}
+        - name: HTTPS_PROXY
+          value: {{ .Values.proxy | quote }}
+        {{- end }}
+        {{- if .Values.excludePodsRegex }}
+        - name: EXCLUDE_PODS_REGEX
+          value: {{ .Values.excludePodsRegex | quote }}
+        {{- end }}
+        {{- if .Values.excludeNamespacesRegex }}
+        - name: EXCLUDE_NAMESPACES_REGEX
+          value: {{ .Values.excludeNamespacesRegex | quote }}
+        {{- end }}
+        {{- if .Values.resources }}
+        resources:
+          {{- toYaml .Values.resources | nindent 10 }}
+        {{- end }}
+      {{- if or .Values.customScriptsConfigMap .Values.customScripts }}
+        volumeMounts:
+          - name: scripts
+            mountPath: "/scripts"
+            readOnly: true
+      volumes:
+        - name: scripts
+          configMap:
+            {{- if .Values.customScriptsConfigMap }}
+            name: {{ .Values.customScriptsConfigMap }}
+            {{- else }}
+            name: {{ template "newrelic-pixie.fullname" . }}-scripts
+            {{- end}}
+      {{- end }}
+      {{- if $.Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml $.Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations:
+        {{- toYaml .Values.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+        {{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/secret.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/secret.yaml
new file mode 100644
index 000000000..4d9561877
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/templates/secret.yaml
@@ -0,0 +1,20 @@
+{{- if (include "newrelic-pixie.areValuesValid" .) }}
+{{- $licenseKey := include "newrelic-pixie.licenseKey" . -}}
+{{- $apiKey := include "newrelic-pixie.apiKey" . -}}
+{{- if or $apiKey $licenseKey}}
+apiVersion: v1
+kind: Secret
+metadata:
+  namespace: {{ template "newrelic-pixie.namespace" . }}
+  labels: {{ include "newrelic-pixie.labels" . | indent 4 }}
+  name: {{ template "newrelic-pixie.fullname" . }}-secrets
+type: Opaque
+data:
+  {{- if $licenseKey }}
+  newrelicLicenseKey: {{ $licenseKey | b64enc }}
+  {{- end }}
+  {{- if $apiKey }}
+  pixieApiKey: {{ include "newrelic-pixie.apiKey" . | b64enc -}}
+  {{- end }}
+{{- end }}
+{{- end}}
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/tests/configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/tests/configmap.yaml
new file mode 100644
index 000000000..ecba6363b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/tests/configmap.yaml
@@ -0,0 +1,44 @@
+suite: test custom scripts ConfigMap
+templates:
+  - templates/configmap.yaml
+tests:
+  - it: ConfigMap is created
+    set:
+      cluster: "test-cluster"
+      licenseKey: "license123"
+      apiKey: "api123"
+      customScripts:
+        custom1.yaml: |
+          name: "custom1"
+          description: "Custom script 1"
+          frequencyS: 60
+          script: |
+            import px
+            df = px.DataFrame(table='http_events', start_time=px.plugin.start_time)
+    asserts:
+      - isKind:
+          of: ConfigMap
+      - equal:
+          path: data.custom1\.yaml
+          value: |-
+            name: "custom1"
+            description: "Custom script 1"
+            frequencyS: 60
+            script: |
+              import px
+              df = px.DataFrame(table='http_events', start_time=px.plugin.start_time)
+      - equal:
+          path: metadata.name
+          value: RELEASE-NAME-newrelic-pixie-scripts
+      - equal:
+          path: metadata.namespace
+          value: NAMESPACE
+  - it: ConfigMap is empty
+    set:
+      cluster: "test-cluster"
+      licenseKey: "license123"
+      apiKey: "api123"
+      customScripts: {}
+    asserts:
+      - hasDocuments:
+          count: 0 
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/tests/jobs.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/tests/jobs.yaml
new file mode 100644
index 000000000..03a3d86b8
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/tests/jobs.yaml
@@ -0,0 +1,138 @@
+suite: test job
+templates:
+  - templates/job.yaml
+tests:
+  - it: Test primary fields of job
+    set:
+      cluster: "test-cluster"
+      licenseKey: "license123"
+      apiKey: "api123"
+      image:
+        tag: "latest"
+    asserts:
+      - isKind:
+          of: Job
+      - equal:
+          path: "metadata.name"
+          value: "RELEASE-NAME-newrelic-pixie"
+      - equal:
+          path: "metadata.namespace"
+          value: "NAMESPACE"
+      - equal:
+          path: "spec.template.spec.containers[0].image"
+          value: "newrelic/newrelic-pixie-integration:latest"
+      - equal:
+          path: "spec.template.spec.containers[0].env"
+          value:
+            - name: CLUSTER_NAME
+              value: test-cluster
+            - name: NR_LICENSE_KEY
+              valueFrom:
+                secretKeyRef:
+                  key: newrelicLicenseKey
+                  name: RELEASE-NAME-newrelic-pixie-secrets
+            - name: PIXIE_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  key: pixieApiKey
+                  name: RELEASE-NAME-newrelic-pixie-secrets
+            - name: PIXIE_CLUSTER_ID
+              valueFrom:
+                secretKeyRef:
+                  key: cluster-id
+                  name: pl-cluster-secrets
+      - isEmpty:
+          path: "spec.template.spec.containers[0].volumeMounts"
+      - isEmpty:
+          path: "spec.template.spec.volumes"
+  - it: Job with clusterId
+    set:
+      cluster: "test-cluster"
+      licenseKey: "license123"
+      apiKey: "api123"
+      clusterId: "cid123"
+    asserts:
+      - equal:
+          path: "spec.template.spec.containers[0].env"
+          value:
+            - name: CLUSTER_NAME
+              value: test-cluster
+            - name: NR_LICENSE_KEY
+              valueFrom:
+                secretKeyRef:
+                  key: newrelicLicenseKey
+                  name: RELEASE-NAME-newrelic-pixie-secrets
+            - name: PIXIE_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  key: pixieApiKey
+                  name: RELEASE-NAME-newrelic-pixie-secrets
+            - name: PIXIE_CLUSTER_ID
+              value: "cid123"
+  - it: Job with Pixie endpoint
+    set:
+      cluster: "test-cluster"
+      licenseKey: "license123"
+      apiKey: "api123"
+      clusterId: "cid123"
+      endpoint: "withpixie.ai:443"
+    asserts:
+      - equal:
+          path: "spec.template.spec.containers[0].env"
+          value:
+            - name: CLUSTER_NAME
+              value: test-cluster
+            - name: NR_LICENSE_KEY
+              valueFrom:
+                secretKeyRef:
+                  key: newrelicLicenseKey
+                  name: RELEASE-NAME-newrelic-pixie-secrets
+            - name: PIXIE_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  key: pixieApiKey
+                  name: RELEASE-NAME-newrelic-pixie-secrets
+            - name: PIXIE_CLUSTER_ID
+              value: "cid123"
+            - name: PIXIE_ENDPOINT
+              value: "withpixie.ai:443"
+  - it: Job with custom scripts
+    set:
+      cluster: "test-cluster"
+      licenseKey: "license123"
+      apiKey: "api123"
+      customScripts:
+        custom1.yaml: |
+          name: "custom1"
+    asserts:
+      - equal:
+          path: "spec.template.spec.containers[0].volumeMounts"
+          value:
+            - name: scripts
+              mountPath: "/scripts"
+              readOnly: true
+      - equal:
+          path: "spec.template.spec.volumes[0]"
+          value:
+            name: scripts
+            configMap:
+              name: RELEASE-NAME-newrelic-pixie-scripts
+  - it: Job with custom script in defined ConfigMap
+    set:
+      cluster: "test-cluster"
+      licenseKey: "license123"
+      apiKey: "api123"
+      customScriptsConfigMap: "myconfigmap"
+    asserts:
+      - equal:
+          path: "spec.template.spec.containers[0].volumeMounts"
+          value:
+            - name: scripts
+              mountPath: "/scripts"
+              readOnly: true
+      - equal:
+          path: "spec.template.spec.volumes[0]"
+          value:
+            name: scripts
+            configMap:
+              name: myconfigmap
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/values.yaml
new file mode 100644
index 000000000..0be8992ac
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-pixie/values.yaml
@@ -0,0 +1,75 @@
+# IMPORTANT: The Kubernetes cluster name
+# https://docs.newrelic.com/docs/kubernetes-monitoring-integration
+# cluster: ""
+
+# The New Relic license key
+# licenseKey: ""
+
+# The Pixie API key
+# apiKey: ""
+
+# The Pixie Cluster Id
+# clusterId:
+
+# The Pixie endpoint
+# endpoint:
+
+# If you already have a secret where the New Relic license key is stored, indicate its name here
+# customSecretName:
+# The key in the customSecretName secret that contains the New Relic license key
+# customSecretLicenseKey:
+# If you already have a secret where the Pixie API key is stored, indicate its name here
+# customSecretApiKeyName:
+# The key in the customSecretApiKeyName secret that contains the Pixie API key
+# customSecretApiKeyKey:
+
+clusterRegistrationWaitImage:
+  repository: gcr.io/pixie-oss/pixie-dev-public/curl
+  tag: "1.0"
+  pullPolicy: IfNotPresent
+
+image:
+  repository: newrelic/newrelic-pixie-integration
+  tag: ""
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+  # - name: regsecret
+
+resources:
+  limits:
+    memory: 250M
+  requests:
+    cpu: 100m
+    memory: 250M
+
+# -- Annotations to add to the pod.
+podAnnotations: {}
+# -- Additional labels for chart pods
+podLabels: {}
+
+job:
+  # job.annotations -- Annotations to add to the Job.
+  annotations: {}
+  # job.labels -- Labels to add to the Job.
+  labels: {}
+
+proxy: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+customScripts: {}
+# Optionally the scripts can be provided in an already existing ConfigMap:
+# customScriptsConfigMap:
+
+excludeNamespacesRegex:
+excludePodsRegex:
+
+# When low data mode is enabled the integration performs heavier sampling on the Pixie span data
+# and sets the collect interval to 15 seconds instead of 10 seconds.
+# Can be set as a global: global.lowDataMode or locally as newrelic-pixie.lowDataMode
+# @default -- false
+lowDataMode:
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/Chart.lock b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/Chart.lock
new file mode 100644
index 000000000..1789f2af9
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.1
+digest: sha256:cfa7bfb136b9bcfe87e37d3556c3fedecc58f42685c4ce39485da106408b6619
+generated: "2025-01-08T01:17:33.941767189Z"
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/Chart.yaml
new file mode 100644
index 000000000..de0b5e9eb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/Chart.yaml
@@ -0,0 +1,22 @@
+annotations:
+  configuratorVersion: 1.19.0
+apiVersion: v2
+appVersion: v2.37.8
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.1
+description: A Helm chart to deploy Prometheus with New Relic Prometheus Configurator.
+keywords:
+- newrelic
+- prometheus
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+name: newrelic-prometheus-agent
+type: application
+version: 1.16.0
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/README.md
new file mode 100644
index 000000000..069b9a79b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/README.md
@@ -0,0 +1,244 @@
+# newrelic-prometheus-agent
+
+A Helm chart to deploy Prometheus with New Relic Prometheus Configurator.
+
+# Description
+
+This chart deploys Prometheus Server in Agent mode configured by the `newrelic-prometheus-configurator`.
+
+The solution is deployed as a StatefulSet for sharding proposes.
+Each Pod will execute the `newrelic-prometheus-configurator` init container which will convert the provided config to a config file in the Prometheus format. Once the init container finishes and saves the config in a shared volume, the container running Prometheus in Agent mode will start.
+
+```mermaid
+graph LR
+  subgraph pod[Pod]
+    direction TB
+    subgraph volume[shared volume]
+      plain[Prometheus Config]
+    end
+
+    subgraph init-container[init Container]
+      configurator[Configurator] --> plain[Prometheus Config]
+    end
+
+    subgraph container[Main Container]
+      plain[Prometheus Config] --> prom-agent[Prometheus-Agent]
+    end
+
+  end
+
+  subgraph configMap
+    NewRelic-Config   --> configurator[Configurator]
+  end
+
+classDef plain fill:#ddd,stroke:#fff,stroke-width:4px,color:#000;
+classDef k8s fill:#326ce5,stroke:#fff,stroke-width:4px,color:#fff;
+classDef pod fill:#fff,stroke:#bbb,stroke-width:2px,color:#326ce5;
+class configurator,init-container,container,prom-agent k8s;
+class volume plain;
+class pod pod;
+
+```
+
+# Helm installation
+
+You can install this chart using [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) located in the
+[helm-charts repository](https://github.com/newrelic/helm-charts) or directly from this repository by adding this Helm repository:
+
+```shell
+helm repo add newrelic-prometheus https://newrelic.github.io/newrelic-prometheus-configurator
+helm upgrade --install newrelic newrelic-prometheus/newrelic-prometheus-agent -f your-custom-values.yaml
+```
+
+## Values managed globally
+
+This chart implements the [New Relic's common Helm library](https://github.com/newrelic/helm-charts/tree/master/library/common-library) which
+means that it honors a wide range of defaults and globals common to most New Relic Helm charts.
+
+Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
+[user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
+
+## Chart particularities
+
+### Configuration
+
+The configuration used is similar to the [Prometheus configuration](https://prometheus.io/docs/prometheus/latest/configuration/configuration/), but it includes some syntactic sugar to make easy to set up some special use-cases like Kubernetes targets, sharding and some New Relic related settings like remote write endpoints.
+
+The configurator will create [scrape_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config), [relabel_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config), [remote_write](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write) and other entries based on the defined configuration.
+
+As general rules:
+- Configs parameters having the same name as the [Prometheus configuration](https://prometheus.io/docs/prometheus/latest/configuration/configuration/) should have similar behavior. For example, the `tls_config` defined inside a `Kubernetes.jobs` will have the same definition as [tls_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#tls_config) of Prometheus and will affect all targets scraped by that job.
+- Configs starting with `extra_` prefix will be appended to the ones created by the Configurator. For example, the relabel configs defined in `extra_relabel_config` on the Kubernetes section will be appended to the end of the list that is already being generated by the Configurator for filtering, sharding, metadata decoration, etc.
+
+### Default Kubernetes jobs configuration
+
+By default, some Kubernetes objects are discovered and scraped by Prometheus. Taking into account the snippet from `values.yaml` below:
+
+```yaml
+    integrations_filter:
+      enabled: true
+      source_labels: ["app.kubernetes.io/name", "app.newrelic.io/name", "k8s-app"]
+      app_values: ["redis", "traefik", "calico", "nginx", "coredns", "etcd", "cockroachdb", "velero", "harbor", "argocd"]
+    jobs:
+    - job_name_prefix: default
+      target_discovery:
+        pod: true
+        endpoints: true
+        filter:
+          annotations:
+            prometheus.io/scrape: true
+    - job_name_prefix: newrelic
+      integrations_filter:
+        enabled: false
+      target_discovery:
+        pod: true
+        endpoints: true
+        filter:
+          annotations:
+            newrelic.io/scrape: true
+```
+
+All pods and endpoints with the `newrelic.io/scrape: true` annotation will be scraped by default.
+
+Moreover, the solution will scrape as well all pods and endpoints with the `prometheus.io/scrape: true` annotations and
+having one of the labels matching the integrations_filter configuration.
+
+Notice that at any point you can turn off the integrations filters and scrape all pods and services annotated with
+`prometheus.io/scrape: true` by setting `config.kubernetes.integrations_filter.integrations_filter: false` or turning
+it off in any specific job.
+
+### Kubernetes job examples
+
+#### API Server metrics
+By default, the API Server Service named `kubernetes` is created in the `default` namespace. The following configuration will scrape metrics from all endpoints behind the mentioned service using the Prometheus Pod bearer token as Authorization Header:
+
+```yaml
+config:
+  kubernetes:
+    jobs:
+    - job_name_prefix: apiserver
+      target_discovery:
+        endpoints: true
+      extra_relabel_config:
+      # Filter endpoints on `default` namespace associated to `kubernetes` service.
+      - source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_service_name]
+        action: keep
+        regex: default;kubernetes
+
+      scheme: https
+      tls_config:
+          ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+          insecure_skip_verify: true
+      authorization:
+        credentials_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+```
+
+### Metrics Filtering
+
+Check [docs](https://github.com/newrelic/newrelic-prometheus-configurator/blob/main/docs/MetricsFilters.md) for a detailed explanation and examples of how to filter metrics and labels.
+
+### Self metrics
+
+By default, it is defined as a job in `static_target.jobs` to obtain self-metrics. Particularly, a snippet like the one
+below is used. If you define your own static_targets jobs, it is important to also include this kind of job in order
+to keep getting self-metrics.
+
+```yaml
+config:
+  static_targets:
+    jobs:
+    - job_name: self-metrics
+      targets:
+        - "localhost:9090"
+      extra_metric_relabel_config:
+        - source_labels: [__name__]
+          regex: "<metrics to include defined in values.yaml>"
+          action: keep
+```
+
+### Low data mode
+
+There are two mechanisms to reduce the amount of data that this integration sends to New Relic. See this snippet from the `values.yaml` file:
+```yaml
+lowDataMode: false
+
+config:
+  common:
+    scrape_interval: 30s
+```
+
+You might set `lowDataMode` flag to `true` (it will filter some metrics which can also be collected using New Relic Kubernetes integration), check
+`values.yaml` for details.
+
+It is also possible to adjust how frequently Prometheus scrapes the targets by setting up the` config.common.scrape_interval` value.
+
+### Affinities and tolerations
+
+The New Relic common library allows you to set affinities, tolerations, and node selectors globally using e.g. `.global.affinity` to ease the configuration
+when you use this chart using `nri-bundle`. This chart has an extra level of granularity to the components that it deploys:
+control plane, ksm, and kubelet.
+
+Take this snippet as an example:
+```yaml
+global:
+  affinity: {}
+affinity: {}
+```
+
+The order to set the affinity is to set `affinity` field (at root level), if that value is empty, the chart fallbacks to `global.affinity`.
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` | Sets pod/node affinities set almost globally. (See [Affinities and tolerations](README.md#affinities-and-tolerations)) |
+| cluster | string | `""` | Name of the Kubernetes cluster monitored. Can be configured also with `global.cluster`. Note it will be set as an external label in prometheus configuration, it will have precedence over `config.common.external_labels.cluster_name` and `customAttributes.cluster_name``. |
+| config | object | See `values.yaml` | It holds the New Relic Prometheus configuration. Here you can easily set up Prometheus to get set metrics, discover ponds and endpoints Kubernetes and send metrics to New Relic using remote-write. |
+| config.common | object | See `values.yaml` | Include global configuration for Prometheus agent. |
+| config.common.scrape_interval | string | `"30s"` | How frequently to scrape targets by default, unless a different value is specified on the job. |
+| config.extra_remote_write | object | `nil` | It includes additional remote-write configuration. Note this configuration is not parsed, so valid [prometheus remote_write configuration](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write) should be provided. |
+| config.extra_scrape_configs | list | `[]` | It is possible to include extra scrape configuration in [prometheus format](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config). Please note, it should be a valid Prometheus configuration which will not be parsed by the chart. WARNING extra_scrape_configs is a raw Prometheus config. Therefore, the metrics collected thanks to it will not have by default the metadata (pod_name, service_name, ...) added by the configurator for the static or kubernetes jobs. This configuration should be used as a workaround whenever kubernetes and static job do not cover a particular use-case. |
+| config.kubernetes | object | See `values.yaml` | It allows defining scrape jobs for Kubernetes in a simple way. |
+| config.kubernetes.integrations_filter.app_values | list | `["redis","traefik","calico","nginx","coredns","kube-dns","etcd","cockroachdb","velero","harbor","argocd"]` | app_values used to create the regex used in the relabel config added by the integration filters configuration. Note that a single regex will be created from this list, example: '.*(?i)(app1|app2|app3).*' |
+| config.kubernetes.integrations_filter.enabled | bool | `true` | enabling the integration filters, merely the targets having one of the specified labels matching    one of the values of app_values are scraped. Each job configuration can override this default. |
+| config.kubernetes.integrations_filter.source_labels | list | `["app.kubernetes.io/name","app.newrelic.io/name","k8s-app"]` | source_labels used to fetch label values in the relabel config added by the integration filters configuration |
+| config.newrelic_remote_write | object | See `values.yaml` | Newrelic remote-write configuration settings. |
+| config.static_targets | object | See `values.yaml`. | It allows defining scrape jobs for targets with static URLs. |
+| config.static_targets.jobs | list | See `values.yaml`. | List of static target jobs. By default, it defines a job to get self-metrics. Please note, if you define `static_target.jobs` and would like to keep self-metrics you need to include a job like the one defined by default. |
+| containerSecurityContext | object | `{}` | Sets security context (at container level). Can be configured also with `global.containerSecurityContext` |
+| customAttributes | object | `{}` | Adds extra attributes to prometheus external labels. Can be configured also with `global.customAttributes`. Please note, values defined in `common.config.externar_labels` will have precedence over `customAttributes`. |
+| customSecretLicenseKey | string | `""` | In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located. Can be configured also with `global.customSecretLicenseKey` |
+| customSecretName | string | `""` | In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there. Can be configured also with `global.customSecretName` |
+| dnsConfig | object | `{}` | Sets pod's dnsConfig. Can be configured also with `global.dnsConfig` |
+| extraVolumeMounts | list | `[]` | Defines where to mount volumes specified with `extraVolumes` |
+| extraVolumes | list | `[]` | Volumes to mount in the containers |
+| fullnameOverride | string | `""` | Override the full name of the release |
+| hostNetwork | bool | `false` | Sets pod's hostNetwork. Can be configured also with `global.hostNetwork` |
+| images.configurator | object | See `values.yaml` | Image for New Relic configurator. |
+| images.prometheus | object | See `values.yaml` | Image for prometheus which is executed in agent mode. |
+| images.pullSecrets | list | `[]` | The secrets that are needed to pull images from a custom registry. |
+| labels | object | `{}` | Additional labels for chart objects. Can be configured also with `global.labels` |
+| licenseKey | string | `""` | This set this license key to use. Can be configured also with `global.licenseKey` |
+| lowDataMode | bool | false | Reduces the number of metrics sent in order to reduce costs. It can be configured also with `global.lowDataMode`. Specifically, it makes Prometheus stop reporting some Kubernetes cluster-specific metrics, you can see details in `static/lowdatamodedefaults.yaml`. |
+| metric_type_override | object | `{"enabled":true}` | It holds the configuration for metric type override. If enabled, a series of metric relabel configs will be added to `config.newrelic_remote_write.extra_write_relabel_configs`, you can check the whole list in `static/metrictyperelabeldefaults.yaml` |
+| nameOverride | string | `""` | Override the name of the chart |
+| nodeSelector | object | `{}` | Sets pod's node selector almost globally. (See [Affinities and tolerations](README.md#affinities-and-tolerations)) |
+| nrStaging | bool | `false` | Send the metrics to the staging backend. Requires a valid staging license key. Can be configured also with `global.nrStaging` |
+| podAnnotations | object | `{}` | Annotations to be added to all pods created by the integration. |
+| podLabels | object | `{}` | Additional labels for chart pods. Can be configured also with `global.podLabels` |
+| podSecurityContext | object | `{}` | Sets security context (at pod level). Can be configured also with `global.podSecurityContext` |
+| priorityClassName | string | `""` | Sets pod's priorityClassName. Can be configured also with `global.priorityClassName` |
+| rbac.create | bool | `true` | Whether the chart should automatically create the RBAC objects required to run. |
+| rbac.pspEnabled | bool | `false` | Whether the chart should create Pod Security Policy objects. |
+| resources | object | `{}` | Resource limits to be added to all pods created by the integration. |
+| serviceAccount | object | See `values.yaml` | Settings controlling ServiceAccount creation. |
+| serviceAccount.create | bool | `true` | Whether the chart should automatically create the ServiceAccount objects required to run. |
+| sharding | string | See `values.yaml` | Set up Prometheus replicas to allow horizontal scalability. |
+| tolerations | list | `[]` | Sets pod's tolerations to node taints almost globally. (See [Affinities and tolerations](README.md#affinities-and-tolerations)) |
+| verboseLog | bool | `false` | Sets the debug log to Prometheus and prometheus-configurator or all integrations if it is set globally. Can be configured also with `global.verboseLog` |
+
+## Maintainers
+
+* [juanjjaramillo](https://github.com/juanjjaramillo)
+* [csongnr](https://github.com/csongnr)
+* [dbudziwojskiNR](https://github.com/dbudziwojskiNR)
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/README.md.gotmpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/README.md.gotmpl
new file mode 100644
index 000000000..8738b7329
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/README.md.gotmpl
@@ -0,0 +1,209 @@
+{{ template "chart.header" . }}
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+# Description
+
+This chart deploys Prometheus Server in Agent mode configured by the `newrelic-prometheus-configurator`.
+
+The solution is deployed as a StatefulSet for sharding proposes.
+Each Pod will execute the `newrelic-prometheus-configurator` init container which will convert the provided config to a config file in the Prometheus format. Once the init container finishes and saves the config in a shared volume, the container running Prometheus in Agent mode will start.
+
+```mermaid
+graph LR
+  subgraph pod[Pod]
+    direction TB
+    subgraph volume[shared volume]
+      plain[Prometheus Config]
+    end
+
+    subgraph init-container[init Container]
+      configurator[Configurator] --> plain[Prometheus Config]
+    end
+
+    subgraph container[Main Container]
+      plain[Prometheus Config] --> prom-agent[Prometheus-Agent]
+    end
+
+  end
+
+  subgraph configMap
+    NewRelic-Config   --> configurator[Configurator]
+  end
+
+classDef plain fill:#ddd,stroke:#fff,stroke-width:4px,color:#000;
+classDef k8s fill:#326ce5,stroke:#fff,stroke-width:4px,color:#fff;
+classDef pod fill:#fff,stroke:#bbb,stroke-width:2px,color:#326ce5;
+class configurator,init-container,container,prom-agent k8s;
+class volume plain;
+class pod pod;
+
+```
+
+# Helm installation
+
+You can install this chart using [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) located in the
+[helm-charts repository](https://github.com/newrelic/helm-charts) or directly from this repository by adding this Helm repository:
+
+```shell
+helm repo add newrelic-prometheus https://newrelic.github.io/newrelic-prometheus-configurator
+helm upgrade --install newrelic newrelic-prometheus/newrelic-prometheus-agent -f your-custom-values.yaml
+```
+
+{{ template "chart.sourcesSection" . }}
+
+## Values managed globally
+
+This chart implements the [New Relic's common Helm library](https://github.com/newrelic/helm-charts/tree/master/library/common-library) which
+means that it honors a wide range of defaults and globals common to most New Relic Helm charts.
+
+Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
+[user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
+
+## Chart particularities
+
+### Configuration
+
+The configuration used is similar to the [Prometheus configuration](https://prometheus.io/docs/prometheus/latest/configuration/configuration/), but it includes some syntactic sugar to make easy to set up some special use-cases like Kubernetes targets, sharding and some New Relic related settings like remote write endpoints.
+
+The configurator will create [scrape_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config), [relabel_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config), [remote_write](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write) and other entries based on the defined configuration.
+
+As general rules:
+- Configs parameters having the same name as the [Prometheus configuration](https://prometheus.io/docs/prometheus/latest/configuration/configuration/) should have similar behavior. For example, the `tls_config` defined inside a `Kubernetes.jobs` will have the same definition as [tls_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#tls_config) of Prometheus and will affect all targets scraped by that job.
+- Configs starting with `extra_` prefix will be appended to the ones created by the Configurator. For example, the relabel configs defined in `extra_relabel_config` on the Kubernetes section will be appended to the end of the list that is already being generated by the Configurator for filtering, sharding, metadata decoration, etc.
+
+### Default Kubernetes jobs configuration
+
+By default, some Kubernetes objects are discovered and scraped by Prometheus. Taking into account the snippet from `values.yaml` below:
+
+```yaml
+    integrations_filter:
+      enabled: true
+      source_labels: ["app.kubernetes.io/name", "app.newrelic.io/name", "k8s-app"]
+      app_values: ["redis", "traefik", "calico", "nginx", "coredns", "etcd", "cockroachdb", "velero", "harbor", "argocd"]
+    jobs:
+    - job_name_prefix: default
+      target_discovery:
+        pod: true
+        endpoints: true
+        filter:
+          annotations:
+            prometheus.io/scrape: true
+    - job_name_prefix: newrelic
+      integrations_filter:
+        enabled: false
+      target_discovery:
+        pod: true
+        endpoints: true
+        filter:
+          annotations:
+            newrelic.io/scrape: true
+```
+
+All pods and endpoints with the `newrelic.io/scrape: true` annotation will be scraped by default.
+
+Moreover, the solution will scrape as well all pods and endpoints with the `prometheus.io/scrape: true` annotations and
+having one of the labels matching the integrations_filter configuration.
+
+Notice that at any point you can turn off the integrations filters and scrape all pods and services annotated with
+`prometheus.io/scrape: true` by setting `config.kubernetes.integrations_filter.integrations_filter: false` or turning
+it off in any specific job.
+
+### Kubernetes job examples
+
+#### API Server metrics
+By default, the API Server Service named `kubernetes` is created in the `default` namespace. The following configuration will scrape metrics from all endpoints behind the mentioned service using the Prometheus Pod bearer token as Authorization Header:
+
+```yaml
+config:
+  kubernetes:
+    jobs:
+    - job_name_prefix: apiserver
+      target_discovery:
+        endpoints: true
+      extra_relabel_config:
+      # Filter endpoints on `default` namespace associated to `kubernetes` service.
+      - source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_service_name]
+        action: keep
+        regex: default;kubernetes
+
+      scheme: https
+      tls_config:
+          ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+          insecure_skip_verify: true
+      authorization:
+        credentials_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+```
+
+### Metrics Filtering
+
+Check [docs](https://github.com/newrelic/newrelic-prometheus-configurator/blob/main/docs/MetricsFilters.md) for a detailed explanation and examples of how to filter metrics and labels.
+
+### Self metrics
+
+By default, it is defined as a job in `static_target.jobs` to obtain self-metrics. Particularly, a snippet like the one
+below is used. If you define your own static_targets jobs, it is important to also include this kind of job in order
+to keep getting self-metrics.
+
+```yaml
+config:
+  static_targets:
+    jobs:
+    - job_name: self-metrics
+      targets:
+        - "localhost:9090"
+      extra_metric_relabel_config:
+        - source_labels: [__name__]
+          regex: "<metrics to include defined in values.yaml>"
+          action: keep
+```
+
+### Low data mode
+
+There are two mechanisms to reduce the amount of data that this integration sends to New Relic. See this snippet from the `values.yaml` file:
+```yaml
+lowDataMode: false
+
+config:
+  common:
+    scrape_interval: 30s
+```
+
+You might set `lowDataMode` flag to `true` (it will filter some metrics which can also be collected using New Relic Kubernetes integration), check
+`values.yaml` for details.
+
+It is also possible to adjust how frequently Prometheus scrapes the targets by setting up the` config.common.scrape_interval` value.
+
+
+### Affinities and tolerations
+
+The New Relic common library allows you to set affinities, tolerations, and node selectors globally using e.g. `.global.affinity` to ease the configuration
+when you use this chart using `nri-bundle`. This chart has an extra level of granularity to the components that it deploys:
+control plane, ksm, and kubelet.
+
+Take this snippet as an example:
+```yaml
+global:
+  affinity: {}
+affinity: {}
+```
+
+The order to set the affinity is to set `affinity` field (at root level), if that value is empty, the chart fallbacks to `global.affinity`.
+
+{{ template "chart.valuesSection" . }}
+
+{{ if .Maintainers }}
+## Maintainers
+{{ range .Maintainers }}
+{{- if .Name }}
+{{- if .Url }}
+* [{{ .Name }}]({{ .Url }})
+{{- else }}
+* {{ .Name }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/Chart.yaml
new file mode 100644
index 000000000..adfc765bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/Chart.yaml
@@ -0,0 +1,17 @@
+apiVersion: v2
+description: Provides helpers to provide consistency on all the charts
+keywords:
+- newrelic
+- chart-library
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+- name: kang-makes
+  url: https://github.com/kang-makes
+name: common-library
+type: library
+version: 1.3.1
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/DEVELOPERS.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/DEVELOPERS.md
new file mode 100644
index 000000000..7208c673e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/DEVELOPERS.md
@@ -0,0 +1,747 @@
+# Functions/templates documented for chart writers
+Here is some rough documentation separated by the file that contains the function, the function
+name and how to use it. We are not covering functions that start with `_` (e.g.
+`newrelic.common.license._licenseKey`) because they are used internally by this library for
+other helpers. Helm does not have the concept of "public" or "private" functions/templates so
+this is a convention of ours.
+
+## _naming.tpl
+These functions are used to name objects.
+
+### `newrelic.common.naming.name`
+This is the same as the idiomatic `CHART-NAME.name` that is created when you use `helm create`.
+
+It honors `.Values.nameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.name" . }}
+```
+
+### `newrelic.common.naming.fullname`
+This is the same as the idiomatic `CHART-NAME.fullname` that is created when you use `helm create`
+
+It honors `.Values.fullnameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.fullname" . }}
+```
+
+### `newrelic.common.naming.chart`
+This is the same as the idiomatic `CHART-NAME.chart` that is created when you use `helm create`.
+
+It is mostly useless for chart writers. It is used internally for templating the labels but there
+is no reason to keep it "private".
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.chart" . }}
+```
+
+### `newrelic.common.naming.truncateToDNS`
+This is a useful template that could be used to trim a string to 63 chars and does not end with a dash (`-`).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $truncatedName := include "newrelic.common.naming.truncateToDNS" $nameToTruncate }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-string-that-should-be */ -}}
+```
+
+### `newrelic.common.naming.truncateToDNSWithSuffix`
+This template function is the same as the above but instead of receiving a string you should give a `dict`
+with a `name` and a `suffix`. This function will join them with a dash (`-`) and trim the `name` so the
+result of `name-suffix` is no more than 63 chars
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $suffix := "A-NOT-SO-LONG-SUFFIX" }}
+{{- $truncatedName := include "truncateToDNSWithSuffix" (dict "name" $nameToTruncate "suffix" $suffix) }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-A-NOT-SO-LONG-SUFFIX */ -}}
+```
+
+
+
+## _labels.tpl
+### `newrelic.common.labels`, `newrelic.common.labels.selectorLabels` and `newrelic.common.labels.podLabels`
+These are functions that are used to label objects. They are configured by this `values.yaml`
+```yaml
+global:
+  podLabels: {}  # included in all the pods of all the charts that implement this library
+  labels: {}  # included in all the objects of all the charts that implement this library
+podLabels: {}  # included in all the pods of this chart
+labels: {}  # included in all the objects of this chart
+```
+
+label maps are merged from global to local values.
+
+And chart writer should use them like this:
+```mustache
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+```
+
+`newrelic.common.labels.podLabels` includes `newrelic.common.labels.selectorLabels` automatically.
+
+
+
+## _priority-class-name.tpl
+### `newrelic.common.priorityClassName`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  priorityClassName: ""
+priorityClassName: ""
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `priorityClassName` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.priorityClassName" . }}
+  priorityClassName: {{ . }}
+  {{- end }}
+```
+
+
+
+## _hostnetwork.tpl
+### `newrelic.common.hostNetwork`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  hostNetwork:  # Note that this is empty (nil)
+hostNetwork:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `hostNetwork` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.hostNetwork" . }}
+  hostNetwork: {{ . }}
+  {{- end }}
+```
+
+### `newrelic.common.hostNetwork.value`
+This function is an abstraction of the function above but this returns directly "true" or "false".
+
+Be careful with using this with an `if` as Helm does evaluate "false" (string) as `true`.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+```
+
+
+
+## _dnsconfig.tpl
+### `newrelic.common.dnsConfig`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  dnsConfig: {}
+dnsConfig: {}
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `dnsConfig` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.dnsConfig" . }}
+  dnsConfig:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _images.tpl
+These functions help us to deal with how images are templated. This allows setting `registries`
+where to fetch images globally while being flexible enough to fit in different maps of images
+and deployments with one or more images. This is the example of a complex `values.yaml` that
+we are going to use during the documentation of these functions:
+
+```yaml
+global:
+  images:
+    registry: nexus-3-instance.internal.clients-domain.tld
+jobImage:
+  registry: # defaults to "example.tld" when empty in these examples
+  repository: ingress-nginx/kube-webhook-certgen
+  tag: v1.1.1
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+images:
+  integration:
+    registry:
+    repository: newrelic/nri-kube-events
+    tag: 1.8.0
+    pullPolicy: IfNotPresent
+  agent:
+    registry:
+    repository: newrelic/k8s-events-forwarder
+    tag: 1.22.0
+    pullPolicy: IfNotPresent
+  pullSecrets: []
+```
+
+### `newrelic.common.images.image`
+This will return a string with the image ready to be downloaded that includes the registry, the image and the tag.
+`defaultRegistry` is used to keep `registry` field empty in `values.yaml` so you can override the image using
+`global.images.registry`, your local `jobImage.registry` and be able to fallback to a registry that is not `docker.io`
+(Or the default repository that the client could have set in the CRI).
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.image" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.registry`
+It returns the registry from the global or local values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.registry" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.repository`
+It returns the image from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.tag`
+It returns the image's tag from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.renderPullSecrets`
+If returns a merged map that contains the pull secrets from the global configuration and the local one.  
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.jobImage.pullSecrets "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+```
+
+
+
+## _serviceaccount.tpl
+These functions are used to evaluate if the service account should be created, with which name and add annotations to it.
+
+The functions that the common library has implemented for service accounts are:
+* `newrelic.common.serviceAccount.create`
+* `newrelic.common.serviceAccount.name`
+* `newrelic.common.serviceAccount.annotations`
+
+Usage:
+```mustache
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- with (include "newrelic.common.serviceAccount.annotations" .) }}
+  annotations:
+    {{- . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
+```
+
+
+
+## _affinity.tpl, _nodeselector.tpl and _tolerations.tpl
+These three files are almost the same and they follow the idiomatic way of `helm create`.
+
+Each function also looks if there is a global value like the other helpers.
+```yaml
+global:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+affinity: {}
+nodeSelector: {}
+tolerations: []
+```
+
+The values here are replaced instead of be merged. If a value at root level is found, the global one is ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.nodeSelector" . }}
+  nodeSelector:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.affinity" . }}
+  affinity:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.tolerations" . }}
+  tolerations:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _agent-config.tpl
+### `newrelic.common.agentConfig.defaults`
+This returns a YAML that the agent can use directly as a config that includes other options from the values file like verbose mode,
+custom attributes, FedRAMP and such.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include newrelic.common.naming.truncateToDNSWithSuffix (dict "name" (include "newrelic.common.naming.fullname" .) suffix "agent-config") }}
+  namespace: {{ .Release.Namespace }}
+data:
+  newrelic-infra.yml: |-
+    # This is the configuration file for the infrastructure agent. See:
+    # https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+    {{- include "newrelic.common.agentConfig.defaults" . | nindent 4 }}
+```
+
+
+
+## _cluster.tpl
+### `newrelic.common.cluster`
+Returns the cluster name
+
+Usage:
+```mustache
+{{ include "newrelic.common.cluster" . }}
+```
+
+
+
+## _custom-attributes.tpl
+### `newrelic.common.customAttributes`
+Return custom attributes in YAML format.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example
+data:
+  custom-attributes.yaml: |
+    {{- include "newrelic.common.customAttributes" . | nindent 4 }}
+  custom-attributes.json: |
+    {{- include "newrelic.common.customAttributes" . | fromYaml | toJson | nindent 4 }}
+```
+
+
+
+## _fedramp.tpl
+### `newrelic.common.fedramp.enabled`
+Returns true if FedRAMP is enabled or an empty string if not. It can be safely used in conditionals as an empty string is a Helm falsiness.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled" . }}
+```
+
+### `newrelic.common.fedramp.enabled.value`
+Returns true if FedRAMP is enabled or false if not. This is to have the value of FedRAMP ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled.value" . }}
+```
+
+
+
+## _license.tpl
+### `newrelic.common.license.secretName` and ### `newrelic.common.license.secretKeyName`
+Returns the secret and key inside the secret where to read the license key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the license key.
+
+To create the secret use `newrelic.common.license.secret`.
+
+Usage:
+```mustache
+{{- if and (.Values.controlPlane.enabled) (not (include "newrelic.fargate" .)) }}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+  containers:
+  - name: agent
+    env:
+    - name: "NRIA_LICENSE_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.license.secretName" . }}
+          key: {{ include "newrelic.common.license.secretKeyName" . }}
+```
+
+
+
+## _license_secret.tpl
+### `newrelic.common.license.secret`
+This function templates the secret that is used by agents and integrations with the license Key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any license key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.license.secret" . -}}
+```
+
+
+
+## _insights.tpl
+### `newrelic.common.insightsKey.secretName` and ### `newrelic.common.insightsKey.secretKeyName`
+Returns the secret and key inside the secret where to read the insights key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.insightsKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "INSIGHTS_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.insightsKey.secretName" . }}
+          key: {{ include "newrelic.common.insightsKey.secretKeyName" . }}
+```
+
+
+
+## _insights_secret.tpl
+### `newrelic.common.insightsKey.secret`
+This function templates the secret that is used by agents and integrations with the insights key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any insights key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.insightsKey.secret" . -}}
+```
+
+
+
+## _userkey.tpl
+### `newrelic.common.userKey.secretName` and ### `newrelic.common.userKey.secretKeyName`
+Returns the secret and key inside the secret where to read a user key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.userKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "API_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.userKey.secretName" . }}
+          key: {{ include "newrelic.common.userKey.secretKeyName" . }}
+```
+
+
+
+## _userkey_secret.tpl
+### `newrelic.common.userKey.secret`
+This function templates the secret that is used by agents and integrations with a user key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any API key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.userKey.secret" . -}}
+```
+
+
+
+## _region.tpl
+### `newrelic.common.region.validate`
+Given a string, return a normalized name for the region if valid.
+
+This function does not need the context of the chart, only the value to be validated. The region returned
+honors the region [definition of the newrelic-client-go implementation](https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21)
+so (as of 2024/09/14) it returns the region as "US", "EU", "Staging", or "Local".
+
+In case the region provided does not match these 4, the helper calls `fail` and abort the templating.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region.validate" "us" }}
+```
+
+### `newrelic.common.region`
+It reads global and local variables for `region`:
+```yaml
+global:
+  region:  # Note that this can be empty (nil) or "" (empty string)
+region:  # Note that this can be empty (nil) or "" (empty string)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in your
+values a `region` is defined, the global one is going to be always ignored.
+
+This function gives protection so it enforces users to give the license key as a value in their
+`values.yaml` or specify a global or local `region` value. To understand how the `region` value
+works, read the documentation of `newrelic.common.region.validate`.
+
+The function will change the region from US, EU or Staging based of the license key and the
+`nrStaging` toggle. Whichever region is computed from the license/toggle can be overridden by
+the `region` value.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region" . }}
+```
+
+
+
+## _low-data-mode.tpl
+### `newrelic.common.lowDataMode`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  lowDataMode:  # Note that this is empty (nil)
+lowDataMode:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `lowdataMode` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.lowDataMode" . }}
+```
+
+
+
+## _privileged.tpl
+### `newrelic.common.privileged`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  privileged:  # Note that this is empty (nil)
+privileged:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `privileged` is defined, the global one is going to be always ignored.
+
+Chart writers could override this and put directly a `true` in the `values.yaml` to override the
+default of the common library.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged" . }}
+```
+
+### `newrelic.common.privileged.value`
+Returns true if privileged mode is enabled or false if not. This is to have the value of privileged ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged.value" . }}
+```
+
+
+
+## _proxy.tpl
+### `newrelic.common.proxy`
+Returns the proxy URL configured by the user. 
+
+Usage:
+```mustache
+{{ include "newrelic.common.proxy" . }}
+```
+
+
+
+## _security-context.tpl
+Use these functions to share the security context among all charts. Useful in clusters that have security enforcing not to
+use the root user (like OpenShift) or users that have an admission webhooks.
+
+The functions are:
+* `newrelic.common.securityContext.container`
+* `newrelic.common.securityContext.pod`
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+    spec:
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+
+      containers:
+        - name: example
+          {{- with include "nriKubernetes.securityContext.container" . }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+```
+
+
+
+## _staging.tpl
+### `newrelic.common.nrStaging`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  nrStaging:  # Note that this is empty (nil)
+nrStaging:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `nrStaging` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging" . }}
+```
+
+### `newrelic.common.nrStaging.value`
+Returns true if staging is enabled or false if not. This is to have the staging value ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging.value" . }}
+```
+
+
+
+## _verbose-log.tpl
+### `newrelic.common.verboseLog`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  verboseLog:  # Note that this is empty (nil)
+verboseLog:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `verboseLog` is defined, the global one is going to be always ignored.
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsBoolean`
+Returns true if verbose is enabled or false if not. This is to have the verbose value ready to be templated as a boolean
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsBoolean" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsInt`
+Returns 1 if verbose is enabled or 0 if not. This is to have the verbose value ready to be templated as an integer
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsInt" . }}
+```
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/README.md
new file mode 100644
index 000000000..10f08ca67
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/README.md
@@ -0,0 +1,106 @@
+# Helm Common library
+
+The common library is a way to unify the UX through all the Helm charts that implement it.
+
+The tooling suite that New Relic is huge and growing and this allows to set things globally
+and locally for a single chart.
+
+## Documentation for chart writers
+
+If you are writing a chart that is going to use this library you can check the [developers guide](/library/common-library/DEVELOPERS.md) to see all
+the functions/templates that we have implemented, what they do and how to use them.
+
+## Values managed globally
+
+We want to have a seamless experience through all the charts so we created this library that tries to standardize the behaviour
+of all the charts. Sadly, because of the complexity of all these integrations, not all the charts behave exactly as expected.
+
+An example is `newrelic-infrastructure` that ignores `hostNetwork` in the control plane scraper because most of the users has the
+control plane listening in the node to `localhost`.
+
+For each chart that has a special behavior (or further information of the behavior) there is a "chart particularities" section
+in its README.md that explains which is the expected behavior.
+
+At the time of writing this, all the charts from `nri-bundle` except `newrelic-logging` and `synthetics-minion` implements this
+library and honors global options as described in this document.
+
+Here is a list of global options:
+
+| Global keys | Local keys | Default | Merged[<sup>1</sup>](#values-managed-globally-1) | Description |
+|-------------|------------|---------|--------------------------------------------------|-------------|
+| global.cluster | cluster | `""` |  | Name of the Kubernetes cluster monitored |
+| global.licenseKey | licenseKey | `""` |  | This set this license key to use |
+| global.customSecretName | customSecretName | `""` |  | In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there |
+| global.customSecretLicenseKey | customSecretLicenseKey | `""` |  | In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located |
+| global.podLabels | podLabels | `{}` | yes | Additional labels for chart pods |
+| global.labels | labels | `{}` | yes | Additional labels for chart objects |
+| global.priorityClassName | priorityClassName | `""` |  | Sets pod's priorityClassName |
+| global.hostNetwork | hostNetwork | `false` |  | Sets pod's hostNetwork |
+| global.dnsConfig | dnsConfig | `{}` |  | Sets pod's dnsConfig |
+| global.images.registry | See [Further information](#values-managed-globally-2) | `""` |  | Changes the registry where to get the images. Useful when there is an internal image cache/proxy |
+| global.images.pullSecrets | See [Further information](#values-managed-globally-2) | `[]` | yes | Set secrets to be able to fetch images |
+| global.podSecurityContext | podSecurityContext | `{}` |  | Sets security context (at pod level) |
+| global.containerSecurityContext | containerSecurityContext | `{}` |  | Sets security context (at container level) |
+| global.affinity | affinity | `{}` |  | Sets pod/node affinities |
+| global.nodeSelector | nodeSelector | `{}` |  | Sets pod's node selector |
+| global.tolerations | tolerations | `[]` |  | Sets pod's tolerations to node taints |
+| global.serviceAccount.create | serviceAccount.create | `true` |  | Configures if the service account should be created or not |
+| global.serviceAccount.name | serviceAccount.name | name of the release |  | Change the name of the service account. This is honored if you disable on this cahrt the creation of the service account so you can use your own. |
+| global.serviceAccount.annotations | serviceAccount.annotations | `{}` | yes | Add these annotations to the service account we create |
+| global.customAttributes | customAttributes | `{}` |  | Adds extra attributes to the cluster and all the metrics emitted to the backend |
+| global.fedramp | fedramp | `false` |  | Enables FedRAMP |
+| global.lowDataMode | lowDataMode | `false` |  | Reduces number of metrics sent in order to reduce costs |
+| global.privileged | privileged | Depends on the chart |  | In each integration it has different behavior. See [Further information](#values-managed-globally-3) but all aims to send less metrics to the backend to try to save costs |
+| global.proxy | proxy | `""` |  | Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port` |
+| global.nrStaging | nrStaging | `false` |  | Send the metrics to the staging backend. Requires a valid staging license key |
+| global.verboseLog | verboseLog | `false` |  | Sets the debug/trace logs to this integration or all integrations if it is set globally |
+
+### Further information
+<a name="values-managed-globally-1"></a>
+#### 1. Merged
+
+Merged means that the values from global are not replaced by the local ones. Think in this example:
+```yaml
+global:
+  labels:
+    global: global
+  hostNetwork: true
+  nodeSelector:
+    global: global
+
+labels:
+  local: local
+nodeSelector:
+  local: local
+hostNetwork: false
+```
+
+This values will template `hostNetwork` to `false`, a map of labels `{ "global": "global", "local": "local" }` and a `nodeSelector` with
+`{ "local": "local" }`.
+
+As Helm by default merges all the maps it could be confusing that we have two behaviors (merging `labels` and replacing `nodeSelector`)
+the `values` from global to local. This is the rationale behind this:
+* `hostNetwork` is templated to `false` because is overriding the value defined globally.
+* `labels` are merged because the user may want to label all the New Relic pods at once and label other solution pods differently for
+  clarity' sake.
+* `nodeSelector` does not merge as `labels` because could make it harder to overwrite/delete a selector that comes from global because
+  of the logic that Helm follows merging maps.
+
+<a name="values-managed-globally-2"></a>
+#### 2. Fine grain registries
+
+Some charts only have 1 image while others that can have 2 or more images. The local path for the registry can change depending
+on the chart itself.
+
+As this is mostly unique per helm chart, you should take a look to the chart's values table (or directly to the `values.yaml` file to see all the
+images that you can change.
+
+This should only be needed if you have an advanced setup that forces you to have granularity enough to force a proxy/cache registry per integration.
+
+
+<a name="values-managed-globally-3"></a>
+#### 3. Privileged mode
+
+By default, from the common library, the privileged mode is set to false. But most of the helm charts require this to be true to fetch more
+metrics so could see a true in some charts. The consequences of the privileged mode differ from one chart to another so for each chart that
+honors the privileged mode toggle should be a section in the README explaining which is the behavior with it enabled or disabled.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_affinity.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_affinity.tpl
new file mode 100644
index 000000000..1b2636754
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_affinity.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod affinity */ -}}
+{{- define "newrelic.common.affinity" -}}
+    {{- if .Values.affinity -}}
+        {{- toYaml .Values.affinity -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.affinity -}}
+            {{- toYaml .Values.global.affinity -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_agent-config.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_agent-config.tpl
new file mode 100644
index 000000000..9c32861a0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_agent-config.tpl
@@ -0,0 +1,26 @@
+{{/*
+This helper should return the defaults that all agents should have
+*/}}
+{{- define "newrelic.common.agentConfig.defaults" -}}
+{{- if include "newrelic.common.verboseLog" . }}
+log:
+  level: trace
+{{- end }}
+
+{{- if (include "newrelic.common.nrStaging" . ) }}
+staging: true
+{{- end }}
+
+{{- with include "newrelic.common.proxy" . }}
+proxy: {{ . | quote }}
+{{- end }}
+
+{{- with include "newrelic.common.fedramp.enabled" . }}
+fedramp: {{ . }}
+{{- end }}
+
+{{- with fromYaml ( include "newrelic.common.customAttributes" . ) }}
+custom_attributes:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_cluster.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_cluster.tpl
new file mode 100644
index 000000000..0197dd35a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_cluster.tpl
@@ -0,0 +1,15 @@
+{{/*
+Return the cluster
+*/}}
+{{- define "newrelic.common.cluster" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.cluster -}}
+    {{- .Values.cluster -}}
+{{- else if $global.cluster -}}
+    {{- $global.cluster -}}
+{{- else -}}
+    {{ fail "There is not cluster name definition set neither in `.global.cluster' nor `.cluster' in your values.yaml. Cluster name is required." }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_custom-attributes.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_custom-attributes.tpl
new file mode 100644
index 000000000..92020719c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_custom-attributes.tpl
@@ -0,0 +1,17 @@
+{{/*
+This will render custom attributes as a YAML ready to be templated or be used with `fromYaml`.
+*/}}
+{{- define "newrelic.common.customAttributes" -}}
+{{- $customAttributes := dict -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- if $global.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes $global.customAttributes -}}
+{{- end -}}
+
+{{- if .Values.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes .Values.customAttributes -}}
+{{- end -}}
+
+{{- toYaml $customAttributes -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_dnsconfig.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_dnsconfig.tpl
new file mode 100644
index 000000000..d4e40aa8a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_dnsconfig.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod dnsConfig */ -}}
+{{- define "newrelic.common.dnsConfig" -}}
+    {{- if .Values.dnsConfig -}}
+        {{- toYaml .Values.dnsConfig -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.dnsConfig -}}
+            {{- toYaml .Values.global.dnsConfig -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_fedramp.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_fedramp.tpl
new file mode 100644
index 000000000..9df8d6b5e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_fedramp.tpl
@@ -0,0 +1,25 @@
+{{- /* Defines the fedRAMP flag */ -}}
+{{- define "newrelic.common.fedramp.enabled" -}}
+    {{- if .Values.fedramp -}}
+        {{- if .Values.fedramp.enabled -}}
+            {{- .Values.fedramp.enabled -}}
+        {{- end -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.fedramp -}}
+             {{- if .Values.global.fedramp.enabled -}}
+                {{- .Values.global.fedramp.enabled -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return FedRAMP value directly ready to be templated */ -}}
+{{- define "newrelic.common.fedramp.enabled.value" -}}
+{{- if include "newrelic.common.fedramp.enabled" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_hostnetwork.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_hostnetwork.tpl
new file mode 100644
index 000000000..4cf017ef7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_hostnetwork.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper allows to override the global `.global.hostNetwork` with the value of `.hostNetwork`.
+Returns "true" if `hostNetwork` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.hostNetwork" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- /*
+`get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs
+
+We also want only to return when this is true, returning `false` here will template "false" (string) when doing
+an `(include "newrelic.common.hostNetwork" .)`, which is not an "empty string" so it is `true` if it is used
+as an evaluation somewhere else.
+*/ -}}
+{{- if get .Values "hostNetwork" | kindIs "bool" -}}
+    {{- if .Values.hostNetwork -}}
+        {{- .Values.hostNetwork -}}
+    {{- end -}}
+{{- else if get $global "hostNetwork" | kindIs "bool" -}}
+    {{- if $global.hostNetwork -}}
+        {{- $global.hostNetwork -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper abstracts the function "newrelic.common.hostNetwork" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.hostNetwork.value" -}}
+{{- if include "newrelic.common.hostNetwork" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_images.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_images.tpl
new file mode 100644
index 000000000..d4fb43290
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_images.tpl
@@ -0,0 +1,94 @@
+{{- /*
+Return the proper image name
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.image" -}}
+    {{- $registryName := include "newrelic.common.images.registry" ( dict "imageRoot" .imageRoot "defaultRegistry" .defaultRegistry "context" .context ) -}}
+    {{- $repositoryName := include "newrelic.common.images.repository" .imageRoot -}}
+    {{- $tag := include "newrelic.common.images.tag" ( dict "imageRoot" .imageRoot "context" .context) -}}
+
+    {{- if $registryName -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag | quote -}}
+    {{- else -}}
+        {{- printf "%s:%s" $repositoryName $tag | quote -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image registry
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.registry" -}}
+{{- $globalRegistry := "" -}}
+{{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+        {{- with .context.Values.global.images.registry -}}
+            {{- $globalRegistry = . -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $localRegistry := "" -}}
+{{- if .imageRoot.registry -}}
+    {{- $localRegistry = .imageRoot.registry -}}
+{{- end -}}
+
+{{- $registry := $localRegistry | default $globalRegistry | default .defaultRegistry -}}
+{{- if $registry -}}
+    {{- $registry -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image repository
+{{ include "newrelic.common.images.repository" .Values.path.to.the.image }}
+*/ -}}
+{{- define "newrelic.common.images.repository" -}}
+    {{- .repository -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image tag
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.path.to.the.image "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.tag" -}}
+    {{- .imageRoot.tag | default .context.Chart.AppVersion | toString -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper Image Pull Registry Secret Names evaluating values as templates
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.path.to.the.images.pullSecrets1, .Values.path.to.the.images.pullSecrets2) "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.renderPullSecrets" -}}
+  {{- $flatlist := list }}
+
+  {{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+      {{- if .context.Values.global.images.pullSecrets -}}
+        {{- range .context.Values.global.images.pullSecrets -}}
+          {{- $flatlist = append $flatlist . -}}
+        {{- end -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- range .pullSecrets -}}
+    {{- if not (empty .) -}}
+      {{- range . -}}
+        {{- $flatlist = append $flatlist . -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if $flatlist -}}
+    {{- toYaml $flatlist -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_insights.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_insights.tpl
new file mode 100644
index 000000000..895c37732
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_insights.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the Insights Key.
+*/}}
+{{- define "newrelic.common.insightsKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "insightskey" ) -}}
+{{- include "newrelic.common.insightsKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secretKeyName" -}}
+{{- include "newrelic.common.insightsKey._customSecretKey" . | default "insightsKey" -}}
+{{- end -}}
+
+{{/*
+Return local insightsKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._licenseKey" -}}
+{{- if .Values.insightsKey -}}
+  {{- .Values.insightsKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.insightsKey -}}
+    {{- .Values.global.insightsKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the Insights Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretName" -}}
+{{- if .Values.customInsightsKeySecretName -}}
+  {{- .Values.customInsightsKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretName -}}
+    {{- .Values.global.customInsightsKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretKey" -}}
+{{- if .Values.customInsightsKeySecretKey -}}
+  {{- .Values.customInsightsKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretKey }}
+    {{- .Values.global.customInsightsKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_insights_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_insights_secret.yaml.tpl
new file mode 100644
index 000000000..556caa6ca
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_insights_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the insights key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secret" }}
+{{- if not (include "newrelic.common.insightsKey._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.insightsKey._licenseKey" .) }}
+    {{- fail "You must specify a insightsKey or a customInsightsSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.insightsKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.insightsKey.secretKeyName" . }}: {{ include "newrelic.common.insightsKey._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_labels.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_labels.tpl
new file mode 100644
index 000000000..1cc1e792b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_labels.tpl
@@ -0,0 +1,58 @@
+{{/*
+This will render the labels that should be used in all the manifests used by the helm chart.
+*/}}
+{{- define "newrelic.common.labels" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- $chart := dict "helm.sh/chart" (include "newrelic.common.naming.chart" . ) -}}
+{{- $managedBy := dict "app.kubernetes.io/managed-by" .Release.Service -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $labels := mustMergeOverwrite $chart $managedBy $selectorLabels -}}
+{{- if .Chart.AppVersion -}}
+{{- $labels = mustMergeOverwrite $labels (dict "app.kubernetes.io/version" .Chart.AppVersion) -}}
+{{- end -}}
+
+{{- $globalUserLabels := $global.labels | default dict -}}
+{{- $localUserLabels := .Values.labels | default dict -}}
+
+{{- $labels = mustMergeOverwrite $labels $globalUserLabels $localUserLabels -}}
+
+{{- range $k, $v := $labels -}}
+  {{- $_ := set $labels $k (include "newrelic.common.naming.truncateToDNS" $v ) -}}
+{{- end -}}
+
+{{- toYaml $labels -}}
+{{- end -}}
+
+
+
+{{/*
+This will render the labels that should be used in deployments/daemonsets template pods as a selector.
+*/}}
+{{- define "newrelic.common.labels.selectorLabels" -}}
+{{- $name := dict "app.kubernetes.io/name" ( include "newrelic.common.naming.name" . ) -}}
+{{- $instance := dict "app.kubernetes.io/instance" .Release.Name -}}
+
+{{- $selectorLabels := mustMergeOverwrite $name $instance -}}
+
+{{- toYaml $selectorLabels -}}
+{{- end }}
+
+
+
+{{/*
+Pod labels
+*/}}
+{{- define "newrelic.common.labels.podLabels" -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- $globalPodLabels := $global.podLabels | default dict }}
+
+{{- $localPodLabels := .Values.podLabels | default dict }}
+
+{{- $podLabels := mustMergeOverwrite $selectorLabels $globalPodLabels $localPodLabels -}}
+
+{{- toYaml $podLabels -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_license.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_license.tpl
new file mode 100644
index 000000000..cb349f6bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_license.tpl
@@ -0,0 +1,68 @@
+{{/*
+Return the name of the secret holding the License Key.
+*/}}
+{{- define "newrelic.common.license.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "license" ) -}}
+{{- include "newrelic.common.license._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+*/}}
+{{- define "newrelic.common.license.secretKeyName" -}}
+{{- include "newrelic.common.license._customSecretKey" . | default "licenseKey" -}}
+{{- end -}}
+
+{{/*
+Return local licenseKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._licenseKey" -}}
+{{- if .Values.licenseKey -}}
+  {{- .Values.licenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.licenseKey -}}
+    {{- .Values.global.licenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the License Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretName" -}}
+{{- if .Values.customSecretName -}}
+  {{- .Values.customSecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretName -}}
+    {{- .Values.global.customSecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretKey" -}}
+{{- if .Values.customSecretLicenseKey -}}
+  {{- .Values.customSecretLicenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretLicenseKey }}
+    {{- .Values.global.customSecretLicenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the user set a custom secret for the license.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._usesCustomSecret" -}}
+{{- if or (include "newrelic.common.license._customSecretName" .) (include "newrelic.common.license._customSecretKey" .) -}}
+true
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_license_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_license_secret.yaml.tpl
new file mode 100644
index 000000000..610a0a337
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_license_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the license key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.license.secret" }}
+{{- if not (include "newrelic.common.license._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.license._licenseKey" .) }}
+    {{- fail "You must specify a licenseKey or a customSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.license.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.license.secretKeyName" . }}: {{ include "newrelic.common.license._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_low-data-mode.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_low-data-mode.tpl
new file mode 100644
index 000000000..3dd55ef2f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_low-data-mode.tpl
@@ -0,0 +1,26 @@
+{{- /*
+Abstraction of the lowDataMode toggle.
+This helper allows to override the global `.global.lowDataMode` with the value of `.lowDataMode`.
+Returns "true" if `lowDataMode` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.lowDataMode" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "lowDataMode" | kindIs "bool") -}}
+    {{- if .Values.lowDataMode -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.lowDataMode" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.lowDataMode -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "lowDataMode" | kindIs "bool" -}}
+    {{- if $global.lowDataMode -}}
+        {{- $global.lowDataMode -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_naming.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_naming.tpl
new file mode 100644
index 000000000..19fa92648
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_naming.tpl
@@ -0,0 +1,73 @@
+{{/*
+This is an function to be called directly with a string just to truncate strings to
+63 chars because some Kubernetes name fields are limited to that.
+*/}}
+{{- define "newrelic.common.naming.truncateToDNS" -}}
+{{- . | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+
+
+{{- /*
+Given a name and a suffix returns a 'DNS Valid' which always include the suffix, truncating the name if needed.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If suffix is too long it gets truncated but it always takes precedence over name, so a 63 chars suffix would suppress the name.
+Usage:
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" "<my-name>" "suffix" "my-suffix" ) }}
+*/ -}}
+{{- define "newrelic.common.naming.truncateToDNSWithSuffix" -}}
+{{- $suffix := (include "newrelic.common.naming.truncateToDNS" .suffix) -}}
+{{- $maxLen := (max (sub 63 (add1 (len $suffix))) 0) -}} {{- /* We prepend "-" to the suffix so an additional character is needed */ -}}
+
+{{- $newName := .name | trunc ($maxLen | int) | trimSuffix "-"  -}}
+{{- if $newName -}}
+{{- printf "%s-%s" $newName $suffix -}}
+{{- else -}}
+{{ $suffix }}
+{{- end -}}
+
+{{- end -}}
+
+
+
+{{/*
+Expand the name of the chart.
+Uses the Chart name by default if nameOverride is not set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.name" -}}
+{{- $name := .Values.nameOverride | default .Chart.Name -}}
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+{{- end }}
+
+
+
+{{/*
+Create a default fully qualified app name.
+By default the full name will be "<release_name>" just in if it has the chart name included in that, if not
+it will be concatenated like "<release_name>-<chart_chart>". This could change if fullnameOverride or
+nameOverride are set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.fullname" -}}
+{{- $name := include "newrelic.common.naming.name" . -}}
+
+{{- if .Values.fullnameOverride -}}
+    {{- $name = .Values.fullnameOverride  -}}
+{{- else if not (contains $name .Release.Name) -}}
+    {{- $name = printf "%s-%s" .Release.Name $name -}}
+{{- end -}}
+
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+
+{{- end -}}
+
+
+
+{{/*
+Create chart name and version as used by the chart label.
+This function should not be used for naming objects. Use "common.naming.{name,fullname}" instead.
+*/}}
+{{- define "newrelic.common.naming.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_nodeselector.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_nodeselector.tpl
new file mode 100644
index 000000000..d48887341
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_nodeselector.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod nodeSelector */ -}}
+{{- define "newrelic.common.nodeSelector" -}}
+    {{- if .Values.nodeSelector -}}
+        {{- toYaml .Values.nodeSelector -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.nodeSelector -}}
+            {{- toYaml .Values.global.nodeSelector -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_priority-class-name.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_priority-class-name.tpl
new file mode 100644
index 000000000..50182b734
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_priority-class-name.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the pod priorityClassName */ -}}
+{{- define "newrelic.common.priorityClassName" -}}
+    {{- if .Values.priorityClassName -}}
+        {{- .Values.priorityClassName -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.priorityClassName -}}
+            {{- .Values.global.priorityClassName -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_privileged.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_privileged.tpl
new file mode 100644
index 000000000..f3ae814dd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_privileged.tpl
@@ -0,0 +1,28 @@
+{{- /*
+This is a helper that returns whether the chart should assume the user is fine deploying privileged pods.
+*/ -}}
+{{- define "newrelic.common.privileged" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists. */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if get .Values "privileged" | kindIs "bool" -}}
+    {{- if .Values.privileged -}}
+        {{- .Values.privileged -}}
+    {{- end -}}
+{{- else if get $global "privileged" | kindIs "bool" -}}
+    {{- if $global.privileged -}}
+        {{- $global.privileged -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return directly "true" or "false" based in the exist of "newrelic.common.privileged" */ -}}
+{{- define "newrelic.common.privileged.value" -}}
+{{- if include "newrelic.common.privileged" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_proxy.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_proxy.tpl
new file mode 100644
index 000000000..60f34c7ec
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_proxy.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the proxy */ -}}
+{{- define "newrelic.common.proxy" -}}
+    {{- if .Values.proxy -}}
+        {{- .Values.proxy -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.proxy -}}
+            {{- .Values.global.proxy -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_region.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_region.tpl
new file mode 100644
index 000000000..bdcacf323
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_region.tpl
@@ -0,0 +1,74 @@
+{{/*
+Return the region that is being used by the user
+*/}}
+{{- define "newrelic.common.region" -}}
+{{- if and (include "newrelic.common.license._usesCustomSecret" .) (not (include "newrelic.common.region._fromValues" .)) -}}
+  {{- fail "This Helm Chart is not able to compute the region. You must specify a .global.region or .region if the license is set using a custom secret." -}}
+{{- end -}}
+
+{{- /* Defaults */ -}}
+{{- $region := "us" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+  {{- $region = "staging" -}}
+{{- else if include "newrelic.common.region._isEULicenseKey" . -}}
+  {{- $region = "eu" -}}
+{{- end -}}
+
+{{- include "newrelic.common.region.validate" (include "newrelic.common.region._fromValues" . | default $region ) -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values if valid. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+
+Usage: `include "newrelic.common.region.validate" "us"`
+*/}}
+{{- define "newrelic.common.region.validate" -}}
+{{- /* Ref: https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21 */ -}}
+{{- $region := . | lower -}}
+{{- if eq $region "us" -}}
+  US
+{{- else if eq $region "eu" -}}
+  EU
+{{- else if eq $region "staging" -}}
+  Staging
+{{- else if eq $region "local" -}}
+  Local
+{{- else -}}
+  {{- fail (printf "the region provided is not valid: %s not in \"US\" \"EU\" \"Staging\" \"Local\"" .) -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._fromValues" -}}
+{{- if .Values.region -}}
+  {{- .Values.region -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.region -}}
+    {{- .Values.global.region -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the license is for EU region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._isEULicenseKey" -}}
+{{- if not (include "newrelic.common.license._usesCustomSecret" .) -}}
+  {{- $license := include "newrelic.common.license._licenseKey" . -}}
+  {{- if hasPrefix "eu" $license -}}
+    true
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_security-context.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_security-context.tpl
new file mode 100644
index 000000000..9edfcabfd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_security-context.tpl
@@ -0,0 +1,23 @@
+{{- /* Defines the container securityContext context */ -}}
+{{- define "newrelic.common.securityContext.container" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.containerSecurityContext -}}
+    {{- toYaml .Values.containerSecurityContext -}}
+{{- else if $global.containerSecurityContext -}}
+    {{- toYaml $global.containerSecurityContext -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the pod securityContext context */ -}}
+{{- define "newrelic.common.securityContext.pod" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.podSecurityContext -}}
+    {{- toYaml .Values.podSecurityContext -}}
+{{- else if $global.podSecurityContext -}}
+    {{- toYaml $global.podSecurityContext -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_serviceaccount.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_serviceaccount.tpl
new file mode 100644
index 000000000..2d352f6ea
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_serviceaccount.tpl
@@ -0,0 +1,90 @@
+{{- /* Defines if the service account has to be created or not */ -}}
+{{- define "newrelic.common.serviceAccount.create" -}}
+{{- $valueFound := false -}}
+
+{{- /* Look for a global creation of a service account */ -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "create" | kindIs "bool") -}}
+        {{- $valueFound = true -}}
+        {{- if .Values.serviceAccount.create -}}
+            {{- /*
+                We want only to return when this is true, returning `false` here will template "false" (string) when doing
+                an `(include "newrelic.common.serviceAccount.name" .)`, which is not an "empty string" so it is `true` if it is used
+                as an evaluation somewhere else.
+            */ -}}
+            {{- .Values.serviceAccount.create -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* Look for a local creation of a service account */ -}}
+{{- if not $valueFound -}}
+    {{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+    {{- $global := index .Values "global" | default dict -}}
+    {{- if get $global "serviceAccount" | kindIs "map" -}}
+        {{- if get $global.serviceAccount "create" | kindIs "bool" -}}
+            {{- $valueFound = true -}}
+            {{- if $global.serviceAccount.create -}}
+                {{- $global.serviceAccount.create -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* In case no serviceAccount value has been found, default to "true" */ -}}
+{{- if not $valueFound -}}
+true
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the name of the service account */ -}}
+{{- define "newrelic.common.serviceAccount.name" -}}
+{{- $localServiceAccount := "" -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "name" | kindIs "string") -}}
+        {{- $localServiceAccount = .Values.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := "" -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "name" | kindIs "string" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- if (include "newrelic.common.serviceAccount.create" .) -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default (include "newrelic.common.naming.fullname" .) -}}
+{{- else -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default "default" -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Merge the global and local annotations for the service account */ -}}
+{{- define "newrelic.common.serviceAccount.annotations" -}}
+{{- $localServiceAccount := dict -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if get .Values.serviceAccount "annotations" -}}
+        {{- $localServiceAccount = .Values.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := dict -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "annotations" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $merged := mustMergeOverwrite $globalServiceAccount $localServiceAccount -}}
+
+{{- if $merged -}}
+    {{- toYaml $merged -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_staging.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_staging.tpl
new file mode 100644
index 000000000..bd9ad09bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_staging.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the nrStaging toggle.
+This helper allows to override the global `.global.nrStaging` with the value of `.nrStaging`.
+Returns "true" if `nrStaging` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.nrStaging" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "nrStaging" | kindIs "bool") -}}
+    {{- if .Values.nrStaging -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.nrStaging" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.nrStaging -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "nrStaging" | kindIs "bool" -}}
+    {{- if $global.nrStaging -}}
+        {{- $global.nrStaging -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Returns "true" of "false" directly instead of empty string (Helm falsiness) based on the exit of "newrelic.common.nrStaging"
+*/ -}}
+{{- define "newrelic.common.nrStaging.value" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_tolerations.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_tolerations.tpl
new file mode 100644
index 000000000..e016b38e2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_tolerations.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod tolerations */ -}}
+{{- define "newrelic.common.tolerations" -}}
+    {{- if .Values.tolerations -}}
+        {{- toYaml .Values.tolerations -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.tolerations -}}
+            {{- toYaml .Values.global.tolerations -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_userkey.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_userkey.tpl
new file mode 100644
index 000000000..982ea8e09
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_userkey.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the API Key.
+*/}}
+{{- define "newrelic.common.userKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "userkey" ) -}}
+{{- include "newrelic.common.userKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+*/}}
+{{- define "newrelic.common.userKey.secretKeyName" -}}
+{{- include "newrelic.common.userKey._customSecretKey" . | default "userKey" -}}
+{{- end -}}
+
+{{/*
+Return local API Key if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._userKey" -}}
+{{- if .Values.userKey -}}
+  {{- .Values.userKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.userKey -}}
+    {{- .Values.global.userKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the API Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretName" -}}
+{{- if .Values.customUserKeySecretName -}}
+  {{- .Values.customUserKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretName -}}
+    {{- .Values.global.customUserKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretKey" -}}
+{{- if .Values.customUserKeySecretKey -}}
+  {{- .Values.customUserKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretKey }}
+    {{- .Values.global.customUserKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_userkey_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_userkey_secret.yaml.tpl
new file mode 100644
index 000000000..b97985654
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_userkey_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the user key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.userKey.secret" }}
+{{- if not (include "newrelic.common.userKey._customSecretName" .) }}
+{{- /* Fail if user key is empty and required: */ -}}
+{{- if not (include "newrelic.common.userKey._userKey" .) }}
+    {{- fail "You must specify a userKey or a customUserKeySecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.userKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.userKey.secretKeyName" . }}: {{ include "newrelic.common.userKey._userKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_verbose-log.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_verbose-log.tpl
new file mode 100644
index 000000000..2286d4681
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/templates/_verbose-log.tpl
@@ -0,0 +1,54 @@
+{{- /*
+Abstraction of the verbose toggle.
+This helper allows to override the global `.global.verboseLog` with the value of `.verboseLog`.
+Returns "true" if `verbose` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.verboseLog" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "verboseLog" | kindIs "bool") -}}
+    {{- if .Values.verboseLog -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.verboseLog" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.verboseLog -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "verboseLog" | kindIs "bool" -}}
+    {{- if $global.verboseLog -}}
+        {{- $global.verboseLog -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsBoolean" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return 1 or 0 directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsInt" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+1
+{{- else -}}
+0
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/values.yaml
new file mode 100644
index 000000000..75e2d112a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/charts/common-library/values.yaml
@@ -0,0 +1 @@
+# values are not needed for the library chart, however this file is still needed for helm lint to work.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/ci/test-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/ci/test-values.yaml
new file mode 100644
index 000000000..ac5ed6bb0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/ci/test-values.yaml
@@ -0,0 +1,6 @@
+licenseKey: fakeLicenseKey
+cluster: test-cluster-name
+images:
+  configurator:
+    repository: ct/prometheus-configurator
+    tag: ct
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/static/lowdatamodedefaults.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/static/lowdatamodedefaults.yaml
new file mode 100644
index 000000000..726815755
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/static/lowdatamodedefaults.yaml
@@ -0,0 +1,6 @@
+# This file contains an entry of the array `extra_write_relabel_configs` to filter
+# metrics on Low Data Mode. These metrics are already collected by the New Relic Kubernetes Integration.
+low_data_mode:
+- action: drop
+  source_labels: [__name__]
+  regex: "kube_.+|container_.+|machine_.+|cadvisor_.+"
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/static/metrictyperelabeldefaults.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/static/metrictyperelabeldefaults.yaml
new file mode 100644
index 000000000..c0a277409
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/static/metrictyperelabeldefaults.yaml
@@ -0,0 +1,17 @@
+# This file contains an entry of the array `extra_write_relabel_configs` to override metric types.
+# https://docs.newrelic.com/docs/infrastructure/prometheus-integrations/install-configure-remote-write/set-your-prometheus-remote-write-integration#override-mapping
+metrics_type_relabel:
+- source_labels: [__name__]
+  separator: ;
+  regex: timeseries_write_(.*)   # Cockroach
+  target_label: newrelic_metric_type
+  replacement: counter
+  action: replace
+- source_labels: [__name__]
+  separator: ;
+  regex: sql_byte(.*)   # Cockroach
+  target_label: newrelic_metric_type
+  replacement: counter
+  action: replace
+# Note that adding more elements to this list could cause a possible breaking change to users already leveraging affected metrics.
+# Therefore, before adding new entries check if any users is relying already on those metrics and warn them.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/_helpers.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/_helpers.tpl
new file mode 100644
index 000000000..6cc58e251
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/_helpers.tpl
@@ -0,0 +1,165 @@
+{{- /* Return the newrelic-prometheus configuration */ -}}
+
+{{- /* it builds the common configuration from configurator config, cluster name and custom attributes */ -}}
+{{- define "newrelic-prometheus.configurator.common" -}}
+{{- $tmp := dict "external_labels" (dict "cluster_name" (include "newrelic.common.cluster" . )) -}}
+
+{{- if .Values.config  -}}
+  {{- if .Values.config.common -}}
+      {{- $_ := mustMerge $tmp .Values.config.common -}}
+  {{- end -}}
+{{- end -}}
+
+{{- $tmpCustomAttribute := dict "external_labels" (include "newrelic.common.customAttributes" . | fromYaml ) -}}
+{{- $tmp = mustMerge $tmp $tmpCustomAttribute  -}}
+
+common:
+{{- $tmp | toYaml | nindent 2 -}}
+
+{{- end -}}
+
+
+{{- /* it builds the newrelic_remote_write configuration from configurator config */ -}}
+{{- define "newrelic-prometheus.configurator.newrelic_remote_write" -}}
+{{- $tmp := dict -}}
+
+{{- if include "newrelic.common.nrStaging" . -}}
+  {{- $_ := set $tmp "staging" true  -}}
+{{- end -}}
+
+{{- if include "newrelic.common.fedramp.enabled" . -}}
+  {{- $_ := set $tmp "fedramp" (dict "enabled" true)  -}}
+{{- end -}}
+
+{{- $extra_write_relabel_configs :=(include "newrelic-prometheus.configurator.extra_write_relabel_configs" . | fromYaml) -}}
+{{- if ne (len $extra_write_relabel_configs.list) 0 -}}
+  {{- $_ := set $tmp "extra_write_relabel_configs" $extra_write_relabel_configs.list -}}
+{{- end -}}
+
+{{- if .Values.config -}}
+{{- if .Values.config.newrelic_remote_write -}}
+  {{- $tmp = mustMerge $tmp .Values.config.newrelic_remote_write  -}}
+{{- end -}}
+{{- end -}}
+
+{{- if not (empty $tmp) -}}
+  {{- dict "newrelic_remote_write" $tmp | toYaml -}}
+{{- end -}}
+
+{{- end -}}
+
+{{- /* it builds the extra_write_relabel_configs configuration merging: lowdatamode, user ones, and metrictyperelabeldefaults  */ -}}
+{{- define "newrelic-prometheus.configurator.extra_write_relabel_configs" -}}
+
+{{- $extra_write_relabel_configs := list  -}}
+{{- if (include "newrelic.common.lowDataMode" .) -}}
+  {{- $lowDataModeRelabelConfig := .Files.Get "static/lowdatamodedefaults.yaml" | fromYaml -}}
+  {{- $extra_write_relabel_configs = concat $extra_write_relabel_configs $lowDataModeRelabelConfig.low_data_mode -}}
+{{- end -}}
+
+{{- if .Values.metric_type_override -}}
+  {{- if .Values.metric_type_override.enabled -}}
+    {{- $metricTypeOverride := .Files.Get "static/metrictyperelabeldefaults.yaml" | fromYaml -}}
+    {{- $extra_write_relabel_configs = concat $extra_write_relabel_configs $metricTypeOverride.metrics_type_relabel -}}
+  {{- end -}}
+{{- end -}}
+
+{{- if .Values.config -}}
+{{- if .Values.config.newrelic_remote_write -}}
+  {{- /* it concatenates the defined 'extra_write_relabel_configs' to the ones defined in lowDataMode  */ -}}
+  {{- if .Values.config.newrelic_remote_write.extra_write_relabel_configs  -}}
+      {{- $extra_write_relabel_configs = concat $extra_write_relabel_configs .Values.config.newrelic_remote_write.extra_write_relabel_configs -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- /* sadly in helm we cannot pass back a list without putting it into a tmp dict  */ -}}
+{{ dict "list" $extra_write_relabel_configs | toYaml}}
+
+{{- end -}}
+
+
+{{- /* it builds the extra_remote_write configuration from configurator config */ -}}
+{{- define "newrelic-prometheus.configurator.extra_remote_write" -}}
+{{- if .Values.config -}}
+  {{- if .Values.config.extra_remote_write  -}}
+extra_remote_write:
+    {{- .Values.config.extra_remote_write | toYaml | nindent 2 -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "newrelic-prometheus.configurator.static_targets" -}}
+{{- if .Values.config -}}
+  {{- if .Values.config.static_targets -}}
+static_targets:
+    {{- .Values.config.static_targets | toYaml | nindent 2 -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "newrelic-prometheus.configurator.extra_scrape_configs" -}}
+{{- if .Values.config -}}
+  {{- if .Values.config.extra_scrape_configs  -}}
+extra_scrape_configs:
+    {{- .Values.config.extra_scrape_configs | toYaml | nindent 2 -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "newrelic-prometheus.configurator.kubernetes" -}}
+{{- if .Values.config -}}
+{{- if .Values.config.kubernetes  -}}
+kubernetes:
+  {{- if .Values.config.kubernetes.jobs }}
+  jobs:
+    {{- .Values.config.kubernetes.jobs | toYaml | nindent 2 -}}
+  {{- end -}}
+
+  {{- if .Values.config.kubernetes.integrations_filter }}
+  integrations_filter:
+     {{- .Values.config.kubernetes.integrations_filter | toYaml | nindent 4 -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "newrelic-prometheus.configurator.sharding" -}}
+  {{- if .Values.sharding  -}}
+sharding:
+  total_shards_count: {{ include "newrelic-prometheus.configurator.replicas" . }}
+  {{- end -}}
+{{- end -}}
+
+{{- define "newrelic-prometheus.configurator.replicas" -}}
+  {{- if .Values.sharding  -}}
+{{- .Values.sharding.total_shards_count | default 1 }}
+  {{- else -}}
+1
+  {{- end -}}
+{{- end -}}
+
+{{- /*
+Return the proper configurator image name
+{{ include "newrelic-prometheus.configurator.images.configurator_image" ( dict "imageRoot" .Values.path.to.the.image "context" .) }}
+*/ -}}
+{{- define "newrelic-prometheus.configurator.configurator_image" -}}
+    {{- $registryName := include "newrelic.common.images.registry" ( dict "imageRoot" .imageRoot "context" .context) -}}
+    {{- $repositoryName := include "newrelic.common.images.repository" .imageRoot -}}
+    {{- $tag := include "newrelic-prometheus.configurator.configurator_image.tag" ( dict "imageRoot" .imageRoot "context" .context) -}}
+
+    {{- if $registryName -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag | quote -}}
+    {{- else -}}
+        {{- printf "%s:%s" $repositoryName $tag | quote -}}
+    {{- end -}}
+{{- end -}}
+
+
+{{- /*
+Return the proper image tag for the configurator image
+{{ include "newrelic-prometheus.configurator.configurator_image.tag" ( dict "imageRoot" .Values.path.to.the.image "context" .) }}
+*/ -}}
+{{- define "newrelic-prometheus.configurator.configurator_image.tag" -}}
+    {{- .imageRoot.tag | default .context.Chart.Annotations.configuratorVersion | toString -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/clusterrole.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/clusterrole.yaml
new file mode 100644
index 000000000..e9d4208e2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/clusterrole.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - endpoints
+      - services
+      - pods
+      - services
+    verbs:
+      - get
+      - list
+      - watch
+  - nonResourceURLs:
+      - "/metrics"
+    verbs:
+      - get
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/clusterrolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/clusterrolebinding.yaml
new file mode 100644
index 000000000..44244653f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/clusterrolebinding.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "newrelic.common.naming.fullname" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/configmap.yaml
new file mode 100644
index 000000000..b775aca74
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/configmap.yaml
@@ -0,0 +1,31 @@
+kind: ConfigMap
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+apiVersion: v1
+data:
+  config.yaml: |-
+    # Configuration for newrelic-prometheus-configurator
+    {{- with (include "newrelic-prometheus.configurator.newrelic_remote_write" . ) -}}
+      {{- . | nindent 4 }}
+    {{- end -}}
+    {{- with (include "newrelic-prometheus.configurator.extra_remote_write" . ) -}}
+      {{- . | nindent 4 }}
+    {{- end -}}
+    {{- with (include "newrelic-prometheus.configurator.static_targets" . ) -}}
+      {{- . | nindent 4 }}
+    {{- end -}}
+    {{- with (include "newrelic-prometheus.configurator.extra_scrape_configs" . ) -}}
+      {{- . | nindent 4 }}
+    {{- end -}}
+    {{- with (include "newrelic-prometheus.configurator.common" . ) -}}
+      {{- . | nindent 4 }}
+    {{- end -}}
+    {{- with (include "newrelic-prometheus.configurator.kubernetes" . ) -}}
+      {{- . | nindent 4 }}
+    {{- end -}}
+    {{- with (include "newrelic-prometheus.configurator.sharding" . ) -}}
+      {{- . | nindent 4 }}
+    {{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/secret.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/secret.yaml
new file mode 100644
index 000000000..f558ee86c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/secret.yaml
@@ -0,0 +1,2 @@
+{{- /* Common library will take care of creating the secret or not. */}}
+{{- include "newrelic.common.license.secret" . }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/serviceaccount.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/serviceaccount.yaml
new file mode 100644
index 000000000..b1e74523e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/serviceaccount.yaml
@@ -0,0 +1,13 @@
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- if include "newrelic.common.serviceAccount.annotations" . }}
+  annotations:
+    {{- include "newrelic.common.serviceAccount.annotations" . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/statefulset.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/statefulset.yaml
new file mode 100644
index 000000000..846c41c23
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/templates/statefulset.yaml
@@ -0,0 +1,157 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  serviceName: {{ include "newrelic.common.naming.fullname" . }}-headless
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+  replicas: {{ include "newrelic-prometheus.configurator.replicas" . }}
+  template:
+    metadata:
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+      {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+    spec:
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.images.pullSecrets) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 }}
+      {{- end }}
+
+      {{- with include "newrelic.common.priorityClassName" . }}
+      priorityClassName: {{ . }}
+      {{- end }}
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+
+      {{- with include "newrelic.common.dnsConfig" . }}
+      dnsConfig:
+        {{- . | nindent 8 }}
+      {{- end }}
+
+      hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+      {{- if include "newrelic.common.hostNetwork" . }}
+      dnsPolicy: ClusterFirstWithHostNet
+      {{- end }}
+
+      serviceAccountName: {{ include "newrelic.common.serviceAccount.name" . }}
+
+      initContainers:
+        - name: configurator
+          {{- with include "newrelic.common.securityContext.container" . }}
+          securityContext:
+            {{- . | nindent 12 }}
+          {{- end }}
+          image: {{ include "newrelic-prometheus.configurator.configurator_image" ( dict "imageRoot" .Values.images.configurator "context" .) }}
+          imagePullPolicy: {{ .Values.images.configurator.pullPolicy }}
+          args:
+            - --input=/etc/configurator/config.yaml
+            - --output=/etc/prometheus/config/config.yaml
+            {{- if include "newrelic.common.verboseLog" . }}
+            - --verbose=true
+            {{- end }}
+          {{- with .Values.resources.configurator }}
+          resources: {{ toYaml . | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - name: configurator-config
+              mountPath: /etc/configurator/
+            - name: prometheus-config
+              mountPath: /etc/prometheus/config
+          env:
+            - name: NR_PROM_DATA_SOURCE_NAME
+              valueFrom: 
+                fieldRef: 
+                  fieldPath: metadata.name
+            - name: NR_PROM_LICENSE_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "newrelic.common.license.secretName" . }}
+                  key: {{ include "newrelic.common.license.secretKeyName" . }}
+            - name: NR_PROM_CHART_VERSION
+              value: {{ .Chart.Version }}
+
+      containers:
+        - name: prometheus
+          {{- with include "newrelic.common.securityContext.container" . }}
+          securityContext:
+            {{- . | nindent 12 }}
+          {{- end }}
+          image: {{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.prometheus "context" .) }}
+          imagePullPolicy: {{ .Values.images.prometheus.pullPolicy }}
+          ports:
+            - containerPort: 9090
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /-/healthy
+              port: 9090
+              scheme: HTTP
+            initialDelaySeconds: 10
+            periodSeconds: 15
+            timeoutSeconds: 10
+            failureThreshold: 3
+            successThreshold: 1
+          readinessProbe:
+            httpGet:
+              path: /-/ready
+              port: 9090
+              scheme: HTTP
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            timeoutSeconds: 4
+            failureThreshold: 3
+            successThreshold: 1
+          args:
+            - --config.file=/etc/prometheus/config/config.yaml
+            - --enable-feature=agent,expand-external-labels
+            - --storage.agent.retention.max-time=30m
+            - --storage.agent.wal-truncate-frequency=30m
+            - --storage.agent.path=/etc/prometheus/storage
+            {{- if include "newrelic.common.verboseLog" . }}
+            - --log.level=debug
+            {{- end }}
+          {{- with .Values.resources.prometheus }}
+          resources: {{ toYaml . | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - name: prometheus-config
+              mountPath: /etc/prometheus/config
+            - name: prometheus-storage
+              mountPath: /etc/prometheus/storage
+            {{- with .Values.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+
+      volumes:
+        - name: configurator-config
+          configMap:
+            name: {{ include "newrelic.common.naming.fullname" . }}
+        - name: prometheus-config
+          emptyDir: {}
+        - name: prometheus-storage
+          emptyDir: {}
+        {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{ include "newrelic.common.nodeSelector" . | nindent 8 }}
+      {{- with include "newrelic.common.affinity" . }}
+      affinity:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.tolerations" . }}
+      tolerations:
+        {{- . | nindent 8 }}
+      {{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/tests/configmap_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/tests/configmap_test.yaml
new file mode 100644
index 000000000..f2dd0468e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/tests/configmap_test.yaml
@@ -0,0 +1,572 @@
+suite: test configmap
+templates:
+  - templates/configmap.yaml
+tests:
+  - it: config with defaults
+    set:
+      licenseKey: license-key-test
+      cluster: cluster-test
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            newrelic_remote_write:
+              extra_write_relabel_configs:
+              - action: replace
+                regex: timeseries_write_(.*)
+                replacement: counter
+                separator: ;
+                source_labels:
+                - __name__
+                target_label: newrelic_metric_type
+              - action: replace
+                regex: sql_byte(.*)
+                replacement: counter
+                separator: ;
+                source_labels:
+                - __name__
+                target_label: newrelic_metric_type
+            static_targets:
+              jobs:
+              - extra_metric_relabel_config:
+                - action: keep
+                  regex: prometheus_agent_active_series|prometheus_target_interval_length_seconds|prometheus_target_scrape_pool_targets|prometheus_remote_storage_samples_pending|prometheus_remote_storage_samples_in_total|prometheus_remote_storage_samples_retried_total|prometheus_agent_corruptions_total|prometheus_remote_storage_shards|prometheus_sd_kubernetes_events_total|prometheus_agent_checkpoint_creations_failed_total|prometheus_agent_checkpoint_deletions_failed_total|prometheus_remote_storage_samples_dropped_total|prometheus_remote_storage_samples_failed_total|prometheus_sd_kubernetes_http_request_total|prometheus_agent_truncate_duration_seconds_sum|prometheus_build_info|process_resident_memory_bytes|process_virtual_memory_bytes|process_cpu_seconds_total|prometheus_remote_storage_bytes_total
+                  source_labels:
+                  - __name__
+                job_name: self-metrics
+                skip_sharding: true
+                targets:
+                - localhost:9090
+            common:
+              external_labels:
+                cluster_name: cluster-test
+              scrape_interval: 30s
+            kubernetes:
+              jobs:
+              - job_name_prefix: default
+                target_discovery:
+                  endpoints: true
+                  filter:
+                    annotations:
+                      prometheus.io/scrape: true
+                  pod: true
+              - integrations_filter:
+                  enabled: false
+                job_name_prefix: newrelic
+                target_discovery:
+                  endpoints: true
+                  filter:
+                    annotations:
+                      newrelic.io/scrape: true
+                  pod: true
+              integrations_filter:
+                app_values:
+                - redis
+                - traefik
+                - calico
+                - nginx
+                - coredns
+                - kube-dns
+                - etcd
+                - cockroachdb
+                - velero
+                - harbor
+                - argocd
+                enabled: true
+                source_labels:
+                - app.kubernetes.io/name
+                - app.newrelic.io/name
+                - k8s-app
+
+  - it: staging is enabled
+    set:
+      licenseKey: license-key-test
+      cluster: cluster-test
+      nrStaging: true
+      metric_type_override:
+        enabled: false
+      config:
+        static_targets:  # Set empty to make this test simple
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "newrelic_remote_write:\n  staging: true"  # We do not want to test the whole YAML
+
+  - it: fedramp is enabled
+    set:
+      licenseKey: license-key-test
+      cluster: cluster-test
+      fedramp:
+        enabled: true
+      metric_type_override:
+        enabled: false
+      config:
+        static_targets:  # Set empty to make this test simple
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "newrelic_remote_write:\n  fedramp:\n    enabled: true"  # We do not want to test the whole YAML
+
+  - it: config including remote_write most possible sections
+    set:
+      licenseKey: license-key-test
+      cluster: cluster-test
+      nrStaging: true
+      config:
+        newrelic_remote_write:
+          proxy_url: http://proxy.url
+          remote_timeout: 30s
+          tls_config:
+            insecure_skip_verify: true
+          queue_config:
+            retry_on_http_429: false
+          extra_write_relabel_configs:
+            - source_labels:
+              - __name__
+              - instance
+              regex: node_memory_active_bytes;localhost:9100
+              action: drop
+        extra_remote_write:
+          - url: "https://second.remote.write"
+        # Set empty to make this test simple
+        static_targets:
+        kubernetes:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            newrelic_remote_write:
+              extra_write_relabel_configs:
+              - action: replace
+                regex: timeseries_write_(.*)
+                replacement: counter
+                separator: ;
+                source_labels:
+                - __name__
+                target_label: newrelic_metric_type
+              - action: replace
+                regex: sql_byte(.*)
+                replacement: counter
+                separator: ;
+                source_labels:
+                - __name__
+                target_label: newrelic_metric_type
+              - action: drop
+                regex: node_memory_active_bytes;localhost:9100
+                source_labels:
+                - __name__
+                - instance
+              proxy_url: http://proxy.url
+              queue_config:
+                retry_on_http_429: false
+              remote_timeout: 30s
+              staging: true
+              tls_config:
+                insecure_skip_verify: true
+            extra_remote_write:
+              - url: https://second.remote.write
+            common:
+              external_labels:
+                cluster_name: cluster-test
+              scrape_interval: 30s
+
+  - it: config including remote_write.extra_write_relabel_configs and not metric relabels
+    set:
+      licenseKey: license-key-test
+      cluster: cluster-test
+      metric_type_override:
+        enabled: false
+      config:
+        newrelic_remote_write:
+          extra_write_relabel_configs:
+            - source_labels:
+                - __name__
+                - instance
+              regex: node_memory_active_bytes;localhost:9100
+              action: drop
+
+        static_targets:
+        kubernetes:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            newrelic_remote_write:
+              extra_write_relabel_configs:
+              - action: drop
+                regex: node_memory_active_bytes;localhost:9100
+                source_labels:
+                - __name__
+                - instance
+            common:
+              external_labels:
+                cluster_name: cluster-test
+              scrape_interval: 30s
+
+  - it: cluster_name is set from global
+    set:
+      licenseKey: license-key-test
+      global:
+       cluster: "test"
+      metric_type_override:
+        enabled: false
+      config:
+        # Set empty to make this test simple
+        static_targets:
+        kubernetes:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            common:
+              external_labels:
+                cluster_name: test
+              scrape_interval: 30s
+  - it: cluster_name local value has precedence over global precedence
+    set:
+      licenseKey: license-key-test
+      global:
+        cluster: "test"
+      cluster: "test2"
+      metric_type_override:
+        enabled: false
+      config:
+        # Set empty to make this test simple
+        static_targets:
+        kubernetes:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            common:
+              external_labels:
+                cluster_name: test2
+              scrape_interval: 30s
+  - it: cluster_name is not overwritten from customAttributes
+    set:
+      licenseKey: license-key-test
+      global:
+        cluster: "test"
+      cluster: "test2"
+      customAttributes:
+        cluster_name: "test3"
+      metric_type_override:
+        enabled: false
+      config:
+        # Set empty to make this test simple
+        static_targets:
+        kubernetes:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            common:
+              external_labels:
+                cluster_name: test2
+              scrape_interval: 30s
+
+  - it: cluster_name has precedence over extra labels has precedence over customAttributes
+    set:
+      licenseKey: license-key-test
+      cluster: test
+      customAttributes:
+        attribute: "value"
+        one: error
+        cluster_name: "different"
+      metric_type_override:
+        enabled: false
+      config:
+        common:
+          external_labels:
+            one: two
+            cluster_name: "different"
+          scrape_interval: 15
+        # Set empty to make this test simple
+        static_targets:
+        kubernetes:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            common:
+              external_labels:
+                attribute: value
+                cluster_name: test
+                one: two
+              scrape_interval: 15
+
+  - it: config including static_targets overwritten with most possible sections
+    set:
+      licenseKey: license-key-test
+      cluster: cluster-test
+      metric_type_override:
+        enabled: false
+      config:
+        static_targets:
+          jobs:
+            - job_name: my-custom-target-authorization-full
+              targets:
+                - "192.168.3.1:2379"
+              params:
+                q: [ "puppies" ]
+                oe: [ "utf8" ]
+              scheme: "https"
+              body_size_limit: 100MiB
+              sample_limit: 2000
+              target_limit: 2000
+              label_limit: 2000
+              label_name_length_limit: 2000
+              label_value_length_limit: 2000
+              scrape_interval: 15s
+              scrape_timeout: 15s
+              tls_config:
+                insecure_skip_verify: true
+                ca_file: /path/to/ca.crt
+                key_file: /path/to/key.crt
+                cert_file: /path/to/cert.crt
+                server_name: server.name
+                min_version: TLS12
+              authorization:
+                type: Bearer
+                credentials: "fancy-credentials"
+              extra_relabel_config:
+                - source_labels: [ '__name__', 'instance' ]
+                  regex: node_memory_active_bytes;localhost:9100
+                  action: drop
+              extra_metric_relabel_config:
+                - source_labels: [ '__name__', 'instance' ]
+                  regex: node_memory_active_bytes;localhost:9100
+                  action: drop
+        extra_scrape_configs:
+          - job_name: extra-scrape-config
+            static_configs:
+              - targets:
+                  - "192.168.3.1:2379"
+                labels:
+                  label1: value1
+                  label2: value2
+            scrape_interval: 15s
+            scrape_timeout: 15s
+            tls_config:
+              insecure_skip_verify: true
+              ca_file: /path/to/ca.crt
+              key_file: /path/to/key.crt
+              cert_file: /path/to/cert.crt
+              server_name: server.name
+              min_version: TLS12
+            authorization:
+              type: Bearer
+              credentials: "fancy-credentials"
+            relabel_configs:
+              - source_labels: [ '__name__', 'instance' ]
+                regex: node_memory_active_bytes;localhost:9100
+                action: drop
+            metric_relabel_configs:
+              - source_labels: [ '__name__', 'instance' ]
+                regex: node_memory_active_bytes;localhost:9100
+                action: drop
+        # Set empty to make this test simple
+        kubernetes:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            static_targets:
+              jobs:
+              - authorization:
+                  credentials: fancy-credentials
+                  type: Bearer
+                body_size_limit: 100MiB
+                extra_metric_relabel_config:
+                - action: drop
+                  regex: node_memory_active_bytes;localhost:9100
+                  source_labels:
+                  - __name__
+                  - instance
+                extra_relabel_config:
+                - action: drop
+                  regex: node_memory_active_bytes;localhost:9100
+                  source_labels:
+                  - __name__
+                  - instance
+                job_name: my-custom-target-authorization-full
+                label_limit: 2000
+                label_name_length_limit: 2000
+                label_value_length_limit: 2000
+                params:
+                  oe:
+                  - utf8
+                  q:
+                  - puppies
+                sample_limit: 2000
+                scheme: https
+                scrape_interval: 15s
+                scrape_timeout: 15s
+                target_limit: 2000
+                targets:
+                - 192.168.3.1:2379
+                tls_config:
+                  ca_file: /path/to/ca.crt
+                  cert_file: /path/to/cert.crt
+                  insecure_skip_verify: true
+                  key_file: /path/to/key.crt
+                  min_version: TLS12
+                  server_name: server.name
+            extra_scrape_configs:
+              - authorization:
+                  credentials: fancy-credentials
+                  type: Bearer
+                job_name: extra-scrape-config
+                metric_relabel_configs:
+                - action: drop
+                  regex: node_memory_active_bytes;localhost:9100
+                  source_labels:
+                  - __name__
+                  - instance
+                relabel_configs:
+                - action: drop
+                  regex: node_memory_active_bytes;localhost:9100
+                  source_labels:
+                  - __name__
+                  - instance
+                scrape_interval: 15s
+                scrape_timeout: 15s
+                static_configs:
+                - labels:
+                    label1: value1
+                    label2: value2
+                  targets:
+                  - 192.168.3.1:2379
+                tls_config:
+                  ca_file: /path/to/ca.crt
+                  cert_file: /path/to/cert.crt
+                  insecure_skip_verify: true
+                  key_file: /path/to/key.crt
+                  min_version: TLS12
+                  server_name: server.name
+            common:
+              external_labels:
+                cluster_name: cluster-test
+              scrape_interval: 30s
+
+  - it: kubernetes config section custom values
+    set:
+      licenseKey: license-key-test
+      cluster: cluster-test
+      metric_type_override:
+        enabled: false
+      config:
+        kubernetes:
+          integrations_filter:
+            enabled: false
+          jobs:
+            - job_name_prefix: pod-job
+              target_discovery:
+                pod: true
+                endpoints: false
+                filter:
+                  annotations:
+                    custom/scrape-pod: true
+            - job_name_prefix: endpoints-job
+              target_discovery:
+                pod: false
+                endpoints: true
+                filter:
+                  annotations:
+                    custom/scrape-endpoints: true
+        # Set empty to make this test simple
+        static_targets:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            common:
+              external_labels:
+                cluster_name: cluster-test
+              scrape_interval: 30s
+            kubernetes:
+              jobs:
+              - job_name_prefix: pod-job
+                target_discovery:
+                  endpoints: false
+                  filter:
+                    annotations:
+                      custom/scrape-pod: true
+                  pod: true
+              - job_name_prefix: endpoints-job
+                target_discovery:
+                  endpoints: true
+                  filter:
+                    annotations:
+                      custom/scrape-endpoints: true
+                  pod: false
+              integrations_filter:
+                app_values:
+                - redis
+                - traefik
+                - calico
+                - nginx
+                - coredns
+                - kube-dns
+                - etcd
+                - cockroachdb
+                - velero
+                - harbor
+                - argocd
+                enabled: false
+                source_labels:
+                - app.kubernetes.io/name
+                - app.newrelic.io/name
+                - k8s-app
+
+  - it: sharding empty not propagated
+    set:
+      licenseKey: license-key-test
+      cluster: cluster-test
+      sharding:
+      metric_type_override:
+        enabled: false
+      config:
+        kubernetes:
+        static_targets:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            common:
+              external_labels:
+                cluster_name: cluster-test
+              scrape_interval: 30s
+
+  - it: sharding config custom values
+    set:
+      licenseKey: license-key-test
+      cluster: cluster-test
+      sharding:
+        total_shards_count: 2
+      metric_type_override:
+        enabled: false
+      config:
+        kubernetes:
+        static_targets:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            common:
+              external_labels:
+                cluster_name: cluster-test
+              scrape_interval: 30s
+            sharding:
+              total_shards_count: 2
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/tests/configurator_image_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/tests/configurator_image_test.yaml
new file mode 100644
index 000000000..0f5da69bf
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/tests/configurator_image_test.yaml
@@ -0,0 +1,57 @@
+suite: test image
+templates:
+  - templates/statefulset.yaml
+  - templates/configmap.yaml
+tests:
+  - it: configurator image is set
+    set:
+      licenseKey: license-key-test
+      cluster: cluster-test
+      images:
+        configurator:
+          tag: "test"
+          pullPolicy: Never
+        prometheus:
+          tag: "test-2"
+    asserts:
+      - template: templates/statefulset.yaml
+        equal:
+          path: spec.template.spec.initContainers[0].image
+          value: "newrelic/newrelic-prometheus-configurator:test"
+      - equal:
+          path: spec.template.spec.initContainers[0].imagePullPolicy
+          value: "Never"
+        template: templates/statefulset.yaml
+      - template: templates/statefulset.yaml
+        equal:
+          path: spec.template.spec.containers[0].image
+          value: "quay.io/prometheus/prometheus:test-2"
+      - equal:
+          path: spec.template.spec.containers[0].imagePullPolicy
+          value: "IfNotPresent"
+        template: templates/statefulset.yaml
+
+  - it: has a linux node selector by default
+    set:
+      licenseKey: license-key-test
+      cluster: my-cluster
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+        template: templates/statefulset.yaml
+
+  - it: has a linux node selector and additional selectors
+    set:
+      licenseKey: license-key-test
+      cluster: my-cluster
+      nodeSelector:
+        aCoolTestLabel: aCoolTestValue
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+            aCoolTestLabel: aCoolTestValue
+        template: templates/statefulset.yaml
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/tests/integration_filters_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/tests/integration_filters_test.yaml
new file mode 100644
index 000000000..d1813f135
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/tests/integration_filters_test.yaml
@@ -0,0 +1,119 @@
+suite: test configmap with IntegrationFilter
+templates:
+  - templates/configmap.yaml
+tests:
+  - it: config with IntegrationFilter true
+    set:
+      licenseKey: license-key-test
+      cluster: cluster-test
+      metric_type_override:
+        enabled: false
+      config:
+        kubernetes:
+          integrations_filter:
+            enabled: true
+        # Set empty to make this test simple
+        static_targets:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            common:
+              external_labels:
+                cluster_name: cluster-test
+              scrape_interval: 30s
+            kubernetes:
+              jobs:
+              - job_name_prefix: default
+                target_discovery:
+                  endpoints: true
+                  filter:
+                    annotations:
+                      prometheus.io/scrape: true
+                  pod: true
+              - integrations_filter:
+                  enabled: false
+                job_name_prefix: newrelic
+                target_discovery:
+                  endpoints: true
+                  filter:
+                    annotations:
+                      newrelic.io/scrape: true
+                  pod: true
+              integrations_filter:
+                app_values:
+                - redis
+                - traefik
+                - calico
+                - nginx
+                - coredns
+                - kube-dns
+                - etcd
+                - cockroachdb
+                - velero
+                - harbor
+                - argocd
+                enabled: true
+                source_labels:
+                - app.kubernetes.io/name
+                - app.newrelic.io/name
+                - k8s-app
+
+  - it: config with IntegrationFilter false
+    set:
+      licenseKey: license-key-test
+      cluster: cluster-test
+      metric_type_override:
+        enabled: false
+      config:
+        kubernetes:
+          integrations_filter:
+            enabled: false
+        # Set empty to make this test simple
+        static_targets:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            common:
+              external_labels:
+                cluster_name: cluster-test
+              scrape_interval: 30s
+            kubernetes:
+              jobs:
+              - job_name_prefix: default
+                target_discovery:
+                  endpoints: true
+                  filter:
+                    annotations:
+                      prometheus.io/scrape: true
+                  pod: true
+              - integrations_filter:
+                  enabled: false
+                job_name_prefix: newrelic
+                target_discovery:
+                  endpoints: true
+                  filter:
+                    annotations:
+                      newrelic.io/scrape: true
+                  pod: true
+              integrations_filter:
+                app_values:
+                - redis
+                - traefik
+                - calico
+                - nginx
+                - coredns
+                - kube-dns
+                - etcd
+                - cockroachdb
+                - velero
+                - harbor
+                - argocd
+                enabled: false
+                source_labels:
+                - app.kubernetes.io/name
+                - app.newrelic.io/name
+                - k8s-app
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/tests/lowdatamode_configmap_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/tests/lowdatamode_configmap_test.yaml
new file mode 100644
index 000000000..ac3953df6
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/tests/lowdatamode_configmap_test.yaml
@@ -0,0 +1,138 @@
+suite: test configmap with LowDataMode
+templates:
+  - templates/configmap.yaml
+tests:
+  - it: config with lowDataMode true
+    set:
+      licenseKey: license-key-test
+      cluster: cluster-test
+      lowDataMode: true
+      metric_type_override:
+        enabled: false
+      config:
+        # Set empty to make this test simple
+        static_targets:
+        kubernetes:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            newrelic_remote_write:
+              extra_write_relabel_configs:
+              - action: drop
+                regex: kube_.+|container_.+|machine_.+|cadvisor_.+
+                source_labels:
+                - __name__
+            common:
+              external_labels:
+                cluster_name: cluster-test
+              scrape_interval: 30s
+
+  - it: config with lowDataMode and nrStaging true
+    set:
+      licenseKey: license-key-test
+      cluster: cluster-test
+      lowDataMode: true
+      nrStaging: true
+      metric_type_override:
+        enabled: false
+      config:
+        # Set empty to make this test simple
+        static_targets:
+        kubernetes:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            newrelic_remote_write:
+              extra_write_relabel_configs:
+              - action: drop
+                regex: kube_.+|container_.+|machine_.+|cadvisor_.+
+                source_labels:
+                - __name__
+              staging: true
+            common:
+              external_labels:
+                cluster_name: cluster-test
+              scrape_interval: 30s
+
+  - it: config with lowDataMode true from global config
+    set:
+      global:
+        lowDataMode: true
+      licenseKey: license-key-test
+      cluster: cluster-test
+      metric_type_override:
+        enabled: false
+      config:
+        # Set empty to make this test simple
+        static_targets:
+        kubernetes:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            newrelic_remote_write:
+              extra_write_relabel_configs:
+              - action: drop
+                regex: kube_.+|container_.+|machine_.+|cadvisor_.+
+                source_labels:
+                - __name__
+            common:
+              external_labels:
+                cluster_name: cluster-test
+              scrape_interval: 30s
+
+  - it: existing relabel configs are appended to low data mode and metric_type_override relabel configs.
+    set:
+      lowDataMode: true
+      licenseKey: license-key-test
+      cluster: cluster-test
+      metric_type_override:
+        enabled: true
+      config:
+        newrelic_remote_write:
+          extra_write_relabel_configs:
+            - action: drop
+              regex: my_custom_metric_relabel_config
+              source_labels:
+              - __name__
+        # Set empty to make this test simple
+        static_targets:
+        kubernetes:
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            # Configuration for newrelic-prometheus-configurator
+            newrelic_remote_write:
+              extra_write_relabel_configs:
+              - action: drop
+                regex: kube_.+|container_.+|machine_.+|cadvisor_.+
+                source_labels:
+                - __name__
+              - action: replace
+                regex: timeseries_write_(.*)
+                replacement: counter
+                separator: ;
+                source_labels:
+                - __name__
+                target_label: newrelic_metric_type
+              - action: replace
+                regex: sql_byte(.*)
+                replacement: counter
+                separator: ;
+                source_labels:
+                - __name__
+                target_label: newrelic_metric_type
+              - action: drop
+                regex: my_custom_metric_relabel_config
+                source_labels:
+                - __name__
+            common:
+              external_labels:
+                cluster_name: cluster-test
+              scrape_interval: 30s
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/values.yaml
new file mode 100644
index 000000000..2fb3ed7bc
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/newrelic-prometheus-agent/values.yaml
@@ -0,0 +1,473 @@
+# -- Override the name of the chart
+nameOverride: ""
+# -- Override the full name of the release
+fullnameOverride: ""
+
+# -- Name of the Kubernetes cluster monitored. Can be configured also with `global.cluster`.
+# Note it will be set as an external label in prometheus configuration, it will have precedence over `config.common.external_labels.cluster_name`
+# and `customAttributes.cluster_name``.
+cluster: ""
+# -- This set this license key to use. Can be configured also with `global.licenseKey`
+licenseKey: ""
+# -- In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there. Can be configured also with `global.customSecretName`
+customSecretName: ""
+# -- In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located. Can be configured also with `global.customSecretLicenseKey`
+customSecretLicenseKey: ""
+
+# -- Adds extra attributes to prometheus external labels. Can be configured also with `global.customAttributes`. Please note, values defined
+# in `common.config.externar_labels` will have precedence over `customAttributes`.
+customAttributes: {}
+
+# Images used by the chart for prometheus and New Relic configurator.
+# @default See `values.yaml`
+images:
+  # -- The secrets that are needed to pull images from a custom registry.
+  pullSecrets: []
+
+  # -- Image for New Relic configurator.
+  # @default -- See `values.yaml`
+  configurator:
+    registry: ""
+    repository: newrelic/newrelic-prometheus-configurator
+    pullPolicy: IfNotPresent
+    # @default It defaults to `annotation.configuratorVersion` in `Chart.yaml`.
+    tag: ""
+  # -- Image for prometheus which is executed in agent mode.
+  # @default -- See `values.yaml`
+  prometheus:
+    registry: ""
+    repository: quay.io/prometheus/prometheus
+    pullPolicy: IfNotPresent
+    # @default It defaults to `appVersion` in `Chart.yaml`.
+    tag: ""
+
+# -- Volumes to mount in the containers
+extraVolumes: []
+# -- Defines where to mount volumes specified with `extraVolumes`
+extraVolumeMounts: []
+
+# -- Settings controlling ServiceAccount creation.
+# @default -- See `values.yaml`
+serviceAccount:
+  # -- Whether the chart should automatically create the ServiceAccount objects required to run.
+  create: true
+  annotations: {}
+  # If not set and create is true, a name is generated using the full name template
+  name: ""
+
+# -- Additional labels for chart objects. Can be configured also with `global.labels`
+labels: {}
+# -- Annotations to be added to all pods created by the integration.
+podAnnotations: {}
+# -- Additional labels for chart pods. Can be configured also with `global.podLabels`
+podLabels: {}
+
+# -- Resource limits to be added to all pods created by the integration.
+# @default -- `{}`
+resources:
+  prometheus: {}
+
+# -- Sets pod's priorityClassName. Can be configured also with `global.priorityClassName`
+priorityClassName: ""
+# -- (bool) Sets pod's hostNetwork. Can be configured also with `global.hostNetwork`
+# @default -- `false`
+hostNetwork:
+# -- Sets security context (at pod level). Can be configured also with `global.podSecurityContext`
+podSecurityContext: {}
+# -- Sets security context (at container level). Can be configured also with `global.containerSecurityContext`
+containerSecurityContext: {}
+
+# -- Sets pod's dnsConfig. Can be configured also with `global.dnsConfig`
+dnsConfig: {}
+
+# Settings controlling RBAC objects creation.
+rbac:
+  # -- Whether the chart should automatically create the RBAC objects required to run.
+  create: true
+  # -- Whether the chart should create Pod Security Policy objects.
+  pspEnabled: false
+
+# -- Sets pod/node affinities set almost globally. (See [Affinities and tolerations](README.md#affinities-and-tolerations))
+affinity: {}
+# -- Sets pod's node selector almost globally. (See [Affinities and tolerations](README.md#affinities-and-tolerations))
+nodeSelector: {}
+# -- Sets pod's tolerations to node taints almost globally. (See [Affinities and tolerations](README.md#affinities-and-tolerations))
+tolerations: []
+
+# -- (bool) Send the metrics to the staging backend. Requires a valid staging license key. Can be configured also with `global.nrStaging`
+# @default -- `false`
+nrStaging:
+
+# -- (bool) Reduces the number of metrics sent in order to reduce costs. It can be configured also with `global.lowDataMode`.
+# Specifically, it makes Prometheus stop reporting some Kubernetes cluster-specific metrics, you can see details in `static/lowdatamodedefaults.yaml`.
+# @default -- false
+lowDataMode:
+
+# -- It holds the configuration for metric type override. If enabled, a series of metric relabel configs will be added to
+# `config.newrelic_remote_write.extra_write_relabel_configs`, you can check the whole list in `static/metrictyperelabeldefaults.yaml`
+metric_type_override:
+  enabled: true
+
+# -- Set up Prometheus replicas to allow horizontal scalability.
+# @default -- See `values.yaml`
+sharding:
+  # -- Sets the number of Prometheus instances running on sharding mode.
+  # @default -- `1`
+  # total_shards_count:
+
+# -- (bool) Sets the debug log to Prometheus and prometheus-configurator or all integrations if it is set globally. Can be configured also with `global.verboseLog`
+# @default -- `false`
+verboseLog:
+
+# -- It holds the New Relic Prometheus configuration. Here you can easily set up Prometheus to get set metrics, discover
+# ponds and endpoints Kubernetes and send metrics to New Relic using remote-write.
+# @default -- See `values.yaml`
+config:
+  # -- Include global configuration for Prometheus agent.
+  # @default -- See `values.yaml`
+  common:
+    # -- The labels to add to any timeseries that this Prometheus instance scrapes.
+    # @default -- `{}`
+    # external_labels:
+    #   label_key_example: foo-bar
+    # -- How frequently to scrape targets by default, unless a different value is specified on the job.
+    scrape_interval: 30s
+    # -- The default timeout when scraping targets.
+    # @default -- `10s`
+    # scrape_timeout:
+
+  # -- (object) Newrelic remote-write configuration settings.
+  # @default -- See `values.yaml`
+  newrelic_remote_write:
+    # # -- Includes additional [relabel configs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config)
+    # # for the New Relic remote write.
+    # # @default -- `[]`
+    # extra_write_relabel_configs: []
+
+    #   # Enable the extra_write_relabel_configs below for backwards compatibility with legacy POMI labels.
+    #   # This helpful when migrating from POMI to ensure that Prometheus metrics will contain both labels (e.g. cluster_name and clusterName).
+    #   # For more migration info, please visit the [migration guide](https://docs.newrelic.com/docs/infrastructure/prometheus-integrations/install-configure-prometheus-agent/migration-guide/).
+    #   - source_labels: [namespace]
+    #     action: replace
+    #     target_label: namespaceName
+    #   - source_labels: [node]
+    #     action: replace
+    #     target_label: nodeName
+    #   - source_labels: [pod]
+    #     action: replace
+    #     target_label: podName
+    #   - source_labels: [service]
+    #     action: replace
+    #     target_label: serviceName
+    #   - source_labels: [cluster_name]
+    #     action: replace
+    #     target_label: clusterName
+    #   - source_labels: [job]
+    #     action: replace
+    #     target_label: scrapedTargetKind
+    #   - source_labels: [instance]
+    #     action: replace
+    #     target_label: scrapedTargetInstance
+
+    # -- Set up the proxy used to send metrics to New Relic.
+    # @default -- `""`
+    # proxy_url:
+
+    # -- # Timeout for requests to the remote write endpoint.
+    # @default -- `30s`
+    # remote_timeout:
+
+    # -- Fine-tune remote-write behavior: <https://prometheus.io/docs/practices/remote_write/#remote-write-tuning>.
+    # queue_config:
+      # -- Remote Write shard capacity.
+      # @default -- `2500`
+      # capacity:
+      # -- Maximum number of shards.
+      # @default -- `200`
+      # max_shards:
+      # -- Minimum number of shards.
+      # @default -- `1`
+      # min_shards:
+      # -- Maximum number of samples per send.
+      # @default -- `500`
+      # max_samples_per_send:
+      # -- Maximum time a sample will wait in the buffer.
+      # @default -- `5s`
+      # batch_send_deadline:
+      # -- Initial retry delay. Gets doubled for every retry.
+      # @default -- `30ms`
+      # min_backoff:
+      # -- Maximum retry delay.
+      # @default -- `5s`
+      # max_backoff:
+      # -- Retry upon receiving a 429 status code from the remote-write storage.
+      # @default -- `false`
+      # retry_on_http_429:
+
+  # -- (object) It includes additional remote-write configuration. Note this configuration is not parsed, so valid
+  # [prometheus remote_write configuration](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write)
+  # should be provided.
+  extra_remote_write:
+
+  # -- It allows defining scrape jobs for Kubernetes in a simple way.
+  # @default -- See `values.yaml`
+  kubernetes:
+    # NewRelic provides a list of Dashboards, alerts and entities for several Services. The integrations_filter configuration
+    # allows to scrape only the targets having this experience out of the box.
+    # If integrations_filter is enabled, then the jobs scrape merely the targets having one of the specified labels matching
+    # one of the values of app_values.
+    # Under the hood, a relabel_configs with 'action=keep' are generated, consider it in case any custom extra_relabel_config is needed.
+    integrations_filter:
+      # -- enabling the integration filters, merely the targets having one of the specified labels matching
+      #    one of the values of app_values are scraped. Each job configuration can override this default.
+      enabled: true
+      # -- source_labels used to fetch label values in the relabel config added by the integration filters configuration
+      source_labels: ["app.kubernetes.io/name", "app.newrelic.io/name", "k8s-app"]
+      # -- app_values used to create the regex used in the relabel config added by the integration filters configuration.
+      # Note that a single regex will be created from this list, example: '.*(?i)(app1|app2|app3).*'
+      app_values: ["redis", "traefik", "calico", "nginx", "coredns", "kube-dns", "etcd", "cockroachdb", "velero", "harbor", "argocd"]
+
+    # Kubernetes jobs define [kubernetes_sd_configs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config)
+    # to discover and scrape Kubernetes objects. Besides, a set of relabel_configs are included in order to include some Kubernetes metadata as
+    # Labels. For example, address, metrics_path, URL scheme, prometheus_io_parameters, namespace, pod name, service name and labels are taken
+    # to set the corresponding labels.
+    # Please note, the relabeling allows configuring the pod/endpoints scrape using the following annotations:
+    # - `prometheus.io/scheme`: If the metrics endpoint is secured then you will need to set this to `https`
+    # - `prometheus.io/path`: If the metrics path is not `/metrics` override this.
+    # - `prometheus.io/port`: If the metrics are exposed on a different port to the service for service endpoints or to
+    #   the default 9102 for pods.
+    # - `prometheus.io/param_<param-name>`: To include additional parameters in the scrape URL.
+    jobs:
+    # 'default' scrapes all targets having 'prometheus.io/scrape: true'.
+    # Out of the box, since kubernetes.integrations_filter.enabled=true then only targets selected by the integration filters are considered.
+    - job_name_prefix: default
+      target_discovery:
+        pod: true
+        endpoints: true
+        filter:
+          annotations:
+            prometheus.io/scrape: true
+      # -- integrations_filter configuration for this specific job. It overrides kubernetes.integrations_filter configuration
+      # integrations_filter:
+
+      # 'newrelic' scrapes all targets having 'newrelic.io/scrape: true'.
+      # This is useful to extend the targets scraped by the 'default' job allowlisting services leveraging `newrelic.io/scrape` annotation
+    - job_name_prefix: newrelic
+      integrations_filter:
+        enabled: false
+      target_discovery:
+        pod: true
+        endpoints: true
+        filter:
+          annotations:
+            newrelic.io/scrape: true
+
+    # -- Set up the job name prefix. The final Prometheus `job` name will be composed of <job_name_prefix> + the target discovery kind. ie: `default-pod`
+    # @default -- `""`
+    # - job_name_prefix:
+
+      # -- The target discovery field allows customizing how Kubernetes discovery works.
+      # target_discovery:
+
+        # -- Whether pods should be discovered.
+        # @default -- `false`
+        # pod:
+
+        # -- Whether endpoints should be discovered.
+        # @default -- `false`
+        # endpoints:
+
+        # -- Defines filtering criteria, it is possible to set labels and/or annotations. All filters will apply (defined
+        # filters are taken into account as an "AND operation").
+        # @default -- `{}`
+        # filter:
+          # -- Map of annotations that the targets should have. If only the annotation name is defined, the filter only checks if exists.
+          # @default -- `{}`
+          # annotations:
+
+          # -- Map of labels that the targets should have. If only the label name is defined, the filter only checks if exists.
+          # @default -- `{}`
+          # labels:
+
+      # -- Advanced configs of the Kubernetes service discovery `kuberentes_sd_config` options,
+      # check [prometheus documentation](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config) for details.
+      # Notice that using `filter` is the recommended way to filter targets to avoid adding load to the API Server.
+      # additional_config:
+        # kubeconfig_file: ""
+        # namespaces: {}
+        # selectors: {}
+        # attach_metadata: {}
+
+
+    # -- The HTTP resource path on which to fetch metrics from targets.
+    # Use `prometheus.io/path` pod/service annotation to override this or modify it here.
+    # @default -- `/metrics`
+    # metrics_path:
+
+    # -- Optional HTTP URL parameters.
+    # Use `prometheus.io/param_<param-name>` pod/service annotation to include additional parameters in the scrape url or modify it here.
+    # @default -- `{}`
+    # params:
+
+    # -- Configures the protocol scheme used for requests.
+    # Annotate the service/pod with `prometheus.io/scheme=https` if the secured port is used or modify it here.
+    # @default -- `http`
+    # scheme:
+
+    # -- How frequently to scrape targets from this job.
+    # @default -- defined in `common.scrape_interval`
+    # scrape_interval:
+
+    # -- Per-scrape timeout when scraping this job.
+    # @default -- defined in `common.scrape_timeout`
+    # scrape_timeout:
+
+    # -- Configures the scrape request's TLS settings.
+    # @default -- `{}`
+    # tls_config:
+      # -- CA certificate file path to validate API server certificate with.
+      # @default -- `""`
+      # ca_file:
+
+      # -- Certificate and key files path for client cert authentication to the server.
+      # @default -- `""`
+      # cert_file:
+      # key_file:
+
+      # Disable validation of the server certificate.
+      # @default -- `false`
+      # insecure_skip_verify:
+
+    # -- Sets the `Authorization` Bearer token header on every scrape request
+    # @default -- `{}`
+    # authorization:
+      # Sets the credentials to the credentials read from the configured file.
+      # @default -- `""`
+      # credentials_file:
+
+    # -- Sets the `Authorization` header on every scrape request with the configured username and password.
+    # @default -- `{}`
+    # basic_auth:
+      # username:
+      # password_file:
+
+    # -- List of relabeling configurations. Used if needed to add any special filter or label manipulation before the scrape takes place.
+    # @default -- `[]`
+    # extra_relabel_config:
+
+    # -- List of metric relabel configurations. Used it to filter metrics and labels after scrape.
+    # @default -- `[]`
+    # extra_metric_relabel_config:
+
+
+  # -- It allows defining scrape jobs for targets with static URLs.
+  # @default -- See `values.yaml`.
+  static_targets:
+    # -- List of static target jobs. By default, it defines a job to get self-metrics. Please note, if you define `static_target.jobs` and would like to keep
+    # self-metrics you need to include a job like the one defined by default.
+    # @default -- See `values.yaml`.
+    jobs:
+    - job_name: self-metrics
+      skip_sharding: true  # sharding is skipped to obtain self-metrics from all Prometheus servers.
+      targets:
+        - "localhost:9090"
+      extra_metric_relabel_config:
+        - source_labels: [__name__]
+          regex: "\
+            prometheus_agent_active_series|\
+            prometheus_target_interval_length_seconds|\
+            prometheus_target_scrape_pool_targets|\
+            prometheus_remote_storage_samples_pending|\
+            prometheus_remote_storage_samples_in_total|\
+            prometheus_remote_storage_samples_retried_total|\
+            prometheus_agent_corruptions_total|\
+            prometheus_remote_storage_shards|\
+            prometheus_sd_kubernetes_events_total|\
+            prometheus_agent_checkpoint_creations_failed_total|\
+            prometheus_agent_checkpoint_deletions_failed_total|\
+            prometheus_remote_storage_samples_dropped_total|\
+            prometheus_remote_storage_samples_failed_total|\
+            prometheus_sd_kubernetes_http_request_total|\
+            prometheus_agent_truncate_duration_seconds_sum|\
+            prometheus_build_info|\
+            process_resident_memory_bytes|\
+            process_virtual_memory_bytes|\
+            process_cpu_seconds_total|\
+            prometheus_remote_storage_bytes_total"
+          action: keep
+
+    # -- The job name assigned to scraped metrics by default.
+    # @default -- `""`.
+    # - job_name:
+      # -- List of target URLs to be scraped by this job.
+      # @default -- `[]`.
+      # targets:
+
+      # -- Labels assigned to all metrics scraped from the targets.
+      # @default -- `{}`.
+      # labels:
+
+      # -- The HTTP resource path on which to fetch metrics from targets.
+      # @default -- `/metrics`
+      # metrics_path:
+
+      # -- Optional HTTP URL parameters.
+      # @default -- `{}`
+      # params:
+
+      # -- Configures the protocol scheme used for requests.
+      # @default -- `http`
+      # scheme:
+
+      # -- How frequently to scrape targets from this job.
+      # @default -- defined in `common.scrape_interval`
+      # scrape_interval:
+
+      # -- Per-scrape timeout when scraping this job.
+      # @default -- defined in `common.scrape_timeout`
+      # scrape_timeout:
+
+      # -- Configures the scrape request's TLS settings.
+      # @default -- `{}`
+      # tls_config:
+        # -- CA certificate file path to validate API server certificate with.
+        # @default -- `""`
+        # ca_file:
+
+        # -- Certificate and key files path for client cert authentication to the server.
+        # @default -- `""`
+        # cert_file:
+        # key_file:
+
+        # Disable validation of the server certificate.
+        # @default -- `false`
+        # insecure_skip_verify:
+
+      # -- Sets the `Authorization` Bearer token header on every scrape request
+      # @default -- `{}`
+      # authorization:
+        # Sets the credentials to the credentials read from the configured file.
+        # @default -- `""`
+        # credentials_file:
+
+      # -- Sets the `Authorization` header on every scrape request with the configured username and password.
+      # @default -- `{}`
+      # basic_auth:
+        # username:
+        # password_file:
+
+      # -- List of relabeling configurations. Used if needed to add any special filter or label manipulation before the scrape takes place.
+      # @default -- `[]`
+      # extra_relabel_config:
+
+      # -- List of metric relabel configurations. Used it to filter metrics and labels after scrape.
+      # @default -- `[]`
+      # extra_metric_relabel_config:
+
+
+  # -- It is possible to include extra scrape configuration in [prometheus format](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config).
+  # Please note, it should be a valid Prometheus configuration which will not be parsed by the chart.
+  # WARNING extra_scrape_configs is a raw Prometheus config. Therefore, the metrics collected thanks to it will not have by default the metadata (pod_name, service_name, ...) added by the configurator for the static or kubernetes jobs.
+  # This configuration should be used as a workaround whenever kubernetes and static job do not cover a particular use-case.
+  # @default -- `[]`
+  extra_scrape_configs: []
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/Chart.lock b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/Chart.lock
new file mode 100644
index 000000000..f8bfb97c3
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.1
+digest: sha256:cfa7bfb136b9bcfe87e37d3556c3fedecc58f42685c4ce39485da106408b6619
+generated: "2025-01-09T00:16:28.768416201Z"
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/Chart.yaml
new file mode 100644
index 000000000..31aa626e9
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/Chart.yaml
@@ -0,0 +1,26 @@
+apiVersion: v2
+appVersion: 2.11.6
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.1
+description: A Helm chart to deploy the New Relic Kube Events router
+home: https://docs.newrelic.com/docs/integrations/kubernetes-integration/kubernetes-events/install-kubernetes-events-integration
+icon: https://newrelic.com/themes/custom/curio/assets/mediakit/NR_logo_Horizontal.svg
+keywords:
+- infrastructure
+- newrelic
+- monitoring
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+name: nri-kube-events
+sources:
+- https://github.com/newrelic/nri-kube-events/
+- https://github.com/newrelic/nri-kube-events/tree/main/charts/nri-kube-events
+- https://github.com/newrelic/infrastructure-agent/
+version: 3.11.6
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/README.md
new file mode 100644
index 000000000..f98e90da8
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/README.md
@@ -0,0 +1,79 @@
+# nri-kube-events
+
+![Version: 3.11.6](https://img.shields.io/badge/Version-3.11.6-informational?style=flat-square) ![AppVersion: 2.11.6](https://img.shields.io/badge/AppVersion-2.11.6-informational?style=flat-square)
+
+A Helm chart to deploy the New Relic Kube Events router
+
+**Homepage:** <https://docs.newrelic.com/docs/integrations/kubernetes-integration/kubernetes-events/install-kubernetes-events-integration>
+
+# Helm installation
+
+You can install this chart using [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) located in the
+[helm-charts repository](https://github.com/newrelic/helm-charts) or directly from this repository by adding this Helm repository:
+
+```shell
+helm repo add nri-kube-events https://newrelic.github.io/nri-kube-events
+helm upgrade --install nri-kube-events/nri-kube-events -f your-custom-values.yaml
+```
+
+## Source Code
+
+* <https://github.com/newrelic/nri-kube-events/>
+* <https://github.com/newrelic/nri-kube-events/tree/main/charts/nri-kube-events>
+* <https://github.com/newrelic/infrastructure-agent/>
+
+## Values managed globally
+
+This chart implements the [New Relic's common Helm library](https://github.com/newrelic/helm-charts/tree/master/library/common-library) which
+means that it honors a wide range of defaults and globals common to most New Relic Helm charts.
+
+Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
+[user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` | Sets pod/node affinities. Can be configured also with `global.affinity` |
+| agentHTTPTimeout | string | `"30s"` | Amount of time to wait until timeout to send metrics to the metric forwarder |
+| cluster | string | `""` | Name of the Kubernetes cluster monitored. Mandatory. Can be configured also with `global.cluster` |
+| containerSecurityContext | object | `{}` | Sets security context (at container level). Can be configured also with `global.containerSecurityContext` |
+| customAttributes | object | `{}` | Adds extra attributes to the cluster and all the metrics emitted to the backend. Can be configured also with `global.customAttributes` |
+| customSecretLicenseKey | string | `""` | In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located. Can be configured also with `global.customSecretLicenseKey` |
+| customSecretName | string | `""` | In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there. Can be configured also with `global.customSecretName` |
+| deployment.annotations | object | `{}` | Annotations to add to the Deployment. |
+| dnsConfig | object | `{}` | Sets pod's dnsConfig. Can be configured also with `global.dnsConfig` |
+| fedramp.enabled | bool | `false` | Enables FedRAMP. Can be configured also with `global.fedramp.enabled` |
+| forwarder | object | `{"resources":{}}` | Resources for the forwarder sidecar container |
+| fullnameOverride | string | `""` | Override the full name of the release |
+| hostNetwork | bool | `false` | Sets pod's hostNetwork. Can be configured also with `global.hostNetwork` |
+| images | object | See `values.yaml` | Images used by the chart for the integration and agents |
+| images.agent | object | See `values.yaml` | Image for the New Relic Infrastructure Agent sidecar |
+| images.integration | object | See `values.yaml` | Image for the New Relic Kubernetes integration |
+| images.pullSecrets | list | `[]` | The secrets that are needed to pull images from a custom registry. |
+| labels | object | `{}` | Additional labels for chart objects |
+| licenseKey | string | `""` | This set this license key to use. Can be configured also with `global.licenseKey` |
+| nameOverride | string | `""` | Override the name of the chart |
+| nodeSelector | object | `{}` | Sets pod's node selector. Can be configured also with `global.nodeSelector` |
+| nrStaging | bool | `false` | Send the metrics to the staging backend. Requires a valid staging license key. Can be configured also with `global.nrStaging` |
+| podAnnotations | object | `{}` | Annotations to add to the pod. |
+| podLabels | object | `{}` | Additional labels for chart pods |
+| podSecurityContext | object | `{}` | Sets security context (at pod level). Can be configured also with `global.podSecurityContext` |
+| priorityClassName | string | `""` | Sets pod's priorityClassName. Can be configured also with `global.priorityClassName` |
+| proxy | string | `""` | Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port`. Can be configured also with `global.proxy` |
+| rbac.create | bool | `true` | Specifies whether RBAC resources should be created |
+| resources | object | `{}` | Resources for the integration container |
+| scrapers | object | See `values.yaml` | Configure the various kinds of scrapers that should be run. |
+| serviceAccount | object | See `values.yaml` | Settings controlling ServiceAccount creation |
+| serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created |
+| sinks | object | See `values.yaml` | Configure where will the metrics be written. Mostly for debugging purposes. |
+| sinks.newRelicInfra | bool | `true` | The newRelicInfra sink sends all events to New Relic. |
+| sinks.stdout | bool | `false` | Enable the stdout sink to also see all events in the logs. |
+| tolerations | list | `[]` | Sets pod's tolerations to node taints. Can be configured also with `global.tolerations` |
+| verboseLog | bool | `false` | Sets the debug logs to this integration or all integrations if it is set globally. Can be configured also with `global.verboseLog` |
+
+## Maintainers
+
+* [juanjjaramillo](https://github.com/juanjjaramillo)
+* [csongnr](https://github.com/csongnr)
+* [dbudziwojskiNR](https://github.com/dbudziwojskiNR)
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/README.md.gotmpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/README.md.gotmpl
new file mode 100644
index 000000000..e77eb7f14
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/README.md.gotmpl
@@ -0,0 +1,43 @@
+{{ template "chart.header" . }}
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+# Helm installation
+
+You can install this chart using [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) located in the
+[helm-charts repository](https://github.com/newrelic/helm-charts) or directly from this repository by adding this Helm repository:
+
+```shell
+helm repo add nri-kube-events https://newrelic.github.io/nri-kube-events
+helm upgrade --install nri-kube-events/nri-kube-events -f your-custom-values.yaml
+```
+
+{{ template "chart.sourcesSection" . }}
+
+## Values managed globally
+
+This chart implements the [New Relic's common Helm library](https://github.com/newrelic/helm-charts/tree/master/library/common-library) which
+means that it honors a wide range of defaults and globals common to most New Relic Helm charts.
+
+Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
+[user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
+
+{{ template "chart.valuesSection" . }}
+
+{{ if .Maintainers }}
+## Maintainers
+{{ range .Maintainers }}
+{{- if .Name }}
+{{- if .Url }}
+* [{{ .Name }}]({{ .Url }})
+{{- else }}
+* {{ .Name }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/Chart.yaml
new file mode 100644
index 000000000..adfc765bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/Chart.yaml
@@ -0,0 +1,17 @@
+apiVersion: v2
+description: Provides helpers to provide consistency on all the charts
+keywords:
+- newrelic
+- chart-library
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+- name: kang-makes
+  url: https://github.com/kang-makes
+name: common-library
+type: library
+version: 1.3.1
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/DEVELOPERS.md b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/DEVELOPERS.md
new file mode 100644
index 000000000..7208c673e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/DEVELOPERS.md
@@ -0,0 +1,747 @@
+# Functions/templates documented for chart writers
+Here is some rough documentation separated by the file that contains the function, the function
+name and how to use it. We are not covering functions that start with `_` (e.g.
+`newrelic.common.license._licenseKey`) because they are used internally by this library for
+other helpers. Helm does not have the concept of "public" or "private" functions/templates so
+this is a convention of ours.
+
+## _naming.tpl
+These functions are used to name objects.
+
+### `newrelic.common.naming.name`
+This is the same as the idiomatic `CHART-NAME.name` that is created when you use `helm create`.
+
+It honors `.Values.nameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.name" . }}
+```
+
+### `newrelic.common.naming.fullname`
+This is the same as the idiomatic `CHART-NAME.fullname` that is created when you use `helm create`
+
+It honors `.Values.fullnameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.fullname" . }}
+```
+
+### `newrelic.common.naming.chart`
+This is the same as the idiomatic `CHART-NAME.chart` that is created when you use `helm create`.
+
+It is mostly useless for chart writers. It is used internally for templating the labels but there
+is no reason to keep it "private".
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.chart" . }}
+```
+
+### `newrelic.common.naming.truncateToDNS`
+This is a useful template that could be used to trim a string to 63 chars and does not end with a dash (`-`).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $truncatedName := include "newrelic.common.naming.truncateToDNS" $nameToTruncate }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-string-that-should-be */ -}}
+```
+
+### `newrelic.common.naming.truncateToDNSWithSuffix`
+This template function is the same as the above but instead of receiving a string you should give a `dict`
+with a `name` and a `suffix`. This function will join them with a dash (`-`) and trim the `name` so the
+result of `name-suffix` is no more than 63 chars
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $suffix := "A-NOT-SO-LONG-SUFFIX" }}
+{{- $truncatedName := include "truncateToDNSWithSuffix" (dict "name" $nameToTruncate "suffix" $suffix) }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-A-NOT-SO-LONG-SUFFIX */ -}}
+```
+
+
+
+## _labels.tpl
+### `newrelic.common.labels`, `newrelic.common.labels.selectorLabels` and `newrelic.common.labels.podLabels`
+These are functions that are used to label objects. They are configured by this `values.yaml`
+```yaml
+global:
+  podLabels: {}  # included in all the pods of all the charts that implement this library
+  labels: {}  # included in all the objects of all the charts that implement this library
+podLabels: {}  # included in all the pods of this chart
+labels: {}  # included in all the objects of this chart
+```
+
+label maps are merged from global to local values.
+
+And chart writer should use them like this:
+```mustache
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+```
+
+`newrelic.common.labels.podLabels` includes `newrelic.common.labels.selectorLabels` automatically.
+
+
+
+## _priority-class-name.tpl
+### `newrelic.common.priorityClassName`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  priorityClassName: ""
+priorityClassName: ""
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `priorityClassName` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.priorityClassName" . }}
+  priorityClassName: {{ . }}
+  {{- end }}
+```
+
+
+
+## _hostnetwork.tpl
+### `newrelic.common.hostNetwork`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  hostNetwork:  # Note that this is empty (nil)
+hostNetwork:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `hostNetwork` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.hostNetwork" . }}
+  hostNetwork: {{ . }}
+  {{- end }}
+```
+
+### `newrelic.common.hostNetwork.value`
+This function is an abstraction of the function above but this returns directly "true" or "false".
+
+Be careful with using this with an `if` as Helm does evaluate "false" (string) as `true`.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+```
+
+
+
+## _dnsconfig.tpl
+### `newrelic.common.dnsConfig`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  dnsConfig: {}
+dnsConfig: {}
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `dnsConfig` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.dnsConfig" . }}
+  dnsConfig:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _images.tpl
+These functions help us to deal with how images are templated. This allows setting `registries`
+where to fetch images globally while being flexible enough to fit in different maps of images
+and deployments with one or more images. This is the example of a complex `values.yaml` that
+we are going to use during the documentation of these functions:
+
+```yaml
+global:
+  images:
+    registry: nexus-3-instance.internal.clients-domain.tld
+jobImage:
+  registry: # defaults to "example.tld" when empty in these examples
+  repository: ingress-nginx/kube-webhook-certgen
+  tag: v1.1.1
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+images:
+  integration:
+    registry:
+    repository: newrelic/nri-kube-events
+    tag: 1.8.0
+    pullPolicy: IfNotPresent
+  agent:
+    registry:
+    repository: newrelic/k8s-events-forwarder
+    tag: 1.22.0
+    pullPolicy: IfNotPresent
+  pullSecrets: []
+```
+
+### `newrelic.common.images.image`
+This will return a string with the image ready to be downloaded that includes the registry, the image and the tag.
+`defaultRegistry` is used to keep `registry` field empty in `values.yaml` so you can override the image using
+`global.images.registry`, your local `jobImage.registry` and be able to fallback to a registry that is not `docker.io`
+(Or the default repository that the client could have set in the CRI).
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.image" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.registry`
+It returns the registry from the global or local values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.registry" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.repository`
+It returns the image from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.tag`
+It returns the image's tag from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.renderPullSecrets`
+If returns a merged map that contains the pull secrets from the global configuration and the local one.  
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.jobImage.pullSecrets "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+```
+
+
+
+## _serviceaccount.tpl
+These functions are used to evaluate if the service account should be created, with which name and add annotations to it.
+
+The functions that the common library has implemented for service accounts are:
+* `newrelic.common.serviceAccount.create`
+* `newrelic.common.serviceAccount.name`
+* `newrelic.common.serviceAccount.annotations`
+
+Usage:
+```mustache
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- with (include "newrelic.common.serviceAccount.annotations" .) }}
+  annotations:
+    {{- . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
+```
+
+
+
+## _affinity.tpl, _nodeselector.tpl and _tolerations.tpl
+These three files are almost the same and they follow the idiomatic way of `helm create`.
+
+Each function also looks if there is a global value like the other helpers.
+```yaml
+global:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+affinity: {}
+nodeSelector: {}
+tolerations: []
+```
+
+The values here are replaced instead of be merged. If a value at root level is found, the global one is ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.nodeSelector" . }}
+  nodeSelector:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.affinity" . }}
+  affinity:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.tolerations" . }}
+  tolerations:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _agent-config.tpl
+### `newrelic.common.agentConfig.defaults`
+This returns a YAML that the agent can use directly as a config that includes other options from the values file like verbose mode,
+custom attributes, FedRAMP and such.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include newrelic.common.naming.truncateToDNSWithSuffix (dict "name" (include "newrelic.common.naming.fullname" .) suffix "agent-config") }}
+  namespace: {{ .Release.Namespace }}
+data:
+  newrelic-infra.yml: |-
+    # This is the configuration file for the infrastructure agent. See:
+    # https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+    {{- include "newrelic.common.agentConfig.defaults" . | nindent 4 }}
+```
+
+
+
+## _cluster.tpl
+### `newrelic.common.cluster`
+Returns the cluster name
+
+Usage:
+```mustache
+{{ include "newrelic.common.cluster" . }}
+```
+
+
+
+## _custom-attributes.tpl
+### `newrelic.common.customAttributes`
+Return custom attributes in YAML format.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example
+data:
+  custom-attributes.yaml: |
+    {{- include "newrelic.common.customAttributes" . | nindent 4 }}
+  custom-attributes.json: |
+    {{- include "newrelic.common.customAttributes" . | fromYaml | toJson | nindent 4 }}
+```
+
+
+
+## _fedramp.tpl
+### `newrelic.common.fedramp.enabled`
+Returns true if FedRAMP is enabled or an empty string if not. It can be safely used in conditionals as an empty string is a Helm falsiness.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled" . }}
+```
+
+### `newrelic.common.fedramp.enabled.value`
+Returns true if FedRAMP is enabled or false if not. This is to have the value of FedRAMP ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled.value" . }}
+```
+
+
+
+## _license.tpl
+### `newrelic.common.license.secretName` and ### `newrelic.common.license.secretKeyName`
+Returns the secret and key inside the secret where to read the license key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the license key.
+
+To create the secret use `newrelic.common.license.secret`.
+
+Usage:
+```mustache
+{{- if and (.Values.controlPlane.enabled) (not (include "newrelic.fargate" .)) }}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+  containers:
+  - name: agent
+    env:
+    - name: "NRIA_LICENSE_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.license.secretName" . }}
+          key: {{ include "newrelic.common.license.secretKeyName" . }}
+```
+
+
+
+## _license_secret.tpl
+### `newrelic.common.license.secret`
+This function templates the secret that is used by agents and integrations with the license Key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any license key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.license.secret" . -}}
+```
+
+
+
+## _insights.tpl
+### `newrelic.common.insightsKey.secretName` and ### `newrelic.common.insightsKey.secretKeyName`
+Returns the secret and key inside the secret where to read the insights key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.insightsKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "INSIGHTS_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.insightsKey.secretName" . }}
+          key: {{ include "newrelic.common.insightsKey.secretKeyName" . }}
+```
+
+
+
+## _insights_secret.tpl
+### `newrelic.common.insightsKey.secret`
+This function templates the secret that is used by agents and integrations with the insights key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any insights key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.insightsKey.secret" . -}}
+```
+
+
+
+## _userkey.tpl
+### `newrelic.common.userKey.secretName` and ### `newrelic.common.userKey.secretKeyName`
+Returns the secret and key inside the secret where to read a user key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.userKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "API_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.userKey.secretName" . }}
+          key: {{ include "newrelic.common.userKey.secretKeyName" . }}
+```
+
+
+
+## _userkey_secret.tpl
+### `newrelic.common.userKey.secret`
+This function templates the secret that is used by agents and integrations with a user key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any API key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.userKey.secret" . -}}
+```
+
+
+
+## _region.tpl
+### `newrelic.common.region.validate`
+Given a string, return a normalized name for the region if valid.
+
+This function does not need the context of the chart, only the value to be validated. The region returned
+honors the region [definition of the newrelic-client-go implementation](https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21)
+so (as of 2024/09/14) it returns the region as "US", "EU", "Staging", or "Local".
+
+In case the region provided does not match these 4, the helper calls `fail` and abort the templating.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region.validate" "us" }}
+```
+
+### `newrelic.common.region`
+It reads global and local variables for `region`:
+```yaml
+global:
+  region:  # Note that this can be empty (nil) or "" (empty string)
+region:  # Note that this can be empty (nil) or "" (empty string)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in your
+values a `region` is defined, the global one is going to be always ignored.
+
+This function gives protection so it enforces users to give the license key as a value in their
+`values.yaml` or specify a global or local `region` value. To understand how the `region` value
+works, read the documentation of `newrelic.common.region.validate`.
+
+The function will change the region from US, EU or Staging based of the license key and the
+`nrStaging` toggle. Whichever region is computed from the license/toggle can be overridden by
+the `region` value.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region" . }}
+```
+
+
+
+## _low-data-mode.tpl
+### `newrelic.common.lowDataMode`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  lowDataMode:  # Note that this is empty (nil)
+lowDataMode:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `lowdataMode` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.lowDataMode" . }}
+```
+
+
+
+## _privileged.tpl
+### `newrelic.common.privileged`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  privileged:  # Note that this is empty (nil)
+privileged:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `privileged` is defined, the global one is going to be always ignored.
+
+Chart writers could override this and put directly a `true` in the `values.yaml` to override the
+default of the common library.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged" . }}
+```
+
+### `newrelic.common.privileged.value`
+Returns true if privileged mode is enabled or false if not. This is to have the value of privileged ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged.value" . }}
+```
+
+
+
+## _proxy.tpl
+### `newrelic.common.proxy`
+Returns the proxy URL configured by the user. 
+
+Usage:
+```mustache
+{{ include "newrelic.common.proxy" . }}
+```
+
+
+
+## _security-context.tpl
+Use these functions to share the security context among all charts. Useful in clusters that have security enforcing not to
+use the root user (like OpenShift) or users that have an admission webhooks.
+
+The functions are:
+* `newrelic.common.securityContext.container`
+* `newrelic.common.securityContext.pod`
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+    spec:
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+
+      containers:
+        - name: example
+          {{- with include "nriKubernetes.securityContext.container" . }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+```
+
+
+
+## _staging.tpl
+### `newrelic.common.nrStaging`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  nrStaging:  # Note that this is empty (nil)
+nrStaging:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `nrStaging` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging" . }}
+```
+
+### `newrelic.common.nrStaging.value`
+Returns true if staging is enabled or false if not. This is to have the staging value ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging.value" . }}
+```
+
+
+
+## _verbose-log.tpl
+### `newrelic.common.verboseLog`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  verboseLog:  # Note that this is empty (nil)
+verboseLog:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `verboseLog` is defined, the global one is going to be always ignored.
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsBoolean`
+Returns true if verbose is enabled or false if not. This is to have the verbose value ready to be templated as a boolean
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsBoolean" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsInt`
+Returns 1 if verbose is enabled or 0 if not. This is to have the verbose value ready to be templated as an integer
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsInt" . }}
+```
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/README.md
new file mode 100644
index 000000000..10f08ca67
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/README.md
@@ -0,0 +1,106 @@
+# Helm Common library
+
+The common library is a way to unify the UX through all the Helm charts that implement it.
+
+The tooling suite that New Relic is huge and growing and this allows to set things globally
+and locally for a single chart.
+
+## Documentation for chart writers
+
+If you are writing a chart that is going to use this library you can check the [developers guide](/library/common-library/DEVELOPERS.md) to see all
+the functions/templates that we have implemented, what they do and how to use them.
+
+## Values managed globally
+
+We want to have a seamless experience through all the charts so we created this library that tries to standardize the behaviour
+of all the charts. Sadly, because of the complexity of all these integrations, not all the charts behave exactly as expected.
+
+An example is `newrelic-infrastructure` that ignores `hostNetwork` in the control plane scraper because most of the users has the
+control plane listening in the node to `localhost`.
+
+For each chart that has a special behavior (or further information of the behavior) there is a "chart particularities" section
+in its README.md that explains which is the expected behavior.
+
+At the time of writing this, all the charts from `nri-bundle` except `newrelic-logging` and `synthetics-minion` implements this
+library and honors global options as described in this document.
+
+Here is a list of global options:
+
+| Global keys | Local keys | Default | Merged[<sup>1</sup>](#values-managed-globally-1) | Description |
+|-------------|------------|---------|--------------------------------------------------|-------------|
+| global.cluster | cluster | `""` |  | Name of the Kubernetes cluster monitored |
+| global.licenseKey | licenseKey | `""` |  | This set this license key to use |
+| global.customSecretName | customSecretName | `""` |  | In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there |
+| global.customSecretLicenseKey | customSecretLicenseKey | `""` |  | In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located |
+| global.podLabels | podLabels | `{}` | yes | Additional labels for chart pods |
+| global.labels | labels | `{}` | yes | Additional labels for chart objects |
+| global.priorityClassName | priorityClassName | `""` |  | Sets pod's priorityClassName |
+| global.hostNetwork | hostNetwork | `false` |  | Sets pod's hostNetwork |
+| global.dnsConfig | dnsConfig | `{}` |  | Sets pod's dnsConfig |
+| global.images.registry | See [Further information](#values-managed-globally-2) | `""` |  | Changes the registry where to get the images. Useful when there is an internal image cache/proxy |
+| global.images.pullSecrets | See [Further information](#values-managed-globally-2) | `[]` | yes | Set secrets to be able to fetch images |
+| global.podSecurityContext | podSecurityContext | `{}` |  | Sets security context (at pod level) |
+| global.containerSecurityContext | containerSecurityContext | `{}` |  | Sets security context (at container level) |
+| global.affinity | affinity | `{}` |  | Sets pod/node affinities |
+| global.nodeSelector | nodeSelector | `{}` |  | Sets pod's node selector |
+| global.tolerations | tolerations | `[]` |  | Sets pod's tolerations to node taints |
+| global.serviceAccount.create | serviceAccount.create | `true` |  | Configures if the service account should be created or not |
+| global.serviceAccount.name | serviceAccount.name | name of the release |  | Change the name of the service account. This is honored if you disable on this cahrt the creation of the service account so you can use your own. |
+| global.serviceAccount.annotations | serviceAccount.annotations | `{}` | yes | Add these annotations to the service account we create |
+| global.customAttributes | customAttributes | `{}` |  | Adds extra attributes to the cluster and all the metrics emitted to the backend |
+| global.fedramp | fedramp | `false` |  | Enables FedRAMP |
+| global.lowDataMode | lowDataMode | `false` |  | Reduces number of metrics sent in order to reduce costs |
+| global.privileged | privileged | Depends on the chart |  | In each integration it has different behavior. See [Further information](#values-managed-globally-3) but all aims to send less metrics to the backend to try to save costs |
+| global.proxy | proxy | `""` |  | Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port` |
+| global.nrStaging | nrStaging | `false` |  | Send the metrics to the staging backend. Requires a valid staging license key |
+| global.verboseLog | verboseLog | `false` |  | Sets the debug/trace logs to this integration or all integrations if it is set globally |
+
+### Further information
+<a name="values-managed-globally-1"></a>
+#### 1. Merged
+
+Merged means that the values from global are not replaced by the local ones. Think in this example:
+```yaml
+global:
+  labels:
+    global: global
+  hostNetwork: true
+  nodeSelector:
+    global: global
+
+labels:
+  local: local
+nodeSelector:
+  local: local
+hostNetwork: false
+```
+
+This values will template `hostNetwork` to `false`, a map of labels `{ "global": "global", "local": "local" }` and a `nodeSelector` with
+`{ "local": "local" }`.
+
+As Helm by default merges all the maps it could be confusing that we have two behaviors (merging `labels` and replacing `nodeSelector`)
+the `values` from global to local. This is the rationale behind this:
+* `hostNetwork` is templated to `false` because is overriding the value defined globally.
+* `labels` are merged because the user may want to label all the New Relic pods at once and label other solution pods differently for
+  clarity' sake.
+* `nodeSelector` does not merge as `labels` because could make it harder to overwrite/delete a selector that comes from global because
+  of the logic that Helm follows merging maps.
+
+<a name="values-managed-globally-2"></a>
+#### 2. Fine grain registries
+
+Some charts only have 1 image while others that can have 2 or more images. The local path for the registry can change depending
+on the chart itself.
+
+As this is mostly unique per helm chart, you should take a look to the chart's values table (or directly to the `values.yaml` file to see all the
+images that you can change.
+
+This should only be needed if you have an advanced setup that forces you to have granularity enough to force a proxy/cache registry per integration.
+
+
+<a name="values-managed-globally-3"></a>
+#### 3. Privileged mode
+
+By default, from the common library, the privileged mode is set to false. But most of the helm charts require this to be true to fetch more
+metrics so could see a true in some charts. The consequences of the privileged mode differ from one chart to another so for each chart that
+honors the privileged mode toggle should be a section in the README explaining which is the behavior with it enabled or disabled.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_affinity.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_affinity.tpl
new file mode 100644
index 000000000..1b2636754
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_affinity.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod affinity */ -}}
+{{- define "newrelic.common.affinity" -}}
+    {{- if .Values.affinity -}}
+        {{- toYaml .Values.affinity -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.affinity -}}
+            {{- toYaml .Values.global.affinity -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_agent-config.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_agent-config.tpl
new file mode 100644
index 000000000..9c32861a0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_agent-config.tpl
@@ -0,0 +1,26 @@
+{{/*
+This helper should return the defaults that all agents should have
+*/}}
+{{- define "newrelic.common.agentConfig.defaults" -}}
+{{- if include "newrelic.common.verboseLog" . }}
+log:
+  level: trace
+{{- end }}
+
+{{- if (include "newrelic.common.nrStaging" . ) }}
+staging: true
+{{- end }}
+
+{{- with include "newrelic.common.proxy" . }}
+proxy: {{ . | quote }}
+{{- end }}
+
+{{- with include "newrelic.common.fedramp.enabled" . }}
+fedramp: {{ . }}
+{{- end }}
+
+{{- with fromYaml ( include "newrelic.common.customAttributes" . ) }}
+custom_attributes:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_cluster.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_cluster.tpl
new file mode 100644
index 000000000..0197dd35a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_cluster.tpl
@@ -0,0 +1,15 @@
+{{/*
+Return the cluster
+*/}}
+{{- define "newrelic.common.cluster" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.cluster -}}
+    {{- .Values.cluster -}}
+{{- else if $global.cluster -}}
+    {{- $global.cluster -}}
+{{- else -}}
+    {{ fail "There is not cluster name definition set neither in `.global.cluster' nor `.cluster' in your values.yaml. Cluster name is required." }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_custom-attributes.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_custom-attributes.tpl
new file mode 100644
index 000000000..92020719c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_custom-attributes.tpl
@@ -0,0 +1,17 @@
+{{/*
+This will render custom attributes as a YAML ready to be templated or be used with `fromYaml`.
+*/}}
+{{- define "newrelic.common.customAttributes" -}}
+{{- $customAttributes := dict -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- if $global.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes $global.customAttributes -}}
+{{- end -}}
+
+{{- if .Values.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes .Values.customAttributes -}}
+{{- end -}}
+
+{{- toYaml $customAttributes -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_dnsconfig.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_dnsconfig.tpl
new file mode 100644
index 000000000..d4e40aa8a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_dnsconfig.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod dnsConfig */ -}}
+{{- define "newrelic.common.dnsConfig" -}}
+    {{- if .Values.dnsConfig -}}
+        {{- toYaml .Values.dnsConfig -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.dnsConfig -}}
+            {{- toYaml .Values.global.dnsConfig -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_fedramp.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_fedramp.tpl
new file mode 100644
index 000000000..9df8d6b5e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_fedramp.tpl
@@ -0,0 +1,25 @@
+{{- /* Defines the fedRAMP flag */ -}}
+{{- define "newrelic.common.fedramp.enabled" -}}
+    {{- if .Values.fedramp -}}
+        {{- if .Values.fedramp.enabled -}}
+            {{- .Values.fedramp.enabled -}}
+        {{- end -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.fedramp -}}
+             {{- if .Values.global.fedramp.enabled -}}
+                {{- .Values.global.fedramp.enabled -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return FedRAMP value directly ready to be templated */ -}}
+{{- define "newrelic.common.fedramp.enabled.value" -}}
+{{- if include "newrelic.common.fedramp.enabled" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_hostnetwork.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_hostnetwork.tpl
new file mode 100644
index 000000000..4cf017ef7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_hostnetwork.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper allows to override the global `.global.hostNetwork` with the value of `.hostNetwork`.
+Returns "true" if `hostNetwork` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.hostNetwork" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- /*
+`get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs
+
+We also want only to return when this is true, returning `false` here will template "false" (string) when doing
+an `(include "newrelic.common.hostNetwork" .)`, which is not an "empty string" so it is `true` if it is used
+as an evaluation somewhere else.
+*/ -}}
+{{- if get .Values "hostNetwork" | kindIs "bool" -}}
+    {{- if .Values.hostNetwork -}}
+        {{- .Values.hostNetwork -}}
+    {{- end -}}
+{{- else if get $global "hostNetwork" | kindIs "bool" -}}
+    {{- if $global.hostNetwork -}}
+        {{- $global.hostNetwork -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper abstracts the function "newrelic.common.hostNetwork" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.hostNetwork.value" -}}
+{{- if include "newrelic.common.hostNetwork" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_images.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_images.tpl
new file mode 100644
index 000000000..d4fb43290
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_images.tpl
@@ -0,0 +1,94 @@
+{{- /*
+Return the proper image name
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.image" -}}
+    {{- $registryName := include "newrelic.common.images.registry" ( dict "imageRoot" .imageRoot "defaultRegistry" .defaultRegistry "context" .context ) -}}
+    {{- $repositoryName := include "newrelic.common.images.repository" .imageRoot -}}
+    {{- $tag := include "newrelic.common.images.tag" ( dict "imageRoot" .imageRoot "context" .context) -}}
+
+    {{- if $registryName -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag | quote -}}
+    {{- else -}}
+        {{- printf "%s:%s" $repositoryName $tag | quote -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image registry
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.registry" -}}
+{{- $globalRegistry := "" -}}
+{{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+        {{- with .context.Values.global.images.registry -}}
+            {{- $globalRegistry = . -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $localRegistry := "" -}}
+{{- if .imageRoot.registry -}}
+    {{- $localRegistry = .imageRoot.registry -}}
+{{- end -}}
+
+{{- $registry := $localRegistry | default $globalRegistry | default .defaultRegistry -}}
+{{- if $registry -}}
+    {{- $registry -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image repository
+{{ include "newrelic.common.images.repository" .Values.path.to.the.image }}
+*/ -}}
+{{- define "newrelic.common.images.repository" -}}
+    {{- .repository -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image tag
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.path.to.the.image "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.tag" -}}
+    {{- .imageRoot.tag | default .context.Chart.AppVersion | toString -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper Image Pull Registry Secret Names evaluating values as templates
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.path.to.the.images.pullSecrets1, .Values.path.to.the.images.pullSecrets2) "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.renderPullSecrets" -}}
+  {{- $flatlist := list }}
+
+  {{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+      {{- if .context.Values.global.images.pullSecrets -}}
+        {{- range .context.Values.global.images.pullSecrets -}}
+          {{- $flatlist = append $flatlist . -}}
+        {{- end -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- range .pullSecrets -}}
+    {{- if not (empty .) -}}
+      {{- range . -}}
+        {{- $flatlist = append $flatlist . -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if $flatlist -}}
+    {{- toYaml $flatlist -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_insights.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_insights.tpl
new file mode 100644
index 000000000..895c37732
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_insights.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the Insights Key.
+*/}}
+{{- define "newrelic.common.insightsKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "insightskey" ) -}}
+{{- include "newrelic.common.insightsKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secretKeyName" -}}
+{{- include "newrelic.common.insightsKey._customSecretKey" . | default "insightsKey" -}}
+{{- end -}}
+
+{{/*
+Return local insightsKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._licenseKey" -}}
+{{- if .Values.insightsKey -}}
+  {{- .Values.insightsKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.insightsKey -}}
+    {{- .Values.global.insightsKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the Insights Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretName" -}}
+{{- if .Values.customInsightsKeySecretName -}}
+  {{- .Values.customInsightsKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretName -}}
+    {{- .Values.global.customInsightsKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretKey" -}}
+{{- if .Values.customInsightsKeySecretKey -}}
+  {{- .Values.customInsightsKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretKey }}
+    {{- .Values.global.customInsightsKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_insights_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_insights_secret.yaml.tpl
new file mode 100644
index 000000000..556caa6ca
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_insights_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the insights key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secret" }}
+{{- if not (include "newrelic.common.insightsKey._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.insightsKey._licenseKey" .) }}
+    {{- fail "You must specify a insightsKey or a customInsightsSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.insightsKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.insightsKey.secretKeyName" . }}: {{ include "newrelic.common.insightsKey._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_labels.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_labels.tpl
new file mode 100644
index 000000000..1cc1e792b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_labels.tpl
@@ -0,0 +1,58 @@
+{{/*
+This will render the labels that should be used in all the manifests used by the helm chart.
+*/}}
+{{- define "newrelic.common.labels" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- $chart := dict "helm.sh/chart" (include "newrelic.common.naming.chart" . ) -}}
+{{- $managedBy := dict "app.kubernetes.io/managed-by" .Release.Service -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $labels := mustMergeOverwrite $chart $managedBy $selectorLabels -}}
+{{- if .Chart.AppVersion -}}
+{{- $labels = mustMergeOverwrite $labels (dict "app.kubernetes.io/version" .Chart.AppVersion) -}}
+{{- end -}}
+
+{{- $globalUserLabels := $global.labels | default dict -}}
+{{- $localUserLabels := .Values.labels | default dict -}}
+
+{{- $labels = mustMergeOverwrite $labels $globalUserLabels $localUserLabels -}}
+
+{{- range $k, $v := $labels -}}
+  {{- $_ := set $labels $k (include "newrelic.common.naming.truncateToDNS" $v ) -}}
+{{- end -}}
+
+{{- toYaml $labels -}}
+{{- end -}}
+
+
+
+{{/*
+This will render the labels that should be used in deployments/daemonsets template pods as a selector.
+*/}}
+{{- define "newrelic.common.labels.selectorLabels" -}}
+{{- $name := dict "app.kubernetes.io/name" ( include "newrelic.common.naming.name" . ) -}}
+{{- $instance := dict "app.kubernetes.io/instance" .Release.Name -}}
+
+{{- $selectorLabels := mustMergeOverwrite $name $instance -}}
+
+{{- toYaml $selectorLabels -}}
+{{- end }}
+
+
+
+{{/*
+Pod labels
+*/}}
+{{- define "newrelic.common.labels.podLabels" -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- $globalPodLabels := $global.podLabels | default dict }}
+
+{{- $localPodLabels := .Values.podLabels | default dict }}
+
+{{- $podLabels := mustMergeOverwrite $selectorLabels $globalPodLabels $localPodLabels -}}
+
+{{- toYaml $podLabels -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_license.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_license.tpl
new file mode 100644
index 000000000..cb349f6bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_license.tpl
@@ -0,0 +1,68 @@
+{{/*
+Return the name of the secret holding the License Key.
+*/}}
+{{- define "newrelic.common.license.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "license" ) -}}
+{{- include "newrelic.common.license._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+*/}}
+{{- define "newrelic.common.license.secretKeyName" -}}
+{{- include "newrelic.common.license._customSecretKey" . | default "licenseKey" -}}
+{{- end -}}
+
+{{/*
+Return local licenseKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._licenseKey" -}}
+{{- if .Values.licenseKey -}}
+  {{- .Values.licenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.licenseKey -}}
+    {{- .Values.global.licenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the License Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretName" -}}
+{{- if .Values.customSecretName -}}
+  {{- .Values.customSecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretName -}}
+    {{- .Values.global.customSecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretKey" -}}
+{{- if .Values.customSecretLicenseKey -}}
+  {{- .Values.customSecretLicenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretLicenseKey }}
+    {{- .Values.global.customSecretLicenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the user set a custom secret for the license.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._usesCustomSecret" -}}
+{{- if or (include "newrelic.common.license._customSecretName" .) (include "newrelic.common.license._customSecretKey" .) -}}
+true
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_license_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_license_secret.yaml.tpl
new file mode 100644
index 000000000..610a0a337
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_license_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the license key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.license.secret" }}
+{{- if not (include "newrelic.common.license._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.license._licenseKey" .) }}
+    {{- fail "You must specify a licenseKey or a customSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.license.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.license.secretKeyName" . }}: {{ include "newrelic.common.license._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_low-data-mode.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_low-data-mode.tpl
new file mode 100644
index 000000000..3dd55ef2f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_low-data-mode.tpl
@@ -0,0 +1,26 @@
+{{- /*
+Abstraction of the lowDataMode toggle.
+This helper allows to override the global `.global.lowDataMode` with the value of `.lowDataMode`.
+Returns "true" if `lowDataMode` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.lowDataMode" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "lowDataMode" | kindIs "bool") -}}
+    {{- if .Values.lowDataMode -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.lowDataMode" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.lowDataMode -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "lowDataMode" | kindIs "bool" -}}
+    {{- if $global.lowDataMode -}}
+        {{- $global.lowDataMode -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_naming.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_naming.tpl
new file mode 100644
index 000000000..19fa92648
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_naming.tpl
@@ -0,0 +1,73 @@
+{{/*
+This is an function to be called directly with a string just to truncate strings to
+63 chars because some Kubernetes name fields are limited to that.
+*/}}
+{{- define "newrelic.common.naming.truncateToDNS" -}}
+{{- . | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+
+
+{{- /*
+Given a name and a suffix returns a 'DNS Valid' which always include the suffix, truncating the name if needed.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If suffix is too long it gets truncated but it always takes precedence over name, so a 63 chars suffix would suppress the name.
+Usage:
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" "<my-name>" "suffix" "my-suffix" ) }}
+*/ -}}
+{{- define "newrelic.common.naming.truncateToDNSWithSuffix" -}}
+{{- $suffix := (include "newrelic.common.naming.truncateToDNS" .suffix) -}}
+{{- $maxLen := (max (sub 63 (add1 (len $suffix))) 0) -}} {{- /* We prepend "-" to the suffix so an additional character is needed */ -}}
+
+{{- $newName := .name | trunc ($maxLen | int) | trimSuffix "-"  -}}
+{{- if $newName -}}
+{{- printf "%s-%s" $newName $suffix -}}
+{{- else -}}
+{{ $suffix }}
+{{- end -}}
+
+{{- end -}}
+
+
+
+{{/*
+Expand the name of the chart.
+Uses the Chart name by default if nameOverride is not set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.name" -}}
+{{- $name := .Values.nameOverride | default .Chart.Name -}}
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+{{- end }}
+
+
+
+{{/*
+Create a default fully qualified app name.
+By default the full name will be "<release_name>" just in if it has the chart name included in that, if not
+it will be concatenated like "<release_name>-<chart_chart>". This could change if fullnameOverride or
+nameOverride are set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.fullname" -}}
+{{- $name := include "newrelic.common.naming.name" . -}}
+
+{{- if .Values.fullnameOverride -}}
+    {{- $name = .Values.fullnameOverride  -}}
+{{- else if not (contains $name .Release.Name) -}}
+    {{- $name = printf "%s-%s" .Release.Name $name -}}
+{{- end -}}
+
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+
+{{- end -}}
+
+
+
+{{/*
+Create chart name and version as used by the chart label.
+This function should not be used for naming objects. Use "common.naming.{name,fullname}" instead.
+*/}}
+{{- define "newrelic.common.naming.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_nodeselector.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_nodeselector.tpl
new file mode 100644
index 000000000..d48887341
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_nodeselector.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod nodeSelector */ -}}
+{{- define "newrelic.common.nodeSelector" -}}
+    {{- if .Values.nodeSelector -}}
+        {{- toYaml .Values.nodeSelector -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.nodeSelector -}}
+            {{- toYaml .Values.global.nodeSelector -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_priority-class-name.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_priority-class-name.tpl
new file mode 100644
index 000000000..50182b734
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_priority-class-name.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the pod priorityClassName */ -}}
+{{- define "newrelic.common.priorityClassName" -}}
+    {{- if .Values.priorityClassName -}}
+        {{- .Values.priorityClassName -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.priorityClassName -}}
+            {{- .Values.global.priorityClassName -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_privileged.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_privileged.tpl
new file mode 100644
index 000000000..f3ae814dd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_privileged.tpl
@@ -0,0 +1,28 @@
+{{- /*
+This is a helper that returns whether the chart should assume the user is fine deploying privileged pods.
+*/ -}}
+{{- define "newrelic.common.privileged" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists. */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if get .Values "privileged" | kindIs "bool" -}}
+    {{- if .Values.privileged -}}
+        {{- .Values.privileged -}}
+    {{- end -}}
+{{- else if get $global "privileged" | kindIs "bool" -}}
+    {{- if $global.privileged -}}
+        {{- $global.privileged -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return directly "true" or "false" based in the exist of "newrelic.common.privileged" */ -}}
+{{- define "newrelic.common.privileged.value" -}}
+{{- if include "newrelic.common.privileged" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_proxy.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_proxy.tpl
new file mode 100644
index 000000000..60f34c7ec
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_proxy.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the proxy */ -}}
+{{- define "newrelic.common.proxy" -}}
+    {{- if .Values.proxy -}}
+        {{- .Values.proxy -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.proxy -}}
+            {{- .Values.global.proxy -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_region.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_region.tpl
new file mode 100644
index 000000000..bdcacf323
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_region.tpl
@@ -0,0 +1,74 @@
+{{/*
+Return the region that is being used by the user
+*/}}
+{{- define "newrelic.common.region" -}}
+{{- if and (include "newrelic.common.license._usesCustomSecret" .) (not (include "newrelic.common.region._fromValues" .)) -}}
+  {{- fail "This Helm Chart is not able to compute the region. You must specify a .global.region or .region if the license is set using a custom secret." -}}
+{{- end -}}
+
+{{- /* Defaults */ -}}
+{{- $region := "us" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+  {{- $region = "staging" -}}
+{{- else if include "newrelic.common.region._isEULicenseKey" . -}}
+  {{- $region = "eu" -}}
+{{- end -}}
+
+{{- include "newrelic.common.region.validate" (include "newrelic.common.region._fromValues" . | default $region ) -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values if valid. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+
+Usage: `include "newrelic.common.region.validate" "us"`
+*/}}
+{{- define "newrelic.common.region.validate" -}}
+{{- /* Ref: https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21 */ -}}
+{{- $region := . | lower -}}
+{{- if eq $region "us" -}}
+  US
+{{- else if eq $region "eu" -}}
+  EU
+{{- else if eq $region "staging" -}}
+  Staging
+{{- else if eq $region "local" -}}
+  Local
+{{- else -}}
+  {{- fail (printf "the region provided is not valid: %s not in \"US\" \"EU\" \"Staging\" \"Local\"" .) -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._fromValues" -}}
+{{- if .Values.region -}}
+  {{- .Values.region -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.region -}}
+    {{- .Values.global.region -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the license is for EU region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._isEULicenseKey" -}}
+{{- if not (include "newrelic.common.license._usesCustomSecret" .) -}}
+  {{- $license := include "newrelic.common.license._licenseKey" . -}}
+  {{- if hasPrefix "eu" $license -}}
+    true
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_security-context.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_security-context.tpl
new file mode 100644
index 000000000..9edfcabfd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_security-context.tpl
@@ -0,0 +1,23 @@
+{{- /* Defines the container securityContext context */ -}}
+{{- define "newrelic.common.securityContext.container" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.containerSecurityContext -}}
+    {{- toYaml .Values.containerSecurityContext -}}
+{{- else if $global.containerSecurityContext -}}
+    {{- toYaml $global.containerSecurityContext -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the pod securityContext context */ -}}
+{{- define "newrelic.common.securityContext.pod" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.podSecurityContext -}}
+    {{- toYaml .Values.podSecurityContext -}}
+{{- else if $global.podSecurityContext -}}
+    {{- toYaml $global.podSecurityContext -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_serviceaccount.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_serviceaccount.tpl
new file mode 100644
index 000000000..2d352f6ea
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_serviceaccount.tpl
@@ -0,0 +1,90 @@
+{{- /* Defines if the service account has to be created or not */ -}}
+{{- define "newrelic.common.serviceAccount.create" -}}
+{{- $valueFound := false -}}
+
+{{- /* Look for a global creation of a service account */ -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "create" | kindIs "bool") -}}
+        {{- $valueFound = true -}}
+        {{- if .Values.serviceAccount.create -}}
+            {{- /*
+                We want only to return when this is true, returning `false` here will template "false" (string) when doing
+                an `(include "newrelic.common.serviceAccount.name" .)`, which is not an "empty string" so it is `true` if it is used
+                as an evaluation somewhere else.
+            */ -}}
+            {{- .Values.serviceAccount.create -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* Look for a local creation of a service account */ -}}
+{{- if not $valueFound -}}
+    {{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+    {{- $global := index .Values "global" | default dict -}}
+    {{- if get $global "serviceAccount" | kindIs "map" -}}
+        {{- if get $global.serviceAccount "create" | kindIs "bool" -}}
+            {{- $valueFound = true -}}
+            {{- if $global.serviceAccount.create -}}
+                {{- $global.serviceAccount.create -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* In case no serviceAccount value has been found, default to "true" */ -}}
+{{- if not $valueFound -}}
+true
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the name of the service account */ -}}
+{{- define "newrelic.common.serviceAccount.name" -}}
+{{- $localServiceAccount := "" -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "name" | kindIs "string") -}}
+        {{- $localServiceAccount = .Values.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := "" -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "name" | kindIs "string" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- if (include "newrelic.common.serviceAccount.create" .) -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default (include "newrelic.common.naming.fullname" .) -}}
+{{- else -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default "default" -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Merge the global and local annotations for the service account */ -}}
+{{- define "newrelic.common.serviceAccount.annotations" -}}
+{{- $localServiceAccount := dict -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if get .Values.serviceAccount "annotations" -}}
+        {{- $localServiceAccount = .Values.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := dict -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "annotations" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $merged := mustMergeOverwrite $globalServiceAccount $localServiceAccount -}}
+
+{{- if $merged -}}
+    {{- toYaml $merged -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_staging.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_staging.tpl
new file mode 100644
index 000000000..bd9ad09bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_staging.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the nrStaging toggle.
+This helper allows to override the global `.global.nrStaging` with the value of `.nrStaging`.
+Returns "true" if `nrStaging` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.nrStaging" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "nrStaging" | kindIs "bool") -}}
+    {{- if .Values.nrStaging -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.nrStaging" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.nrStaging -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "nrStaging" | kindIs "bool" -}}
+    {{- if $global.nrStaging -}}
+        {{- $global.nrStaging -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Returns "true" of "false" directly instead of empty string (Helm falsiness) based on the exit of "newrelic.common.nrStaging"
+*/ -}}
+{{- define "newrelic.common.nrStaging.value" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_tolerations.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_tolerations.tpl
new file mode 100644
index 000000000..e016b38e2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_tolerations.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod tolerations */ -}}
+{{- define "newrelic.common.tolerations" -}}
+    {{- if .Values.tolerations -}}
+        {{- toYaml .Values.tolerations -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.tolerations -}}
+            {{- toYaml .Values.global.tolerations -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_userkey.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_userkey.tpl
new file mode 100644
index 000000000..982ea8e09
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_userkey.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the API Key.
+*/}}
+{{- define "newrelic.common.userKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "userkey" ) -}}
+{{- include "newrelic.common.userKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+*/}}
+{{- define "newrelic.common.userKey.secretKeyName" -}}
+{{- include "newrelic.common.userKey._customSecretKey" . | default "userKey" -}}
+{{- end -}}
+
+{{/*
+Return local API Key if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._userKey" -}}
+{{- if .Values.userKey -}}
+  {{- .Values.userKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.userKey -}}
+    {{- .Values.global.userKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the API Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretName" -}}
+{{- if .Values.customUserKeySecretName -}}
+  {{- .Values.customUserKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretName -}}
+    {{- .Values.global.customUserKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretKey" -}}
+{{- if .Values.customUserKeySecretKey -}}
+  {{- .Values.customUserKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretKey }}
+    {{- .Values.global.customUserKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_userkey_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_userkey_secret.yaml.tpl
new file mode 100644
index 000000000..b97985654
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_userkey_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the user key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.userKey.secret" }}
+{{- if not (include "newrelic.common.userKey._customSecretName" .) }}
+{{- /* Fail if user key is empty and required: */ -}}
+{{- if not (include "newrelic.common.userKey._userKey" .) }}
+    {{- fail "You must specify a userKey or a customUserKeySecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.userKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.userKey.secretKeyName" . }}: {{ include "newrelic.common.userKey._userKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_verbose-log.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_verbose-log.tpl
new file mode 100644
index 000000000..2286d4681
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/templates/_verbose-log.tpl
@@ -0,0 +1,54 @@
+{{- /*
+Abstraction of the verbose toggle.
+This helper allows to override the global `.global.verboseLog` with the value of `.verboseLog`.
+Returns "true" if `verbose` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.verboseLog" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "verboseLog" | kindIs "bool") -}}
+    {{- if .Values.verboseLog -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.verboseLog" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.verboseLog -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "verboseLog" | kindIs "bool" -}}
+    {{- if $global.verboseLog -}}
+        {{- $global.verboseLog -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsBoolean" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return 1 or 0 directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsInt" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+1
+{{- else -}}
+0
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/values.yaml
new file mode 100644
index 000000000..75e2d112a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/charts/common-library/values.yaml
@@ -0,0 +1 @@
+# values are not needed for the library chart, however this file is still needed for helm lint to work.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/ci/test-bare-minimum-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/ci/test-bare-minimum-values.yaml
new file mode 100644
index 000000000..3fb7df050
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/ci/test-bare-minimum-values.yaml
@@ -0,0 +1,3 @@
+global:
+  licenseKey: 1234567890abcdef1234567890abcdef12345678
+  cluster: test-cluster
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/ci/test-custom-attributes-as-map.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/ci/test-custom-attributes-as-map.yaml
new file mode 100644
index 000000000..9fec33dc6
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/ci/test-custom-attributes-as-map.yaml
@@ -0,0 +1,12 @@
+global:
+  licenseKey: 1234567890abcdef1234567890abcdef12345678
+  cluster: test-cluster
+
+customAttributes:
+  test_tag_label: test_tag_value
+
+image:
+  kubeEvents:
+    repository: e2e/nri-kube-events
+    tag: test
+    pullPolicy: IfNotPresent
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/ci/test-custom-attributes-as-string.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/ci/test-custom-attributes-as-string.yaml
new file mode 100644
index 000000000..e12cba339
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/ci/test-custom-attributes-as-string.yaml
@@ -0,0 +1,11 @@
+global:
+  licenseKey: 1234567890abcdef1234567890abcdef12345678
+  cluster: test-cluster
+
+customAttributes: '{"test_tag_label": "test_tag_value"}'
+
+image:
+  kubeEvents:
+    repository: e2e/nri-kube-events
+    tag: test
+    pullPolicy: IfNotPresent
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/ci/test-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/ci/test-values.yaml
new file mode 100644
index 000000000..4e517d666
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/ci/test-values.yaml
@@ -0,0 +1,60 @@
+global:
+  licenseKey: 1234567890abcdef1234567890abcdef12345678
+  cluster: test-cluster
+
+sinks:
+  # Enable the stdout sink to also see all events in the logs.
+  stdout: true
+  # The newRelicInfra sink sends all events to New relic.
+  newRelicInfra: true
+
+customAttributes:
+  test_tag_label: test_tag_value
+
+config:
+  accountID: 111
+  region: EU
+
+rbac:
+  create: true
+
+serviceAccount:
+  create: true
+
+podAnnotations:
+  annotation1: "annotation"
+
+nodeSelector:
+  kubernetes.io/os: linux
+
+tolerations:
+  - key: "key1"
+    effect: "NoSchedule"
+    operator: "Exists"
+
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+        - matchExpressions:
+            - key: kubernetes.io/os
+              operator: In
+              values:
+                - linux
+
+hostNetwork: true
+
+dnsConfig:
+  nameservers:
+    - 1.2.3.4
+  searches:
+    - my.dns.search.suffix
+  options:
+    - name: ndots
+      value: "1"
+
+image:
+  kubeEvents:
+    repository: e2e/nri-kube-events
+    tag: test
+    pullPolicy: IfNotPresent
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/NOTES.txt b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/NOTES.txt
new file mode 100644
index 000000000..3fd06b4a2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/NOTES.txt
@@ -0,0 +1,3 @@
+{{ include "nri-kube-events.compatibility.message.securityContext.runAsUser" . }}
+
+{{ include "nri-kube-events.compatibility.message.images" . }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/_helpers.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/_helpers.tpl
new file mode 100644
index 000000000..5d0b8d257
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/_helpers.tpl
@@ -0,0 +1,45 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{- define "nri-kube-events.securityContext.pod" -}}
+{{- $defaults := fromYaml ( include "nriKubernetes.securityContext.podDefaults" . ) -}}
+{{- $compatibilityLayer := include "nri-kube-events.compatibility.securityContext.pod" . | fromYaml -}}
+{{- $commonLibrary := fromYaml ( include "newrelic.common.securityContext.pod" . ) -}}
+
+{{- $finalSecurityContext := dict -}}
+{{- if $commonLibrary -}}
+    {{- $finalSecurityContext = mustMergeOverwrite $commonLibrary $compatibilityLayer  -}}
+{{- else -}}
+    {{- $finalSecurityContext = mustMergeOverwrite $defaults $compatibilityLayer  -}}
+{{- end -}}
+{{- toYaml $finalSecurityContext -}}
+{{- end -}}
+
+
+
+{{- /* These are the defaults that are used for all the containers in this chart */ -}}
+{{- define "nriKubernetes.securityContext.podDefaults" -}}
+runAsUser: 1000
+runAsNonRoot: true
+{{- end -}}
+
+
+
+{{- define "nri-kube-events.securityContext.container" -}}
+{{- if include "newrelic.common.securityContext.container" . -}}
+{{- include "newrelic.common.securityContext.container" . -}}
+{{- else -}}
+privileged: false
+allowPrivilegeEscalation: false
+readOnlyRootFilesystem: true
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*  */ -}}
+{{- define "nri-kube-events.agentConfig" -}}
+is_forward_only: true
+http_server_enabled: true
+http_server_port: 8001
+{{ include "newrelic.common.agentConfig.defaults" . }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/_helpers_compatibility.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/_helpers_compatibility.tpl
new file mode 100644
index 000000000..059cfff12
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/_helpers_compatibility.tpl
@@ -0,0 +1,262 @@
+{{/*
+Returns a dictionary with legacy runAsUser config.
+We know that it only has "one line" but it is separated from the rest of the helpers because it is a temporary things
+that we should EOL. The EOL time of this will be marked when we GA the deprecation of Helm v2.
+*/}}
+{{- define "nri-kube-events.compatibility.securityContext.pod" -}}
+{{- if .Values.runAsUser -}}
+runAsUser: {{ .Values.runAsUser }}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Functions to get values from the globals instead of the common library
+We make this because there could be difficult to see what is going under
+the hood if we use the common-library here. So it is easy to read something
+like:
+{{- $registry := $oldRegistry | default $newRegistry | default $globalRegistry -}}
+*/ -}}
+{{- define "nri-kube-events.compatibility.global.registry" -}}
+    {{- if .Values.global -}}
+        {{- if .Values.global.images -}}
+            {{- if .Values.global.images.registry -}}
+                {{- .Values.global.images.registry -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* Functions to fetch integration image configuration from the old .Values.image */ -}}
+{{- /* integration's old registry */ -}}
+{{- define "nri-kube-events.compatibility.old.integration.registry" -}}
+    {{- if .Values.image -}}
+        {{- if .Values.image.kubeEvents -}}
+            {{- if .Values.image.kubeEvents.registry -}}
+                {{- .Values.image.kubeEvents.registry -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* integration's old repository */ -}}
+{{- define "nri-kube-events.compatibility.old.integration.repository" -}}
+    {{- if .Values.image -}}
+        {{- if .Values.image.kubeEvents -}}
+            {{- if .Values.image.kubeEvents.repository -}}
+                {{- .Values.image.kubeEvents.repository -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* integration's old tag */ -}}
+{{- define "nri-kube-events.compatibility.old.integration.tag" -}}
+    {{- if .Values.image -}}
+        {{- if .Values.image.kubeEvents -}}
+            {{- if .Values.image.kubeEvents.tag -}}
+                {{- .Values.image.kubeEvents.tag -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* integration's old imagePullPolicy */ -}}
+{{- define "nri-kube-events.compatibility.old.integration.pullPolicy" -}}
+    {{- if .Values.image -}}
+        {{- if .Values.image.kubeEvents -}}
+            {{- if .Values.image.kubeEvents.pullPolicy -}}
+                {{- .Values.image.kubeEvents.pullPolicy -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* Functions to fetch agent image configuration from the old .Values.image */ -}}
+{{- /* agent's old registry */ -}}
+{{- define "nri-kube-events.compatibility.old.agent.registry" -}}
+    {{- if .Values.image -}}
+        {{- if .Values.image.infraAgent -}}
+            {{- if .Values.image.infraAgent.registry -}}
+                {{- .Values.image.infraAgent.registry -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* agent's old repository */ -}}
+{{- define "nri-kube-events.compatibility.old.agent.repository" -}}
+    {{- if .Values.image -}}
+        {{- if .Values.image.infraAgent -}}
+            {{- if .Values.image.infraAgent.repository -}}
+                {{- .Values.image.infraAgent.repository -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* agent's old tag */ -}}
+{{- define "nri-kube-events.compatibility.old.agent.tag" -}}
+    {{- if .Values.image -}}
+        {{- if .Values.image.infraAgent -}}
+            {{- if .Values.image.infraAgent.tag -}}
+                {{- .Values.image.infraAgent.tag -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* agent's old imagePullPolicy */ -}}
+{{- define "nri-kube-events.compatibility.old.agent.pullPolicy" -}}
+    {{- if .Values.image -}}
+        {{- if .Values.image.infraAgent -}}
+            {{- if .Values.image.infraAgent.pullPolicy -}}
+                {{- .Values.image.infraAgent.pullPolicy -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Creates the image string needed to pull the integration image respecting the breaking change we made in the values file
+*/}}
+{{- define "nri-kube-events.compatibility.images.integration" -}}
+{{- $globalRegistry := include "nri-kube-events.compatibility.global.registry" . -}}
+{{- $oldRegistry := include "nri-kube-events.compatibility.old.integration.registry" . -}}
+{{- $newRegistry := .Values.images.integration.registry -}}
+{{- $registry := $oldRegistry | default $newRegistry | default $globalRegistry -}}
+
+{{- $oldRepository := include "nri-kube-events.compatibility.old.integration.repository" . -}}
+{{- $newRepository := .Values.images.integration.repository -}}
+{{- $repository := $oldRepository | default $newRepository }}
+
+{{- $oldTag := include "nri-kube-events.compatibility.old.integration.tag" . -}}
+{{- $newTag := .Values.images.integration.tag -}}
+{{- $tag := $oldTag | default $newTag | default .Chart.AppVersion -}}
+
+{{- if $registry -}}
+    {{- printf "%s/%s:%s" $registry $repository $tag -}}
+{{- else -}}
+    {{- printf "%s:%s" $repository $tag -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Creates the image string needed to pull the agent's image respecting the breaking change we made in the values file
+*/}}
+{{- define "nri-kube-events.compatibility.images.agent" -}}
+{{- $globalRegistry := include "nri-kube-events.compatibility.global.registry" . -}}
+{{- $oldRegistry := include "nri-kube-events.compatibility.old.agent.registry" . -}}
+{{- $newRegistry := .Values.images.agent.registry -}}
+{{- $registry := $oldRegistry | default $newRegistry | default $globalRegistry -}}
+
+{{- $oldRepository := include "nri-kube-events.compatibility.old.agent.repository" . -}}
+{{- $newRepository := .Values.images.agent.repository -}}
+{{- $repository := $oldRepository | default $newRepository }}
+
+{{- $oldTag := include "nri-kube-events.compatibility.old.agent.tag" . -}}
+{{- $newTag := .Values.images.agent.tag -}}
+{{- $tag := $oldTag | default $newTag -}}
+
+{{- if $registry -}}
+    {{- printf "%s/%s:%s" $registry $repository $tag -}}
+{{- else -}}
+    {{- printf "%s:%s" $repository $tag -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the pull policy for the integration image taking into account that we made a breaking change on the values path.
+*/}}
+{{- define "nri-kube-events.compatibility.images.pullPolicy.integration" -}}
+{{- $old := include "nri-kube-events.compatibility.old.integration.pullPolicy" . -}}
+{{- $new := .Values.images.integration.pullPolicy -}}
+
+{{- $old | default $new -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the pull policy for the agent image taking into account that we made a breaking change on the values path.
+*/}}
+{{- define "nri-kube-events.compatibility.images.pullPolicy.agent" -}}
+{{- $old := include "nri-kube-events.compatibility.old.agent.pullPolicy" . -}}
+{{- $new := .Values.images.agent.pullPolicy -}}
+
+{{- $old | default $new -}}
+{{- end -}}
+
+
+
+{{/*
+Returns a merged list of pull secrets ready to be used
+*/}}
+{{- define "nri-kube-events.compatibility.images.renderPullSecrets" -}}
+{{- $list := list -}}
+
+{{- if .Values.image -}}
+    {{- if .Values.image.pullSecrets -}}
+        {{- $list = append $list .Values.image.pullSecrets }}
+    {{- end -}}
+{{- end -}}
+
+{{- if .Values.images.pullSecrets -}}
+    {{- $list = append $list .Values.images.pullSecrets -}}
+{{- end -}}
+
+{{- include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" $list "context" .) }}
+{{- end -}}
+
+
+
+{{- /* Messege to show to the user saying that image value is not supported anymore */ -}}
+{{- define "nri-kube-events.compatibility.message.images" -}}
+{{- $oldIntegrationRegistry := include "nri-kube-events.compatibility.old.integration.registry" . -}}
+{{- $oldIntegrationRepository := include "nri-kube-events.compatibility.old.integration.repository" . -}}
+{{- $oldIntegrationTag := include "nri-kube-events.compatibility.old.integration.tag" . -}}
+{{- $oldIntegrationPullPolicy := include "nri-kube-events.compatibility.old.integration.pullPolicy" . -}}
+{{- $oldAgentRegistry := include "nri-kube-events.compatibility.old.agent.registry" . -}}
+{{- $oldAgentRepository := include "nri-kube-events.compatibility.old.agent.repository" . -}}
+{{- $oldAgentTag := include "nri-kube-events.compatibility.old.agent.tag" . -}}
+{{- $oldAgentPullPolicy := include "nri-kube-events.compatibility.old.agent.pullPolicy" . -}}
+
+{{- if or $oldIntegrationRegistry $oldIntegrationRepository $oldIntegrationTag $oldIntegrationPullPolicy $oldAgentRegistry $oldAgentRepository $oldAgentTag $oldAgentPullPolicy }}
+Configuring image repository an tag under 'image' is no longer supported.
+This is the list values that we no longer support:
+ - image.kubeEvents.registry
+ - image.kubeEvents.repository
+ - image.kubeEvents.tag
+ - image.kubeEvents.pullPolicy
+ - image.infraAgent.registry
+ - image.infraAgent.repository
+ - image.infraAgent.tag
+ - image.infraAgent.pullPolicy
+
+Please set:
+ - images.agent.* to configure the infrastructure-agent forwarder.
+ - images.integration.* to configure the image in charge of scraping k8s data.
+
+------
+{{- end }}
+{{- end -}}
+
+
+
+{{- /* Messege to show to the user saying that image value is not supported anymore */ -}}
+{{- define "nri-kube-events.compatibility.message.securityContext.runAsUser" -}}
+{{- if .Values.runAsUser }}
+WARNING: `runAsUser` is deprecated
+==================================
+
+We have automatically translated your `runAsUser` setting to the new format, but this shimming will be removed in the
+future. Please migrate your configs to the new format in the `securityContext` key.
+{{- end }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/agent-configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/agent-configmap.yaml
new file mode 100644
index 000000000..02bf8306b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/agent-configmap.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.sinks.newRelicInfra -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.naming.fullname" . }}-agent-config
+  namespace: {{ .Release.Namespace }}
+data:
+  newrelic-infra.yml: |
+    {{- include "nri-kube-events.agentConfig" . | nindent 4 }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/clusterrole.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/clusterrole.yaml
new file mode 100644
index 000000000..cbfd5d9ce
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/clusterrole.yaml
@@ -0,0 +1,42 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.naming.fullname" . }}
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - events
+  - namespaces
+  - nodes
+  - jobs
+  - persistentvolumes
+  - persistentvolumeclaims
+  - pods
+  - services
+  verbs:
+  - get
+  - watch
+  - list
+- apiGroups:
+  - apps
+  resources:
+  - daemonsets
+  - deployments
+  verbs:
+  - get
+  - watch
+  - list
+- apiGroups:
+  - batch
+  resources:
+  - cronjobs
+  - jobs
+  verbs:
+  - get
+  - watch
+  - list
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/clusterrolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/clusterrolebinding.yaml
new file mode 100644
index 000000000..fc5dfb8da
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/clusterrolebinding.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.naming.fullname" . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "newrelic.common.naming.fullname" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/configmap.yaml
new file mode 100644
index 000000000..9e4e35f6b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/configmap.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.naming.fullname" . }}-config
+  namespace: {{ .Release.Namespace }}
+data:
+  config.yaml: |-
+    sinks:
+    {{- if .Values.sinks.stdout }}
+      - name: stdout
+    {{- end }}
+    {{- if .Values.sinks.newRelicInfra }}
+      - name: newRelicInfra
+        config:
+          agentEndpoint: http://localhost:8001/v1/data
+          clusterName: {{ include "newrelic.common.cluster" . }}
+          agentHTTPTimeout: {{ .Values.agentHTTPTimeout }}
+    {{- end }}
+    captureDescribe: {{ .Values.scrapers.descriptions.enabled }}
+    describeRefresh: {{ .Values.scrapers.descriptions.resyncPeriod | default "24h" }}
+    captureEvents: {{ .Values.scrapers.events.enabled }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/deployment.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/deployment.yaml
new file mode 100644
index 000000000..7ba9eaea9
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/deployment.yaml
@@ -0,0 +1,124 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  annotations:
+  {{- if .Values.deployment.annotations }}
+    {{- toYaml .Values.deployment.annotations | nindent 4 }}
+  {{- end }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "newrelic.common.naming.name" . }}
+  template:
+    metadata:
+      {{- if .Values.podAnnotations }}
+      annotations:
+        {{- toYaml .Values.podAnnotations | nindent 8}}
+      {{- end }}
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+    spec:
+      {{- with include "nri-kube-events.compatibility.images.renderPullSecrets" . }}
+      imagePullSecrets:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "nri-kube-events.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: kube-events
+          image: {{ include "nri-kube-events.compatibility.images.integration" . }}
+          imagePullPolicy: {{ include "nri-kube-events.compatibility.images.pullPolicy.integration" . }}
+          {{- with include "nri-kube-events.securityContext.container" . }}
+          securityContext:
+            {{- . | nindent 12 }}
+          {{- end }}
+          {{- if .Values.resources }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          args: ["-config", "/app/config/config.yaml", "-loglevel", "debug"]
+          volumeMounts:
+            - name: config-volume
+              mountPath: /app/config
+        {{- if .Values.sinks.newRelicInfra }}
+        - name: forwarder
+          image: {{ include "nri-kube-events.compatibility.images.agent" . }}
+          imagePullPolicy: {{ include "nri-kube-events.compatibility.images.pullPolicy.agent" . }}
+          {{- with include "nri-kube-events.securityContext.container" . }}
+          securityContext:
+            {{- . | nindent 12 }}
+          {{- end }}
+          ports:
+            - containerPort: {{ get (fromYaml (include "nri-kube-events.agentConfig" .)) "http_server_port" }}
+          env:
+            - name: NRIA_LICENSE_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "newrelic.common.license.secretName" . }}
+                  key: {{ include "newrelic.common.license.secretKeyName" . }}
+
+            - name: NRIA_OVERRIDE_HOSTNAME_SHORT
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: spec.nodeName
+
+          volumeMounts:
+            - mountPath: /var/db/newrelic-infra/data
+              name: tmpfs-data
+            - mountPath: /var/db/newrelic-infra/user_data
+              name: tmpfs-user-data
+            - mountPath: /tmp
+              name: tmpfs-tmp
+            - name: config
+              mountPath: /etc/newrelic-infra.yml
+              subPath: newrelic-infra.yml
+          {{- if ((.Values.forwarder).resources) }}
+          resources:
+            {{- toYaml .Values.forwarder.resources | nindent 12 }}
+          {{- end }}
+        {{- end }}
+      serviceAccountName: {{ include "newrelic.common.serviceAccount.name" . }}
+      volumes:
+        {{- if .Values.sinks.newRelicInfra }}
+        - name: config
+          configMap:
+            name: {{ include "newrelic.common.naming.fullname" . }}-agent-config
+            items:
+            - key: newrelic-infra.yml
+              path: newrelic-infra.yml
+        {{- end }}
+        - name: config-volume
+          configMap:
+            name: {{ include "newrelic.common.naming.fullname" . }}-config
+        - name: tmpfs-data
+          emptyDir: {}
+        - name: tmpfs-user-data
+          emptyDir: {}
+        - name: tmpfs-tmp
+          emptyDir: {}
+      {{- with include "newrelic.common.priorityClassName" . }}
+      priorityClassName: {{ . }}
+      {{- end }}
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{ include "newrelic.common.nodeSelector" . | nindent 8 }}
+      {{- with include "newrelic.common.tolerations" . }}
+      tolerations:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.affinity" . }}
+      affinity:
+        {{- . | nindent 8 }}
+      {{- end }}
+      hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+      {{- with include "newrelic.common.dnsConfig" . }}
+      dnsConfig:
+        {{- . | nindent 8 }}
+      {{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/secret.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/secret.yaml
new file mode 100644
index 000000000..f558ee86c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/secret.yaml
@@ -0,0 +1,2 @@
+{{- /* Common library will take care of creating the secret or not. */}}
+{{- include "newrelic.common.license.secret" . }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/serviceaccount.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/serviceaccount.yaml
new file mode 100644
index 000000000..07e818da0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/templates/serviceaccount.yaml
@@ -0,0 +1,11 @@
+{{- if include "newrelic.common.serviceAccount.create" . }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+{{ include "newrelic.common.serviceAccount.annotations" . | indent 4 }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/agent_configmap_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/agent_configmap_test.yaml
new file mode 100644
index 000000000..831b0c5aa
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/agent_configmap_test.yaml
@@ -0,0 +1,46 @@
+suite: test configmap for newrelic infra agent
+templates:
+  - templates/agent-configmap.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: has the correct default values
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+    asserts:
+      - equal:
+          path: data["newrelic-infra.yml"]
+          value: |
+            is_forward_only: true
+            http_server_enabled: true
+            http_server_port: 8001
+
+  - it: integrates properly with the common library
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      fedramp.enabled: true
+      verboseLog: true
+    asserts:
+      - equal:
+          path: data["newrelic-infra.yml"]
+          value: |
+            is_forward_only: true
+            http_server_enabled: true
+            http_server_port: 8001
+
+            log:
+              level: trace
+            fedramp: true
+
+  - it: does not template if the http sink is disabled
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      sinks:
+        newRelicInfra: false
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/configmap_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/configmap_test.yaml
new file mode 100644
index 000000000..68ad53a57
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/configmap_test.yaml
@@ -0,0 +1,139 @@
+suite: test configmap for sinks
+templates:
+  - templates/configmap.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: has the correct sinks when default values used
+    set:
+      licenseKey: us-whatever
+      cluster: a-cluster
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            sinks:
+              - name: newRelicInfra
+                config:
+                  agentEndpoint: http://localhost:8001/v1/data
+                  clusterName: a-cluster
+                  agentHTTPTimeout: 30s
+            captureDescribe: true
+            describeRefresh: 24h
+            captureEvents: true
+
+  - it: honors agentHTTPTimeout
+    set:
+      licenseKey: us-whatever
+      cluster: a-cluster
+      agentHTTPTimeout: 10s
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            sinks:
+              - name: newRelicInfra
+                config:
+                  agentEndpoint: http://localhost:8001/v1/data
+                  clusterName: a-cluster
+                  agentHTTPTimeout: 10s
+            captureDescribe: true
+            describeRefresh: 24h
+            captureEvents: true
+
+  - it: has the correct sinks defined in local values
+    set:
+      licenseKey: us-whatever
+      cluster: a-cluster
+      sinks:
+        stdout: true
+        newRelicInfra: false
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            sinks:
+              - name: stdout
+            captureDescribe: true
+            describeRefresh: 24h
+            captureEvents: true
+
+  - it: allows enabling/disabling event scraping
+    set:
+      licenseKey: us-whatever
+      cluster: a-cluster
+      scrapers:
+        events:
+          enabled: false
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            sinks:
+              - name: newRelicInfra
+                config:
+                  agentEndpoint: http://localhost:8001/v1/data
+                  clusterName: a-cluster
+                  agentHTTPTimeout: 30s
+            captureDescribe: true
+            describeRefresh: 24h
+            captureEvents: false
+
+  - it: allows enabling/disabling description scraping
+    set:
+      licenseKey: us-whatever
+      cluster: a-cluster
+      scrapers:
+        descriptions:
+          enabled: false
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            sinks:
+              - name: newRelicInfra
+                config:
+                  agentEndpoint: http://localhost:8001/v1/data
+                  clusterName: a-cluster
+                  agentHTTPTimeout: 30s
+            captureDescribe: false
+            describeRefresh: 24h
+            captureEvents: true
+
+  - it: allows changing description resync intervals
+    set:
+      licenseKey: us-whatever
+      cluster: a-cluster
+      scrapers:
+        descriptions:
+          resyncPeriod: 4h
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            sinks:
+              - name: newRelicInfra
+                config:
+                  agentEndpoint: http://localhost:8001/v1/data
+                  clusterName: a-cluster
+                  agentHTTPTimeout: 30s
+            captureDescribe: true
+            describeRefresh: 4h
+            captureEvents: true
+
+  - it: has another document generated with the proper config set
+    set:
+      licenseKey: us-whatever
+      cluster: a-cluster
+      sinks:
+        stdout: false
+        newRelicInfra: false
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            sinks:
+            captureDescribe: true
+            describeRefresh: 24h
+            captureEvents: true
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/deployment_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/deployment_test.yaml
new file mode 100644
index 000000000..702917bce
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/deployment_test.yaml
@@ -0,0 +1,104 @@
+suite: test deployment images
+templates:
+  - templates/deployment.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: deployment image uses pullSecrets
+    set:
+      cluster: my-cluster
+      licenseKey: us-whatever
+      images:
+        pullSecrets:
+          - name: regsecret
+    asserts:
+      - equal:
+          path: spec.template.spec.imagePullSecrets
+          value:
+            - name: regsecret
+
+  - it: deployment images use the proper image tag
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      images:
+        integration:
+          repository: newrelic/nri-kube-events
+          tag: "latest"
+        agent:
+          repository: newrelic/k8s-events-forwarder
+          tag: "latest"
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: .*newrelic/nri-kube-events:latest$
+      - matchRegex:
+          path: spec.template.spec.containers[1].image
+          pattern: .*newrelic/k8s-events-forwarder:latest$
+
+
+  - it: by default the agent forwarder templates
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+    asserts:
+      - contains:
+          path: spec.template.spec.containers
+          any: true
+          content:
+            name: forwarder
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: config
+            configMap:
+              name: my-release-nri-kube-events-agent-config
+              items:
+                - key: newrelic-infra.yml
+                  path: newrelic-infra.yml
+
+  - it: agent does not template if the sink is disabled
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      sinks:
+        newRelicInfra: false
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers
+          any: true
+          content:
+            name: forwarder
+      - notContains:
+          path: spec.template.spec.volumes
+          content:
+            name: config
+            configMap:
+              name: my-release-nri-kube-events-agent-config
+              items:
+                - key: newrelic-infra.yml
+                  path: newrelic-infra.yml
+
+  - it: has a linux node selector by default
+    set:
+      cluster: my-cluster
+      licenseKey: us-whatever
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+
+  - it: has a linux node selector and additional selectors
+    set:
+      cluster: my-cluster
+      licenseKey: us-whatever
+      nodeSelector:
+        aCoolTestLabel: aCoolTestValue
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+            aCoolTestLabel: aCoolTestValue
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/images_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/images_test.yaml
new file mode 100644
index 000000000..361be582b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/images_test.yaml
@@ -0,0 +1,168 @@
+suite: test image compatibility layer
+templates:
+  - templates/deployment.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: by default the tag is not nil
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ".*nil.*"
+      - notMatchRegex:
+          path: spec.template.spec.containers[1].image
+          pattern: ".*nil.*"
+
+  - it: templates image correctly from the new values
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      images:
+        integration:
+          registry: ireg
+          repository: irep
+          tag: itag
+        agent:
+          registry: areg
+          repository: arep
+          tag: atag
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: ireg/irep:itag
+      - equal:
+          path: spec.template.spec.containers[1].image
+          value: areg/arep:atag
+
+  - it: templates image correctly from old values
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      image:
+        kubeEvents:
+          registry: ireg
+          repository: irep
+          tag: itag
+        infraAgent:
+          registry: areg
+          repository: arep
+          tag: atag
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: ireg/irep:itag
+      - equal:
+          path: spec.template.spec.containers[1].image
+          value: areg/arep:atag
+
+  - it: old image values take precedence
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      images:
+        integration:
+          registry: inew
+          repository: inew
+          tag: inew
+        agent:
+          registry: anew
+          repository: anew
+          tag: anew
+      image:
+        kubeEvents:
+          registry: iold
+          repository: iold
+          tag: iold
+        infraAgent:
+          registry: aold
+          repository: aold
+          tag: aold
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: iold/iold:iold
+      - equal:
+          path: spec.template.spec.containers[1].image
+          value: aold/aold:aold
+
+  - it: pullImagePolicy templates correctly from the new values
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      images:
+        integration:
+          pullPolicy: new
+        agent:
+          pullPolicy: new
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].imagePullPolicy
+          value: new
+      - equal:
+          path: spec.template.spec.containers[1].imagePullPolicy
+          value: new
+
+  - it: pullImagePolicy templates correctly from old values
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      image:
+        kubeEvents:
+          pullPolicy: old
+        infraAgent:
+          pullPolicy: old
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].imagePullPolicy
+          value: old
+      - equal:
+          path: spec.template.spec.containers[1].imagePullPolicy
+          value: old
+
+  - it: old imagePullPolicy values take precedence
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      images:
+        integration:
+          pullPolicy: new
+        agent:
+          pullPolicy: new
+      image:
+        kubeEvents:
+          pullPolicy: old
+        infraAgent:
+          pullPolicy: old
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].imagePullPolicy
+          value: old
+      - equal:
+          path: spec.template.spec.containers[1].imagePullPolicy
+          value: old
+
+  - it: imagePullSecrets merge properly
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      global:
+        images:
+          pullSecrets:
+            - global: global
+      images:
+        pullSecrets:
+          - images: images
+      image:
+        pullSecrets:
+          - image: image
+    asserts:
+      - equal:
+          path: spec.template.spec.imagePullSecrets
+          value:
+            - global: global
+            - image: image
+            - images: images
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/security_context_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/security_context_test.yaml
new file mode 100644
index 000000000..b2b710331
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/tests/security_context_test.yaml
@@ -0,0 +1,77 @@
+suite: test deployment security context
+templates:
+  - templates/deployment.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: pod securityContext set to defaults when no values provided
+    set:
+      cluster: my-cluster
+      licenseKey: us-whatever
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext
+          value:
+            runAsUser: 1000
+            runAsNonRoot: true
+  - it: pod securityContext set common-library values
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      podSecurityContext:
+        foobar: true
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.foobar
+          value: true
+  - it: pod securityContext compatibility layer overrides values from common-library
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      runAsUser: 1001
+      podSecurityContext:
+        runAsUser: 1000
+        runAsNonRoot: false
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext
+          value:
+            runAsUser: 1001
+            runAsNonRoot: false
+  - it: pod securityContext compatibility layer overrides defaults
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      runAsUser: 1001
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsUser
+          value: 1001
+  - it: set to defaults when no containerSecurityContext set
+    set:
+      cluster: my-cluster
+      licenseKey: us-whatever
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].securityContext
+          value:
+            allowPrivilegeEscalation: false
+            privileged: false
+            readOnlyRootFilesystem: true
+      - equal:
+          path: spec.template.spec.containers[1].securityContext
+          value:
+            allowPrivilegeEscalation: false
+            privileged: false
+            readOnlyRootFilesystem: true
+  - it: set containerSecurityContext custom values
+    set:
+      cluster: test-cluster
+      licenseKey: us-whatever
+      containerSecurityContext:
+        foobar: true
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.foobar
+          value: true
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/values.yaml
new file mode 100644
index 000000000..8cd56a6db
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-kube-events/values.yaml
@@ -0,0 +1,135 @@
+# -- Override the name of the chart
+nameOverride: ""
+# -- Override the full name of the release
+fullnameOverride: ""
+
+# -- Name of the Kubernetes cluster monitored. Mandatory. Can be configured also with `global.cluster`
+cluster: ""
+# -- This set this license key to use. Can be configured also with `global.licenseKey`
+licenseKey: ""
+# -- In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there. Can be configured also with `global.customSecretName`
+customSecretName: ""
+# -- In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located. Can be configured also with `global.customSecretLicenseKey`
+customSecretLicenseKey: ""
+
+# -- Images used by the chart for the integration and agents
+# @default -- See `values.yaml`
+images:
+  # -- Image for the New Relic Kubernetes integration
+  # @default -- See `values.yaml`
+  integration:
+    registry:
+    repository: newrelic/nri-kube-events
+    tag:
+    pullPolicy: IfNotPresent
+  # -- Image for the New Relic Infrastructure Agent sidecar
+  # @default -- See `values.yaml`
+  agent:
+    registry:
+    repository: newrelic/k8s-events-forwarder
+    tag: 1.59.2
+    pullPolicy: IfNotPresent
+  # -- The secrets that are needed to pull images from a custom registry.
+  pullSecrets: []
+  # - name: regsecret
+
+# -- Resources for the integration container
+resources: {}
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+# -- Resources for the forwarder sidecar container
+forwarder:
+  resources: {}
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
+
+rbac:
+  # -- Specifies whether RBAC resources should be created
+  create: true
+
+# -- Settings controlling ServiceAccount creation
+# @default -- See `values.yaml`
+serviceAccount:
+  # serviceAccount.create -- (bool) Specifies whether a ServiceAccount should be created
+  # @default -- `true`
+  create:
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+  # Specify any annotations to add to the ServiceAccount
+  annotations:
+
+# -- Annotations to add to the pod.
+podAnnotations: {}
+deployment:
+  # deployment.annotations -- Annotations to add to the Deployment.
+  annotations: {}
+# -- Additional labels for chart pods
+podLabels: {}
+# -- Additional labels for chart objects
+labels: {}
+
+# -- Amount of time to wait until timeout to send metrics to the metric forwarder
+agentHTTPTimeout: "30s"
+
+# -- Configure where will the metrics be written. Mostly for debugging purposes.
+# @default -- See `values.yaml`
+sinks:
+  # -- Enable the stdout sink to also see all events in the logs.
+  stdout: false
+  # -- The newRelicInfra sink sends all events to New Relic.
+  newRelicInfra: true
+
+# -- Configure the various kinds of scrapers that should be run.
+# @default -- See `values.yaml`
+scrapers:
+  descriptions:
+    enabled: true
+    resyncPeriod: "24h"
+  events:
+    enabled: true
+
+# -- Sets pod's priorityClassName. Can be configured also with `global.priorityClassName`
+priorityClassName: ""
+# -- (bool) Sets pod's hostNetwork. Can be configured also with `global.hostNetwork`
+# @default -- `false`
+hostNetwork:
+# -- Sets pod's dnsConfig. Can be configured also with `global.dnsConfig`
+dnsConfig: {}
+# -- Sets security context (at pod level). Can be configured also with `global.podSecurityContext`
+podSecurityContext: {}
+# -- Sets security context (at container level). Can be configured also with `global.containerSecurityContext`
+containerSecurityContext: {}
+
+# -- Sets pod/node affinities. Can be configured also with `global.affinity`
+affinity: {}
+# -- Sets pod's node selector. Can be configured also with `global.nodeSelector`
+nodeSelector: {}
+# -- Sets pod's tolerations to node taints. Can be configured also with `global.tolerations`
+tolerations: []
+
+# -- Adds extra attributes to the cluster and all the metrics emitted to the backend. Can be configured also with `global.customAttributes`
+customAttributes: {}
+
+# -- Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port`. Can be configured also with `global.proxy`
+proxy: ""
+
+# -- (bool) Send the metrics to the staging backend. Requires a valid staging license key. Can be configured also with `global.nrStaging`
+# @default -- `false`
+nrStaging:
+fedramp:
+  # -- (bool) Enables FedRAMP. Can be configured also with `global.fedramp.enabled`
+  # @default -- `false`
+  enabled:
+
+# -- (bool) Sets the debug logs to this integration or all integrations if it is set globally. Can be configured also with `global.verboseLog`
+# @default -- `false`
+verboseLog:
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/.helmignore
new file mode 100644
index 000000000..f62b5519e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/.helmignore
@@ -0,0 +1 @@
+templates/admission-webhooks/job-patch/README.md
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/Chart.lock b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/Chart.lock
new file mode 100644
index 000000000..a5af0626c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.1
+digest: sha256:cfa7bfb136b9bcfe87e37d3556c3fedecc58f42685c4ce39485da106408b6619
+generated: "2025-01-08T01:20:29.871261607Z"
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/Chart.yaml
new file mode 100644
index 000000000..d4de15007
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/Chart.yaml
@@ -0,0 +1,25 @@
+apiVersion: v2
+appVersion: 1.31.0
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.1
+description: A Helm chart to deploy the New Relic metadata injection webhook.
+home: https://hub.docker.com/r/newrelic/k8s-metadata-injection
+icon: https://newrelic.com/assets/newrelic/source/NewRelic-logo-square.svg
+keywords:
+- infrastructure
+- newrelic
+- monitoring
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+name: nri-metadata-injection
+sources:
+- https://github.com/newrelic/k8s-metadata-injection
+- https://github.com/newrelic/k8s-metadata-injection/tree/master/charts/nri-metadata-injection
+version: 4.23.0
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/README.md
new file mode 100644
index 000000000..dd922ef13
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/README.md
@@ -0,0 +1,68 @@
+# nri-metadata-injection
+
+A Helm chart to deploy the New Relic metadata injection webhook.
+
+**Homepage:** <https://hub.docker.com/r/newrelic/k8s-metadata-injection>
+
+# Helm installation
+
+You can install this chart using [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) located in the
+[helm-charts repository](https://github.com/newrelic/helm-charts) or directly from this repository by adding this Helm repository:
+
+```shell
+helm repo add nri-metadata-injection https://newrelic.github.io/k8s-metadata-injection
+helm upgrade --install nri-metadata-injection/nri-metadata-injection -f your-custom-values.yaml
+```
+
+## Source Code
+
+* <https://github.com/newrelic/k8s-metadata-injection>
+* <https://github.com/newrelic/k8s-metadata-injection/tree/master/charts/nri-metadata-injection>
+
+## Values managed globally
+
+This chart implements the [New Relic's common Helm library](https://github.com/newrelic/helm-charts/tree/master/library/common-library) which
+means that it honors a wide range of defaults and globals common to most New Relic Helm charts.
+
+Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
+[user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` | Sets pod/node affinities. Can be configured also with `global.affinity` |
+| certManager.enabled | bool | `false` | Use cert manager for webhook certs |
+| certManager.rootCertificateDuration | string | `"43800h"` | Sets the root certificate duration. Defaults to 43800h (5 years). |
+| certManager.webhookCertificateDuration | string | `"8760h"` | Sets certificate duration. Defaults to 8760h (1 year). |
+| cluster | string | `""` | Name of the Kubernetes cluster monitored. Can be configured also with `global.cluster` |
+| containerSecurityContext | object | `{}` | Sets security context (at container level). Can be configured also with `global.containerSecurityContext` |
+| customTLSCertificate | bool | `false` | Use custom tls certificates for the webhook, or let the chart handle it automatically. Ref: https://docs.newrelic.com/docs/integrations/kubernetes-integration/link-your-applications/link-your-applications-kubernetes#configure-injection |
+| dnsConfig | object | `{}` | Sets pod's dnsConfig. Can be configured also with `global.dnsConfig` |
+| fullnameOverride | string | `""` | Override the full name of the release |
+| hostNetwork | bool | false | Sets pod's hostNetwork. Can be configured also with `global.hostNetwork` |
+| image | object | See `values.yaml` | Image for the New Relic Metadata Injector |
+| image.pullSecrets | list | `[]` | The secrets that are needed to pull images from a custom registry. |
+| injectOnlyLabeledNamespaces | bool | `false` | Enable the metadata decoration only for pods living in namespaces labeled with 'newrelic-metadata-injection=enabled'. |
+| jobImage | object | See `values.yaml` | Image for creating the needed certificates of this webhook to work |
+| jobImage.pullSecrets | list | `[]` | The secrets that are needed to pull images from a custom registry. |
+| jobImage.volumeMounts | list | `[]` | Volume mounts to add to the job, you might want to mount tmp if Pod Security Policies Enforce a read-only root. |
+| jobImage.volumes | list | `[]` | Volumes to add to the job container |
+| labels | object | `{}` | Additional labels for chart objects. Can be configured also with `global.labels` |
+| nameOverride | string | `""` | Override the name of the chart |
+| nodeSelector | object | `{}` | Sets pod's node selector. Can be configured also with `global.nodeSelector` |
+| podAnnotations | object | `{}` | Annotations to be added to all pods created by the integration. |
+| podLabels | object | `{}` | Additional labels for chart pods. Can be configured also with `global.podLabels` |
+| podSecurityContext | object | `{}` | Sets security context (at pod level). Can be configured also with `global.podSecurityContext` |
+| priorityClassName | string | `""` | Sets pod's priorityClassName. Can be configured also with `global.priorityClassName` |
+| rbac.pspEnabled | bool | `false` | Whether the chart should create Pod Security Policy objects. |
+| replicas | int | `1` |  |
+| resources | object | 100m/30M -/80M | Image for creating the needed certificates of this webhook to work |
+| timeoutSeconds | int | `28` | Webhook timeout Ref: https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#timeouts |
+| tolerations | list | `[]` | Sets pod's tolerations to node taints. Can be configured also with `global.tolerations` |
+
+## Maintainers
+
+* [juanjjaramillo](https://github.com/juanjjaramillo)
+* [csongnr](https://github.com/csongnr)
+* [dbudziwojskiNR](https://github.com/dbudziwojskiNR)
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/README.md.gotmpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/README.md.gotmpl
new file mode 100644
index 000000000..752ba8aae
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/README.md.gotmpl
@@ -0,0 +1,41 @@
+{{ template "chart.header" . }}
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+# Helm installation
+
+You can install this chart using [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) located in the
+[helm-charts repository](https://github.com/newrelic/helm-charts) or directly from this repository by adding this Helm repository:
+
+```shell
+helm repo add nri-metadata-injection https://newrelic.github.io/k8s-metadata-injection
+helm upgrade --install nri-metadata-injection/nri-metadata-injection -f your-custom-values.yaml
+```
+
+{{ template "chart.sourcesSection" . }}
+
+## Values managed globally
+
+This chart implements the [New Relic's common Helm library](https://github.com/newrelic/helm-charts/tree/master/library/common-library) which
+means that it honors a wide range of defaults and globals common to most New Relic Helm charts.
+
+Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
+[user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
+
+{{ template "chart.valuesSection" . }}
+
+{{ if .Maintainers }}
+## Maintainers
+{{ range .Maintainers }}
+{{- if .Name }}
+{{- if .Url }}
+* [{{ .Name }}]({{ .Url }})
+{{- else }}
+* {{ .Name }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/Chart.yaml
new file mode 100644
index 000000000..adfc765bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/Chart.yaml
@@ -0,0 +1,17 @@
+apiVersion: v2
+description: Provides helpers to provide consistency on all the charts
+keywords:
+- newrelic
+- chart-library
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+- name: kang-makes
+  url: https://github.com/kang-makes
+name: common-library
+type: library
+version: 1.3.1
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/DEVELOPERS.md b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/DEVELOPERS.md
new file mode 100644
index 000000000..7208c673e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/DEVELOPERS.md
@@ -0,0 +1,747 @@
+# Functions/templates documented for chart writers
+Here is some rough documentation separated by the file that contains the function, the function
+name and how to use it. We are not covering functions that start with `_` (e.g.
+`newrelic.common.license._licenseKey`) because they are used internally by this library for
+other helpers. Helm does not have the concept of "public" or "private" functions/templates so
+this is a convention of ours.
+
+## _naming.tpl
+These functions are used to name objects.
+
+### `newrelic.common.naming.name`
+This is the same as the idiomatic `CHART-NAME.name` that is created when you use `helm create`.
+
+It honors `.Values.nameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.name" . }}
+```
+
+### `newrelic.common.naming.fullname`
+This is the same as the idiomatic `CHART-NAME.fullname` that is created when you use `helm create`
+
+It honors `.Values.fullnameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.fullname" . }}
+```
+
+### `newrelic.common.naming.chart`
+This is the same as the idiomatic `CHART-NAME.chart` that is created when you use `helm create`.
+
+It is mostly useless for chart writers. It is used internally for templating the labels but there
+is no reason to keep it "private".
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.chart" . }}
+```
+
+### `newrelic.common.naming.truncateToDNS`
+This is a useful template that could be used to trim a string to 63 chars and does not end with a dash (`-`).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $truncatedName := include "newrelic.common.naming.truncateToDNS" $nameToTruncate }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-string-that-should-be */ -}}
+```
+
+### `newrelic.common.naming.truncateToDNSWithSuffix`
+This template function is the same as the above but instead of receiving a string you should give a `dict`
+with a `name` and a `suffix`. This function will join them with a dash (`-`) and trim the `name` so the
+result of `name-suffix` is no more than 63 chars
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $suffix := "A-NOT-SO-LONG-SUFFIX" }}
+{{- $truncatedName := include "truncateToDNSWithSuffix" (dict "name" $nameToTruncate "suffix" $suffix) }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-A-NOT-SO-LONG-SUFFIX */ -}}
+```
+
+
+
+## _labels.tpl
+### `newrelic.common.labels`, `newrelic.common.labels.selectorLabels` and `newrelic.common.labels.podLabels`
+These are functions that are used to label objects. They are configured by this `values.yaml`
+```yaml
+global:
+  podLabels: {}  # included in all the pods of all the charts that implement this library
+  labels: {}  # included in all the objects of all the charts that implement this library
+podLabels: {}  # included in all the pods of this chart
+labels: {}  # included in all the objects of this chart
+```
+
+label maps are merged from global to local values.
+
+And chart writer should use them like this:
+```mustache
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+```
+
+`newrelic.common.labels.podLabels` includes `newrelic.common.labels.selectorLabels` automatically.
+
+
+
+## _priority-class-name.tpl
+### `newrelic.common.priorityClassName`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  priorityClassName: ""
+priorityClassName: ""
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `priorityClassName` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.priorityClassName" . }}
+  priorityClassName: {{ . }}
+  {{- end }}
+```
+
+
+
+## _hostnetwork.tpl
+### `newrelic.common.hostNetwork`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  hostNetwork:  # Note that this is empty (nil)
+hostNetwork:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `hostNetwork` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.hostNetwork" . }}
+  hostNetwork: {{ . }}
+  {{- end }}
+```
+
+### `newrelic.common.hostNetwork.value`
+This function is an abstraction of the function above but this returns directly "true" or "false".
+
+Be careful with using this with an `if` as Helm does evaluate "false" (string) as `true`.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+```
+
+
+
+## _dnsconfig.tpl
+### `newrelic.common.dnsConfig`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  dnsConfig: {}
+dnsConfig: {}
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `dnsConfig` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.dnsConfig" . }}
+  dnsConfig:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _images.tpl
+These functions help us to deal with how images are templated. This allows setting `registries`
+where to fetch images globally while being flexible enough to fit in different maps of images
+and deployments with one or more images. This is the example of a complex `values.yaml` that
+we are going to use during the documentation of these functions:
+
+```yaml
+global:
+  images:
+    registry: nexus-3-instance.internal.clients-domain.tld
+jobImage:
+  registry: # defaults to "example.tld" when empty in these examples
+  repository: ingress-nginx/kube-webhook-certgen
+  tag: v1.1.1
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+images:
+  integration:
+    registry:
+    repository: newrelic/nri-kube-events
+    tag: 1.8.0
+    pullPolicy: IfNotPresent
+  agent:
+    registry:
+    repository: newrelic/k8s-events-forwarder
+    tag: 1.22.0
+    pullPolicy: IfNotPresent
+  pullSecrets: []
+```
+
+### `newrelic.common.images.image`
+This will return a string with the image ready to be downloaded that includes the registry, the image and the tag.
+`defaultRegistry` is used to keep `registry` field empty in `values.yaml` so you can override the image using
+`global.images.registry`, your local `jobImage.registry` and be able to fallback to a registry that is not `docker.io`
+(Or the default repository that the client could have set in the CRI).
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.image" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.registry`
+It returns the registry from the global or local values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.registry" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.repository`
+It returns the image from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.tag`
+It returns the image's tag from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.renderPullSecrets`
+If returns a merged map that contains the pull secrets from the global configuration and the local one.  
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.jobImage.pullSecrets "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+```
+
+
+
+## _serviceaccount.tpl
+These functions are used to evaluate if the service account should be created, with which name and add annotations to it.
+
+The functions that the common library has implemented for service accounts are:
+* `newrelic.common.serviceAccount.create`
+* `newrelic.common.serviceAccount.name`
+* `newrelic.common.serviceAccount.annotations`
+
+Usage:
+```mustache
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- with (include "newrelic.common.serviceAccount.annotations" .) }}
+  annotations:
+    {{- . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
+```
+
+
+
+## _affinity.tpl, _nodeselector.tpl and _tolerations.tpl
+These three files are almost the same and they follow the idiomatic way of `helm create`.
+
+Each function also looks if there is a global value like the other helpers.
+```yaml
+global:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+affinity: {}
+nodeSelector: {}
+tolerations: []
+```
+
+The values here are replaced instead of be merged. If a value at root level is found, the global one is ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.nodeSelector" . }}
+  nodeSelector:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.affinity" . }}
+  affinity:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.tolerations" . }}
+  tolerations:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _agent-config.tpl
+### `newrelic.common.agentConfig.defaults`
+This returns a YAML that the agent can use directly as a config that includes other options from the values file like verbose mode,
+custom attributes, FedRAMP and such.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include newrelic.common.naming.truncateToDNSWithSuffix (dict "name" (include "newrelic.common.naming.fullname" .) suffix "agent-config") }}
+  namespace: {{ .Release.Namespace }}
+data:
+  newrelic-infra.yml: |-
+    # This is the configuration file for the infrastructure agent. See:
+    # https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+    {{- include "newrelic.common.agentConfig.defaults" . | nindent 4 }}
+```
+
+
+
+## _cluster.tpl
+### `newrelic.common.cluster`
+Returns the cluster name
+
+Usage:
+```mustache
+{{ include "newrelic.common.cluster" . }}
+```
+
+
+
+## _custom-attributes.tpl
+### `newrelic.common.customAttributes`
+Return custom attributes in YAML format.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example
+data:
+  custom-attributes.yaml: |
+    {{- include "newrelic.common.customAttributes" . | nindent 4 }}
+  custom-attributes.json: |
+    {{- include "newrelic.common.customAttributes" . | fromYaml | toJson | nindent 4 }}
+```
+
+
+
+## _fedramp.tpl
+### `newrelic.common.fedramp.enabled`
+Returns true if FedRAMP is enabled or an empty string if not. It can be safely used in conditionals as an empty string is a Helm falsiness.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled" . }}
+```
+
+### `newrelic.common.fedramp.enabled.value`
+Returns true if FedRAMP is enabled or false if not. This is to have the value of FedRAMP ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled.value" . }}
+```
+
+
+
+## _license.tpl
+### `newrelic.common.license.secretName` and ### `newrelic.common.license.secretKeyName`
+Returns the secret and key inside the secret where to read the license key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the license key.
+
+To create the secret use `newrelic.common.license.secret`.
+
+Usage:
+```mustache
+{{- if and (.Values.controlPlane.enabled) (not (include "newrelic.fargate" .)) }}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+  containers:
+  - name: agent
+    env:
+    - name: "NRIA_LICENSE_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.license.secretName" . }}
+          key: {{ include "newrelic.common.license.secretKeyName" . }}
+```
+
+
+
+## _license_secret.tpl
+### `newrelic.common.license.secret`
+This function templates the secret that is used by agents and integrations with the license Key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any license key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.license.secret" . -}}
+```
+
+
+
+## _insights.tpl
+### `newrelic.common.insightsKey.secretName` and ### `newrelic.common.insightsKey.secretKeyName`
+Returns the secret and key inside the secret where to read the insights key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.insightsKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "INSIGHTS_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.insightsKey.secretName" . }}
+          key: {{ include "newrelic.common.insightsKey.secretKeyName" . }}
+```
+
+
+
+## _insights_secret.tpl
+### `newrelic.common.insightsKey.secret`
+This function templates the secret that is used by agents and integrations with the insights key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any insights key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.insightsKey.secret" . -}}
+```
+
+
+
+## _userkey.tpl
+### `newrelic.common.userKey.secretName` and ### `newrelic.common.userKey.secretKeyName`
+Returns the secret and key inside the secret where to read a user key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.userKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "API_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.userKey.secretName" . }}
+          key: {{ include "newrelic.common.userKey.secretKeyName" . }}
+```
+
+
+
+## _userkey_secret.tpl
+### `newrelic.common.userKey.secret`
+This function templates the secret that is used by agents and integrations with a user key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any API key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.userKey.secret" . -}}
+```
+
+
+
+## _region.tpl
+### `newrelic.common.region.validate`
+Given a string, return a normalized name for the region if valid.
+
+This function does not need the context of the chart, only the value to be validated. The region returned
+honors the region [definition of the newrelic-client-go implementation](https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21)
+so (as of 2024/09/14) it returns the region as "US", "EU", "Staging", or "Local".
+
+In case the region provided does not match these 4, the helper calls `fail` and abort the templating.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region.validate" "us" }}
+```
+
+### `newrelic.common.region`
+It reads global and local variables for `region`:
+```yaml
+global:
+  region:  # Note that this can be empty (nil) or "" (empty string)
+region:  # Note that this can be empty (nil) or "" (empty string)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in your
+values a `region` is defined, the global one is going to be always ignored.
+
+This function gives protection so it enforces users to give the license key as a value in their
+`values.yaml` or specify a global or local `region` value. To understand how the `region` value
+works, read the documentation of `newrelic.common.region.validate`.
+
+The function will change the region from US, EU or Staging based of the license key and the
+`nrStaging` toggle. Whichever region is computed from the license/toggle can be overridden by
+the `region` value.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region" . }}
+```
+
+
+
+## _low-data-mode.tpl
+### `newrelic.common.lowDataMode`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  lowDataMode:  # Note that this is empty (nil)
+lowDataMode:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `lowdataMode` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.lowDataMode" . }}
+```
+
+
+
+## _privileged.tpl
+### `newrelic.common.privileged`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  privileged:  # Note that this is empty (nil)
+privileged:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `privileged` is defined, the global one is going to be always ignored.
+
+Chart writers could override this and put directly a `true` in the `values.yaml` to override the
+default of the common library.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged" . }}
+```
+
+### `newrelic.common.privileged.value`
+Returns true if privileged mode is enabled or false if not. This is to have the value of privileged ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged.value" . }}
+```
+
+
+
+## _proxy.tpl
+### `newrelic.common.proxy`
+Returns the proxy URL configured by the user. 
+
+Usage:
+```mustache
+{{ include "newrelic.common.proxy" . }}
+```
+
+
+
+## _security-context.tpl
+Use these functions to share the security context among all charts. Useful in clusters that have security enforcing not to
+use the root user (like OpenShift) or users that have an admission webhooks.
+
+The functions are:
+* `newrelic.common.securityContext.container`
+* `newrelic.common.securityContext.pod`
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+    spec:
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+
+      containers:
+        - name: example
+          {{- with include "nriKubernetes.securityContext.container" . }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+```
+
+
+
+## _staging.tpl
+### `newrelic.common.nrStaging`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  nrStaging:  # Note that this is empty (nil)
+nrStaging:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `nrStaging` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging" . }}
+```
+
+### `newrelic.common.nrStaging.value`
+Returns true if staging is enabled or false if not. This is to have the staging value ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging.value" . }}
+```
+
+
+
+## _verbose-log.tpl
+### `newrelic.common.verboseLog`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  verboseLog:  # Note that this is empty (nil)
+verboseLog:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `verboseLog` is defined, the global one is going to be always ignored.
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsBoolean`
+Returns true if verbose is enabled or false if not. This is to have the verbose value ready to be templated as a boolean
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsBoolean" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsInt`
+Returns 1 if verbose is enabled or 0 if not. This is to have the verbose value ready to be templated as an integer
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsInt" . }}
+```
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/README.md
new file mode 100644
index 000000000..10f08ca67
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/README.md
@@ -0,0 +1,106 @@
+# Helm Common library
+
+The common library is a way to unify the UX through all the Helm charts that implement it.
+
+The tooling suite that New Relic is huge and growing and this allows to set things globally
+and locally for a single chart.
+
+## Documentation for chart writers
+
+If you are writing a chart that is going to use this library you can check the [developers guide](/library/common-library/DEVELOPERS.md) to see all
+the functions/templates that we have implemented, what they do and how to use them.
+
+## Values managed globally
+
+We want to have a seamless experience through all the charts so we created this library that tries to standardize the behaviour
+of all the charts. Sadly, because of the complexity of all these integrations, not all the charts behave exactly as expected.
+
+An example is `newrelic-infrastructure` that ignores `hostNetwork` in the control plane scraper because most of the users has the
+control plane listening in the node to `localhost`.
+
+For each chart that has a special behavior (or further information of the behavior) there is a "chart particularities" section
+in its README.md that explains which is the expected behavior.
+
+At the time of writing this, all the charts from `nri-bundle` except `newrelic-logging` and `synthetics-minion` implements this
+library and honors global options as described in this document.
+
+Here is a list of global options:
+
+| Global keys | Local keys | Default | Merged[<sup>1</sup>](#values-managed-globally-1) | Description |
+|-------------|------------|---------|--------------------------------------------------|-------------|
+| global.cluster | cluster | `""` |  | Name of the Kubernetes cluster monitored |
+| global.licenseKey | licenseKey | `""` |  | This set this license key to use |
+| global.customSecretName | customSecretName | `""` |  | In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there |
+| global.customSecretLicenseKey | customSecretLicenseKey | `""` |  | In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located |
+| global.podLabels | podLabels | `{}` | yes | Additional labels for chart pods |
+| global.labels | labels | `{}` | yes | Additional labels for chart objects |
+| global.priorityClassName | priorityClassName | `""` |  | Sets pod's priorityClassName |
+| global.hostNetwork | hostNetwork | `false` |  | Sets pod's hostNetwork |
+| global.dnsConfig | dnsConfig | `{}` |  | Sets pod's dnsConfig |
+| global.images.registry | See [Further information](#values-managed-globally-2) | `""` |  | Changes the registry where to get the images. Useful when there is an internal image cache/proxy |
+| global.images.pullSecrets | See [Further information](#values-managed-globally-2) | `[]` | yes | Set secrets to be able to fetch images |
+| global.podSecurityContext | podSecurityContext | `{}` |  | Sets security context (at pod level) |
+| global.containerSecurityContext | containerSecurityContext | `{}` |  | Sets security context (at container level) |
+| global.affinity | affinity | `{}` |  | Sets pod/node affinities |
+| global.nodeSelector | nodeSelector | `{}` |  | Sets pod's node selector |
+| global.tolerations | tolerations | `[]` |  | Sets pod's tolerations to node taints |
+| global.serviceAccount.create | serviceAccount.create | `true` |  | Configures if the service account should be created or not |
+| global.serviceAccount.name | serviceAccount.name | name of the release |  | Change the name of the service account. This is honored if you disable on this cahrt the creation of the service account so you can use your own. |
+| global.serviceAccount.annotations | serviceAccount.annotations | `{}` | yes | Add these annotations to the service account we create |
+| global.customAttributes | customAttributes | `{}` |  | Adds extra attributes to the cluster and all the metrics emitted to the backend |
+| global.fedramp | fedramp | `false` |  | Enables FedRAMP |
+| global.lowDataMode | lowDataMode | `false` |  | Reduces number of metrics sent in order to reduce costs |
+| global.privileged | privileged | Depends on the chart |  | In each integration it has different behavior. See [Further information](#values-managed-globally-3) but all aims to send less metrics to the backend to try to save costs |
+| global.proxy | proxy | `""` |  | Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port` |
+| global.nrStaging | nrStaging | `false` |  | Send the metrics to the staging backend. Requires a valid staging license key |
+| global.verboseLog | verboseLog | `false` |  | Sets the debug/trace logs to this integration or all integrations if it is set globally |
+
+### Further information
+<a name="values-managed-globally-1"></a>
+#### 1. Merged
+
+Merged means that the values from global are not replaced by the local ones. Think in this example:
+```yaml
+global:
+  labels:
+    global: global
+  hostNetwork: true
+  nodeSelector:
+    global: global
+
+labels:
+  local: local
+nodeSelector:
+  local: local
+hostNetwork: false
+```
+
+This values will template `hostNetwork` to `false`, a map of labels `{ "global": "global", "local": "local" }` and a `nodeSelector` with
+`{ "local": "local" }`.
+
+As Helm by default merges all the maps it could be confusing that we have two behaviors (merging `labels` and replacing `nodeSelector`)
+the `values` from global to local. This is the rationale behind this:
+* `hostNetwork` is templated to `false` because is overriding the value defined globally.
+* `labels` are merged because the user may want to label all the New Relic pods at once and label other solution pods differently for
+  clarity' sake.
+* `nodeSelector` does not merge as `labels` because could make it harder to overwrite/delete a selector that comes from global because
+  of the logic that Helm follows merging maps.
+
+<a name="values-managed-globally-2"></a>
+#### 2. Fine grain registries
+
+Some charts only have 1 image while others that can have 2 or more images. The local path for the registry can change depending
+on the chart itself.
+
+As this is mostly unique per helm chart, you should take a look to the chart's values table (or directly to the `values.yaml` file to see all the
+images that you can change.
+
+This should only be needed if you have an advanced setup that forces you to have granularity enough to force a proxy/cache registry per integration.
+
+
+<a name="values-managed-globally-3"></a>
+#### 3. Privileged mode
+
+By default, from the common library, the privileged mode is set to false. But most of the helm charts require this to be true to fetch more
+metrics so could see a true in some charts. The consequences of the privileged mode differ from one chart to another so for each chart that
+honors the privileged mode toggle should be a section in the README explaining which is the behavior with it enabled or disabled.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_affinity.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_affinity.tpl
new file mode 100644
index 000000000..1b2636754
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_affinity.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod affinity */ -}}
+{{- define "newrelic.common.affinity" -}}
+    {{- if .Values.affinity -}}
+        {{- toYaml .Values.affinity -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.affinity -}}
+            {{- toYaml .Values.global.affinity -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_agent-config.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_agent-config.tpl
new file mode 100644
index 000000000..9c32861a0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_agent-config.tpl
@@ -0,0 +1,26 @@
+{{/*
+This helper should return the defaults that all agents should have
+*/}}
+{{- define "newrelic.common.agentConfig.defaults" -}}
+{{- if include "newrelic.common.verboseLog" . }}
+log:
+  level: trace
+{{- end }}
+
+{{- if (include "newrelic.common.nrStaging" . ) }}
+staging: true
+{{- end }}
+
+{{- with include "newrelic.common.proxy" . }}
+proxy: {{ . | quote }}
+{{- end }}
+
+{{- with include "newrelic.common.fedramp.enabled" . }}
+fedramp: {{ . }}
+{{- end }}
+
+{{- with fromYaml ( include "newrelic.common.customAttributes" . ) }}
+custom_attributes:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_cluster.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_cluster.tpl
new file mode 100644
index 000000000..0197dd35a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_cluster.tpl
@@ -0,0 +1,15 @@
+{{/*
+Return the cluster
+*/}}
+{{- define "newrelic.common.cluster" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.cluster -}}
+    {{- .Values.cluster -}}
+{{- else if $global.cluster -}}
+    {{- $global.cluster -}}
+{{- else -}}
+    {{ fail "There is not cluster name definition set neither in `.global.cluster' nor `.cluster' in your values.yaml. Cluster name is required." }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_custom-attributes.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_custom-attributes.tpl
new file mode 100644
index 000000000..92020719c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_custom-attributes.tpl
@@ -0,0 +1,17 @@
+{{/*
+This will render custom attributes as a YAML ready to be templated or be used with `fromYaml`.
+*/}}
+{{- define "newrelic.common.customAttributes" -}}
+{{- $customAttributes := dict -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- if $global.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes $global.customAttributes -}}
+{{- end -}}
+
+{{- if .Values.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes .Values.customAttributes -}}
+{{- end -}}
+
+{{- toYaml $customAttributes -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_dnsconfig.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_dnsconfig.tpl
new file mode 100644
index 000000000..d4e40aa8a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_dnsconfig.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod dnsConfig */ -}}
+{{- define "newrelic.common.dnsConfig" -}}
+    {{- if .Values.dnsConfig -}}
+        {{- toYaml .Values.dnsConfig -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.dnsConfig -}}
+            {{- toYaml .Values.global.dnsConfig -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_fedramp.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_fedramp.tpl
new file mode 100644
index 000000000..9df8d6b5e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_fedramp.tpl
@@ -0,0 +1,25 @@
+{{- /* Defines the fedRAMP flag */ -}}
+{{- define "newrelic.common.fedramp.enabled" -}}
+    {{- if .Values.fedramp -}}
+        {{- if .Values.fedramp.enabled -}}
+            {{- .Values.fedramp.enabled -}}
+        {{- end -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.fedramp -}}
+             {{- if .Values.global.fedramp.enabled -}}
+                {{- .Values.global.fedramp.enabled -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return FedRAMP value directly ready to be templated */ -}}
+{{- define "newrelic.common.fedramp.enabled.value" -}}
+{{- if include "newrelic.common.fedramp.enabled" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_hostnetwork.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_hostnetwork.tpl
new file mode 100644
index 000000000..4cf017ef7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_hostnetwork.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper allows to override the global `.global.hostNetwork` with the value of `.hostNetwork`.
+Returns "true" if `hostNetwork` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.hostNetwork" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- /*
+`get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs
+
+We also want only to return when this is true, returning `false` here will template "false" (string) when doing
+an `(include "newrelic.common.hostNetwork" .)`, which is not an "empty string" so it is `true` if it is used
+as an evaluation somewhere else.
+*/ -}}
+{{- if get .Values "hostNetwork" | kindIs "bool" -}}
+    {{- if .Values.hostNetwork -}}
+        {{- .Values.hostNetwork -}}
+    {{- end -}}
+{{- else if get $global "hostNetwork" | kindIs "bool" -}}
+    {{- if $global.hostNetwork -}}
+        {{- $global.hostNetwork -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper abstracts the function "newrelic.common.hostNetwork" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.hostNetwork.value" -}}
+{{- if include "newrelic.common.hostNetwork" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_images.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_images.tpl
new file mode 100644
index 000000000..d4fb43290
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_images.tpl
@@ -0,0 +1,94 @@
+{{- /*
+Return the proper image name
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.image" -}}
+    {{- $registryName := include "newrelic.common.images.registry" ( dict "imageRoot" .imageRoot "defaultRegistry" .defaultRegistry "context" .context ) -}}
+    {{- $repositoryName := include "newrelic.common.images.repository" .imageRoot -}}
+    {{- $tag := include "newrelic.common.images.tag" ( dict "imageRoot" .imageRoot "context" .context) -}}
+
+    {{- if $registryName -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag | quote -}}
+    {{- else -}}
+        {{- printf "%s:%s" $repositoryName $tag | quote -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image registry
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.registry" -}}
+{{- $globalRegistry := "" -}}
+{{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+        {{- with .context.Values.global.images.registry -}}
+            {{- $globalRegistry = . -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $localRegistry := "" -}}
+{{- if .imageRoot.registry -}}
+    {{- $localRegistry = .imageRoot.registry -}}
+{{- end -}}
+
+{{- $registry := $localRegistry | default $globalRegistry | default .defaultRegistry -}}
+{{- if $registry -}}
+    {{- $registry -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image repository
+{{ include "newrelic.common.images.repository" .Values.path.to.the.image }}
+*/ -}}
+{{- define "newrelic.common.images.repository" -}}
+    {{- .repository -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image tag
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.path.to.the.image "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.tag" -}}
+    {{- .imageRoot.tag | default .context.Chart.AppVersion | toString -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper Image Pull Registry Secret Names evaluating values as templates
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.path.to.the.images.pullSecrets1, .Values.path.to.the.images.pullSecrets2) "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.renderPullSecrets" -}}
+  {{- $flatlist := list }}
+
+  {{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+      {{- if .context.Values.global.images.pullSecrets -}}
+        {{- range .context.Values.global.images.pullSecrets -}}
+          {{- $flatlist = append $flatlist . -}}
+        {{- end -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- range .pullSecrets -}}
+    {{- if not (empty .) -}}
+      {{- range . -}}
+        {{- $flatlist = append $flatlist . -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if $flatlist -}}
+    {{- toYaml $flatlist -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_insights.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_insights.tpl
new file mode 100644
index 000000000..895c37732
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_insights.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the Insights Key.
+*/}}
+{{- define "newrelic.common.insightsKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "insightskey" ) -}}
+{{- include "newrelic.common.insightsKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secretKeyName" -}}
+{{- include "newrelic.common.insightsKey._customSecretKey" . | default "insightsKey" -}}
+{{- end -}}
+
+{{/*
+Return local insightsKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._licenseKey" -}}
+{{- if .Values.insightsKey -}}
+  {{- .Values.insightsKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.insightsKey -}}
+    {{- .Values.global.insightsKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the Insights Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretName" -}}
+{{- if .Values.customInsightsKeySecretName -}}
+  {{- .Values.customInsightsKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretName -}}
+    {{- .Values.global.customInsightsKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretKey" -}}
+{{- if .Values.customInsightsKeySecretKey -}}
+  {{- .Values.customInsightsKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretKey }}
+    {{- .Values.global.customInsightsKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_insights_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_insights_secret.yaml.tpl
new file mode 100644
index 000000000..556caa6ca
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_insights_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the insights key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secret" }}
+{{- if not (include "newrelic.common.insightsKey._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.insightsKey._licenseKey" .) }}
+    {{- fail "You must specify a insightsKey or a customInsightsSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.insightsKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.insightsKey.secretKeyName" . }}: {{ include "newrelic.common.insightsKey._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_labels.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_labels.tpl
new file mode 100644
index 000000000..1cc1e792b
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_labels.tpl
@@ -0,0 +1,58 @@
+{{/*
+This will render the labels that should be used in all the manifests used by the helm chart.
+*/}}
+{{- define "newrelic.common.labels" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- $chart := dict "helm.sh/chart" (include "newrelic.common.naming.chart" . ) -}}
+{{- $managedBy := dict "app.kubernetes.io/managed-by" .Release.Service -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $labels := mustMergeOverwrite $chart $managedBy $selectorLabels -}}
+{{- if .Chart.AppVersion -}}
+{{- $labels = mustMergeOverwrite $labels (dict "app.kubernetes.io/version" .Chart.AppVersion) -}}
+{{- end -}}
+
+{{- $globalUserLabels := $global.labels | default dict -}}
+{{- $localUserLabels := .Values.labels | default dict -}}
+
+{{- $labels = mustMergeOverwrite $labels $globalUserLabels $localUserLabels -}}
+
+{{- range $k, $v := $labels -}}
+  {{- $_ := set $labels $k (include "newrelic.common.naming.truncateToDNS" $v ) -}}
+{{- end -}}
+
+{{- toYaml $labels -}}
+{{- end -}}
+
+
+
+{{/*
+This will render the labels that should be used in deployments/daemonsets template pods as a selector.
+*/}}
+{{- define "newrelic.common.labels.selectorLabels" -}}
+{{- $name := dict "app.kubernetes.io/name" ( include "newrelic.common.naming.name" . ) -}}
+{{- $instance := dict "app.kubernetes.io/instance" .Release.Name -}}
+
+{{- $selectorLabels := mustMergeOverwrite $name $instance -}}
+
+{{- toYaml $selectorLabels -}}
+{{- end }}
+
+
+
+{{/*
+Pod labels
+*/}}
+{{- define "newrelic.common.labels.podLabels" -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- $globalPodLabels := $global.podLabels | default dict }}
+
+{{- $localPodLabels := .Values.podLabels | default dict }}
+
+{{- $podLabels := mustMergeOverwrite $selectorLabels $globalPodLabels $localPodLabels -}}
+
+{{- toYaml $podLabels -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_license.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_license.tpl
new file mode 100644
index 000000000..cb349f6bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_license.tpl
@@ -0,0 +1,68 @@
+{{/*
+Return the name of the secret holding the License Key.
+*/}}
+{{- define "newrelic.common.license.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "license" ) -}}
+{{- include "newrelic.common.license._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+*/}}
+{{- define "newrelic.common.license.secretKeyName" -}}
+{{- include "newrelic.common.license._customSecretKey" . | default "licenseKey" -}}
+{{- end -}}
+
+{{/*
+Return local licenseKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._licenseKey" -}}
+{{- if .Values.licenseKey -}}
+  {{- .Values.licenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.licenseKey -}}
+    {{- .Values.global.licenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the License Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretName" -}}
+{{- if .Values.customSecretName -}}
+  {{- .Values.customSecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretName -}}
+    {{- .Values.global.customSecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretKey" -}}
+{{- if .Values.customSecretLicenseKey -}}
+  {{- .Values.customSecretLicenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretLicenseKey }}
+    {{- .Values.global.customSecretLicenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the user set a custom secret for the license.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._usesCustomSecret" -}}
+{{- if or (include "newrelic.common.license._customSecretName" .) (include "newrelic.common.license._customSecretKey" .) -}}
+true
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_license_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_license_secret.yaml.tpl
new file mode 100644
index 000000000..610a0a337
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_license_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the license key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.license.secret" }}
+{{- if not (include "newrelic.common.license._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.license._licenseKey" .) }}
+    {{- fail "You must specify a licenseKey or a customSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.license.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.license.secretKeyName" . }}: {{ include "newrelic.common.license._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_low-data-mode.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_low-data-mode.tpl
new file mode 100644
index 000000000..3dd55ef2f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_low-data-mode.tpl
@@ -0,0 +1,26 @@
+{{- /*
+Abstraction of the lowDataMode toggle.
+This helper allows to override the global `.global.lowDataMode` with the value of `.lowDataMode`.
+Returns "true" if `lowDataMode` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.lowDataMode" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "lowDataMode" | kindIs "bool") -}}
+    {{- if .Values.lowDataMode -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.lowDataMode" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.lowDataMode -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "lowDataMode" | kindIs "bool" -}}
+    {{- if $global.lowDataMode -}}
+        {{- $global.lowDataMode -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_naming.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_naming.tpl
new file mode 100644
index 000000000..19fa92648
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_naming.tpl
@@ -0,0 +1,73 @@
+{{/*
+This is an function to be called directly with a string just to truncate strings to
+63 chars because some Kubernetes name fields are limited to that.
+*/}}
+{{- define "newrelic.common.naming.truncateToDNS" -}}
+{{- . | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+
+
+{{- /*
+Given a name and a suffix returns a 'DNS Valid' which always include the suffix, truncating the name if needed.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If suffix is too long it gets truncated but it always takes precedence over name, so a 63 chars suffix would suppress the name.
+Usage:
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" "<my-name>" "suffix" "my-suffix" ) }}
+*/ -}}
+{{- define "newrelic.common.naming.truncateToDNSWithSuffix" -}}
+{{- $suffix := (include "newrelic.common.naming.truncateToDNS" .suffix) -}}
+{{- $maxLen := (max (sub 63 (add1 (len $suffix))) 0) -}} {{- /* We prepend "-" to the suffix so an additional character is needed */ -}}
+
+{{- $newName := .name | trunc ($maxLen | int) | trimSuffix "-"  -}}
+{{- if $newName -}}
+{{- printf "%s-%s" $newName $suffix -}}
+{{- else -}}
+{{ $suffix }}
+{{- end -}}
+
+{{- end -}}
+
+
+
+{{/*
+Expand the name of the chart.
+Uses the Chart name by default if nameOverride is not set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.name" -}}
+{{- $name := .Values.nameOverride | default .Chart.Name -}}
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+{{- end }}
+
+
+
+{{/*
+Create a default fully qualified app name.
+By default the full name will be "<release_name>" just in if it has the chart name included in that, if not
+it will be concatenated like "<release_name>-<chart_chart>". This could change if fullnameOverride or
+nameOverride are set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.fullname" -}}
+{{- $name := include "newrelic.common.naming.name" . -}}
+
+{{- if .Values.fullnameOverride -}}
+    {{- $name = .Values.fullnameOverride  -}}
+{{- else if not (contains $name .Release.Name) -}}
+    {{- $name = printf "%s-%s" .Release.Name $name -}}
+{{- end -}}
+
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+
+{{- end -}}
+
+
+
+{{/*
+Create chart name and version as used by the chart label.
+This function should not be used for naming objects. Use "common.naming.{name,fullname}" instead.
+*/}}
+{{- define "newrelic.common.naming.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_nodeselector.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_nodeselector.tpl
new file mode 100644
index 000000000..d48887341
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_nodeselector.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod nodeSelector */ -}}
+{{- define "newrelic.common.nodeSelector" -}}
+    {{- if .Values.nodeSelector -}}
+        {{- toYaml .Values.nodeSelector -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.nodeSelector -}}
+            {{- toYaml .Values.global.nodeSelector -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_priority-class-name.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_priority-class-name.tpl
new file mode 100644
index 000000000..50182b734
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_priority-class-name.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the pod priorityClassName */ -}}
+{{- define "newrelic.common.priorityClassName" -}}
+    {{- if .Values.priorityClassName -}}
+        {{- .Values.priorityClassName -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.priorityClassName -}}
+            {{- .Values.global.priorityClassName -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_privileged.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_privileged.tpl
new file mode 100644
index 000000000..f3ae814dd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_privileged.tpl
@@ -0,0 +1,28 @@
+{{- /*
+This is a helper that returns whether the chart should assume the user is fine deploying privileged pods.
+*/ -}}
+{{- define "newrelic.common.privileged" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists. */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if get .Values "privileged" | kindIs "bool" -}}
+    {{- if .Values.privileged -}}
+        {{- .Values.privileged -}}
+    {{- end -}}
+{{- else if get $global "privileged" | kindIs "bool" -}}
+    {{- if $global.privileged -}}
+        {{- $global.privileged -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return directly "true" or "false" based in the exist of "newrelic.common.privileged" */ -}}
+{{- define "newrelic.common.privileged.value" -}}
+{{- if include "newrelic.common.privileged" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_proxy.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_proxy.tpl
new file mode 100644
index 000000000..60f34c7ec
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_proxy.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the proxy */ -}}
+{{- define "newrelic.common.proxy" -}}
+    {{- if .Values.proxy -}}
+        {{- .Values.proxy -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.proxy -}}
+            {{- .Values.global.proxy -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_region.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_region.tpl
new file mode 100644
index 000000000..bdcacf323
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_region.tpl
@@ -0,0 +1,74 @@
+{{/*
+Return the region that is being used by the user
+*/}}
+{{- define "newrelic.common.region" -}}
+{{- if and (include "newrelic.common.license._usesCustomSecret" .) (not (include "newrelic.common.region._fromValues" .)) -}}
+  {{- fail "This Helm Chart is not able to compute the region. You must specify a .global.region or .region if the license is set using a custom secret." -}}
+{{- end -}}
+
+{{- /* Defaults */ -}}
+{{- $region := "us" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+  {{- $region = "staging" -}}
+{{- else if include "newrelic.common.region._isEULicenseKey" . -}}
+  {{- $region = "eu" -}}
+{{- end -}}
+
+{{- include "newrelic.common.region.validate" (include "newrelic.common.region._fromValues" . | default $region ) -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values if valid. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+
+Usage: `include "newrelic.common.region.validate" "us"`
+*/}}
+{{- define "newrelic.common.region.validate" -}}
+{{- /* Ref: https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21 */ -}}
+{{- $region := . | lower -}}
+{{- if eq $region "us" -}}
+  US
+{{- else if eq $region "eu" -}}
+  EU
+{{- else if eq $region "staging" -}}
+  Staging
+{{- else if eq $region "local" -}}
+  Local
+{{- else -}}
+  {{- fail (printf "the region provided is not valid: %s not in \"US\" \"EU\" \"Staging\" \"Local\"" .) -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._fromValues" -}}
+{{- if .Values.region -}}
+  {{- .Values.region -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.region -}}
+    {{- .Values.global.region -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the license is for EU region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._isEULicenseKey" -}}
+{{- if not (include "newrelic.common.license._usesCustomSecret" .) -}}
+  {{- $license := include "newrelic.common.license._licenseKey" . -}}
+  {{- if hasPrefix "eu" $license -}}
+    true
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_security-context.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_security-context.tpl
new file mode 100644
index 000000000..9edfcabfd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_security-context.tpl
@@ -0,0 +1,23 @@
+{{- /* Defines the container securityContext context */ -}}
+{{- define "newrelic.common.securityContext.container" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.containerSecurityContext -}}
+    {{- toYaml .Values.containerSecurityContext -}}
+{{- else if $global.containerSecurityContext -}}
+    {{- toYaml $global.containerSecurityContext -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the pod securityContext context */ -}}
+{{- define "newrelic.common.securityContext.pod" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.podSecurityContext -}}
+    {{- toYaml .Values.podSecurityContext -}}
+{{- else if $global.podSecurityContext -}}
+    {{- toYaml $global.podSecurityContext -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_serviceaccount.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_serviceaccount.tpl
new file mode 100644
index 000000000..2d352f6ea
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_serviceaccount.tpl
@@ -0,0 +1,90 @@
+{{- /* Defines if the service account has to be created or not */ -}}
+{{- define "newrelic.common.serviceAccount.create" -}}
+{{- $valueFound := false -}}
+
+{{- /* Look for a global creation of a service account */ -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "create" | kindIs "bool") -}}
+        {{- $valueFound = true -}}
+        {{- if .Values.serviceAccount.create -}}
+            {{- /*
+                We want only to return when this is true, returning `false` here will template "false" (string) when doing
+                an `(include "newrelic.common.serviceAccount.name" .)`, which is not an "empty string" so it is `true` if it is used
+                as an evaluation somewhere else.
+            */ -}}
+            {{- .Values.serviceAccount.create -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* Look for a local creation of a service account */ -}}
+{{- if not $valueFound -}}
+    {{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+    {{- $global := index .Values "global" | default dict -}}
+    {{- if get $global "serviceAccount" | kindIs "map" -}}
+        {{- if get $global.serviceAccount "create" | kindIs "bool" -}}
+            {{- $valueFound = true -}}
+            {{- if $global.serviceAccount.create -}}
+                {{- $global.serviceAccount.create -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* In case no serviceAccount value has been found, default to "true" */ -}}
+{{- if not $valueFound -}}
+true
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the name of the service account */ -}}
+{{- define "newrelic.common.serviceAccount.name" -}}
+{{- $localServiceAccount := "" -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "name" | kindIs "string") -}}
+        {{- $localServiceAccount = .Values.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := "" -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "name" | kindIs "string" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- if (include "newrelic.common.serviceAccount.create" .) -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default (include "newrelic.common.naming.fullname" .) -}}
+{{- else -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default "default" -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Merge the global and local annotations for the service account */ -}}
+{{- define "newrelic.common.serviceAccount.annotations" -}}
+{{- $localServiceAccount := dict -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if get .Values.serviceAccount "annotations" -}}
+        {{- $localServiceAccount = .Values.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := dict -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "annotations" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $merged := mustMergeOverwrite $globalServiceAccount $localServiceAccount -}}
+
+{{- if $merged -}}
+    {{- toYaml $merged -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_staging.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_staging.tpl
new file mode 100644
index 000000000..bd9ad09bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_staging.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the nrStaging toggle.
+This helper allows to override the global `.global.nrStaging` with the value of `.nrStaging`.
+Returns "true" if `nrStaging` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.nrStaging" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "nrStaging" | kindIs "bool") -}}
+    {{- if .Values.nrStaging -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.nrStaging" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.nrStaging -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "nrStaging" | kindIs "bool" -}}
+    {{- if $global.nrStaging -}}
+        {{- $global.nrStaging -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Returns "true" of "false" directly instead of empty string (Helm falsiness) based on the exit of "newrelic.common.nrStaging"
+*/ -}}
+{{- define "newrelic.common.nrStaging.value" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_tolerations.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_tolerations.tpl
new file mode 100644
index 000000000..e016b38e2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_tolerations.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod tolerations */ -}}
+{{- define "newrelic.common.tolerations" -}}
+    {{- if .Values.tolerations -}}
+        {{- toYaml .Values.tolerations -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.tolerations -}}
+            {{- toYaml .Values.global.tolerations -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_userkey.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_userkey.tpl
new file mode 100644
index 000000000..982ea8e09
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_userkey.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the API Key.
+*/}}
+{{- define "newrelic.common.userKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "userkey" ) -}}
+{{- include "newrelic.common.userKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+*/}}
+{{- define "newrelic.common.userKey.secretKeyName" -}}
+{{- include "newrelic.common.userKey._customSecretKey" . | default "userKey" -}}
+{{- end -}}
+
+{{/*
+Return local API Key if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._userKey" -}}
+{{- if .Values.userKey -}}
+  {{- .Values.userKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.userKey -}}
+    {{- .Values.global.userKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the API Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretName" -}}
+{{- if .Values.customUserKeySecretName -}}
+  {{- .Values.customUserKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretName -}}
+    {{- .Values.global.customUserKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretKey" -}}
+{{- if .Values.customUserKeySecretKey -}}
+  {{- .Values.customUserKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretKey }}
+    {{- .Values.global.customUserKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_userkey_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_userkey_secret.yaml.tpl
new file mode 100644
index 000000000..b97985654
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_userkey_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the user key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.userKey.secret" }}
+{{- if not (include "newrelic.common.userKey._customSecretName" .) }}
+{{- /* Fail if user key is empty and required: */ -}}
+{{- if not (include "newrelic.common.userKey._userKey" .) }}
+    {{- fail "You must specify a userKey or a customUserKeySecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.userKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.userKey.secretKeyName" . }}: {{ include "newrelic.common.userKey._userKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_verbose-log.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_verbose-log.tpl
new file mode 100644
index 000000000..2286d4681
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/templates/_verbose-log.tpl
@@ -0,0 +1,54 @@
+{{- /*
+Abstraction of the verbose toggle.
+This helper allows to override the global `.global.verboseLog` with the value of `.verboseLog`.
+Returns "true" if `verbose` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.verboseLog" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "verboseLog" | kindIs "bool") -}}
+    {{- if .Values.verboseLog -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.verboseLog" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.verboseLog -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "verboseLog" | kindIs "bool" -}}
+    {{- if $global.verboseLog -}}
+        {{- $global.verboseLog -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsBoolean" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return 1 or 0 directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsInt" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+1
+{{- else -}}
+0
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/values.yaml
new file mode 100644
index 000000000..75e2d112a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/charts/common-library/values.yaml
@@ -0,0 +1 @@
+# values are not needed for the library chart, however this file is still needed for helm lint to work.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/ci/test-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/ci/test-values.yaml
new file mode 100644
index 000000000..6f79dea93
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/ci/test-values.yaml
@@ -0,0 +1,5 @@
+cluster: test-cluster
+
+image:
+  repository: e2e/metadata-injection
+  tag: test  # Defaults to AppVersion
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/NOTES.txt b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/NOTES.txt
new file mode 100644
index 000000000..544124d11
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/NOTES.txt
@@ -0,0 +1,23 @@
+Your deployment of the New Relic metadata injection webhook is complete. You can check on the progress of this by running the following command:
+
+    kubectl get deployments -o wide -w --namespace {{ .Release.Namespace }} {{ template "newrelic.common.naming.fullname" . }}
+
+{{- if .Values.customTLSCertificate }}
+You have configure the chart to use a custom tls certificate, make sure to read the 'Manage custom certificates' section of the official docs to find the instructions on how to finish setting up the webhook.
+
+https://docs.newrelic.com/docs/integrations/kubernetes-integration/link-your-applications/link-your-applications-kubernetes#configure-injection
+{{- end }}
+
+To validate the injection of metadata create a dummy pod containing Busybox by running:
+
+    kubectl create -f https://git.io/vPieo
+
+Check if New Relic environment variables were injected:
+
+    kubectl exec busybox0 -- env | grep NEW_RELIC_METADATA_KUBERNETES
+
+    NEW_RELIC_METADATA_KUBERNETES_CLUSTER_NAME=fsi
+    NEW_RELIC_METADATA_KUBERNETES_NODE_NAME=nodea
+    NEW_RELIC_METADATA_KUBERNETES_NAMESPACE_NAME=default
+    NEW_RELIC_METADATA_KUBERNETES_POD_NAME=busybox0
+    NEW_RELIC_METADATA_KUBERNETES_CONTAINER_NAME=busybox
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/_helpers.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/_helpers.tpl
new file mode 100644
index 000000000..54a23e981
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/_helpers.tpl
@@ -0,0 +1,72 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{- /* Allow to change pod defaults dynamically */ -}}
+{{- define "nri-metadata-injection.securityContext.pod" -}}
+{{- if include "newrelic.common.securityContext.pod" . -}}
+{{- include "newrelic.common.securityContext.pod" . -}}
+{{- else -}}
+fsGroup: 1001
+runAsUser: 1001
+runAsGroup: 1001
+{{- end -}}
+{{- end -}}
+
+{{- /*
+Naming helpers
+*/ -}}
+
+{{- define "nri-metadata-injection.name.admission" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.name" .) "suffix" "admission") }}
+{{- end -}}
+
+{{- define "nri-metadata-injection.fullname.admission" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "admission") }}
+{{- end -}}
+
+{{- define "nri-metadata-injection.fullname.admission.serviceAccount" -}}
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+  {{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "admission") }}
+{{- else -}}
+  {{ include "newrelic.common.serviceAccount.name" . }}
+{{- end -}}
+{{- end -}}
+
+{{- define "nri-metadata-injection.name.admission-create" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.name" .) "suffix" "admission-create") }}
+{{- end -}}
+
+{{- define "nri-metadata-injection.fullname.admission-create" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "admission-create") }}
+{{- end -}}
+
+{{- define "nri-metadata-injection.name.admission-patch" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.name" .) "suffix" "admission-patch") }}
+{{- end -}}
+
+{{- define "nri-metadata-injection.fullname.admission-patch" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "admission-patch") }}
+{{- end -}}
+
+{{- define "nri-metadata-injection.name.self-signed-issuer" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.name" .) "suffix" "self-signed-issuer") }}
+{{- end -}}
+
+{{- define "nri-metadata-injection.fullname.self-signed-issuer" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "self-signed-issuer") }}
+{{- end -}}
+
+{{- define "nri-metadata-injection.name.root-issuer" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.name" .) "suffix" "root-issuer") }}
+{{- end -}}
+
+{{- define "nri-metadata-injection.fullname.root-issuer" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "root-issuer") }}
+{{- end -}}
+
+{{- define "nri-metadata-injection.name.webhook-cert" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.name" .) "suffix" "webhook-cert") }}
+{{- end -}}
+
+{{- define "nri-metadata-injection.fullname.webhook-cert" -}}
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" (dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "webhook-cert") }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/clusterrole.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/clusterrole.yaml
new file mode 100644
index 000000000..275b597c8
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/clusterrole.yaml
@@ -0,0 +1,27 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "nri-metadata-injection.fullname.admission" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "newrelic.common.naming.name" $ }}-admission
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - admissionregistration.k8s.io
+    resources:
+      - mutatingwebhookconfigurations
+    verbs:
+      - get
+      - update
+{{- if .Values.rbac.pspEnabled }}
+  - apiGroups: ['policy']
+    resources: ['podsecuritypolicies']
+    verbs: ['use']
+    resourceNames:
+    - {{ include "nri-metadata-injection.fullname.admission" . }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/clusterrolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/clusterrolebinding.yaml
new file mode 100644
index 000000000..cf846745e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/clusterrolebinding.yaml
@@ -0,0 +1,20 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "nri-metadata-injection.fullname.admission" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+    app: {{ include "nri-metadata-injection.name.admission" . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "nri-metadata-injection.fullname.admission" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "nri-metadata-injection.fullname.admission.serviceAccount" . }}
+    namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-createSecret.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-createSecret.yaml
new file mode 100644
index 000000000..a04f27935
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-createSecret.yaml
@@ -0,0 +1,61 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ include "nri-metadata-injection.fullname.admission-create" . }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "nri-metadata-injection.name.admission-create" . }}
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  template:
+    metadata:
+      name: {{ include "nri-metadata-injection.fullname.admission-create" . }}
+      {{- if .Values.podAnnotations }}
+      annotations:
+        {{- toYaml .Values.podAnnotations | nindent 8 }}
+      {{- end }}
+      labels:
+        app: {{ include "nri-metadata-injection.name.admission-create" . }}
+        {{- include "newrelic.common.labels" . | nindent 8 }}
+    spec:
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" ( list .Values.jobImage.pullSecrets ) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 -}}
+      {{- end }}
+      containers:
+        - name: create
+          image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "registry.k8s.io" "imageRoot" .Values.jobImage "context" .) }}
+          imagePullPolicy: {{ .Values.jobImage.pullPolicy }}
+          args:
+            - create
+            - --host={{ include "newrelic.common.naming.fullname" . }},{{ include "newrelic.common.naming.fullname" . }}.{{ .Release.Namespace }}.svc
+            - --namespace={{ .Release.Namespace }}
+            - --secret-name={{ include "nri-metadata-injection.fullname.admission" . }}
+            - --cert-name=tls.crt
+            - --key-name=tls.key
+          {{- if .Values.jobImage.volumeMounts }}
+          volumeMounts:
+          {{- .Values.jobImage.volumeMounts | toYaml | nindent 10 }}
+          {{- end }}
+      {{- if .Values.jobImage.volumes }}
+      volumes:
+      {{- .Values.jobImage.volumes | toYaml | nindent 8 }}
+      {{- end }}
+      restartPolicy: OnFailure
+      serviceAccountName: {{ include "nri-metadata-injection.fullname.admission.serviceAccount" . }}
+      securityContext:
+        runAsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 2000
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{ include "newrelic.common.nodeSelector" . | nindent 8 }}
+      {{- if .Values.tolerations }}
+      tolerations:
+        {{- toYaml .Values.tolerations | nindent 8 }}
+      {{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-patchWebhook.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
new file mode 100644
index 000000000..99374ef35
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -0,0 +1,61 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ include "nri-metadata-injection.fullname.admission-patch" . }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "nri-metadata-injection.name.admission-patch" . }}
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  template:
+    metadata:
+      name: {{ include "nri-metadata-injection.fullname.admission-patch" . }}
+      {{- if .Values.podAnnotations }}
+      annotations:
+        {{- toYaml .Values.podAnnotations | nindent 8 }}
+      {{- end }}
+      labels:
+        app: {{ include "nri-metadata-injection.name.admission-patch" . }}
+        {{- include "newrelic.common.labels" . | nindent 8 }}
+    spec:
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" ( list .Values.jobImage.pullSecrets ) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 -}}
+      {{- end }}
+      containers:
+        - name: patch
+          image: {{ include "newrelic.common.images.image" ( dict "defaultRegistry" "registry.k8s.io" "imageRoot" .Values.jobImage "context" .) }}
+          imagePullPolicy: {{ .Values.jobImage.pullPolicy }}
+          args:
+            - patch
+            - --webhook-name={{ include "newrelic.common.naming.fullname" . }}
+            - --namespace={{ .Release.Namespace }}
+            - --secret-name={{ include "nri-metadata-injection.fullname.admission" . }}
+            - --patch-failure-policy=Ignore
+            - --patch-validating=false
+          {{- if .Values.jobImage.volumeMounts }}
+          volumeMounts:
+          {{- .Values.jobImage.volumeMounts | toYaml | nindent 10 }}
+          {{- end }}
+      {{- if .Values.jobImage.volumes }}
+      volumes:
+      {{- .Values.jobImage.volumes | toYaml | nindent 8 }}
+      {{- end }}
+      restartPolicy: OnFailure
+      serviceAccountName: {{ include "nri-metadata-injection.fullname.admission.serviceAccount" . }}
+      securityContext:
+        runAsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 2000
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{ include "newrelic.common.nodeSelector" . | nindent 8 }}
+      {{- if .Values.tolerations }}
+      tolerations:
+        {{- toYaml .Values.tolerations | nindent 8 }}
+      {{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/psp.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/psp.yaml
new file mode 100644
index 000000000..899ac95fe
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/psp.yaml
@@ -0,0 +1,50 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled) (.Values.rbac.pspEnabled) (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy")) }}
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ include "nri-metadata-injection.fullname.admission" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "nri-metadata-injection.name.admission" . }}
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  privileged: false
+  # Required to prevent escalations to root.
+  # allowPrivilegeEscalation: false
+  # This is redundant with non-root + disallow privilege escalation,
+  # but we can provide it for defense in depth.
+  #requiredDropCapabilities:
+  #  - ALL
+  # Allow core volume types.
+  volumes:
+    - 'configMap'
+    - 'emptyDir'
+    - 'projected'
+    - 'secret'
+    - 'downwardAPI'
+    - 'persistentVolumeClaim'
+  hostNetwork: false
+  hostIPC: false
+  hostPID: false
+  runAsUser:
+    # Permits the container to run with root privileges as well.
+    rule: 'RunAsAny'
+  seLinux:
+    # This policy assumes the nodes are using AppArmor rather than SELinux.
+    rule: 'RunAsAny'
+  supplementalGroups:
+    rule: 'MustRunAs'
+    ranges:
+      # Forbid adding the root group.
+      - min: 0
+        max: 65535
+  fsGroup:
+    rule: 'MustRunAs'
+    ranges:
+      # Forbid adding the root group.
+      - min: 0
+        max: 65535
+  readOnlyRootFilesystem: false
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/role.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/role.yaml
new file mode 100644
index 000000000..e42670257
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/role.yaml
@@ -0,0 +1,21 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "nri-metadata-injection.fullname.admission" . }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "nri-metadata-injection.name.admission" . }}
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+    verbs:
+      - get
+      - create
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/rolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/rolebinding.yaml
new file mode 100644
index 000000000..e73bf472c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/rolebinding.yaml
@@ -0,0 +1,21 @@
+{{- if (and (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "nri-metadata-injection.fullname.admission" . }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "nri-metadata-injection.name.admission" . }}
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "nri-metadata-injection.fullname.admission" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "nri-metadata-injection.fullname.admission.serviceAccount" . }}
+    namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/serviceaccount.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/serviceaccount.yaml
new file mode 100644
index 000000000..027a59089
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/job-patch/serviceaccount.yaml
@@ -0,0 +1,14 @@
+{{- $createServiceAccount := include "newrelic.common.serviceAccount.create" . -}}
+{{- if (and $createServiceAccount (not .Values.customTLSCertificate) (not .Values.certManager.enabled)) -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "nri-metadata-injection.fullname.admission.serviceAccount" . }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    app: {{ include "nri-metadata-injection.name.admission" . }}
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/mutatingWebhookConfiguration.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/mutatingWebhookConfiguration.yaml
new file mode 100644
index 000000000..b196d4f59
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/admission-webhooks/mutatingWebhookConfiguration.yaml
@@ -0,0 +1,36 @@
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+{{- if .Values.certManager.enabled }}
+  annotations:
+    certmanager.k8s.io/inject-ca-from: {{ printf "%s/%s-root-cert" .Release.Namespace (include "newrelic.common.naming.fullname" .) | quote }}
+    cert-manager.io/inject-ca-from: {{ printf "%s/%s-root-cert" .Release.Namespace (include "newrelic.common.naming.fullname" .) | quote }}
+{{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+webhooks:
+- name: metadata-injection.newrelic.com
+  clientConfig:
+    service:
+      name: {{ include "newrelic.common.naming.fullname" . }}
+      namespace: {{ .Release.Namespace }}
+      path: "/mutate"
+{{- if not .Values.certManager.enabled }}
+    caBundle: ""
+{{- end }}
+  rules:
+  - operations: ["CREATE"]
+    apiGroups: [""]
+    apiVersions: ["v1"]
+    resources: ["pods"]
+{{- if .Values.injectOnlyLabeledNamespaces }}
+    scope: Namespaced
+  namespaceSelector:
+    matchLabels:
+      newrelic-metadata-injection: enabled
+{{- end }}
+  failurePolicy: Ignore
+  timeoutSeconds: {{ .Values.timeoutSeconds }}
+  sideEffects: None
+  admissionReviewVersions: ["v1", "v1beta1"]
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/cert-manager.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/cert-manager.yaml
new file mode 100644
index 000000000..502fa44bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/cert-manager.yaml
@@ -0,0 +1,53 @@
+{{ if .Values.certManager.enabled }}
+---
+# Create a selfsigned Issuer, in order to create a root CA certificate for
+# signing webhook serving certificates
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ include "nri-metadata-injection.fullname.self-signed-issuer" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  selfSigned: {}
+---
+# Generate a CA Certificate used to sign certificates for the webhook
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}-root-cert
+  namespace: {{ .Release.Namespace }}
+spec:
+  secretName: {{ include "newrelic.common.naming.fullname" . }}-root-cert
+  duration: {{ .Values.certManager.rootCertificateDuration}}
+  issuerRef:
+    name: {{ include "nri-metadata-injection.fullname.self-signed-issuer" . }}
+  commonName: "ca.webhook.nri"
+  isCA: true
+---
+# Create an Issuer that uses the above generated CA certificate to issue certs
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ include "nri-metadata-injection.fullname.root-issuer" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  ca:
+    secretName: {{ include "newrelic.common.naming.fullname" . }}-root-cert
+---
+
+# Finally, generate a serving certificate for the webhook to use
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ include "nri-metadata-injection.fullname.webhook-cert" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  secretName: {{ include "nri-metadata-injection.fullname.admission" . }}
+  duration: {{ .Values.certManager.webhookCertificateDuration }}
+  issuerRef:
+    name: {{ include "nri-metadata-injection.fullname.root-issuer" . }}
+  dnsNames:
+  - {{ include "newrelic.common.naming.fullname" . }}
+  - {{ include "newrelic.common.naming.fullname" . }}.{{ .Release.Namespace }}
+  - {{ include "newrelic.common.naming.fullname" . }}.{{ .Release.Namespace }}.svc
+{{ end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/deployment.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/deployment.yaml
new file mode 100644
index 000000000..4974dbbc1
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/deployment.yaml
@@ -0,0 +1,85 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicas }}
+  selector:
+    matchLabels:
+      {{- /* We cannot use the common library here because of a legacy issue */}}
+      {{- /* `selector` is immutable  and the previous chart did not have all the idiomatic labels */}}
+      app.kubernetes.io/name: {{ include "newrelic.common.naming.name" . }}
+  template:
+    metadata:
+      {{- if .Values.podAnnotations }}
+      annotations:
+        {{- toYaml .Values.podAnnotations | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+    spec:
+      {{- with include "nri-metadata-injection.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 -}}
+      {{- end }}
+      {{- with include "newrelic.common.priorityClassName" . }}
+      priorityClassName: {{ . }}
+      {{- end }}
+      {{- with include "newrelic.common.dnsConfig" . }}
+      dnsConfig:
+        {{- . | nindent 8 }}
+      {{- end }}
+      hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+      {{- if include "newrelic.common.hostNetwork" . }}
+      dnsPolicy: ClusterFirstWithHostNet
+      {{- end }}
+
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" ( list .Values.image.pullSecrets ) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 -}}
+      {{- end }}
+      containers:
+      - name: {{ include "newrelic.common.naming.name" . }}
+        image: {{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.image "context" .) }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- with include "newrelic.common.securityContext.container" . }}
+        securityContext:
+          {{- . | nindent 10 }}
+        {{- end }}
+        env:
+        - name: clusterName
+          value: {{ include "newrelic.common.cluster" . }}
+        ports:
+          - containerPort: 8443
+            protocol: TCP
+        volumeMounts:
+        - name: tls-key-cert-pair
+          mountPath: /etc/tls-key-cert-pair
+        readinessProbe:
+          httpGet:
+            path: /health
+            port: 8080
+          initialDelaySeconds: 1
+          periodSeconds: 1
+        {{- if .Values.resources }}
+        resources:
+          {{ toYaml .Values.resources | nindent 10 }}
+        {{- end }}
+      volumes:
+      - name: tls-key-cert-pair
+        secret:
+          secretName: {{ include "nri-metadata-injection.fullname.admission" . }}
+      nodeSelector:
+        kubernetes.io/os: linux
+        {{ include "newrelic.common.nodeSelector" . | nindent 8 }}
+      {{- with include "newrelic.common.tolerations" . }}
+      tolerations:
+        {{- . | nindent 8 -}}
+      {{- end }}
+      {{- with include "newrelic.common.affinity" . }}
+      affinity:
+        {{- . | nindent 8 -}}
+      {{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/service.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/service.yaml
new file mode 100644
index 000000000..e4a57587c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/templates/service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  ports:
+  - port: 443
+    targetPort: 8443
+  selector:
+    {{- include "newrelic.common.labels.selectorLabels" . | nindent 4 }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/tests/cluster_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/tests/cluster_test.yaml
new file mode 100644
index 000000000..a28487a06
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/tests/cluster_test.yaml
@@ -0,0 +1,39 @@
+suite: test cluster environment variable setup
+templates:
+  - templates/deployment.yaml
+release:
+  name: release
+  namespace: ns
+tests:
+  - it: clusterName env is properly set
+    set:
+      cluster: my-cluster
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: clusterName
+            value: my-cluster
+  - it: fail when cluster is not defined
+    asserts:
+      - failedTemplate:
+          errorMessage: There is not cluster name definition set neither in `.global.cluster' nor `.cluster' in your values.yaml. Cluster name is required.
+  - it: has a linux node selector by default
+    set:
+      cluster: my-cluster
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+  - it: has a linux node selector and additional selectors
+    set:
+      cluster: my-cluster
+      nodeSelector:
+        aCoolTestLabel: aCoolTestValue
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+            aCoolTestLabel: aCoolTestValue
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/tests/job_serviceaccount_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/tests/job_serviceaccount_test.yaml
new file mode 100644
index 000000000..63b6f0534
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/tests/job_serviceaccount_test.yaml
@@ -0,0 +1,59 @@
+suite: test job' serviceAccount
+templates:
+  - templates/admission-webhooks/job-patch/job-createSecret.yaml
+  - templates/admission-webhooks/job-patch/job-patchWebhook.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: RBAC points to the service account that is created by default
+    set:
+      cluster: test-cluster
+      rbac.create: true
+      serviceAccount.create: true
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: my-release-nri-metadata-injection-admission
+
+  - it: RBAC points to the service account the user supplies when serviceAccount is disabled
+    set:
+      cluster: test-cluster
+      rbac.create: true
+      serviceAccount.create: false
+      serviceAccount.name: sa-test
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: sa-test
+
+  - it: RBAC points to the service account the user supplies when serviceAccount is disabled
+    set:
+      cluster: test-cluster
+      rbac.create: true
+      serviceAccount.create: false
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: default
+
+  - it: has a linux node selector by default
+    set:
+      cluster: my-cluster
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+
+  - it: has a linux node selector and additional selectors
+    set:
+      cluster: my-cluster
+      nodeSelector:
+        aCoolTestLabel: aCoolTestValue
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector
+          value:
+            kubernetes.io/os: linux
+            aCoolTestLabel: aCoolTestValue
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/tests/rbac_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/tests/rbac_test.yaml
new file mode 100644
index 000000000..5a69191df
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/tests/rbac_test.yaml
@@ -0,0 +1,38 @@
+suite: test RBAC creation
+templates:
+  - templates/admission-webhooks/job-patch/rolebinding.yaml
+  - templates/admission-webhooks/job-patch/clusterrolebinding.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: RBAC points to the service account that is created by default
+    set:
+      cluster: test-cluster
+      rbac.create: true
+      serviceAccount.create: true
+    asserts:
+      - equal:
+          path: subjects[0].name
+          value: my-release-nri-metadata-injection-admission
+
+  - it: RBAC points to the service account the user supplies when serviceAccount is disabled
+    set:
+      cluster: test-cluster
+      rbac.create: true
+      serviceAccount.create: false
+      serviceAccount.name: sa-test
+    asserts:
+      - equal:
+          path: subjects[0].name
+          value: sa-test
+
+  - it: RBAC points to the service account the user supplies when serviceAccount is disabled
+    set:
+      cluster: test-cluster
+      rbac.create: true
+      serviceAccount.create: false
+    asserts:
+      - equal:
+          path: subjects[0].name
+          value: default
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/tests/volume_mounts_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/tests/volume_mounts_test.yaml
new file mode 100644
index 000000000..4a3c1327d
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/tests/volume_mounts_test.yaml
@@ -0,0 +1,30 @@
+suite: check volume mounts is properly set
+templates:
+  - templates/admission-webhooks/job-patch/job-createSecret.yaml
+  - templates/admission-webhooks/job-patch/job-patchWebhook.yaml
+release:
+  name: release
+  namespace: ns
+tests:
+  - it: clusterName env is properly set
+    set:
+      cluster: my-cluster
+      jobImage:
+        volumeMounts:
+          - name: test-volume
+            volumePath: /test-volume
+        volumes:
+          - name: test-volume-container
+            emptyDir: {}
+
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: test-volume
+            volumePath: /test-volume
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: test-volume-container
+            emptyDir: {}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/values.yaml
new file mode 100644
index 000000000..8ea50aab2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-metadata-injection/values.yaml
@@ -0,0 +1,102 @@
+# -- Override the name of the chart
+nameOverride: ""
+# -- Override the full name of the release
+fullnameOverride: ""
+
+# -- Name of the Kubernetes cluster monitored. Can be configured also with `global.cluster`
+cluster: ""
+
+# -- Image for the New Relic Metadata Injector
+# @default -- See `values.yaml`
+image:
+  registry:
+  repository: newrelic/k8s-metadata-injection
+  tag: ""  # Defaults to chart's appVersion
+  pullPolicy: IfNotPresent
+  # -- The secrets that are needed to pull images from a custom registry.
+  pullSecrets: []
+  # - name: regsecret
+
+# -- Image for creating the needed certificates of this webhook to work
+# @default -- See `values.yaml`
+jobImage:
+  registry:  # Defaults to registry.k8s.io
+  repository: ingress-nginx/kube-webhook-certgen
+  tag: v1.4.3
+  pullPolicy: IfNotPresent
+  # -- The secrets that are needed to pull images from a custom registry.
+  pullSecrets: []
+  # - name: regsecret
+
+  # -- Volume mounts to add to the job, you might want to mount tmp if Pod Security Policies
+  # Enforce a read-only root.
+  volumeMounts: []
+  #  - name: tmp
+  #    mountPath: /tmp
+
+  # -- Volumes to add to the job container
+  volumes: []
+  #  - name: tmp
+  #    emptyDir: {}
+
+rbac:
+  # rbac.pspEnabled -- Whether the chart should create Pod Security Policy objects.
+  pspEnabled: false
+
+replicas: 1
+
+# -- Additional labels for chart objects. Can be configured also with `global.labels`
+labels: {}
+# -- Annotations to be added to all pods created by the integration.
+podAnnotations: {}
+# -- Additional labels for chart pods. Can be configured also with `global.podLabels`
+podLabels: {}
+
+# -- Image for creating the needed certificates of this webhook to work
+# @default -- 100m/30M -/80M
+resources:
+  limits:
+    memory: 80M
+  requests:
+    cpu: 100m
+    memory: 30M
+
+# -- Sets pod's priorityClassName. Can be configured also with `global.priorityClassName`
+priorityClassName: ""
+# -- (bool) Sets pod's hostNetwork. Can be configured also with `global.hostNetwork`
+# @default -- false
+hostNetwork:
+# -- Sets pod's dnsConfig. Can be configured also with `global.dnsConfig`
+dnsConfig: {}
+# -- Sets security context (at pod level). Can be configured also with `global.podSecurityContext`
+podSecurityContext: {}
+# -- Sets security context (at container level). Can be configured also with `global.containerSecurityContext`
+containerSecurityContext: {}
+
+certManager:
+  # certManager.enabled -- Use cert manager for webhook certs
+  enabled: false
+  # -- Sets the root certificate duration. Defaults to 43800h (5 years).
+  rootCertificateDuration: 43800h
+  # -- Sets certificate duration. Defaults to 8760h (1 year).
+  webhookCertificateDuration: 8760h
+
+# -- Sets pod/node affinities. Can be configured also with `global.affinity`
+affinity: {}
+# -- Sets pod's node selector. Can be configured also with `global.nodeSelector`
+nodeSelector: {}
+# -- Sets pod's tolerations to node taints. Can be configured also with `global.tolerations`
+tolerations: []
+
+# -- Enable the metadata decoration only for pods living in namespaces labeled
+# with 'newrelic-metadata-injection=enabled'.
+injectOnlyLabeledNamespaces: false
+
+# -- Use custom tls certificates for the webhook, or let the chart handle it
+# automatically.
+# Ref: https://docs.newrelic.com/docs/integrations/kubernetes-integration/link-your-applications/link-your-applications-kubernetes#configure-injection
+customTLSCertificate: false
+
+# -- Webhook timeout
+# Ref: https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#timeouts
+timeoutSeconds: 28
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/.helmignore
new file mode 100644
index 000000000..50af03172
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/Chart.lock b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/Chart.lock
new file mode 100644
index 000000000..934f6dcbc
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.0
+digest: sha256:2e1da613fd8a52706bde45af077779c5d69e9e1641bdf5c982eaf6d1ac67a443
+generated: "2024-09-30T16:12:25.200183-07:00"
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/Chart.yaml
new file mode 100644
index 000000000..d33f07729
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/Chart.yaml
@@ -0,0 +1,29 @@
+apiVersion: v2
+appVersion: 2.21.4
+dependencies:
+- name: common-library
+  repository: https://helm-charts.newrelic.com
+  version: 1.3.0
+description: A Helm chart to deploy the New Relic Prometheus OpenMetrics integration
+home: https://docs.newrelic.com/docs/infrastructure/prometheus-integrations/install-configure-openmetrics/configure-prometheus-openmetrics-integrations/
+icon: https://newrelic.com/themes/custom/curio/assets/mediakit/new_relic_logo_vertical.svg
+keywords:
+- prometheus
+- newrelic
+- monitoring
+maintainers:
+- name: alvarocabanas
+  url: https://github.com/alvarocabanas
+- name: sigilioso
+  url: https://github.com/sigilioso
+- name: gsanchezgavier
+  url: https://github.com/gsanchezgavier
+- name: kang-makes
+  url: https://github.com/kang-makes
+- name: paologallinaharbur
+  url: https://github.com/paologallinaharbur
+name: nri-prometheus
+sources:
+- https://github.com/newrelic/nri-prometheus
+- https://github.com/newrelic/nri-prometheus/tree/main/charts/nri-prometheus
+version: 2.1.19
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/README.md
new file mode 100644
index 000000000..0287b2b2a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/README.md
@@ -0,0 +1,116 @@
+# nri-prometheus
+
+A Helm chart to deploy the New Relic Prometheus OpenMetrics integration
+
+**Homepage:** <https://docs.newrelic.com/docs/infrastructure/prometheus-integrations/install-configure-openmetrics/configure-prometheus-openmetrics-integrations/>
+
+# Helm installation
+
+You can install this chart using [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) located in the
+[helm-charts repository](https://github.com/newrelic/helm-charts) or directly from this repository by adding this Helm repository:
+
+```shell
+helm repo add nri-prometheus https://newrelic.github.io/nri-prometheus
+helm upgrade --install newrelic-prometheus nri-prometheus/nri-prometheus -f your-custom-values.yaml
+```
+
+## Source Code
+
+* <https://github.com/newrelic/nri-prometheus>
+* <https://github.com/newrelic/nri-prometheus/tree/main/charts/nri-prometheus>
+
+## Scraping services and endpoints
+
+When a service is labeled or annotated with `scrape_enabled_label` (defaults to `prometheus.io/scrape`),
+`nri-prometheus` will attempt to hit the service directly, rather than the endpoints behind it.
+
+This is the default behavior for compatibility reasons, but is known to cause issues if more than one endpoint
+is behind the service, as metric queries will be load-balanced as well leading to inaccurate histograms.
+
+In order to change this behaviour set `scrape_endpoints` to `true` and `scrape_services` to `false`.
+This will instruct `nri-prometheus` to scrape the underlying endpoints, as Prometheus server does.
+
+Existing users that are switching to this behavior should note that, depending on the number of endpoints
+behind the services in the cluster the load and the metrics reported by those, data ingestion might see
+an increase when flipping this option. Resource requirements might also be impacted, again depending on the number of new targets.
+
+While it is technically possible to set both `scrape_services` and `scrape_endpoints` to true, we do no recommend
+doing so as it will lead to redundant metrics being processed,
+
+## Values managed globally
+
+This chart implements the [New Relic's common Helm library](https://github.com/newrelic/helm-charts/tree/master/library/common-library) which
+means that it honors a wide range of defaults and globals common to most New Relic Helm charts.
+
+Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
+[user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
+
+## Chart particularities
+
+### Low data mode
+See this snippet from the `values.yaml` file:
+```yaml
+global:
+  lowDataMode: false
+lowDataMode: false
+```
+
+To reduce the amount ot metrics we send to New Relic, enabling the `lowDataMode` will add [these transformations](static/lowdatamodedefaults.yaml):
+```yaml
+transformations:
+  - description: "Low data mode defaults"
+    ignore_metrics:
+      # Ignore the following metrics.
+      # These metrics are already collected by the New Relic Kubernetes Integration.
+      - prefixes:
+        - kube_
+        - container_
+        - machine_
+        - cadvisor_
+```
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` | Sets pod/node affinities. Can be configured also with `global.affinity` |
+| cluster | string | `""` | Name of the Kubernetes cluster monitored. Can be configured also with `global.cluster` |
+| config | object | See `values.yaml` | Provides your own `config.yaml` for this integration. Ref: https://docs.newrelic.com/docs/infrastructure/prometheus-integrations/install-configure-openmetrics/configure-prometheus-openmetrics-integrations/#example-configuration-file |
+| containerSecurityContext | object | `{}` | Sets security context (at container level). Can be configured also with `global.containerSecurityContext` |
+| customSecretLicenseKey | string | `""` | In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located. Can be configured also with `global.customSecretLicenseKey` |
+| customSecretName | string | `""` | In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there. Can be configured also with `global.customSecretName` |
+| dnsConfig | object | `{}` | Sets pod's dnsConfig. Can be configured also with `global.dnsConfig` |
+| fedramp.enabled | bool | false | Enables FedRAMP. Can be configured also with `global.fedramp.enabled` |
+| fullnameOverride | string | `""` | Override the full name of the release |
+| hostNetwork | bool | `false` | Sets pod's hostNetwork. Can be configured also with `global.hostNetwork` |
+| image | object | See `values.yaml` | Image for the New Relic Kubernetes integration |
+| image.pullSecrets | list | `[]` | The secrets that are needed to pull images from a custom registry. |
+| labels | object | `{}` | Additional labels for chart objects. Can be configured also with `global.labels` |
+| licenseKey | string | `""` | This set this license key to use. Can be configured also with `global.licenseKey` |
+| lowDataMode | bool | false | Reduces number of metrics sent in order to reduce costs. Can be configured also with `global.lowDataMode` |
+| nameOverride | string | `""` | Override the name of the chart |
+| nodeSelector | object | `{}` | Sets pod's node selector. Can be configured also with `global.nodeSelector` |
+| nrStaging | bool | false | Send the metrics to the staging backend. Requires a valid staging license key. Can be configured also with `global.nrStaging` |
+| podAnnotations | object | `{}` | Annotations to be added to all pods created by the integration. |
+| podLabels | object | `{}` | Additional labels for chart pods. Can be configured also with `global.podLabels` |
+| podSecurityContext | object | `{}` | Sets security context (at pod level). Can be configured also with `global.podSecurityContext` |
+| priorityClassName | string | `""` | Sets pod's priorityClassName. Can be configured also with `global.priorityClassName` |
+| proxy | string | `""` | Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port`. Can be configured also with `global.proxy` |
+| rbac.create | bool | `true` | Specifies whether RBAC resources should be created |
+| resources | object | `{}` |  |
+| serviceAccount.annotations | object | `{}` | Add these annotations to the service account we create. Can be configured also with `global.serviceAccount.annotations` |
+| serviceAccount.create | bool | `true` | Configures if the service account should be created or not. Can be configured also with `global.serviceAccount.create` |
+| serviceAccount.name | string | `nil` | Change the name of the service account. This is honored if you disable on this cahrt the creation of the service account so you can use your own. Can be configured also with `global.serviceAccount.name` |
+| tolerations | list | `[]` | Sets pod's tolerations to node taints. Can be configured also with `global.tolerations` |
+| verboseLog | bool | false | Sets the debug logs to this integration or all integrations if it is set globally. Can be configured also with `global.verboseLog` |
+
+## Maintainers
+
+* [alvarocabanas](https://github.com/alvarocabanas)
+* [carlossscastro](https://github.com/carlossscastro)
+* [sigilioso](https://github.com/sigilioso)
+* [gsanchezgavier](https://github.com/gsanchezgavier)
+* [kang-makes](https://github.com/kang-makes)
+* [marcsanmi](https://github.com/marcsanmi)
+* [paologallinaharbur](https://github.com/paologallinaharbur)
+* [roobre](https://github.com/roobre)
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/README.md.gotmpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/README.md.gotmpl
new file mode 100644
index 000000000..5c1da4577
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/README.md.gotmpl
@@ -0,0 +1,83 @@
+{{ template "chart.header" . }}
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+# Helm installation
+
+You can install this chart using [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) located in the
+[helm-charts repository](https://github.com/newrelic/helm-charts) or directly from this repository by adding this Helm repository:
+
+```shell
+helm repo add nri-prometheus https://newrelic.github.io/nri-prometheus
+helm upgrade --install newrelic-prometheus nri-prometheus/nri-prometheus -f your-custom-values.yaml
+```
+
+{{ template "chart.sourcesSection" . }}
+
+## Scraping services and endpoints
+
+When a service is labeled or annotated with `scrape_enabled_label` (defaults to `prometheus.io/scrape`),
+`nri-prometheus` will attempt to hit the service directly, rather than the endpoints behind it.
+
+This is the default behavior for compatibility reasons, but is known to cause issues if more than one endpoint
+is behind the service, as metric queries will be load-balanced as well leading to inaccurate histograms.
+
+In order to change this behaviour set `scrape_endpoints` to `true` and `scrape_services` to `false`.
+This will instruct `nri-prometheus` to scrape the underlying endpoints, as Prometheus server does.
+
+Existing users that are switching to this behavior should note that, depending on the number of endpoints
+behind the services in the cluster the load and the metrics reported by those, data ingestion might see
+an increase when flipping this option. Resource requirements might also be impacted, again depending on the number of new targets.
+
+While it is technically possible to set both `scrape_services` and `scrape_endpoints` to true, we do no recommend
+doing so as it will lead to redundant metrics being processed,
+
+## Values managed globally
+
+This chart implements the [New Relic's common Helm library](https://github.com/newrelic/helm-charts/tree/master/library/common-library) which
+means that it honors a wide range of defaults and globals common to most New Relic Helm charts.
+
+Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
+[user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
+
+## Chart particularities
+
+### Low data mode
+See this snippet from the `values.yaml` file:
+```yaml
+global:
+  lowDataMode: false
+lowDataMode: false
+```
+
+To reduce the amount ot metrics we send to New Relic, enabling the `lowDataMode` will add [these transformations](static/lowdatamodedefaults.yaml):
+```yaml
+transformations:
+  - description: "Low data mode defaults"
+    ignore_metrics:
+      # Ignore the following metrics.
+      # These metrics are already collected by the New Relic Kubernetes Integration.
+      - prefixes:
+        - kube_
+        - container_
+        - machine_
+        - cadvisor_
+```
+
+{{ template "chart.valuesSection" . }}
+
+{{ if .Maintainers }}
+## Maintainers
+{{ range .Maintainers }}
+{{- if .Name }}
+{{- if .Url }}
+* [{{ .Name }}]({{ .Url }})
+{{- else }}
+* {{ .Name }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/.helmignore b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/Chart.yaml
new file mode 100644
index 000000000..f2ee5497e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/Chart.yaml
@@ -0,0 +1,17 @@
+apiVersion: v2
+description: Provides helpers to provide consistency on all the charts
+keywords:
+- newrelic
+- chart-library
+maintainers:
+- name: juanjjaramillo
+  url: https://github.com/juanjjaramillo
+- name: csongnr
+  url: https://github.com/csongnr
+- name: dbudziwojskiNR
+  url: https://github.com/dbudziwojskiNR
+- name: kang-makes
+  url: https://github.com/kang-makes
+name: common-library
+type: library
+version: 1.3.0
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/DEVELOPERS.md b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/DEVELOPERS.md
new file mode 100644
index 000000000..7208c673e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/DEVELOPERS.md
@@ -0,0 +1,747 @@
+# Functions/templates documented for chart writers
+Here is some rough documentation separated by the file that contains the function, the function
+name and how to use it. We are not covering functions that start with `_` (e.g.
+`newrelic.common.license._licenseKey`) because they are used internally by this library for
+other helpers. Helm does not have the concept of "public" or "private" functions/templates so
+this is a convention of ours.
+
+## _naming.tpl
+These functions are used to name objects.
+
+### `newrelic.common.naming.name`
+This is the same as the idiomatic `CHART-NAME.name` that is created when you use `helm create`.
+
+It honors `.Values.nameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.name" . }}
+```
+
+### `newrelic.common.naming.fullname`
+This is the same as the idiomatic `CHART-NAME.fullname` that is created when you use `helm create`
+
+It honors `.Values.fullnameOverride`.
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.fullname" . }}
+```
+
+### `newrelic.common.naming.chart`
+This is the same as the idiomatic `CHART-NAME.chart` that is created when you use `helm create`.
+
+It is mostly useless for chart writers. It is used internally for templating the labels but there
+is no reason to keep it "private".
+
+Usage:
+```mustache
+{{ include "newrelic.common.naming.chart" . }}
+```
+
+### `newrelic.common.naming.truncateToDNS`
+This is a useful template that could be used to trim a string to 63 chars and does not end with a dash (`-`).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $truncatedName := include "newrelic.common.naming.truncateToDNS" $nameToTruncate }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-string-that-should-be */ -}}
+```
+
+### `newrelic.common.naming.truncateToDNSWithSuffix`
+This template function is the same as the above but instead of receiving a string you should give a `dict`
+with a `name` and a `suffix`. This function will join them with a dash (`-`) and trim the `name` so the
+result of `name-suffix` is no more than 63 chars
+
+Usage:
+```mustache
+{{ $nameToTruncate := "a-really-really-really-really-REALLY-long-string-that-should-be-truncated-because-it-is-enought-long-to-brak-something"
+{{- $suffix := "A-NOT-SO-LONG-SUFFIX" }}
+{{- $truncatedName := include "truncateToDNSWithSuffix" (dict "name" $nameToTruncate "suffix" $suffix) }}
+{{- $truncatedName }}
+{{- /* This should print: a-really-really-really-really-REALLY-long-A-NOT-SO-LONG-SUFFIX */ -}}
+```
+
+
+
+## _labels.tpl
+### `newrelic.common.labels`, `newrelic.common.labels.selectorLabels` and `newrelic.common.labels.podLabels`
+These are functions that are used to label objects. They are configured by this `values.yaml`
+```yaml
+global:
+  podLabels: {}  # included in all the pods of all the charts that implement this library
+  labels: {}  # included in all the objects of all the charts that implement this library
+podLabels: {}  # included in all the pods of this chart
+labels: {}  # included in all the objects of this chart
+```
+
+label maps are merged from global to local values.
+
+And chart writer should use them like this:
+```mustache
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "newrelic.common.labels.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+```
+
+`newrelic.common.labels.podLabels` includes `newrelic.common.labels.selectorLabels` automatically.
+
+
+
+## _priority-class-name.tpl
+### `newrelic.common.priorityClassName`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  priorityClassName: ""
+priorityClassName: ""
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `priorityClassName` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.priorityClassName" . }}
+  priorityClassName: {{ . }}
+  {{- end }}
+```
+
+
+
+## _hostnetwork.tpl
+### `newrelic.common.hostNetwork`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  hostNetwork:  # Note that this is empty (nil)
+hostNetwork:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `hostNetwork` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.hostNetwork" . }}
+  hostNetwork: {{ . }}
+  {{- end }}
+```
+
+### `newrelic.common.hostNetwork.value`
+This function is an abstraction of the function above but this returns directly "true" or "false".
+
+Be careful with using this with an `if` as Helm does evaluate "false" (string) as `true`.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  hostNetwork: {{ include "newrelic.common.hostNetwork.value" . }}
+```
+
+
+
+## _dnsconfig.tpl
+### `newrelic.common.dnsConfig`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  dnsConfig: {}
+dnsConfig: {}
+```
+
+Be careful: chart writers should put an empty string (or any kind of Helm falsiness) for this
+library to work properly. If in your values a non-falsy `dnsConfig` is found, the global
+one is going to be always ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.dnsConfig" . }}
+  dnsConfig:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _images.tpl
+These functions help us to deal with how images are templated. This allows setting `registries`
+where to fetch images globally while being flexible enough to fit in different maps of images
+and deployments with one or more images. This is the example of a complex `values.yaml` that
+we are going to use during the documentation of these functions:
+
+```yaml
+global:
+  images:
+    registry: nexus-3-instance.internal.clients-domain.tld
+jobImage:
+  registry: # defaults to "example.tld" when empty in these examples
+  repository: ingress-nginx/kube-webhook-certgen
+  tag: v1.1.1
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+images:
+  integration:
+    registry:
+    repository: newrelic/nri-kube-events
+    tag: 1.8.0
+    pullPolicy: IfNotPresent
+  agent:
+    registry:
+    repository: newrelic/k8s-events-forwarder
+    tag: 1.22.0
+    pullPolicy: IfNotPresent
+  pullSecrets: []
+```
+
+### `newrelic.common.images.image`
+This will return a string with the image ready to be downloaded that includes the registry, the image and the tag.
+`defaultRegistry` is used to keep `registry` field empty in `values.yaml` so you can override the image using
+`global.images.registry`, your local `jobImage.registry` and be able to fallback to a registry that is not `docker.io`
+(Or the default repository that the client could have set in the CRI).
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.image" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.registry`
+It returns the registry from the global or local values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.images.agent "context" .) }}
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.registry" ( dict "defaultRegistry" "example.tld" "imageRoot" .Values.jobImage "context" .) }}
+```
+
+### `newrelic.common.images.repository`
+It returns the image from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.repository" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.tag`
+It returns the image's tag from the values. You should avoid using this helper to create your image
+URL and use `newrelic.common.images.image` instead, but it is there to be used in case it is needed.
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.jobImage "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.integration "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.images.agent "context" .) }}
+```
+
+### `newrelic.common.images.renderPullSecrets`
+If returns a merged map that contains the pull secrets from the global configuration and the local one.  
+
+Usage:
+```mustache
+{{- /* For jobImage */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.jobImage.pullSecrets "context" .) }}
+{{- /* For the integration */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+{{- /* For the agent */}}
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" .Values.images.pullSecrets "context" .) }}
+```
+
+
+
+## _serviceaccount.tpl
+These functions are used to evaluate if the service account should be created, with which name and add annotations to it.
+
+The functions that the common library has implemented for service accounts are:
+* `newrelic.common.serviceAccount.create`
+* `newrelic.common.serviceAccount.name`
+* `newrelic.common.serviceAccount.annotations`
+
+Usage:
+```mustache
+{{- if include "newrelic.common.serviceAccount.create" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- with (include "newrelic.common.serviceAccount.annotations" .) }}
+  annotations:
+    {{- . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
+```
+
+
+
+## _affinity.tpl, _nodeselector.tpl and _tolerations.tpl
+These three files are almost the same and they follow the idiomatic way of `helm create`.
+
+Each function also looks if there is a global value like the other helpers.
+```yaml
+global:
+  affinity: {}
+  nodeSelector: {}
+  tolerations: []
+affinity: {}
+nodeSelector: {}
+tolerations: []
+```
+
+The values here are replaced instead of be merged. If a value at root level is found, the global one is ignored.
+
+Usage (example in a pod spec):
+```mustache
+spec:
+  {{- with include "newrelic.common.nodeSelector" . }}
+  nodeSelector:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.affinity" . }}
+  affinity:
+    {{- . | nindent 4 }}
+  {{- end }}
+  {{- with include "newrelic.common.tolerations" . }}
+  tolerations:
+    {{- . | nindent 4 }}
+  {{- end }}
+```
+
+
+
+## _agent-config.tpl
+### `newrelic.common.agentConfig.defaults`
+This returns a YAML that the agent can use directly as a config that includes other options from the values file like verbose mode,
+custom attributes, FedRAMP and such.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  name: {{ include newrelic.common.naming.truncateToDNSWithSuffix (dict "name" (include "newrelic.common.naming.fullname" .) suffix "agent-config") }}
+  namespace: {{ .Release.Namespace }}
+data:
+  newrelic-infra.yml: |-
+    # This is the configuration file for the infrastructure agent. See:
+    # https://docs.newrelic.com/docs/infrastructure/install-infrastructure-agent/configuration/infrastructure-agent-configuration-settings/
+    {{- include "newrelic.common.agentConfig.defaults" . | nindent 4 }}
+```
+
+
+
+## _cluster.tpl
+### `newrelic.common.cluster`
+Returns the cluster name
+
+Usage:
+```mustache
+{{ include "newrelic.common.cluster" . }}
+```
+
+
+
+## _custom-attributes.tpl
+### `newrelic.common.customAttributes`
+Return custom attributes in YAML format.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: example
+data:
+  custom-attributes.yaml: |
+    {{- include "newrelic.common.customAttributes" . | nindent 4 }}
+  custom-attributes.json: |
+    {{- include "newrelic.common.customAttributes" . | fromYaml | toJson | nindent 4 }}
+```
+
+
+
+## _fedramp.tpl
+### `newrelic.common.fedramp.enabled`
+Returns true if FedRAMP is enabled or an empty string if not. It can be safely used in conditionals as an empty string is a Helm falsiness.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled" . }}
+```
+
+### `newrelic.common.fedramp.enabled.value`
+Returns true if FedRAMP is enabled or false if not. This is to have the value of FedRAMP ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.fedramp.enabled.value" . }}
+```
+
+
+
+## _license.tpl
+### `newrelic.common.license.secretName` and ### `newrelic.common.license.secretKeyName`
+Returns the secret and key inside the secret where to read the license key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the license key.
+
+To create the secret use `newrelic.common.license.secret`.
+
+Usage:
+```mustache
+{{- if and (.Values.controlPlane.enabled) (not (include "newrelic.fargate" .)) }}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+  containers:
+  - name: agent
+    env:
+    - name: "NRIA_LICENSE_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.license.secretName" . }}
+          key: {{ include "newrelic.common.license.secretKeyName" . }}
+```
+
+
+
+## _license_secret.tpl
+### `newrelic.common.license.secret`
+This function templates the secret that is used by agents and integrations with the license Key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any license key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.license.secret" . -}}
+```
+
+
+
+## _insights.tpl
+### `newrelic.common.insightsKey.secretName` and ### `newrelic.common.insightsKey.secretKeyName`
+Returns the secret and key inside the secret where to read the insights key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.insightsKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "INSIGHTS_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.insightsKey.secretName" . }}
+          key: {{ include "newrelic.common.insightsKey.secretKeyName" . }}
+```
+
+
+
+## _insights_secret.tpl
+### `newrelic.common.insightsKey.secret`
+This function templates the secret that is used by agents and integrations with the insights key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any insights key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.insightsKey.secret" . -}}
+```
+
+
+
+## _userkey.tpl
+### `newrelic.common.userKey.secretName` and ### `newrelic.common.userKey.secretKeyName`
+Returns the secret and key inside the secret where to read a user key.
+
+The common library will take care of using a user-provided custom secret or creating a secret that contains the insights key.
+
+To create the secret use `newrelic.common.userKey.secret`.
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: statsd
+spec:
+  containers:
+  - name: statsd
+    env:
+    - name: "API_KEY"
+      valueFrom:
+        secretKeyRef:
+          name: {{ include "newrelic.common.userKey.secretName" . }}
+          key: {{ include "newrelic.common.userKey.secretKeyName" . }}
+```
+
+
+
+## _userkey_secret.tpl
+### `newrelic.common.userKey.secret`
+This function templates the secret that is used by agents and integrations with a user key provided by the user. It will
+template nothing (empty string) if the user provides a custom pair of secret name and key.
+
+This template also fails in case the user has not provided any API key or custom secret so no safety checks have to be done
+by chart writers.
+
+You just must have a template with these two lines:
+```mustache
+{{- /* Common library will take care of creating the secret or not. */ -}}
+{{- include "newrelic.common.userKey.secret" . -}}
+```
+
+
+
+## _region.tpl
+### `newrelic.common.region.validate`
+Given a string, return a normalized name for the region if valid.
+
+This function does not need the context of the chart, only the value to be validated. The region returned
+honors the region [definition of the newrelic-client-go implementation](https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21)
+so (as of 2024/09/14) it returns the region as "US", "EU", "Staging", or "Local".
+
+In case the region provided does not match these 4, the helper calls `fail` and abort the templating.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region.validate" "us" }}
+```
+
+### `newrelic.common.region`
+It reads global and local variables for `region`:
+```yaml
+global:
+  region:  # Note that this can be empty (nil) or "" (empty string)
+region:  # Note that this can be empty (nil) or "" (empty string)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in your
+values a `region` is defined, the global one is going to be always ignored.
+
+This function gives protection so it enforces users to give the license key as a value in their
+`values.yaml` or specify a global or local `region` value. To understand how the `region` value
+works, read the documentation of `newrelic.common.region.validate`.
+
+The function will change the region from US, EU or Staging based of the license key and the
+`nrStaging` toggle. Whichever region is computed from the license/toggle can be overridden by
+the `region` value.
+
+Usage:
+```mustache
+{{ include "newrelic.common.region" . }}
+```
+
+
+
+## _low-data-mode.tpl
+### `newrelic.common.lowDataMode`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  lowDataMode:  # Note that this is empty (nil)
+lowDataMode:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `lowdataMode` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.lowDataMode" . }}
+```
+
+
+
+## _privileged.tpl
+### `newrelic.common.privileged`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  privileged:  # Note that this is empty (nil)
+privileged:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `privileged` is defined, the global one is going to be always ignored.
+
+Chart writers could override this and put directly a `true` in the `values.yaml` to override the
+default of the common library.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged" . }}
+```
+
+### `newrelic.common.privileged.value`
+Returns true if privileged mode is enabled or false if not. This is to have the value of privileged ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.privileged.value" . }}
+```
+
+
+
+## _proxy.tpl
+### `newrelic.common.proxy`
+Returns the proxy URL configured by the user. 
+
+Usage:
+```mustache
+{{ include "newrelic.common.proxy" . }}
+```
+
+
+
+## _security-context.tpl
+Use these functions to share the security context among all charts. Useful in clusters that have security enforcing not to
+use the root user (like OpenShift) or users that have an admission webhooks.
+
+The functions are:
+* `newrelic.common.securityContext.container`
+* `newrelic.common.securityContext.pod`
+
+Usage:
+```mustache
+apiVersion: v1
+kind: Pod
+metadata:
+  name: example
+spec:
+    spec:
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+
+      containers:
+        - name: example
+          {{- with include "nriKubernetes.securityContext.container" . }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+```
+
+
+
+## _staging.tpl
+### `newrelic.common.nrStaging`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  nrStaging:  # Note that this is empty (nil)
+nrStaging:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `nrStaging` is defined, the global one is going to be always ignored.
+
+This function returns "true" of "" (empty string) so it can be used for evaluating conditionals.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging" . }}
+```
+
+### `newrelic.common.nrStaging.value`
+Returns true if staging is enabled or false if not. This is to have the staging value ready to be templated.
+
+Usage:
+```mustache
+{{ include "newrelic.common.nrStaging.value" . }}
+```
+
+
+
+## _verbose-log.tpl
+### `newrelic.common.verboseLog`
+Like almost everything in this library, it reads global and local variables:
+```yaml
+global:
+  verboseLog:  # Note that this is empty (nil)
+verboseLog:  # Note that this is empty (nil)
+```
+
+Be careful: chart writers should NOT PUT ANY VALUE for this library to work properly. If in you
+values a `verboseLog` is defined, the global one is going to be always ignored.
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsBoolean`
+Returns true if verbose is enabled or false if not. This is to have the verbose value ready to be templated as a boolean
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsBoolean" . }}
+```
+
+### `newrelic.common.verboseLog.valueAsInt`
+Returns 1 if verbose is enabled or 0 if not. This is to have the verbose value ready to be templated as an integer
+
+Usage:
+```mustache
+{{ include "newrelic.common.verboseLog.valueAsInt" . }}
+```
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/README.md b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/README.md
new file mode 100644
index 000000000..10f08ca67
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/README.md
@@ -0,0 +1,106 @@
+# Helm Common library
+
+The common library is a way to unify the UX through all the Helm charts that implement it.
+
+The tooling suite that New Relic is huge and growing and this allows to set things globally
+and locally for a single chart.
+
+## Documentation for chart writers
+
+If you are writing a chart that is going to use this library you can check the [developers guide](/library/common-library/DEVELOPERS.md) to see all
+the functions/templates that we have implemented, what they do and how to use them.
+
+## Values managed globally
+
+We want to have a seamless experience through all the charts so we created this library that tries to standardize the behaviour
+of all the charts. Sadly, because of the complexity of all these integrations, not all the charts behave exactly as expected.
+
+An example is `newrelic-infrastructure` that ignores `hostNetwork` in the control plane scraper because most of the users has the
+control plane listening in the node to `localhost`.
+
+For each chart that has a special behavior (or further information of the behavior) there is a "chart particularities" section
+in its README.md that explains which is the expected behavior.
+
+At the time of writing this, all the charts from `nri-bundle` except `newrelic-logging` and `synthetics-minion` implements this
+library and honors global options as described in this document.
+
+Here is a list of global options:
+
+| Global keys | Local keys | Default | Merged[<sup>1</sup>](#values-managed-globally-1) | Description |
+|-------------|------------|---------|--------------------------------------------------|-------------|
+| global.cluster | cluster | `""` |  | Name of the Kubernetes cluster monitored |
+| global.licenseKey | licenseKey | `""` |  | This set this license key to use |
+| global.customSecretName | customSecretName | `""` |  | In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there |
+| global.customSecretLicenseKey | customSecretLicenseKey | `""` |  | In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located |
+| global.podLabels | podLabels | `{}` | yes | Additional labels for chart pods |
+| global.labels | labels | `{}` | yes | Additional labels for chart objects |
+| global.priorityClassName | priorityClassName | `""` |  | Sets pod's priorityClassName |
+| global.hostNetwork | hostNetwork | `false` |  | Sets pod's hostNetwork |
+| global.dnsConfig | dnsConfig | `{}` |  | Sets pod's dnsConfig |
+| global.images.registry | See [Further information](#values-managed-globally-2) | `""` |  | Changes the registry where to get the images. Useful when there is an internal image cache/proxy |
+| global.images.pullSecrets | See [Further information](#values-managed-globally-2) | `[]` | yes | Set secrets to be able to fetch images |
+| global.podSecurityContext | podSecurityContext | `{}` |  | Sets security context (at pod level) |
+| global.containerSecurityContext | containerSecurityContext | `{}` |  | Sets security context (at container level) |
+| global.affinity | affinity | `{}` |  | Sets pod/node affinities |
+| global.nodeSelector | nodeSelector | `{}` |  | Sets pod's node selector |
+| global.tolerations | tolerations | `[]` |  | Sets pod's tolerations to node taints |
+| global.serviceAccount.create | serviceAccount.create | `true` |  | Configures if the service account should be created or not |
+| global.serviceAccount.name | serviceAccount.name | name of the release |  | Change the name of the service account. This is honored if you disable on this cahrt the creation of the service account so you can use your own. |
+| global.serviceAccount.annotations | serviceAccount.annotations | `{}` | yes | Add these annotations to the service account we create |
+| global.customAttributes | customAttributes | `{}` |  | Adds extra attributes to the cluster and all the metrics emitted to the backend |
+| global.fedramp | fedramp | `false` |  | Enables FedRAMP |
+| global.lowDataMode | lowDataMode | `false` |  | Reduces number of metrics sent in order to reduce costs |
+| global.privileged | privileged | Depends on the chart |  | In each integration it has different behavior. See [Further information](#values-managed-globally-3) but all aims to send less metrics to the backend to try to save costs |
+| global.proxy | proxy | `""` |  | Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port` |
+| global.nrStaging | nrStaging | `false` |  | Send the metrics to the staging backend. Requires a valid staging license key |
+| global.verboseLog | verboseLog | `false` |  | Sets the debug/trace logs to this integration or all integrations if it is set globally |
+
+### Further information
+<a name="values-managed-globally-1"></a>
+#### 1. Merged
+
+Merged means that the values from global are not replaced by the local ones. Think in this example:
+```yaml
+global:
+  labels:
+    global: global
+  hostNetwork: true
+  nodeSelector:
+    global: global
+
+labels:
+  local: local
+nodeSelector:
+  local: local
+hostNetwork: false
+```
+
+This values will template `hostNetwork` to `false`, a map of labels `{ "global": "global", "local": "local" }` and a `nodeSelector` with
+`{ "local": "local" }`.
+
+As Helm by default merges all the maps it could be confusing that we have two behaviors (merging `labels` and replacing `nodeSelector`)
+the `values` from global to local. This is the rationale behind this:
+* `hostNetwork` is templated to `false` because is overriding the value defined globally.
+* `labels` are merged because the user may want to label all the New Relic pods at once and label other solution pods differently for
+  clarity' sake.
+* `nodeSelector` does not merge as `labels` because could make it harder to overwrite/delete a selector that comes from global because
+  of the logic that Helm follows merging maps.
+
+<a name="values-managed-globally-2"></a>
+#### 2. Fine grain registries
+
+Some charts only have 1 image while others that can have 2 or more images. The local path for the registry can change depending
+on the chart itself.
+
+As this is mostly unique per helm chart, you should take a look to the chart's values table (or directly to the `values.yaml` file to see all the
+images that you can change.
+
+This should only be needed if you have an advanced setup that forces you to have granularity enough to force a proxy/cache registry per integration.
+
+
+<a name="values-managed-globally-3"></a>
+#### 3. Privileged mode
+
+By default, from the common library, the privileged mode is set to false. But most of the helm charts require this to be true to fetch more
+metrics so could see a true in some charts. The consequences of the privileged mode differ from one chart to another so for each chart that
+honors the privileged mode toggle should be a section in the README explaining which is the behavior with it enabled or disabled.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_affinity.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_affinity.tpl
new file mode 100644
index 000000000..1b2636754
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_affinity.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod affinity */ -}}
+{{- define "newrelic.common.affinity" -}}
+    {{- if .Values.affinity -}}
+        {{- toYaml .Values.affinity -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.affinity -}}
+            {{- toYaml .Values.global.affinity -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_agent-config.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_agent-config.tpl
new file mode 100644
index 000000000..9c32861a0
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_agent-config.tpl
@@ -0,0 +1,26 @@
+{{/*
+This helper should return the defaults that all agents should have
+*/}}
+{{- define "newrelic.common.agentConfig.defaults" -}}
+{{- if include "newrelic.common.verboseLog" . }}
+log:
+  level: trace
+{{- end }}
+
+{{- if (include "newrelic.common.nrStaging" . ) }}
+staging: true
+{{- end }}
+
+{{- with include "newrelic.common.proxy" . }}
+proxy: {{ . | quote }}
+{{- end }}
+
+{{- with include "newrelic.common.fedramp.enabled" . }}
+fedramp: {{ . }}
+{{- end }}
+
+{{- with fromYaml ( include "newrelic.common.customAttributes" . ) }}
+custom_attributes:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_cluster.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_cluster.tpl
new file mode 100644
index 000000000..0197dd35a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_cluster.tpl
@@ -0,0 +1,15 @@
+{{/*
+Return the cluster
+*/}}
+{{- define "newrelic.common.cluster" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.cluster -}}
+    {{- .Values.cluster -}}
+{{- else if $global.cluster -}}
+    {{- $global.cluster -}}
+{{- else -}}
+    {{ fail "There is not cluster name definition set neither in `.global.cluster' nor `.cluster' in your values.yaml. Cluster name is required." }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_custom-attributes.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_custom-attributes.tpl
new file mode 100644
index 000000000..92020719c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_custom-attributes.tpl
@@ -0,0 +1,17 @@
+{{/*
+This will render custom attributes as a YAML ready to be templated or be used with `fromYaml`.
+*/}}
+{{- define "newrelic.common.customAttributes" -}}
+{{- $customAttributes := dict -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- if $global.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes $global.customAttributes -}}
+{{- end -}}
+
+{{- if .Values.customAttributes -}}
+{{- $customAttributes = mergeOverwrite $customAttributes .Values.customAttributes -}}
+{{- end -}}
+
+{{- toYaml $customAttributes -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_dnsconfig.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_dnsconfig.tpl
new file mode 100644
index 000000000..d4e40aa8a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_dnsconfig.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod dnsConfig */ -}}
+{{- define "newrelic.common.dnsConfig" -}}
+    {{- if .Values.dnsConfig -}}
+        {{- toYaml .Values.dnsConfig -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.dnsConfig -}}
+            {{- toYaml .Values.global.dnsConfig -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_fedramp.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_fedramp.tpl
new file mode 100644
index 000000000..9df8d6b5e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_fedramp.tpl
@@ -0,0 +1,25 @@
+{{- /* Defines the fedRAMP flag */ -}}
+{{- define "newrelic.common.fedramp.enabled" -}}
+    {{- if .Values.fedramp -}}
+        {{- if .Values.fedramp.enabled -}}
+            {{- .Values.fedramp.enabled -}}
+        {{- end -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.fedramp -}}
+             {{- if .Values.global.fedramp.enabled -}}
+                {{- .Values.global.fedramp.enabled -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return FedRAMP value directly ready to be templated */ -}}
+{{- define "newrelic.common.fedramp.enabled.value" -}}
+{{- if include "newrelic.common.fedramp.enabled" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_hostnetwork.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_hostnetwork.tpl
new file mode 100644
index 000000000..4cf017ef7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_hostnetwork.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper allows to override the global `.global.hostNetwork` with the value of `.hostNetwork`.
+Returns "true" if `hostNetwork` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.hostNetwork" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- /*
+`get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs
+
+We also want only to return when this is true, returning `false` here will template "false" (string) when doing
+an `(include "newrelic.common.hostNetwork" .)`, which is not an "empty string" so it is `true` if it is used
+as an evaluation somewhere else.
+*/ -}}
+{{- if get .Values "hostNetwork" | kindIs "bool" -}}
+    {{- if .Values.hostNetwork -}}
+        {{- .Values.hostNetwork -}}
+    {{- end -}}
+{{- else if get $global "hostNetwork" | kindIs "bool" -}}
+    {{- if $global.hostNetwork -}}
+        {{- $global.hostNetwork -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+{{- /*
+Abstraction of the hostNetwork toggle.
+This helper abstracts the function "newrelic.common.hostNetwork" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.hostNetwork.value" -}}
+{{- if include "newrelic.common.hostNetwork" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_images.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_images.tpl
new file mode 100644
index 000000000..d4fb43290
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_images.tpl
@@ -0,0 +1,94 @@
+{{- /*
+Return the proper image name
+{{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.image" -}}
+    {{- $registryName := include "newrelic.common.images.registry" ( dict "imageRoot" .imageRoot "defaultRegistry" .defaultRegistry "context" .context ) -}}
+    {{- $repositoryName := include "newrelic.common.images.repository" .imageRoot -}}
+    {{- $tag := include "newrelic.common.images.tag" ( dict "imageRoot" .imageRoot "context" .context) -}}
+
+    {{- if $registryName -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag | quote -}}
+    {{- else -}}
+        {{- printf "%s:%s" $repositoryName $tag | quote -}}
+    {{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image registry
+{{ include "newrelic.common.images.registry" ( dict "imageRoot" .Values.path.to.the.image "defaultRegistry" "your.private.registry.tld" "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.registry" -}}
+{{- $globalRegistry := "" -}}
+{{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+        {{- with .context.Values.global.images.registry -}}
+            {{- $globalRegistry = . -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $localRegistry := "" -}}
+{{- if .imageRoot.registry -}}
+    {{- $localRegistry = .imageRoot.registry -}}
+{{- end -}}
+
+{{- $registry := $localRegistry | default $globalRegistry | default .defaultRegistry -}}
+{{- if $registry -}}
+    {{- $registry -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image repository
+{{ include "newrelic.common.images.repository" .Values.path.to.the.image }}
+*/ -}}
+{{- define "newrelic.common.images.repository" -}}
+    {{- .repository -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper image tag
+{{ include "newrelic.common.images.tag" ( dict "imageRoot" .Values.path.to.the.image "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.tag" -}}
+    {{- .imageRoot.tag | default .context.Chart.AppVersion | toString -}}
+{{- end -}}
+
+
+
+{{- /*
+Return the proper Image Pull Registry Secret Names evaluating values as templates
+{{ include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.path.to.the.images.pullSecrets1, .Values.path.to.the.images.pullSecrets2) "context" .) }}
+*/ -}}
+{{- define "newrelic.common.images.renderPullSecrets" -}}
+  {{- $flatlist := list }}
+
+  {{- if .context.Values.global -}}
+    {{- if .context.Values.global.images -}}
+      {{- if .context.Values.global.images.pullSecrets -}}
+        {{- range .context.Values.global.images.pullSecrets -}}
+          {{- $flatlist = append $flatlist . -}}
+        {{- end -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- range .pullSecrets -}}
+    {{- if not (empty .) -}}
+      {{- range . -}}
+        {{- $flatlist = append $flatlist . -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- if $flatlist -}}
+    {{- toYaml $flatlist -}}
+  {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_insights.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_insights.tpl
new file mode 100644
index 000000000..895c37732
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_insights.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the Insights Key.
+*/}}
+{{- define "newrelic.common.insightsKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "insightskey" ) -}}
+{{- include "newrelic.common.insightsKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secretKeyName" -}}
+{{- include "newrelic.common.insightsKey._customSecretKey" . | default "insightsKey" -}}
+{{- end -}}
+
+{{/*
+Return local insightsKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._licenseKey" -}}
+{{- if .Values.insightsKey -}}
+  {{- .Values.insightsKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.insightsKey -}}
+    {{- .Values.global.insightsKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the Insights Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretName" -}}
+{{- if .Values.customInsightsKeySecretName -}}
+  {{- .Values.customInsightsKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretName -}}
+    {{- .Values.global.customInsightsKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the Insights Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.insightsKey._customSecretKey" -}}
+{{- if .Values.customInsightsKeySecretKey -}}
+  {{- .Values.customInsightsKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customInsightsKeySecretKey }}
+    {{- .Values.global.customInsightsKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_insights_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_insights_secret.yaml.tpl
new file mode 100644
index 000000000..556caa6ca
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_insights_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the insights key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.insightsKey.secret" }}
+{{- if not (include "newrelic.common.insightsKey._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.insightsKey._licenseKey" .) }}
+    {{- fail "You must specify a insightsKey or a customInsightsSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.insightsKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.insightsKey.secretKeyName" . }}: {{ include "newrelic.common.insightsKey._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_labels.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_labels.tpl
new file mode 100644
index 000000000..b02594828
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_labels.tpl
@@ -0,0 +1,54 @@
+{{/*
+This will render the labels that should be used in all the manifests used by the helm chart.
+*/}}
+{{- define "newrelic.common.labels" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- $chart := dict "helm.sh/chart" (include "newrelic.common.naming.chart" . ) -}}
+{{- $managedBy := dict "app.kubernetes.io/managed-by" .Release.Service -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $labels := mustMergeOverwrite $chart $managedBy $selectorLabels -}}
+{{- if .Chart.AppVersion -}}
+{{- $labels = mustMergeOverwrite $labels (dict "app.kubernetes.io/version" .Chart.AppVersion) -}}
+{{- end -}}
+
+{{- $globalUserLabels := $global.labels | default dict -}}
+{{- $localUserLabels := .Values.labels | default dict -}}
+
+{{- $labels = mustMergeOverwrite $labels $globalUserLabels $localUserLabels -}}
+
+{{- toYaml $labels -}}
+{{- end -}}
+
+
+
+{{/*
+This will render the labels that should be used in deployments/daemonsets template pods as a selector.
+*/}}
+{{- define "newrelic.common.labels.selectorLabels" -}}
+{{- $name := dict "app.kubernetes.io/name" ( include "newrelic.common.naming.name" . ) -}}
+{{- $instance := dict "app.kubernetes.io/instance" .Release.Name -}}
+
+{{- $selectorLabels := mustMergeOverwrite $name $instance -}}
+
+{{- toYaml $selectorLabels -}}
+{{- end }}
+
+
+
+{{/*
+Pod labels
+*/}}
+{{- define "newrelic.common.labels.podLabels" -}}
+{{- $selectorLabels := fromYaml (include "newrelic.common.labels.selectorLabels" . ) -}}
+
+{{- $global := index .Values "global" | default dict -}}
+{{- $globalPodLabels := $global.podLabels | default dict }}
+
+{{- $localPodLabels := .Values.podLabels | default dict }}
+
+{{- $podLabels := mustMergeOverwrite $selectorLabels $globalPodLabels $localPodLabels -}}
+
+{{- toYaml $podLabels -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_license.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_license.tpl
new file mode 100644
index 000000000..cb349f6bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_license.tpl
@@ -0,0 +1,68 @@
+{{/*
+Return the name of the secret holding the License Key.
+*/}}
+{{- define "newrelic.common.license.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "license" ) -}}
+{{- include "newrelic.common.license._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+*/}}
+{{- define "newrelic.common.license.secretKeyName" -}}
+{{- include "newrelic.common.license._customSecretKey" . | default "licenseKey" -}}
+{{- end -}}
+
+{{/*
+Return local licenseKey if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._licenseKey" -}}
+{{- if .Values.licenseKey -}}
+  {{- .Values.licenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.licenseKey -}}
+    {{- .Values.global.licenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the License Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretName" -}}
+{{- if .Values.customSecretName -}}
+  {{- .Values.customSecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretName -}}
+    {{- .Values.global.customSecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the License Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._customSecretKey" -}}
+{{- if .Values.customSecretLicenseKey -}}
+  {{- .Values.customSecretLicenseKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customSecretLicenseKey }}
+    {{- .Values.global.customSecretLicenseKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the user set a custom secret for the license.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.license._usesCustomSecret" -}}
+{{- if or (include "newrelic.common.license._customSecretName" .) (include "newrelic.common.license._customSecretKey" .) -}}
+true
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_license_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_license_secret.yaml.tpl
new file mode 100644
index 000000000..610a0a337
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_license_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the license key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.license.secret" }}
+{{- if not (include "newrelic.common.license._customSecretName" .) }}
+{{- /* Fail if licenseKey is empty and required: */ -}}
+{{- if not (include "newrelic.common.license._licenseKey" .) }}
+    {{- fail "You must specify a licenseKey or a customSecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.license.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.license.secretKeyName" . }}: {{ include "newrelic.common.license._licenseKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_low-data-mode.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_low-data-mode.tpl
new file mode 100644
index 000000000..3dd55ef2f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_low-data-mode.tpl
@@ -0,0 +1,26 @@
+{{- /*
+Abstraction of the lowDataMode toggle.
+This helper allows to override the global `.global.lowDataMode` with the value of `.lowDataMode`.
+Returns "true" if `lowDataMode` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.lowDataMode" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "lowDataMode" | kindIs "bool") -}}
+    {{- if .Values.lowDataMode -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.lowDataMode" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.lowDataMode -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "lowDataMode" | kindIs "bool" -}}
+    {{- if $global.lowDataMode -}}
+        {{- $global.lowDataMode -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_naming.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_naming.tpl
new file mode 100644
index 000000000..19fa92648
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_naming.tpl
@@ -0,0 +1,73 @@
+{{/*
+This is an function to be called directly with a string just to truncate strings to
+63 chars because some Kubernetes name fields are limited to that.
+*/}}
+{{- define "newrelic.common.naming.truncateToDNS" -}}
+{{- . | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+
+
+{{- /*
+Given a name and a suffix returns a 'DNS Valid' which always include the suffix, truncating the name if needed.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If suffix is too long it gets truncated but it always takes precedence over name, so a 63 chars suffix would suppress the name.
+Usage:
+{{ include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" "<my-name>" "suffix" "my-suffix" ) }}
+*/ -}}
+{{- define "newrelic.common.naming.truncateToDNSWithSuffix" -}}
+{{- $suffix := (include "newrelic.common.naming.truncateToDNS" .suffix) -}}
+{{- $maxLen := (max (sub 63 (add1 (len $suffix))) 0) -}} {{- /* We prepend "-" to the suffix so an additional character is needed */ -}}
+
+{{- $newName := .name | trunc ($maxLen | int) | trimSuffix "-"  -}}
+{{- if $newName -}}
+{{- printf "%s-%s" $newName $suffix -}}
+{{- else -}}
+{{ $suffix }}
+{{- end -}}
+
+{{- end -}}
+
+
+
+{{/*
+Expand the name of the chart.
+Uses the Chart name by default if nameOverride is not set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.name" -}}
+{{- $name := .Values.nameOverride | default .Chart.Name -}}
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+{{- end }}
+
+
+
+{{/*
+Create a default fully qualified app name.
+By default the full name will be "<release_name>" just in if it has the chart name included in that, if not
+it will be concatenated like "<release_name>-<chart_chart>". This could change if fullnameOverride or
+nameOverride are set.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "newrelic.common.naming.fullname" -}}
+{{- $name := include "newrelic.common.naming.name" . -}}
+
+{{- if .Values.fullnameOverride -}}
+    {{- $name = .Values.fullnameOverride  -}}
+{{- else if not (contains $name .Release.Name) -}}
+    {{- $name = printf "%s-%s" .Release.Name $name -}}
+{{- end -}}
+
+{{- include "newrelic.common.naming.truncateToDNS" $name -}}
+
+{{- end -}}
+
+
+
+{{/*
+Create chart name and version as used by the chart label.
+This function should not be used for naming objects. Use "common.naming.{name,fullname}" instead.
+*/}}
+{{- define "newrelic.common.naming.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_nodeselector.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_nodeselector.tpl
new file mode 100644
index 000000000..d48887341
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_nodeselector.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod nodeSelector */ -}}
+{{- define "newrelic.common.nodeSelector" -}}
+    {{- if .Values.nodeSelector -}}
+        {{- toYaml .Values.nodeSelector -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.nodeSelector -}}
+            {{- toYaml .Values.global.nodeSelector -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_priority-class-name.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_priority-class-name.tpl
new file mode 100644
index 000000000..50182b734
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_priority-class-name.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the pod priorityClassName */ -}}
+{{- define "newrelic.common.priorityClassName" -}}
+    {{- if .Values.priorityClassName -}}
+        {{- .Values.priorityClassName -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.priorityClassName -}}
+            {{- .Values.global.priorityClassName -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_privileged.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_privileged.tpl
new file mode 100644
index 000000000..f3ae814dd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_privileged.tpl
@@ -0,0 +1,28 @@
+{{- /*
+This is a helper that returns whether the chart should assume the user is fine deploying privileged pods.
+*/ -}}
+{{- define "newrelic.common.privileged" -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists. */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if get .Values "privileged" | kindIs "bool" -}}
+    {{- if .Values.privileged -}}
+        {{- .Values.privileged -}}
+    {{- end -}}
+{{- else if get $global "privileged" | kindIs "bool" -}}
+    {{- if $global.privileged -}}
+        {{- $global.privileged -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Return directly "true" or "false" based in the exist of "newrelic.common.privileged" */ -}}
+{{- define "newrelic.common.privileged.value" -}}
+{{- if include "newrelic.common.privileged" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_proxy.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_proxy.tpl
new file mode 100644
index 000000000..60f34c7ec
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_proxy.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the proxy */ -}}
+{{- define "newrelic.common.proxy" -}}
+    {{- if .Values.proxy -}}
+        {{- .Values.proxy -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.proxy -}}
+            {{- .Values.global.proxy -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_region.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_region.tpl
new file mode 100644
index 000000000..bdcacf323
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_region.tpl
@@ -0,0 +1,74 @@
+{{/*
+Return the region that is being used by the user
+*/}}
+{{- define "newrelic.common.region" -}}
+{{- if and (include "newrelic.common.license._usesCustomSecret" .) (not (include "newrelic.common.region._fromValues" .)) -}}
+  {{- fail "This Helm Chart is not able to compute the region. You must specify a .global.region or .region if the license is set using a custom secret." -}}
+{{- end -}}
+
+{{- /* Defaults */ -}}
+{{- $region := "us" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+  {{- $region = "staging" -}}
+{{- else if include "newrelic.common.region._isEULicenseKey" . -}}
+  {{- $region = "eu" -}}
+{{- end -}}
+
+{{- include "newrelic.common.region.validate" (include "newrelic.common.region._fromValues" . | default $region ) -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values if valid. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+
+Usage: `include "newrelic.common.region.validate" "us"`
+*/}}
+{{- define "newrelic.common.region.validate" -}}
+{{- /* Ref: https://github.com/newrelic/newrelic-client-go/blob/cbe3e4cf2b95fd37095bf2ffdc5d61cffaec17e2/pkg/region/region_constants.go#L8-L21 */ -}}
+{{- $region := . | lower -}}
+{{- if eq $region "us" -}}
+  US
+{{- else if eq $region "eu" -}}
+  EU
+{{- else if eq $region "staging" -}}
+  Staging
+{{- else if eq $region "local" -}}
+  Local
+{{- else -}}
+  {{- fail (printf "the region provided is not valid: %s not in \"US\" \"EU\" \"Staging\" \"Local\"" .) -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Returns the region from the values. This only return the value from the `values.yaml`.
+More intelligence should be used to compute the region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._fromValues" -}}
+{{- if .Values.region -}}
+  {{- .Values.region -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.region -}}
+    {{- .Values.global.region -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{/*
+Return empty string (falsehood) or "true" if the license is for EU region.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.region._isEULicenseKey" -}}
+{{- if not (include "newrelic.common.license._usesCustomSecret" .) -}}
+  {{- $license := include "newrelic.common.license._licenseKey" . -}}
+  {{- if hasPrefix "eu" $license -}}
+    true
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_security-context.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_security-context.tpl
new file mode 100644
index 000000000..9edfcabfd
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_security-context.tpl
@@ -0,0 +1,23 @@
+{{- /* Defines the container securityContext context */ -}}
+{{- define "newrelic.common.securityContext.container" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.containerSecurityContext -}}
+    {{- toYaml .Values.containerSecurityContext -}}
+{{- else if $global.containerSecurityContext -}}
+    {{- toYaml $global.containerSecurityContext -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the pod securityContext context */ -}}
+{{- define "newrelic.common.securityContext.pod" -}}
+{{- $global := index .Values "global" | default dict -}}
+
+{{- if .Values.podSecurityContext -}}
+    {{- toYaml .Values.podSecurityContext -}}
+{{- else if $global.podSecurityContext -}}
+    {{- toYaml $global.podSecurityContext -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_serviceaccount.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_serviceaccount.tpl
new file mode 100644
index 000000000..2d352f6ea
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_serviceaccount.tpl
@@ -0,0 +1,90 @@
+{{- /* Defines if the service account has to be created or not */ -}}
+{{- define "newrelic.common.serviceAccount.create" -}}
+{{- $valueFound := false -}}
+
+{{- /* Look for a global creation of a service account */ -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "create" | kindIs "bool") -}}
+        {{- $valueFound = true -}}
+        {{- if .Values.serviceAccount.create -}}
+            {{- /*
+                We want only to return when this is true, returning `false` here will template "false" (string) when doing
+                an `(include "newrelic.common.serviceAccount.name" .)`, which is not an "empty string" so it is `true` if it is used
+                as an evaluation somewhere else.
+            */ -}}
+            {{- .Values.serviceAccount.create -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* Look for a local creation of a service account */ -}}
+{{- if not $valueFound -}}
+    {{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+    {{- $global := index .Values "global" | default dict -}}
+    {{- if get $global "serviceAccount" | kindIs "map" -}}
+        {{- if get $global.serviceAccount "create" | kindIs "bool" -}}
+            {{- $valueFound = true -}}
+            {{- if $global.serviceAccount.create -}}
+                {{- $global.serviceAccount.create -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* In case no serviceAccount value has been found, default to "true" */ -}}
+{{- if not $valueFound -}}
+true
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Defines the name of the service account */ -}}
+{{- define "newrelic.common.serviceAccount.name" -}}
+{{- $localServiceAccount := "" -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if (get .Values.serviceAccount "name" | kindIs "string") -}}
+        {{- $localServiceAccount = .Values.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := "" -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "name" | kindIs "string" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.name -}}
+    {{- end -}}
+{{- end -}}
+
+{{- if (include "newrelic.common.serviceAccount.create" .) -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default (include "newrelic.common.naming.fullname" .) -}}
+{{- else -}}
+    {{- $localServiceAccount | default $globalServiceAccount | default "default" -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /* Merge the global and local annotations for the service account */ -}}
+{{- define "newrelic.common.serviceAccount.annotations" -}}
+{{- $localServiceAccount := dict -}}
+{{- if get .Values "serviceAccount" | kindIs "map" -}}
+    {{- if get .Values.serviceAccount "annotations" -}}
+        {{- $localServiceAccount = .Values.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $globalServiceAccount := dict -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "serviceAccount" | kindIs "map" -}}
+    {{- if get $global.serviceAccount "annotations" -}}
+        {{- $globalServiceAccount = $global.serviceAccount.annotations -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $merged := mustMergeOverwrite $globalServiceAccount $localServiceAccount -}}
+
+{{- if $merged -}}
+    {{- toYaml $merged -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_staging.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_staging.tpl
new file mode 100644
index 000000000..bd9ad09bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_staging.tpl
@@ -0,0 +1,39 @@
+{{- /*
+Abstraction of the nrStaging toggle.
+This helper allows to override the global `.global.nrStaging` with the value of `.nrStaging`.
+Returns "true" if `nrStaging` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.nrStaging" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "nrStaging" | kindIs "bool") -}}
+    {{- if .Values.nrStaging -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.nrStaging" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.nrStaging -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "nrStaging" | kindIs "bool" -}}
+    {{- if $global.nrStaging -}}
+        {{- $global.nrStaging -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Returns "true" of "false" directly instead of empty string (Helm falsiness) based on the exit of "newrelic.common.nrStaging"
+*/ -}}
+{{- define "newrelic.common.nrStaging.value" -}}
+{{- if include "newrelic.common.nrStaging" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_tolerations.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_tolerations.tpl
new file mode 100644
index 000000000..e016b38e2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_tolerations.tpl
@@ -0,0 +1,10 @@
+{{- /* Defines the Pod tolerations */ -}}
+{{- define "newrelic.common.tolerations" -}}
+    {{- if .Values.tolerations -}}
+        {{- toYaml .Values.tolerations -}}
+    {{- else if .Values.global -}}
+        {{- if .Values.global.tolerations -}}
+            {{- toYaml .Values.global.tolerations -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_userkey.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_userkey.tpl
new file mode 100644
index 000000000..982ea8e09
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_userkey.tpl
@@ -0,0 +1,56 @@
+{{/*
+Return the name of the secret holding the API Key.
+*/}}
+{{- define "newrelic.common.userKey.secretName" -}}
+{{- $default := include "newrelic.common.naming.truncateToDNSWithSuffix" ( dict "name" (include "newrelic.common.naming.fullname" .) "suffix" "userkey" ) -}}
+{{- include "newrelic.common.userKey._customSecretName" . | default $default -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+*/}}
+{{- define "newrelic.common.userKey.secretKeyName" -}}
+{{- include "newrelic.common.userKey._customSecretKey" . | default "userKey" -}}
+{{- end -}}
+
+{{/*
+Return local API Key if set, global otherwise.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._userKey" -}}
+{{- if .Values.userKey -}}
+  {{- .Values.userKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.userKey -}}
+    {{- .Values.global.userKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the secret holding the API Key.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretName" -}}
+{{- if .Values.customUserKeySecretName -}}
+  {{- .Values.customUserKeySecretName -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretName -}}
+    {{- .Values.global.customUserKeySecretName -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name key for the API Key inside the secret.
+This helper is for internal use.
+*/}}
+{{- define "newrelic.common.userKey._customSecretKey" -}}
+{{- if .Values.customUserKeySecretKey -}}
+  {{- .Values.customUserKeySecretKey -}}
+{{- else if .Values.global -}}
+  {{- if .Values.global.customUserKeySecretKey }}
+    {{- .Values.global.customUserKeySecretKey -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_userkey_secret.yaml.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_userkey_secret.yaml.tpl
new file mode 100644
index 000000000..b97985654
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_userkey_secret.yaml.tpl
@@ -0,0 +1,21 @@
+{{/*
+Renders the user key secret if user has not specified a custom secret.
+*/}}
+{{- define "newrelic.common.userKey.secret" }}
+{{- if not (include "newrelic.common.userKey._customSecretName" .) }}
+{{- /* Fail if user key is empty and required: */ -}}
+{{- if not (include "newrelic.common.userKey._userKey" .) }}
+    {{- fail "You must specify a userKey or a customUserKeySecretName containing it" }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "newrelic.common.userKey.secretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+data:
+  {{ include "newrelic.common.userKey.secretKeyName" . }}: {{ include "newrelic.common.userKey._userKey" . | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_verbose-log.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_verbose-log.tpl
new file mode 100644
index 000000000..2286d4681
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/templates/_verbose-log.tpl
@@ -0,0 +1,54 @@
+{{- /*
+Abstraction of the verbose toggle.
+This helper allows to override the global `.global.verboseLog` with the value of `.verboseLog`.
+Returns "true" if `verbose` is enabled, otherwise "" (empty string)
+*/ -}}
+{{- define "newrelic.common.verboseLog" -}}
+{{- /* `get` will return "" (empty string) if value is not found, and the value otherwise, so we can type-assert with kindIs */ -}}
+{{- if (get .Values "verboseLog" | kindIs "bool") -}}
+    {{- if .Values.verboseLog -}}
+        {{- /*
+            We want only to return when this is true, returning `false` here will template "false" (string) when doing
+            an `(include "newrelic.common.verboseLog" .)`, which is not an "empty string" so it is `true` if it is used
+            as an evaluation somewhere else.
+        */ -}}
+        {{- .Values.verboseLog -}}
+    {{- end -}}
+{{- else -}}
+{{- /* This allows us to use `$global` as an empty dict directly in case `Values.global` does not exists */ -}}
+{{- $global := index .Values "global" | default dict -}}
+{{- if get $global "verboseLog" | kindIs "bool" -}}
+    {{- if $global.verboseLog -}}
+        {{- $global.verboseLog -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return true or false directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsBoolean" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+true
+{{- else -}}
+false
+{{- end -}}
+{{- end -}}
+
+
+
+{{- /*
+Abstraction of the verbose toggle.
+This helper abstracts the function "newrelic.common.verboseLog" to return 1 or 0 directly.
+*/ -}}
+{{- define "newrelic.common.verboseLog.valueAsInt" -}}
+{{- if include "newrelic.common.verboseLog" . -}}
+1
+{{- else -}}
+0
+{{- end -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/values.yaml
new file mode 100644
index 000000000..75e2d112a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/charts/common-library/values.yaml
@@ -0,0 +1 @@
+# values are not needed for the library chart, however this file is still needed for helm lint to work.
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/ci/test-lowdatamode-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/ci/test-lowdatamode-values.yaml
new file mode 100644
index 000000000..57b307a2d
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/ci/test-lowdatamode-values.yaml
@@ -0,0 +1,9 @@
+global:
+  licenseKey: 1234567890abcdef1234567890abcdef12345678
+  cluster: test-cluster
+
+lowDataMode: true
+
+image:
+  repository: e2e/nri-prometheus
+  tag: "test"  # Defaults to chart's appVersion
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/ci/test-override-global-lowdatamode.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/ci/test-override-global-lowdatamode.yaml
new file mode 100644
index 000000000..7ff1a730f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/ci/test-override-global-lowdatamode.yaml
@@ -0,0 +1,10 @@
+global:
+  licenseKey: 1234567890abcdef1234567890abcdef12345678
+  cluster: test-cluster
+  lowDataMode: true
+
+lowDataMode: false
+
+image:
+  repository: e2e/nri-prometheus
+  tag: "test"  # Defaults to chart's appVersion
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/ci/test-values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/ci/test-values.yaml
new file mode 100644
index 000000000..fcd07b2d3
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/ci/test-values.yaml
@@ -0,0 +1,104 @@
+global:
+  licenseKey: 1234567890abcdef1234567890abcdef12345678
+  cluster: test-cluster
+
+lowDataMode: true
+
+nameOverride: my-custom-name
+
+image:
+  registry:
+  repository: e2e/nri-prometheus
+  tag: "test"
+  imagePullPolicy: IfNotPresent
+
+resources:
+  limits:
+    cpu: 200m
+    memory: 512Mi
+  requests:
+    cpu: 100m
+    memory: 256Mi
+
+rbac:
+  create: true
+
+serviceAccount:
+  # Specifies whether a ServiceAccount should be created
+  create: true
+  # The name of the ServiceAccount to use.
+  # If not set and create is true, a name is generated using the name template
+  name: ""
+  # Specify any annotations to add to the ServiceAccount
+  annotations:
+    foo: bar
+
+# If you wish to provide your own config.yaml file include it under config:
+# the sample config file is included here as an example.
+config:
+  scrape_duration: "60s"
+  scrape_timeout: "15s"
+
+  scrape_services: false
+  scrape_endpoints: true
+
+  audit: false
+
+  insecure_skip_verify: false
+
+  scrape_enabled_label: "prometheus.io/scrape"
+
+  require_scrape_enabled_label_for_nodes: true
+
+  transformations:
+  - description: "Custom transformation Example"
+    rename_attributes:
+      - metric_prefix: "foo_"
+        attributes:
+          old_label: "newLabel"
+    ignore_metrics:
+      - prefixes:
+        - bar_
+    copy_attributes:
+      - from_metric: "foo_info"
+        to_metrics: "foo_"
+        match_by:
+          - namespace
+
+podAnnotations:
+  custom-pod-annotation: test
+
+podSecurityContext:
+  runAsUser: 1000
+  runAsGroup: 3000
+  fsGroup: 2000
+
+containerSecurityContext:
+  runAsUser: 2000
+
+tolerations:
+  - key: "key1"
+    operator: "Exists"
+    effect: "NoSchedule"
+
+nodeSelector:
+  kubernetes.io/os: linux
+
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+        - matchExpressions:
+            - key: kubernetes.io/os
+              operator: In
+              values:
+                - linux
+
+nrStaging: false
+
+fedramp:
+  enabled: true
+
+proxy:
+
+verboseLog: true
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/static/lowdatamodedefaults.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/static/lowdatamodedefaults.yaml
new file mode 100644
index 000000000..f749e28da
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/static/lowdatamodedefaults.yaml
@@ -0,0 +1,10 @@
+transformations:
+  - description: "Low data mode defaults"
+    ignore_metrics:
+      # Ignore the following metrics.
+      # These metrics are already collected by the New Relic Kubernetes Integration.
+      - prefixes:
+        - kube_
+        - container_
+        - machine_
+        - cadvisor_
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/_helpers.tpl b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/_helpers.tpl
new file mode 100644
index 000000000..23c072bd7
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/_helpers.tpl
@@ -0,0 +1,15 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Returns mergeTransformations
+Helm can't merge maps of different types. Need to manually create a `transformations` section.
+*/}}
+{{- define "nri-prometheus.mergeTransformations" -}}
+    {{/* Remove current `transformations` from config. */}}
+    {{- omit .Values.config "transformations" | toYaml | nindent 4 -}}
+    {{/* Create new `transformations` yaml section with merged configs from .Values.config.transformations and lowDataMode. */}}
+    transformations:
+    {{- .Values.config.transformations | toYaml | nindent 4 -}}
+    {{ $lowDataDefault := .Files.Get "static/lowdatamodedefaults.yaml" | fromYaml }}
+    {{- $lowDataDefault.transformations | toYaml | nindent 4 -}}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/clusterrole.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/clusterrole.yaml
new file mode 100644
index 000000000..ac4734d31
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/clusterrole.yaml
@@ -0,0 +1,23 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+rules:
+- apiGroups: [""]
+  resources:
+    - "nodes"
+    - "nodes/metrics"
+    - "nodes/stats"
+    - "nodes/proxy"
+    - "pods"
+    - "services"
+    - "endpoints"
+  verbs: ["get", "list", "watch"]
+- nonResourceURLs:
+  - /metrics
+  verbs:
+  - get
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/clusterrolebinding.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/clusterrolebinding.yaml
new file mode 100644
index 000000000..44244653f
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/clusterrolebinding.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "newrelic.common.naming.fullname" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/configmap.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/configmap.yaml
new file mode 100644
index 000000000..5daeed64a
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/configmap.yaml
@@ -0,0 +1,21 @@
+kind: ConfigMap
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+apiVersion: v1
+data:
+  config.yaml: |
+    cluster_name: {{ include "newrelic.common.cluster" . }}
+{{- if .Values.config -}}
+  {{- if and (.Values.config.transformations) (include "newrelic.common.lowDataMode" .) -}}
+    {{- include "nri-prometheus.mergeTransformations" . -}}
+  {{- else if (include "newrelic.common.lowDataMode" .) -}}
+    {{ $lowDataDefault := .Files.Get "static/lowdatamodedefaults.yaml" | fromYaml }}
+    {{- mergeOverwrite (deepCopy .Values.config) $lowDataDefault | toYaml | nindent 4 -}}
+  {{- else }}
+    {{- .Values.config | toYaml | nindent 4  -}}
+  {{- end -}}
+{{- end -}}
+
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/deployment.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/deployment.yaml
new file mode 100644
index 000000000..8529b71f4
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/deployment.yaml
@@ -0,0 +1,98 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "newrelic.common.naming.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      {{- /* We cannot use the common library here because of a legacy issue */}}
+      {{- /* `selector` is inmutable and the previous chart did not have all the idiomatic labels */}}
+      app.kubernetes.io/name: {{ include "newrelic.common.naming.name" . }}
+  template:
+    metadata:
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      labels:
+        {{- include "newrelic.common.labels.podLabels" . | nindent 8 }}
+    spec:
+      serviceAccountName: {{ include "newrelic.common.serviceAccount.name" . }}
+      {{- with include "newrelic.common.securityContext.pod" . }}
+      securityContext:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.images.renderPullSecrets" ( dict "pullSecrets" (list .Values.image.pullSecrets) "context" .) }}
+      imagePullSecrets:
+        {{- . | nindent 8 }}
+      {{- end }}
+      containers:
+      - name: nri-prometheus
+        {{- with include "newrelic.common.securityContext.container" . }}
+        securityContext:
+          {{- . | nindent 10 }}
+        {{- end }}
+        image: {{ include "newrelic.common.images.image" ( dict "imageRoot" .Values.image "context" .) }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        args:
+          - "--configfile=/etc/nri-prometheus/config.yaml"
+        ports:
+          - containerPort: 8080
+        volumeMounts:
+        - name: config-volume
+          mountPath: /etc/nri-prometheus/
+        env:
+          - name: "LICENSE_KEY"
+            valueFrom:
+                secretKeyRef:
+                  name: {{ include "newrelic.common.license.secretName" . }}
+                  key: {{ include "newrelic.common.license.secretKeyName" . }}
+          {{- if (include "newrelic.common.nrStaging" .) }}
+          - name: "METRIC_API_URL"
+            value: "https://staging-metric-api.newrelic.com/metric/v1/infra"
+          {{- else if (include "newrelic.common.fedramp.enabled" .) }}
+          - name: "METRIC_API_URL"
+            value: "https://gov-metric-api.newrelic.com/metric/v1"
+          {{- end }}
+          {{- with include "newrelic.common.proxy" . }}
+          - name: EMITTER_PROXY
+            value: {{ . | quote }}
+          {{- end }}
+          {{- with include "newrelic.common.verboseLog" . }}
+          - name: "VERBOSE"
+            value: {{ . | quote }}
+          {{- end }}
+          - name: "BEARER_TOKEN_FILE"
+            value: "/var/run/secrets/kubernetes.io/serviceaccount/token"
+          - name: "CA_FILE"
+            value: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+        resources:
+          {{- toYaml .Values.resources | nindent 10 }}
+      volumes:
+        - name: config-volume
+          configMap:
+            name: {{ include "newrelic.common.naming.fullname" . }}
+      {{- with include "newrelic.common.priorityClassName" . }}
+      priorityClassName: {{ . }}
+      {{- end }}
+      {{- with include "newrelic.common.dnsConfig" . }}
+      dnsConfig:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.nodeSelector" . }}
+      nodeSelector:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.affinity" . }}
+      affinity:
+        {{- . | nindent 8 }}
+      {{- end }}
+      {{- with include "newrelic.common.tolerations" . }}
+      tolerations:
+        {{- . | nindent 8 }}
+      {{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/secret.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/secret.yaml
new file mode 100644
index 000000000..f558ee86c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/secret.yaml
@@ -0,0 +1,2 @@
+{{- /* Common library will take care of creating the secret or not. */}}
+{{- include "newrelic.common.license.secret" . }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/serviceaccount.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/serviceaccount.yaml
new file mode 100644
index 000000000..df451ec90
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/templates/serviceaccount.yaml
@@ -0,0 +1,13 @@
+{{- if (include "newrelic.common.serviceAccount.create" .) }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "newrelic.common.serviceAccount.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "newrelic.common.labels" . | nindent 4 }}
+  {{- with (include "newrelic.common.serviceAccount.annotations" .) }}
+  annotations:
+    {{- . | nindent 4 }}
+  {{- end }}
+{{- end -}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/tests/configmap_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/tests/configmap_test.yaml
new file mode 100644
index 000000000..ae7d921fe
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/tests/configmap_test.yaml
@@ -0,0 +1,86 @@
+suite: test nri-prometheus configmap
+templates:
+  - templates/configmap.yaml
+  - templates/deployment.yaml
+tests:
+  - it: creates the config map with default config in values.yaml and cluster_name.
+    set:
+      licenseKey: fakeLicense
+      cluster: my-cluster-name
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            cluster_name: my-cluster-name
+            audit: false
+            insecure_skip_verify: false
+            require_scrape_enabled_label_for_nodes: true
+            scrape_enabled_label: prometheus.io/scrape
+            scrape_endpoints: false
+            scrape_services: true
+            transformations: []
+        template: templates/configmap.yaml
+
+  - it: creates the config map with lowDataMode.
+    set:
+      licenseKey: fakeLicense
+      cluster: my-cluster-name
+      lowDataMode: true
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            cluster_name: my-cluster-name
+            audit: false
+            insecure_skip_verify: false
+            require_scrape_enabled_label_for_nodes: true
+            scrape_enabled_label: prometheus.io/scrape
+            scrape_endpoints: false
+            scrape_services: true
+            transformations:
+            - description: Low data mode defaults
+              ignore_metrics:
+              - prefixes:
+                - kube_
+                - container_
+                - machine_
+                - cadvisor_
+        template: templates/configmap.yaml
+
+  - it: merges existing transformation with lowDataMode.
+    set:
+      licenseKey: fakeLicense
+      cluster: my-cluster-name
+      lowDataMode: true
+      config:
+        transformations:
+        - description: Custom transformation Example
+          rename_attributes:
+            - metric_prefix: test_
+              attributes:
+                container_name: containerName
+    asserts:
+      - equal:
+          path: data["config.yaml"]
+          value: |-
+            cluster_name: my-cluster-name
+            audit: false
+            insecure_skip_verify: false
+            require_scrape_enabled_label_for_nodes: true
+            scrape_enabled_label: prometheus.io/scrape
+            scrape_endpoints: false
+            scrape_services: true
+            transformations:
+            - description: Custom transformation Example
+              rename_attributes:
+              - attributes:
+                  container_name: containerName
+                metric_prefix: test_
+            - description: Low data mode defaults
+              ignore_metrics:
+              - prefixes:
+                - kube_
+                - container_
+                - machine_
+                - cadvisor_
+        template: templates/configmap.yaml
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/tests/deployment_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/tests/deployment_test.yaml
new file mode 100644
index 000000000..cb6f90340
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/tests/deployment_test.yaml
@@ -0,0 +1,82 @@
+suite: test deployment
+templates:
+  - templates/deployment.yaml
+  - templates/configmap.yaml
+
+release:
+  name: release
+
+tests:
+  - it: adds defaults.
+    set:
+      licenseKey: fakeLicense
+      cluster: test
+    asserts:
+      - equal:
+          path: spec.template.metadata.labels["app.kubernetes.io/instance"]
+          value: release
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.template.metadata.labels["app.kubernetes.io/name"]
+          value: nri-prometheus
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.selector.matchLabels
+          value:
+            app.kubernetes.io/name: nri-prometheus
+        template: templates/deployment.yaml
+      - isNotEmpty:
+          path: spec.template.metadata.annotations["checksum/config"]
+        template: templates/deployment.yaml
+
+  - it: adds METRIC_API_URL when nrStaging is true.
+    set:
+      licenseKey: fakeLicense
+      cluster: test
+      nrStaging: true
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: "METRIC_API_URL"
+            value: "https://staging-metric-api.newrelic.com/metric/v1/infra"
+        template: templates/deployment.yaml
+
+  - it: adds FedRamp endpoint when FedRamp is enabled.
+    set:
+      licenseKey: fakeLicense
+      cluster: test
+      fedramp:
+        enabled: true
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: "METRIC_API_URL"
+            value: "https://gov-metric-api.newrelic.com/metric/v1"
+        template: templates/deployment.yaml
+
+  - it: adds proxy when enabled.
+    set:
+      licenseKey: fakeLicense
+      cluster: test
+      proxy: "https://my-proxy:9999"
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: "EMITTER_PROXY"
+            value: "https://my-proxy:9999"
+        template: templates/deployment.yaml
+
+  - it: set priorityClassName.
+    set:
+      licenseKey: fakeLicense
+      cluster: test
+      priorityClassName: foo
+    asserts:
+      - equal:
+          path: spec.template.spec.priorityClassName
+          value: foo
+        template: templates/deployment.yaml
+
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/tests/labels_test.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/tests/labels_test.yaml
new file mode 100644
index 000000000..2b6cb53bb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/tests/labels_test.yaml
@@ -0,0 +1,32 @@
+suite: test object names
+templates:
+  - templates/clusterrole.yaml
+  - templates/clusterrolebinding.yaml
+  - templates/configmap.yaml
+  - templates/deployment.yaml
+  - templates/secret.yaml
+  - templates/serviceaccount.yaml
+
+release:
+  name: release
+  revision:
+
+tests:
+  - it: adds default labels.
+    set:
+      licenseKey: fakeLicense
+      cluster: test
+    asserts:
+      - equal:
+          path: metadata.labels["app.kubernetes.io/instance"]
+          value: release
+      - equal:
+          path: metadata.labels["app.kubernetes.io/managed-by"]
+          value: Helm
+      - equal:
+          path: metadata.labels["app.kubernetes.io/name"]
+          value: nri-prometheus
+      - isNotEmpty:
+          path: metadata.labels["app.kubernetes.io/version"]
+      - isNotEmpty:
+          path: metadata.labels["helm.sh/chart"]
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/values.yaml
new file mode 100644
index 000000000..4c562cc66
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/nri-prometheus/values.yaml
@@ -0,0 +1,251 @@
+# -- Override the name of the chart
+nameOverride: ""
+# -- Override the full name of the release
+fullnameOverride: ""
+
+# -- Name of the Kubernetes cluster monitored. Can be configured also with `global.cluster`
+cluster: ""
+# -- This set this license key to use. Can be configured also with `global.licenseKey`
+licenseKey: ""
+# -- In case you don't want to have the license key in you values, this allows you to point to a user created secret to get the key from there. Can be configured also with `global.customSecretName`
+customSecretName: ""
+# -- In case you don't want to have the license key in you values, this allows you to point to which secret key is the license key located. Can be configured also with `global.customSecretLicenseKey`
+customSecretLicenseKey: ""
+
+# -- Image for the New Relic Kubernetes integration
+# @default -- See `values.yaml`
+image:
+  registry:
+  repository: newrelic/nri-prometheus
+  tag: ""  # Defaults to chart's appVersion
+  imagePullPolicy: IfNotPresent
+  # -- The secrets that are needed to pull images from a custom registry.
+  pullSecrets: []
+  # - name: regsecret
+
+resources: {}
+  # limits:
+  #   cpu: 200m
+  #   memory: 512Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 256Mi
+
+rbac:
+  # -- Specifies whether RBAC resources should be created
+  create: true
+
+serviceAccount:
+  # -- Add these annotations to the service account we create. Can be configured also with `global.serviceAccount.annotations`
+  annotations: {}
+  # -- Configures if the service account should be created or not. Can be configured also with `global.serviceAccount.create`
+  create: true
+  # -- Change the name of the service account. This is honored if you disable on this cahrt the creation of the service account so you can use your own. Can be configured also with `global.serviceAccount.name`
+  name:
+
+# -- Annotations to be added to all pods created by the integration.
+podAnnotations: {}
+# -- Additional labels for chart pods. Can be configured also with `global.podLabels`
+podLabels: {}
+# -- Additional labels for chart objects. Can be configured also with `global.labels`
+labels: {}
+
+# -- Sets pod's priorityClassName. Can be configured also with `global.priorityClassName`
+priorityClassName: ""
+# -- (bool) Sets pod's hostNetwork. Can be configured also with `global.hostNetwork`
+# @default -- `false`
+hostNetwork:
+# -- Sets pod's dnsConfig. Can be configured also with `global.dnsConfig`
+dnsConfig: {}
+
+# -- Sets security context (at pod level). Can be configured also with `global.podSecurityContext`
+podSecurityContext: {}
+# -- Sets security context (at container level). Can be configured also with `global.containerSecurityContext`
+containerSecurityContext: {}
+
+# -- Sets pod/node affinities. Can be configured also with `global.affinity`
+affinity: {}
+# -- Sets pod's node selector. Can be configured also with `global.nodeSelector`
+nodeSelector: {}
+# -- Sets pod's tolerations to node taints. Can be configured also with `global.tolerations`
+tolerations: []
+
+
+# -- Provides your own `config.yaml` for this integration.
+# Ref: https://docs.newrelic.com/docs/infrastructure/prometheus-integrations/install-configure-openmetrics/configure-prometheus-openmetrics-integrations/#example-configuration-file
+# @default -- See `values.yaml`
+config:
+  # How often the integration should run.
+  # Default: "30s"
+  # scrape_duration: "30s"
+
+  # The HTTP client timeout when fetching data from targets.
+  # Default: "5s"
+  # scrape_timeout: "5s"
+
+  # scrape_services Allows to enable scraping the service and not the endpoints behind.
+  # When endpoints are scraped this is no longer needed
+  scrape_services: true
+
+  # scrape_endpoints Allows to enable scraping directly endpoints instead of services as prometheus service natively does.
+  # Please notice that depending on the number of endpoints behind a service the load can increase considerably
+  scrape_endpoints: false
+
+  # How old must the entries used for calculating the counters delta be
+  # before the telemetry emitter expires them.
+  # Default: "5m"
+  # telemetry_emitter_delta_expiration_age: "5m"
+
+  # How often must the telemetry emitter check for expired delta entries.
+  # Default: "5m"
+  # telemetry_emitter_delta_expiration_check_interval: "5m"
+
+  # Whether the integration should run in audit mode or not. Defaults to false.
+  # Audit mode logs the uncompressed data sent to New Relic. Use this to log all data sent.
+  # It does not include verbose mode. This can lead to a high log volume, use with care.
+  # Default: false
+  audit: false
+
+  # Whether the integration should skip TLS verification or not.
+  # Default: false
+  insecure_skip_verify: false
+
+  # The label used to identify scrapeable targets.
+  # Targets can be identified using a label or annotation.
+  # Default: "prometheus.io/scrape"
+  scrape_enabled_label: "prometheus.io/scrape"
+
+  # Whether k8s nodes need to be labelled to be scraped or not.
+  # Default: true
+  require_scrape_enabled_label_for_nodes: true
+
+  # Number of worker threads used for scraping targets.
+  # For large clusters with many (>400) targets, slowly increase until scrape
+  # time falls between the desired `scrape_duration`.
+  # Increasing this value too much will result in huge memory consumption if too
+  # many metrics are being scraped.
+  # Default: 4
+  # worker_threads: 4
+
+  # Maximum number of metrics to keep in memory until a report is triggered.
+  # Changing this value is not recommended unless instructed by the New Relic support team.
+  # max_stored_metrics: 10000
+
+  # Minimum amount of time to wait between reports. Cannot be lowered than the default, 200ms.
+  # Changing this value is not recommended unless instructed by the New Relic support team.
+  # min_emitter_harvest_period: 200ms
+
+  # targets:
+  #   - description: Secure etcd example
+  #     urls: ["https://192.168.3.1:2379", "https://192.168.3.2:2379", "https://192.168.3.3:2379"]
+  #     If true the Kubernetes Service Account token will be included as a Bearer token in the HTTP request.
+  #     use_bearer: false
+  #     tls_config:
+  #       ca_file_path: "/etc/etcd/etcd-client-ca.crt"
+  #       cert_file_path: "/etc/etcd/etcd-client.crt"
+  #       key_file_path: "/etc/etcd/etcd-client.key"
+
+  # Certificate to add to the root CA that the emitter will use when
+  # verifying server certificates.
+  # If left empty, TLS uses the host's root CA set.
+  # emitter_ca_file: "/path/to/cert/server.pem"
+
+  # Set to true in order to stop autodiscovery in the k8s cluster. It can be useful when running the Pod with a service account
+  # having limited privileges.
+  # Default: false
+  # disable_autodiscovery: false
+
+  # Whether the emitter should skip TLS verification when submitting data.
+  # Default: false
+  # emitter_insecure_skip_verify: false
+
+  # Histogram support is based on New Relic's guidelines for higher
+  # level metrics abstractions https://github.com/newrelic/newrelic-exporter-specs/blob/master/Guidelines.md.
+  # To better support visualization of this data, percentiles are calculated
+  # based on the histogram metrics and sent to New Relic.
+  # By default, the following percentiles are calculated: 50, 95 and 99.
+  #
+  # percentiles:
+  #   - 50
+  #   - 95
+  #   - 99
+
+  transformations: []
+  # - description: "Custom transformation Example"
+  #   rename_attributes:
+  #     - metric_prefix: ""
+  #       attributes:
+  #         container_name: "containerName"
+  #         pod_name: "podName"
+  #         namespace: "namespaceName"
+  #         node: "nodeName"
+  #         container: "containerName"
+  #         pod: "podName"
+  #         deployment: "deploymentName"
+  #   ignore_metrics:
+  #     # Ignore the following metrics.
+  #     # These metrics are already collected by the New Relic Kubernetes Integration.
+  #     - prefixes:
+  #       - kube_daemonset_
+  #       - kube_deployment_
+  #       - kube_endpoint_
+  #       - kube_namespace_
+  #       - kube_node_
+  #       - kube_persistentvolume_
+  #       - kube_pod_
+  #       - kube_replicaset_
+  #       - kube_service_
+  #       - kube_statefulset_
+  #   copy_attributes:
+  #     # Copy all the labels from the timeseries with metric name
+  #     # `kube_hpa_labels` into every timeseries with a metric name that
+  #     # starts with `kube_hpa_` only if they share the same `namespace`
+  #     # and `hpa` labels.
+  #     - from_metric: "kube_hpa_labels"
+  #       to_metrics: "kube_hpa_"
+  #       match_by:
+  #         - namespace
+  #         - hpa
+  #     - from_metric: "kube_daemonset_labels"
+  #       to_metrics: "kube_daemonset_"
+  #       match_by:
+  #         - namespace
+  #         - daemonset
+  #     - from_metric: "kube_statefulset_labels"
+  #       to_metrics: "kube_statefulset_"
+  #       match_by:
+  #         - namespace
+  #         - statefulset
+  #     - from_metric: "kube_endpoint_labels"
+  #       to_metrics: "kube_endpoint_"
+  #       match_by:
+  #         - namespace
+  #         - endpoint
+  #     - from_metric: "kube_service_labels"
+  #       to_metrics: "kube_service_"
+  #       match_by:
+  #         - namespace
+  #         - service
+  #     - from_metric: "kube_node_labels"
+  #       to_metrics: "kube_node_"
+  #       match_by:
+  #         - namespace
+  #         - node
+
+# -- (bool) Reduces number of metrics sent in order to reduce costs. Can be configured also with `global.lowDataMode`
+# @default -- false
+lowDataMode:
+
+# -- Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port`. Can be configured also with `global.proxy`
+proxy: ""
+
+# -- (bool) Send the metrics to the staging backend. Requires a valid staging license key. Can be configured also with `global.nrStaging`
+# @default -- false
+nrStaging:
+fedramp:
+  # fedramp.enabled -- (bool) Enables FedRAMP. Can be configured also with `global.fedramp.enabled`
+  # @default -- false
+  enabled:
+# -- (bool) Sets the debug logs to this integration or all integrations if it is set globally. Can be configured also with `global.verboseLog`
+# @default -- false
+verboseLog:
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/Chart.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/Chart.yaml
new file mode 100644
index 000000000..f72d981c3
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v2
+name: pixie-operator-chart
+type: application
+version: 0.1.7
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/crds/olm_crd.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/crds/olm_crd.yaml
new file mode 100644
index 000000000..3f5429f78
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/crds/olm_crd.yaml
@@ -0,0 +1,9045 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.9.0
+  creationTimestamp: null
+  name: catalogsources.operators.coreos.com
+spec:
+  group: operators.coreos.com
+  names:
+    categories:
+      - olm
+    kind: CatalogSource
+    listKind: CatalogSourceList
+    plural: catalogsources
+    shortNames:
+      - catsrc
+    singular: catalogsource
+  scope: Namespaced
+  versions:
+    - additionalPrinterColumns:
+        - description: The pretty name of the catalog
+          jsonPath: .spec.displayName
+          name: Display
+          type: string
+        - description: The type of the catalog
+          jsonPath: .spec.sourceType
+          name: Type
+          type: string
+        - description: The publisher of the catalog
+          jsonPath: .spec.publisher
+          name: Publisher
+          type: string
+        - jsonPath: .metadata.creationTimestamp
+          name: Age
+          type: date
+      name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: CatalogSource is a repository of CSVs, CRDs, and operator packages.
+          type: object
+          required:
+            - metadata
+            - spec
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              type: object
+              required:
+                - sourceType
+              properties:
+                address:
+                  description: 'Address is a host that OLM can use to connect to a pre-existing registry. Format: <registry-host or ip>:<port> Only used when SourceType = SourceTypeGrpc. Ignored when the Image field is set.'
+                  type: string
+                configMap:
+                  description: ConfigMap is the name of the ConfigMap to be used to back a configmap-server registry. Only used when SourceType = SourceTypeConfigmap or SourceTypeInternal.
+                  type: string
+                description:
+                  type: string
+                displayName:
+                  description: Metadata
+                  type: string
+                grpcPodConfig:
+                  description: GrpcPodConfig exposes different overrides for the pod spec of the CatalogSource Pod. Only used when SourceType = SourceTypeGrpc and Image is set.
+                  type: object
+                  properties:
+                    affinity:
+                      description: Affinity is the catalog source's pod's affinity.
+                      type: object
+                      properties:
+                        nodeAffinity:
+                          description: Describes node affinity scheduling rules for the pod.
+                          type: object
+                          properties:
+                            preferredDuringSchedulingIgnoredDuringExecution:
+                              description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node matches the corresponding matchExpressions; the node(s) with the highest sum are the most preferred.
+                              type: array
+                              items:
+                                description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                                type: object
+                                required:
+                                  - preference
+                                  - weight
+                                properties:
+                                  preference:
+                                    description: A node selector term, associated with the corresponding weight.
+                                    type: object
+                                    properties:
+                                      matchExpressions:
+                                        description: A list of node selector requirements by node's labels.
+                                        type: array
+                                        items:
+                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: The label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                              type: string
+                                            values:
+                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                      matchFields:
+                                        description: A list of node selector requirements by node's fields.
+                                        type: array
+                                        items:
+                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: The label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                              type: string
+                                            values:
+                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                  weight:
+                                    description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100.
+                                    type: integer
+                                    format: int32
+                            requiredDuringSchedulingIgnoredDuringExecution:
+                              description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to an update), the system may or may not try to eventually evict the pod from its node.
+                              type: object
+                              required:
+                                - nodeSelectorTerms
+                              properties:
+                                nodeSelectorTerms:
+                                  description: Required. A list of node selector terms. The terms are ORed.
+                                  type: array
+                                  items:
+                                    description: A null or empty node selector term matches no objects. The requirements of them are ANDed. The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                                    type: object
+                                    properties:
+                                      matchExpressions:
+                                        description: A list of node selector requirements by node's labels.
+                                        type: array
+                                        items:
+                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: The label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                              type: string
+                                            values:
+                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                      matchFields:
+                                        description: A list of node selector requirements by node's fields.
+                                        type: array
+                                        items:
+                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: The label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                              type: string
+                                            values:
+                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                        podAffinity:
+                          description: Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).
+                          type: object
+                          properties:
+                            preferredDuringSchedulingIgnoredDuringExecution:
+                              description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
+                              type: array
+                              items:
+                                description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                                type: object
+                                required:
+                                  - podAffinityTerm
+                                  - weight
+                                properties:
+                                  podAffinityTerm:
+                                    description: Required. A pod affinity term, associated with the corresponding weight.
+                                    type: object
+                                    required:
+                                      - topologyKey
+                                    properties:
+                                      labelSelector:
+                                        description: A label query over a set of resources, in this case pods.
+                                        type: object
+                                        properties:
+                                          matchExpressions:
+                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                            type: array
+                                            items:
+                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                              type: object
+                                              required:
+                                                - key
+                                                - operator
+                                              properties:
+                                                key:
+                                                  description: key is the label key that the selector applies to.
+                                                  type: string
+                                                operator:
+                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                  type: string
+                                                values:
+                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                          matchLabels:
+                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                      namespaceSelector:
+                                        description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces.
+                                        type: object
+                                        properties:
+                                          matchExpressions:
+                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                            type: array
+                                            items:
+                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                              type: object
+                                              required:
+                                                - key
+                                                - operator
+                                              properties:
+                                                key:
+                                                  description: key is the label key that the selector applies to.
+                                                  type: string
+                                                operator:
+                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                  type: string
+                                                values:
+                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                          matchLabels:
+                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                      namespaces:
+                                        description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                        type: array
+                                        items:
+                                          type: string
+                                      topologyKey:
+                                        description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                        type: string
+                                  weight:
+                                    description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
+                                    type: integer
+                                    format: int32
+                            requiredDuringSchedulingIgnoredDuringExecution:
+                              description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                              type: array
+                              items:
+                                description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
+                                type: object
+                                required:
+                                  - topologyKey
+                                properties:
+                                  labelSelector:
+                                    description: A label query over a set of resources, in this case pods.
+                                    type: object
+                                    properties:
+                                      matchExpressions:
+                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                        type: array
+                                        items:
+                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: key is the label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                              type: string
+                                            values:
+                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                      matchLabels:
+                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                        type: object
+                                        additionalProperties:
+                                          type: string
+                                  namespaceSelector:
+                                    description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces.
+                                    type: object
+                                    properties:
+                                      matchExpressions:
+                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                        type: array
+                                        items:
+                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: key is the label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                              type: string
+                                            values:
+                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                      matchLabels:
+                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                        type: object
+                                        additionalProperties:
+                                          type: string
+                                  namespaces:
+                                    description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                    type: array
+                                    items:
+                                      type: string
+                                  topologyKey:
+                                    description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                    type: string
+                        podAntiAffinity:
+                          description: Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)).
+                          type: object
+                          properties:
+                            preferredDuringSchedulingIgnoredDuringExecution:
+                              description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling anti-affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
+                              type: array
+                              items:
+                                description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                                type: object
+                                required:
+                                  - podAffinityTerm
+                                  - weight
+                                properties:
+                                  podAffinityTerm:
+                                    description: Required. A pod affinity term, associated with the corresponding weight.
+                                    type: object
+                                    required:
+                                      - topologyKey
+                                    properties:
+                                      labelSelector:
+                                        description: A label query over a set of resources, in this case pods.
+                                        type: object
+                                        properties:
+                                          matchExpressions:
+                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                            type: array
+                                            items:
+                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                              type: object
+                                              required:
+                                                - key
+                                                - operator
+                                              properties:
+                                                key:
+                                                  description: key is the label key that the selector applies to.
+                                                  type: string
+                                                operator:
+                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                  type: string
+                                                values:
+                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                          matchLabels:
+                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                      namespaceSelector:
+                                        description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces.
+                                        type: object
+                                        properties:
+                                          matchExpressions:
+                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                            type: array
+                                            items:
+                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                              type: object
+                                              required:
+                                                - key
+                                                - operator
+                                              properties:
+                                                key:
+                                                  description: key is the label key that the selector applies to.
+                                                  type: string
+                                                operator:
+                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                  type: string
+                                                values:
+                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                          matchLabels:
+                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                      namespaces:
+                                        description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                        type: array
+                                        items:
+                                          type: string
+                                      topologyKey:
+                                        description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                        type: string
+                                  weight:
+                                    description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
+                                    type: integer
+                                    format: int32
+                            requiredDuringSchedulingIgnoredDuringExecution:
+                              description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the anti-affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                              type: array
+                              items:
+                                description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
+                                type: object
+                                required:
+                                  - topologyKey
+                                properties:
+                                  labelSelector:
+                                    description: A label query over a set of resources, in this case pods.
+                                    type: object
+                                    properties:
+                                      matchExpressions:
+                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                        type: array
+                                        items:
+                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: key is the label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                              type: string
+                                            values:
+                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                      matchLabels:
+                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                        type: object
+                                        additionalProperties:
+                                          type: string
+                                  namespaceSelector:
+                                    description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces.
+                                    type: object
+                                    properties:
+                                      matchExpressions:
+                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                        type: array
+                                        items:
+                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: key is the label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                              type: string
+                                            values:
+                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                      matchLabels:
+                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                        type: object
+                                        additionalProperties:
+                                          type: string
+                                  namespaces:
+                                    description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                    type: array
+                                    items:
+                                      type: string
+                                  topologyKey:
+                                    description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                    type: string
+                    extractContent:
+                      description: ExtractContent configures the gRPC catalog Pod to extract catalog metadata from the provided index image and use a well-known version of the `opm` server to expose it. The catalog index image that this CatalogSource is configured to use *must* be using the file-based catalogs in order to utilize this feature.
+                      type: object
+                      required:
+                        - cacheDir
+                        - catalogDir
+                      properties:
+                        cacheDir:
+                          description: CacheDir is the directory storing the pre-calculated API cache.
+                          type: string
+                        catalogDir:
+                          description: CatalogDir is the directory storing the file-based catalog contents.
+                          type: string
+                    memoryTarget:
+                      description: "MemoryTarget configures the $GOMEMLIMIT value for the gRPC catalog Pod. This is a soft memory limit for the server, which the runtime will attempt to meet but makes no guarantees that it will do so. If this value is set, the Pod will have the following modifications made to the container running the server: - the $GOMEMLIMIT environment variable will be set to this value in bytes - the memory request will be set to this value \n This field should be set if it's desired to reduce the footprint of a catalog server as much as possible, or if a catalog being served is very large and needs more than the default allocation. If your index image has a file- system cache, determine a good approximation for this value by doubling the size of the package cache at /tmp/cache/cache/packages.json in the index image. \n This field is best-effort; if unset, no default will be used and no Pod memory limit or $GOMEMLIMIT value will be set."
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      anyOf:
+                        - type: integer
+                        - type: string
+                      x-kubernetes-int-or-string: true
+                    nodeSelector:
+                      description: NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node's labels for the pod to be scheduled on that node.
+                      type: object
+                      additionalProperties:
+                        type: string
+                    priorityClassName:
+                      description: If specified, indicates the pod's priority. If not specified, the pod priority will be default or zero if there is no default.
+                      type: string
+                    securityContextConfig:
+                      description: "SecurityContextConfig can be one of `legacy` or `restricted`. The CatalogSource's pod is either injected with the right pod.spec.securityContext and pod.spec.container[*].securityContext values to allow the pod to run in Pod Security Admission (PSA) `restricted` mode, or doesn't set these values at all, in which case the pod can only be run in PSA `baseline` or `privileged` namespaces. Currently if the SecurityContextConfig is unspecified, the default value of `legacy` is used. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older catalog images, which could not be run in `restricted` mode, the SecurityContextConfig should be set to `legacy`. \n In a future version will the default will be set to `restricted`, catalog maintainers should rebuild their catalogs with a version of opm that supports running catalogSource pods in `restricted` mode to prepare for these changes. \n More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'"
+                      type: string
+                      default: legacy
+                      enum:
+                        - legacy
+                        - restricted
+                    tolerations:
+                      description: Tolerations are the catalog source's pod's tolerations.
+                      type: array
+                      items:
+                        description: The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
+                        type: object
+                        properties:
+                          effect:
+                            description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
+                            type: string
+                          key:
+                            description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.
+                            type: string
+                          operator:
+                            description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.
+                            type: string
+                          tolerationSeconds:
+                            description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.
+                            type: integer
+                            format: int64
+                          value:
+                            description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.
+                            type: string
+                icon:
+                  type: object
+                  required:
+                    - base64data
+                    - mediatype
+                  properties:
+                    base64data:
+                      type: string
+                    mediatype:
+                      type: string
+                image:
+                  description: Image is an operator-registry container image to instantiate a registry-server with. Only used when SourceType = SourceTypeGrpc. If present, the address field is ignored.
+                  type: string
+                priority:
+                  description: 'Priority field assigns a weight to the catalog source to prioritize them so that it can be consumed by the dependency resolver. Usage: Higher weight indicates that this catalog source is preferred over lower weighted catalog sources during dependency resolution. The range of the priority value can go from positive to negative in the range of int32. The default value to a catalog source with unassigned priority would be 0. The catalog source with the same priority values will be ranked lexicographically based on its name.'
+                  type: integer
+                publisher:
+                  type: string
+                secrets:
+                  description: Secrets represent set of secrets that can be used to access the contents of the catalog. It is best to keep this list small, since each will need to be tried for every catalog entry.
+                  type: array
+                  items:
+                    type: string
+                sourceType:
+                  description: SourceType is the type of source
+                  type: string
+                updateStrategy:
+                  description: UpdateStrategy defines how updated catalog source images can be discovered Consists of an interval that defines polling duration and an embedded strategy type
+                  type: object
+                  properties:
+                    registryPoll:
+                      type: object
+                      properties:
+                        interval:
+                          description: Interval is used to determine the time interval between checks of the latest catalog source version. The catalog operator polls to see if a new version of the catalog source is available. If available, the latest image is pulled and gRPC traffic is directed to the latest catalog source.
+                          type: string
+            status:
+              type: object
+              properties:
+                conditions:
+                  description: Represents the state of a CatalogSource. Note that Message and Reason represent the original status information, which may be migrated to be conditions based in the future. Any new features introduced will use conditions.
+                  type: array
+                  items:
+                    description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+                    type: object
+                    required:
+                      - lastTransitionTime
+                      - message
+                      - reason
+                      - status
+                      - type
+                    properties:
+                      lastTransitionTime:
+                        description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                        type: string
+                        format: date-time
+                      message:
+                        description: message is a human readable message indicating details about the transition. This may be an empty string.
+                        type: string
+                        maxLength: 32768
+                      observedGeneration:
+                        description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
+                        type: integer
+                        format: int64
+                        minimum: 0
+                      reason:
+                        description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
+                        type: string
+                        maxLength: 1024
+                        minLength: 1
+                        pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      status:
+                        description: status of the condition, one of True, False, Unknown.
+                        type: string
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                      type:
+                        description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                        type: string
+                        maxLength: 316
+                        pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                  x-kubernetes-list-map-keys:
+                    - type
+                  x-kubernetes-list-type: map
+                configMapReference:
+                  type: object
+                  required:
+                    - name
+                    - namespace
+                  properties:
+                    lastUpdateTime:
+                      type: string
+                      format: date-time
+                    name:
+                      type: string
+                    namespace:
+                      type: string
+                    resourceVersion:
+                      type: string
+                    uid:
+                      description: UID is a type that holds unique ID values, including UUIDs.  Because we don't ONLY use UUIDs, this is an alias to string.  Being a type captures intent and helps make sure that UIDs and names do not get conflated.
+                      type: string
+                connectionState:
+                  type: object
+                  required:
+                    - lastObservedState
+                  properties:
+                    address:
+                      type: string
+                    lastConnect:
+                      type: string
+                      format: date-time
+                    lastObservedState:
+                      type: string
+                latestImageRegistryPoll:
+                  description: The last time the CatalogSource image registry has been polled to ensure the image is up-to-date
+                  type: string
+                  format: date-time
+                message:
+                  description: A human readable message indicating details about why the CatalogSource is in this condition.
+                  type: string
+                reason:
+                  description: Reason is the reason the CatalogSource was transitioned to its current state.
+                  type: string
+                registryService:
+                  type: object
+                  properties:
+                    createdAt:
+                      type: string
+                      format: date-time
+                    port:
+                      type: string
+                    protocol:
+                      type: string
+                    serviceName:
+                      type: string
+                    serviceNamespace:
+                      type: string
+      served: true
+      storage: true
+      subresources:
+        status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.9.0
+  creationTimestamp: null
+  name: clusterserviceversions.operators.coreos.com
+spec:
+  group: operators.coreos.com
+  names:
+    categories:
+      - olm
+    kind: ClusterServiceVersion
+    listKind: ClusterServiceVersionList
+    plural: clusterserviceversions
+    shortNames:
+      - csv
+      - csvs
+    singular: clusterserviceversion
+  scope: Namespaced
+  versions:
+    - additionalPrinterColumns:
+        - description: The name of the CSV
+          jsonPath: .spec.displayName
+          name: Display
+          type: string
+        - description: The version of the CSV
+          jsonPath: .spec.version
+          name: Version
+          type: string
+        - description: The name of a CSV that this one replaces
+          jsonPath: .spec.replaces
+          name: Replaces
+          type: string
+        - jsonPath: .status.phase
+          name: Phase
+          type: string
+      name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: ClusterServiceVersion is a Custom Resource of type `ClusterServiceVersionSpec`.
+          type: object
+          required:
+            - metadata
+            - spec
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: ClusterServiceVersionSpec declarations tell OLM how to install an operator that can manage apps for a given version.
+              type: object
+              required:
+                - displayName
+                - install
+              properties:
+                annotations:
+                  description: Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata.
+                  type: object
+                  additionalProperties:
+                    type: string
+                apiservicedefinitions:
+                  description: APIServiceDefinitions declares all of the extension apis managed or required by an operator being ran by ClusterServiceVersion.
+                  type: object
+                  properties:
+                    owned:
+                      type: array
+                      items:
+                        description: APIServiceDescription provides details to OLM about apis provided via aggregation
+                        type: object
+                        required:
+                          - group
+                          - kind
+                          - name
+                          - version
+                        properties:
+                          actionDescriptors:
+                            type: array
+                            items:
+                              description: ActionDescriptor describes a declarative action that can be performed on a custom resource instance
+                              type: object
+                              required:
+                                - path
+                              properties:
+                                description:
+                                  type: string
+                                displayName:
+                                  type: string
+                                path:
+                                  type: string
+                                value:
+                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  type: string
+                                  format: byte
+                                x-descriptors:
+                                  type: array
+                                  items:
+                                    type: string
+                          containerPort:
+                            type: integer
+                            format: int32
+                          deploymentName:
+                            type: string
+                          description:
+                            type: string
+                          displayName:
+                            type: string
+                          group:
+                            type: string
+                          kind:
+                            type: string
+                          name:
+                            type: string
+                          resources:
+                            type: array
+                            items:
+                              description: APIResourceReference is a reference to a Kubernetes resource type that the referrer utilizes.
+                              type: object
+                              required:
+                                - kind
+                                - name
+                                - version
+                              properties:
+                                kind:
+                                  description: Kind of the referenced resource type.
+                                  type: string
+                                name:
+                                  description: Plural name of the referenced resource type (CustomResourceDefinition.Spec.Names[].Plural). Empty string if the referenced resource type is not a custom resource.
+                                  type: string
+                                version:
+                                  description: API Version of the referenced resource type.
+                                  type: string
+                          specDescriptors:
+                            type: array
+                            items:
+                              description: SpecDescriptor describes a field in a spec block of a CRD so that OLM can consume it
+                              type: object
+                              required:
+                                - path
+                              properties:
+                                description:
+                                  type: string
+                                displayName:
+                                  type: string
+                                path:
+                                  type: string
+                                value:
+                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  type: string
+                                  format: byte
+                                x-descriptors:
+                                  type: array
+                                  items:
+                                    type: string
+                          statusDescriptors:
+                            type: array
+                            items:
+                              description: StatusDescriptor describes a field in a status block of a CRD so that OLM can consume it
+                              type: object
+                              required:
+                                - path
+                              properties:
+                                description:
+                                  type: string
+                                displayName:
+                                  type: string
+                                path:
+                                  type: string
+                                value:
+                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  type: string
+                                  format: byte
+                                x-descriptors:
+                                  type: array
+                                  items:
+                                    type: string
+                          version:
+                            type: string
+                    required:
+                      type: array
+                      items:
+                        description: APIServiceDescription provides details to OLM about apis provided via aggregation
+                        type: object
+                        required:
+                          - group
+                          - kind
+                          - name
+                          - version
+                        properties:
+                          actionDescriptors:
+                            type: array
+                            items:
+                              description: ActionDescriptor describes a declarative action that can be performed on a custom resource instance
+                              type: object
+                              required:
+                                - path
+                              properties:
+                                description:
+                                  type: string
+                                displayName:
+                                  type: string
+                                path:
+                                  type: string
+                                value:
+                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  type: string
+                                  format: byte
+                                x-descriptors:
+                                  type: array
+                                  items:
+                                    type: string
+                          containerPort:
+                            type: integer
+                            format: int32
+                          deploymentName:
+                            type: string
+                          description:
+                            type: string
+                          displayName:
+                            type: string
+                          group:
+                            type: string
+                          kind:
+                            type: string
+                          name:
+                            type: string
+                          resources:
+                            type: array
+                            items:
+                              description: APIResourceReference is a reference to a Kubernetes resource type that the referrer utilizes.
+                              type: object
+                              required:
+                                - kind
+                                - name
+                                - version
+                              properties:
+                                kind:
+                                  description: Kind of the referenced resource type.
+                                  type: string
+                                name:
+                                  description: Plural name of the referenced resource type (CustomResourceDefinition.Spec.Names[].Plural). Empty string if the referenced resource type is not a custom resource.
+                                  type: string
+                                version:
+                                  description: API Version of the referenced resource type.
+                                  type: string
+                          specDescriptors:
+                            type: array
+                            items:
+                              description: SpecDescriptor describes a field in a spec block of a CRD so that OLM can consume it
+                              type: object
+                              required:
+                                - path
+                              properties:
+                                description:
+                                  type: string
+                                displayName:
+                                  type: string
+                                path:
+                                  type: string
+                                value:
+                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  type: string
+                                  format: byte
+                                x-descriptors:
+                                  type: array
+                                  items:
+                                    type: string
+                          statusDescriptors:
+                            type: array
+                            items:
+                              description: StatusDescriptor describes a field in a status block of a CRD so that OLM can consume it
+                              type: object
+                              required:
+                                - path
+                              properties:
+                                description:
+                                  type: string
+                                displayName:
+                                  type: string
+                                path:
+                                  type: string
+                                value:
+                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  type: string
+                                  format: byte
+                                x-descriptors:
+                                  type: array
+                                  items:
+                                    type: string
+                          version:
+                            type: string
+                cleanup:
+                  description: Cleanup specifies the cleanup behaviour when the CSV gets deleted
+                  type: object
+                  required:
+                    - enabled
+                  properties:
+                    enabled:
+                      type: boolean
+                customresourcedefinitions:
+                  description: "CustomResourceDefinitions declares all of the CRDs managed or required by an operator being ran by ClusterServiceVersion. \n If the CRD is present in the Owned list, it is implicitly required."
+                  type: object
+                  properties:
+                    owned:
+                      type: array
+                      items:
+                        description: CRDDescription provides details to OLM about the CRDs
+                        type: object
+                        required:
+                          - kind
+                          - name
+                          - version
+                        properties:
+                          actionDescriptors:
+                            type: array
+                            items:
+                              description: ActionDescriptor describes a declarative action that can be performed on a custom resource instance
+                              type: object
+                              required:
+                                - path
+                              properties:
+                                description:
+                                  type: string
+                                displayName:
+                                  type: string
+                                path:
+                                  type: string
+                                value:
+                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  type: string
+                                  format: byte
+                                x-descriptors:
+                                  type: array
+                                  items:
+                                    type: string
+                          description:
+                            type: string
+                          displayName:
+                            type: string
+                          kind:
+                            type: string
+                          name:
+                            type: string
+                          resources:
+                            type: array
+                            items:
+                              description: APIResourceReference is a reference to a Kubernetes resource type that the referrer utilizes.
+                              type: object
+                              required:
+                                - kind
+                                - name
+                                - version
+                              properties:
+                                kind:
+                                  description: Kind of the referenced resource type.
+                                  type: string
+                                name:
+                                  description: Plural name of the referenced resource type (CustomResourceDefinition.Spec.Names[].Plural). Empty string if the referenced resource type is not a custom resource.
+                                  type: string
+                                version:
+                                  description: API Version of the referenced resource type.
+                                  type: string
+                          specDescriptors:
+                            type: array
+                            items:
+                              description: SpecDescriptor describes a field in a spec block of a CRD so that OLM can consume it
+                              type: object
+                              required:
+                                - path
+                              properties:
+                                description:
+                                  type: string
+                                displayName:
+                                  type: string
+                                path:
+                                  type: string
+                                value:
+                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  type: string
+                                  format: byte
+                                x-descriptors:
+                                  type: array
+                                  items:
+                                    type: string
+                          statusDescriptors:
+                            type: array
+                            items:
+                              description: StatusDescriptor describes a field in a status block of a CRD so that OLM can consume it
+                              type: object
+                              required:
+                                - path
+                              properties:
+                                description:
+                                  type: string
+                                displayName:
+                                  type: string
+                                path:
+                                  type: string
+                                value:
+                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  type: string
+                                  format: byte
+                                x-descriptors:
+                                  type: array
+                                  items:
+                                    type: string
+                          version:
+                            type: string
+                    required:
+                      type: array
+                      items:
+                        description: CRDDescription provides details to OLM about the CRDs
+                        type: object
+                        required:
+                          - kind
+                          - name
+                          - version
+                        properties:
+                          actionDescriptors:
+                            type: array
+                            items:
+                              description: ActionDescriptor describes a declarative action that can be performed on a custom resource instance
+                              type: object
+                              required:
+                                - path
+                              properties:
+                                description:
+                                  type: string
+                                displayName:
+                                  type: string
+                                path:
+                                  type: string
+                                value:
+                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  type: string
+                                  format: byte
+                                x-descriptors:
+                                  type: array
+                                  items:
+                                    type: string
+                          description:
+                            type: string
+                          displayName:
+                            type: string
+                          kind:
+                            type: string
+                          name:
+                            type: string
+                          resources:
+                            type: array
+                            items:
+                              description: APIResourceReference is a reference to a Kubernetes resource type that the referrer utilizes.
+                              type: object
+                              required:
+                                - kind
+                                - name
+                                - version
+                              properties:
+                                kind:
+                                  description: Kind of the referenced resource type.
+                                  type: string
+                                name:
+                                  description: Plural name of the referenced resource type (CustomResourceDefinition.Spec.Names[].Plural). Empty string if the referenced resource type is not a custom resource.
+                                  type: string
+                                version:
+                                  description: API Version of the referenced resource type.
+                                  type: string
+                          specDescriptors:
+                            type: array
+                            items:
+                              description: SpecDescriptor describes a field in a spec block of a CRD so that OLM can consume it
+                              type: object
+                              required:
+                                - path
+                              properties:
+                                description:
+                                  type: string
+                                displayName:
+                                  type: string
+                                path:
+                                  type: string
+                                value:
+                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  type: string
+                                  format: byte
+                                x-descriptors:
+                                  type: array
+                                  items:
+                                    type: string
+                          statusDescriptors:
+                            type: array
+                            items:
+                              description: StatusDescriptor describes a field in a status block of a CRD so that OLM can consume it
+                              type: object
+                              required:
+                                - path
+                              properties:
+                                description:
+                                  type: string
+                                displayName:
+                                  type: string
+                                path:
+                                  type: string
+                                value:
+                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  type: string
+                                  format: byte
+                                x-descriptors:
+                                  type: array
+                                  items:
+                                    type: string
+                          version:
+                            type: string
+                description:
+                  description: Description of the operator. Can include the features, limitations or use-cases of the operator.
+                  type: string
+                displayName:
+                  description: The name of the operator in display format.
+                  type: string
+                icon:
+                  description: The icon for this operator.
+                  type: array
+                  items:
+                    type: object
+                    required:
+                      - base64data
+                      - mediatype
+                    properties:
+                      base64data:
+                        type: string
+                      mediatype:
+                        type: string
+                install:
+                  description: NamedInstallStrategy represents the block of an ClusterServiceVersion resource where the install strategy is specified.
+                  type: object
+                  required:
+                    - strategy
+                  properties:
+                    spec:
+                      description: StrategyDetailsDeployment represents the parsed details of a Deployment InstallStrategy.
+                      type: object
+                      required:
+                        - deployments
+                      properties:
+                        clusterPermissions:
+                          type: array
+                          items:
+                            description: StrategyDeploymentPermissions describe the rbac rules and service account needed by the install strategy
+                            type: object
+                            required:
+                              - rules
+                              - serviceAccountName
+                            properties:
+                              rules:
+                                type: array
+                                items:
+                                  description: PolicyRule holds information that describes a policy rule, but does not contain information about who the rule applies to or which namespace the rule applies to.
+                                  type: object
+                                  required:
+                                    - verbs
+                                  properties:
+                                    apiGroups:
+                                      description: APIGroups is the name of the APIGroup that contains the resources.  If multiple API groups are specified, any action requested against one of the enumerated resources in any API group will be allowed. "" represents the core API group and "*" represents all API groups.
+                                      type: array
+                                      items:
+                                        type: string
+                                    nonResourceURLs:
+                                      description: NonResourceURLs is a set of partial urls that a user should have access to.  *s are allowed, but only as the full, final step in the path Since non-resource URLs are not namespaced, this field is only applicable for ClusterRoles referenced from a ClusterRoleBinding. Rules can either apply to API resources (such as "pods" or "secrets") or non-resource URL paths (such as "/api"),  but not both.
+                                      type: array
+                                      items:
+                                        type: string
+                                    resourceNames:
+                                      description: ResourceNames is an optional white list of names that the rule applies to.  An empty set means that everything is allowed.
+                                      type: array
+                                      items:
+                                        type: string
+                                    resources:
+                                      description: Resources is a list of resources this rule applies to. '*' represents all resources.
+                                      type: array
+                                      items:
+                                        type: string
+                                    verbs:
+                                      description: Verbs is a list of Verbs that apply to ALL the ResourceKinds contained in this rule. '*' represents all verbs.
+                                      type: array
+                                      items:
+                                        type: string
+                              serviceAccountName:
+                                type: string
+                        deployments:
+                          type: array
+                          items:
+                            description: StrategyDeploymentSpec contains the name, spec and labels for the deployment ALM should create
+                            type: object
+                            required:
+                              - name
+                              - spec
+                            properties:
+                              label:
+                                description: Set is a map of label:value. It implements Labels.
+                                type: object
+                                additionalProperties:
+                                  type: string
+                              name:
+                                type: string
+                              spec:
+                                description: DeploymentSpec is the specification of the desired behavior of the Deployment.
+                                type: object
+                                required:
+                                  - selector
+                                  - template
+                                properties:
+                                  minReadySeconds:
+                                    description: Minimum number of seconds for which a newly created pod should be ready without any of its container crashing, for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready)
+                                    type: integer
+                                    format: int32
+                                  paused:
+                                    description: Indicates that the deployment is paused.
+                                    type: boolean
+                                  progressDeadlineSeconds:
+                                    description: The maximum time in seconds for a deployment to make progress before it is considered to be failed. The deployment controller will continue to process failed deployments and a condition with a ProgressDeadlineExceeded reason will be surfaced in the deployment status. Note that progress will not be estimated during the time a deployment is paused. Defaults to 600s.
+                                    type: integer
+                                    format: int32
+                                  replicas:
+                                    description: Number of desired pods. This is a pointer to distinguish between explicit zero and not specified. Defaults to 1.
+                                    type: integer
+                                    format: int32
+                                  revisionHistoryLimit:
+                                    description: The number of old ReplicaSets to retain to allow rollback. This is a pointer to distinguish between explicit zero and not specified. Defaults to 10.
+                                    type: integer
+                                    format: int32
+                                  selector:
+                                    description: Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment. It must match the pod template's labels.
+                                    type: object
+                                    properties:
+                                      matchExpressions:
+                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                        type: array
+                                        items:
+                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: key is the label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                              type: string
+                                            values:
+                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                      matchLabels:
+                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                        type: object
+                                        additionalProperties:
+                                          type: string
+                                  strategy:
+                                    description: The deployment strategy to use to replace existing pods with new ones.
+                                    type: object
+                                    properties:
+                                      rollingUpdate:
+                                        description: 'Rolling update config params. Present only if DeploymentStrategyType = RollingUpdate. --- TODO: Update this to follow our convention for oneOf, whatever we decide it to be.'
+                                        type: object
+                                        properties:
+                                          maxSurge:
+                                            description: 'The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). This can not be 0 if MaxUnavailable is 0. Absolute number is calculated from percentage by rounding up. Defaults to 25%. Example: when this is set to 30%, the new ReplicaSet can be scaled up immediately when the rolling update starts, such that the total number of old and new pods do not exceed 130% of desired pods. Once old pods have been killed, new ReplicaSet can be scaled up further, ensuring that total number of pods running at any time during the update is at most 130% of desired pods.'
+                                            anyOf:
+                                              - type: integer
+                                              - type: string
+                                            x-kubernetes-int-or-string: true
+                                          maxUnavailable:
+                                            description: 'The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding down. This can not be 0 if MaxSurge is 0. Defaults to 25%. Example: when this is set to 30%, the old ReplicaSet can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old ReplicaSet can be scaled down further, followed by scaling up the new ReplicaSet, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods.'
+                                            anyOf:
+                                              - type: integer
+                                              - type: string
+                                            x-kubernetes-int-or-string: true
+                                      type:
+                                        description: Type of deployment. Can be "Recreate" or "RollingUpdate". Default is RollingUpdate.
+                                        type: string
+                                  template:
+                                    description: Template describes the pods that will be created. The only allowed template.spec.restartPolicy value is "Always".
+                                    type: object
+                                    properties:
+                                      metadata:
+                                        description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
+                                      spec:
+                                        description: 'Specification of the desired behavior of the pod. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status'
+                                        type: object
+                                        required:
+                                          - containers
+                                        properties:
+                                          activeDeadlineSeconds:
+                                            description: Optional duration in seconds the pod may be active on the node relative to StartTime before the system will actively try to mark it failed and kill associated containers. Value must be a positive integer.
+                                            type: integer
+                                            format: int64
+                                          affinity:
+                                            description: If specified, the pod's scheduling constraints
+                                            type: object
+                                            properties:
+                                              nodeAffinity:
+                                                description: Describes node affinity scheduling rules for the pod.
+                                                type: object
+                                                properties:
+                                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node matches the corresponding matchExpressions; the node(s) with the highest sum are the most preferred.
+                                                    type: array
+                                                    items:
+                                                      description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                                                      type: object
+                                                      required:
+                                                        - preference
+                                                        - weight
+                                                      properties:
+                                                        preference:
+                                                          description: A node selector term, associated with the corresponding weight.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: A list of node selector requirements by node's labels.
+                                                              type: array
+                                                              items:
+                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: The label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                                    type: string
+                                                                  values:
+                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchFields:
+                                                              description: A list of node selector requirements by node's fields.
+                                                              type: array
+                                                              items:
+                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: The label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                                    type: string
+                                                                  values:
+                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                        weight:
+                                                          description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100.
+                                                          type: integer
+                                                          format: int32
+                                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                                    description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to an update), the system may or may not try to eventually evict the pod from its node.
+                                                    type: object
+                                                    required:
+                                                      - nodeSelectorTerms
+                                                    properties:
+                                                      nodeSelectorTerms:
+                                                        description: Required. A list of node selector terms. The terms are ORed.
+                                                        type: array
+                                                        items:
+                                                          description: A null or empty node selector term matches no objects. The requirements of them are ANDed. The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: A list of node selector requirements by node's labels.
+                                                              type: array
+                                                              items:
+                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: The label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                                    type: string
+                                                                  values:
+                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchFields:
+                                                              description: A list of node selector requirements by node's fields.
+                                                              type: array
+                                                              items:
+                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: The label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                                    type: string
+                                                                  values:
+                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                              podAffinity:
+                                                description: Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).
+                                                type: object
+                                                properties:
+                                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
+                                                    type: array
+                                                    items:
+                                                      description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                                                      type: object
+                                                      required:
+                                                        - podAffinityTerm
+                                                        - weight
+                                                      properties:
+                                                        podAffinityTerm:
+                                                          description: Required. A pod affinity term, associated with the corresponding weight.
+                                                          type: object
+                                                          required:
+                                                            - topologyKey
+                                                          properties:
+                                                            labelSelector:
+                                                              description: A label query over a set of resources, in this case pods.
+                                                              type: object
+                                                              properties:
+                                                                matchExpressions:
+                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                                  type: array
+                                                                  items:
+                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                    type: object
+                                                                    required:
+                                                                      - key
+                                                                      - operator
+                                                                    properties:
+                                                                      key:
+                                                                        description: key is the label key that the selector applies to.
+                                                                        type: string
+                                                                      operator:
+                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                        type: string
+                                                                      values:
+                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                        type: array
+                                                                        items:
+                                                                          type: string
+                                                                matchLabels:
+                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    type: string
+                                                            namespaceSelector:
+                                                              description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces.
+                                                              type: object
+                                                              properties:
+                                                                matchExpressions:
+                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                                  type: array
+                                                                  items:
+                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                    type: object
+                                                                    required:
+                                                                      - key
+                                                                      - operator
+                                                                    properties:
+                                                                      key:
+                                                                        description: key is the label key that the selector applies to.
+                                                                        type: string
+                                                                      operator:
+                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                        type: string
+                                                                      values:
+                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                        type: array
+                                                                        items:
+                                                                          type: string
+                                                                matchLabels:
+                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    type: string
+                                                            namespaces:
+                                                              description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                            topologyKey:
+                                                              description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                              type: string
+                                                        weight:
+                                                          description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
+                                                          type: integer
+                                                          format: int32
+                                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                                    description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                                                    type: array
+                                                    items:
+                                                      description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
+                                                      type: object
+                                                      required:
+                                                        - topologyKey
+                                                      properties:
+                                                        labelSelector:
+                                                          description: A label query over a set of resources, in this case pods.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                              type: array
+                                                              items:
+                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: key is the label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                    type: string
+                                                                  values:
+                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchLabels:
+                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                              type: object
+                                                              additionalProperties:
+                                                                type: string
+                                                        namespaceSelector:
+                                                          description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                              type: array
+                                                              items:
+                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: key is the label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                    type: string
+                                                                  values:
+                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchLabels:
+                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                              type: object
+                                                              additionalProperties:
+                                                                type: string
+                                                        namespaces:
+                                                          description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                        topologyKey:
+                                                          description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                          type: string
+                                              podAntiAffinity:
+                                                description: Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)).
+                                                type: object
+                                                properties:
+                                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling anti-affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
+                                                    type: array
+                                                    items:
+                                                      description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                                                      type: object
+                                                      required:
+                                                        - podAffinityTerm
+                                                        - weight
+                                                      properties:
+                                                        podAffinityTerm:
+                                                          description: Required. A pod affinity term, associated with the corresponding weight.
+                                                          type: object
+                                                          required:
+                                                            - topologyKey
+                                                          properties:
+                                                            labelSelector:
+                                                              description: A label query over a set of resources, in this case pods.
+                                                              type: object
+                                                              properties:
+                                                                matchExpressions:
+                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                                  type: array
+                                                                  items:
+                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                    type: object
+                                                                    required:
+                                                                      - key
+                                                                      - operator
+                                                                    properties:
+                                                                      key:
+                                                                        description: key is the label key that the selector applies to.
+                                                                        type: string
+                                                                      operator:
+                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                        type: string
+                                                                      values:
+                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                        type: array
+                                                                        items:
+                                                                          type: string
+                                                                matchLabels:
+                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    type: string
+                                                            namespaceSelector:
+                                                              description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces.
+                                                              type: object
+                                                              properties:
+                                                                matchExpressions:
+                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                                  type: array
+                                                                  items:
+                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                    type: object
+                                                                    required:
+                                                                      - key
+                                                                      - operator
+                                                                    properties:
+                                                                      key:
+                                                                        description: key is the label key that the selector applies to.
+                                                                        type: string
+                                                                      operator:
+                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                        type: string
+                                                                      values:
+                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                        type: array
+                                                                        items:
+                                                                          type: string
+                                                                matchLabels:
+                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    type: string
+                                                            namespaces:
+                                                              description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                            topologyKey:
+                                                              description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                              type: string
+                                                        weight:
+                                                          description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
+                                                          type: integer
+                                                          format: int32
+                                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                                    description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the anti-affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                                                    type: array
+                                                    items:
+                                                      description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
+                                                      type: object
+                                                      required:
+                                                        - topologyKey
+                                                      properties:
+                                                        labelSelector:
+                                                          description: A label query over a set of resources, in this case pods.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                              type: array
+                                                              items:
+                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: key is the label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                    type: string
+                                                                  values:
+                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchLabels:
+                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                              type: object
+                                                              additionalProperties:
+                                                                type: string
+                                                        namespaceSelector:
+                                                          description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                              type: array
+                                                              items:
+                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: key is the label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                    type: string
+                                                                  values:
+                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchLabels:
+                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                              type: object
+                                                              additionalProperties:
+                                                                type: string
+                                                        namespaces:
+                                                          description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                        topologyKey:
+                                                          description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                          type: string
+                                          automountServiceAccountToken:
+                                            description: AutomountServiceAccountToken indicates whether a service account token should be automatically mounted.
+                                            type: boolean
+                                          containers:
+                                            description: List of containers belonging to the pod. Containers cannot currently be added or removed. There must be at least one container in a Pod. Cannot be updated.
+                                            type: array
+                                            items:
+                                              description: A single application container that you want to run within a pod.
+                                              type: object
+                                              required:
+                                                - name
+                                              properties:
+                                                args:
+                                                  description: 'Arguments to the entrypoint. The container image''s CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                                command:
+                                                  description: 'Entrypoint array. Not executed within a shell. The container image''s ENTRYPOINT is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                                env:
+                                                  description: List of environment variables to set in the container. Cannot be updated.
+                                                  type: array
+                                                  items:
+                                                    description: EnvVar represents an environment variable present in a Container.
+                                                    type: object
+                                                    required:
+                                                      - name
+                                                    properties:
+                                                      name:
+                                                        description: Name of the environment variable. Must be a C_IDENTIFIER.
+                                                        type: string
+                                                      value:
+                                                        description: 'Variable references $(VAR_NAME) are expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".'
+                                                        type: string
+                                                      valueFrom:
+                                                        description: Source for the environment variable's value. Cannot be used if value is not empty.
+                                                        type: object
+                                                        properties:
+                                                          configMapKeyRef:
+                                                            description: Selects a key of a ConfigMap.
+                                                            type: object
+                                                            required:
+                                                              - key
+                                                            properties:
+                                                              key:
+                                                                description: The key to select.
+                                                                type: string
+                                                              name:
+                                                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                                type: string
+                                                              optional:
+                                                                description: Specify whether the ConfigMap or its key must be defined
+                                                                type: boolean
+                                                          fieldRef:
+                                                            description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.'
+                                                            type: object
+                                                            required:
+                                                              - fieldPath
+                                                            properties:
+                                                              apiVersion:
+                                                                description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                                                type: string
+                                                              fieldPath:
+                                                                description: Path of the field to select in the specified API version.
+                                                                type: string
+                                                          resourceFieldRef:
+                                                            description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.'
+                                                            type: object
+                                                            required:
+                                                              - resource
+                                                            properties:
+                                                              containerName:
+                                                                description: 'Container name: required for volumes, optional for env vars'
+                                                                type: string
+                                                              divisor:
+                                                                description: Specifies the output format of the exposed resources, defaults to "1"
+                                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                                anyOf:
+                                                                  - type: integer
+                                                                  - type: string
+                                                                x-kubernetes-int-or-string: true
+                                                              resource:
+                                                                description: 'Required: resource to select'
+                                                                type: string
+                                                          secretKeyRef:
+                                                            description: Selects a key of a secret in the pod's namespace
+                                                            type: object
+                                                            required:
+                                                              - key
+                                                            properties:
+                                                              key:
+                                                                description: The key of the secret to select from.  Must be a valid secret key.
+                                                                type: string
+                                                              name:
+                                                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                                type: string
+                                                              optional:
+                                                                description: Specify whether the Secret or its key must be defined
+                                                                type: boolean
+                                                envFrom:
+                                                  description: List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated.
+                                                  type: array
+                                                  items:
+                                                    description: EnvFromSource represents the source of a set of ConfigMaps
+                                                    type: object
+                                                    properties:
+                                                      configMapRef:
+                                                        description: The ConfigMap to select from
+                                                        type: object
+                                                        properties:
+                                                          name:
+                                                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                            type: string
+                                                          optional:
+                                                            description: Specify whether the ConfigMap must be defined
+                                                            type: boolean
+                                                      prefix:
+                                                        description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.
+                                                        type: string
+                                                      secretRef:
+                                                        description: The Secret to select from
+                                                        type: object
+                                                        properties:
+                                                          name:
+                                                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                            type: string
+                                                          optional:
+                                                            description: Specify whether the Secret must be defined
+                                                            type: boolean
+                                                image:
+                                                  description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.'
+                                                  type: string
+                                                imagePullPolicy:
+                                                  description: 'Image pull policy. One of Always, Never, IfNotPresent. Defaults to Always if :latest tag is specified, or IfNotPresent otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images'
+                                                  type: string
+                                                lifecycle:
+                                                  description: Actions that the management system should take in response to container lifecycle events. Cannot be updated.
+                                                  type: object
+                                                  properties:
+                                                    postStart:
+                                                      description: 'PostStart is called immediately after a container is created. If the handler fails, the container is terminated and restarted according to its restart policy. Other management of the container blocks until the hook completes. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                                                      type: object
+                                                      properties:
+                                                        exec:
+                                                          description: Exec specifies the action to take.
+                                                          type: object
+                                                          properties:
+                                                            command:
+                                                              description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                        httpGet:
+                                                          description: HTTPGet specifies the http request to perform.
+                                                          type: object
+                                                          required:
+                                                            - port
+                                                          properties:
+                                                            host:
+                                                              description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                              type: string
+                                                            httpHeaders:
+                                                              description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                              type: array
+                                                              items:
+                                                                description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                                type: object
+                                                                required:
+                                                                  - name
+                                                                  - value
+                                                                properties:
+                                                                  name:
+                                                                    description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                    type: string
+                                                                  value:
+                                                                    description: The header field value
+                                                                    type: string
+                                                            path:
+                                                              description: Path to access on the HTTP server.
+                                                              type: string
+                                                            port:
+                                                              description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                              anyOf:
+                                                                - type: integer
+                                                                - type: string
+                                                              x-kubernetes-int-or-string: true
+                                                            scheme:
+                                                              description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                              type: string
+                                                        tcpSocket:
+                                                          description: Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept for the backward compatibility. There are no validation of this field and lifecycle hooks will fail in runtime when tcp handler is specified.
+                                                          type: object
+                                                          required:
+                                                            - port
+                                                          properties:
+                                                            host:
+                                                              description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                              type: string
+                                                            port:
+                                                              description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                              anyOf:
+                                                                - type: integer
+                                                                - type: string
+                                                              x-kubernetes-int-or-string: true
+                                                    preStop:
+                                                      description: 'PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The Pod''s termination grace period countdown begins before the PreStop hook is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod''s termination grace period (unless delayed by finalizers). Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                                                      type: object
+                                                      properties:
+                                                        exec:
+                                                          description: Exec specifies the action to take.
+                                                          type: object
+                                                          properties:
+                                                            command:
+                                                              description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                        httpGet:
+                                                          description: HTTPGet specifies the http request to perform.
+                                                          type: object
+                                                          required:
+                                                            - port
+                                                          properties:
+                                                            host:
+                                                              description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                              type: string
+                                                            httpHeaders:
+                                                              description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                              type: array
+                                                              items:
+                                                                description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                                type: object
+                                                                required:
+                                                                  - name
+                                                                  - value
+                                                                properties:
+                                                                  name:
+                                                                    description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                    type: string
+                                                                  value:
+                                                                    description: The header field value
+                                                                    type: string
+                                                            path:
+                                                              description: Path to access on the HTTP server.
+                                                              type: string
+                                                            port:
+                                                              description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                              anyOf:
+                                                                - type: integer
+                                                                - type: string
+                                                              x-kubernetes-int-or-string: true
+                                                            scheme:
+                                                              description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                              type: string
+                                                        tcpSocket:
+                                                          description: Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept for the backward compatibility. There are no validation of this field and lifecycle hooks will fail in runtime when tcp handler is specified.
+                                                          type: object
+                                                          required:
+                                                            - port
+                                                          properties:
+                                                            host:
+                                                              description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                              type: string
+                                                            port:
+                                                              description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                              anyOf:
+                                                                - type: integer
+                                                                - type: string
+                                                              x-kubernetes-int-or-string: true
+                                                livenessProbe:
+                                                  description: 'Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                  type: object
+                                                  properties:
+                                                    exec:
+                                                      description: Exec specifies the action to take.
+                                                      type: object
+                                                      properties:
+                                                        command:
+                                                          description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                    failureThreshold:
+                                                      description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    grpc:
+                                                      description: GRPC specifies an action involving a GRPC port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        port:
+                                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                                          type: integer
+                                                          format: int32
+                                                        service:
+                                                          description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC."
+                                                          type: string
+                                                    httpGet:
+                                                      description: HTTPGet specifies the http request to perform.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                          type: string
+                                                        httpHeaders:
+                                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                          type: array
+                                                          items:
+                                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                            type: object
+                                                            required:
+                                                              - name
+                                                              - value
+                                                            properties:
+                                                              name:
+                                                                description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                type: string
+                                                              value:
+                                                                description: The header field value
+                                                                type: string
+                                                        path:
+                                                          description: Path to access on the HTTP server.
+                                                          type: string
+                                                        port:
+                                                          description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                        scheme:
+                                                          description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                          type: string
+                                                    initialDelaySeconds:
+                                                      description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                    periodSeconds:
+                                                      description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    successThreshold:
+                                                      description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    tcpSocket:
+                                                      description: TCPSocket specifies an action involving a TCP port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                          type: string
+                                                        port:
+                                                          description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                    terminationGracePeriodSeconds:
+                                                      description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. The grace period is the duration in seconds after the processes running in the pod are sent a termination signal and the time when the processes are forcibly halted with a kill signal. Set this value longer than the expected cleanup time for your process. If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this value overrides the value provided by the pod spec. Value must be non-negative integer. The value zero indicates stop immediately via the kill signal (no opportunity to shut down). This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                                      type: integer
+                                                      format: int64
+                                                    timeoutSeconds:
+                                                      description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                name:
+                                                  description: Name of the container specified as a DNS_LABEL. Each container in a pod must have a unique name (DNS_LABEL). Cannot be updated.
+                                                  type: string
+                                                ports:
+                                                  description: List of ports to expose from the container. Not specifying a port here DOES NOT prevent that port from being exposed. Any port which is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Modifying this array with strategic merge patch may corrupt the data. For more information See https://github.com/kubernetes/kubernetes/issues/108255. Cannot be updated.
+                                                  type: array
+                                                  items:
+                                                    description: ContainerPort represents a network port in a single container.
+                                                    type: object
+                                                    required:
+                                                      - containerPort
+                                                    properties:
+                                                      containerPort:
+                                                        description: Number of port to expose on the pod's IP address. This must be a valid port number, 0 < x < 65536.
+                                                        type: integer
+                                                        format: int32
+                                                      hostIP:
+                                                        description: What host IP to bind the external port to.
+                                                        type: string
+                                                      hostPort:
+                                                        description: Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this.
+                                                        type: integer
+                                                        format: int32
+                                                      name:
+                                                        description: If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services.
+                                                        type: string
+                                                      protocol:
+                                                        description: Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP".
+                                                        type: string
+                                                        default: TCP
+                                                  x-kubernetes-list-map-keys:
+                                                    - containerPort
+                                                    - protocol
+                                                  x-kubernetes-list-type: map
+                                                readinessProbe:
+                                                  description: 'Periodic probe of container service readiness. Container will be removed from service endpoints if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                  type: object
+                                                  properties:
+                                                    exec:
+                                                      description: Exec specifies the action to take.
+                                                      type: object
+                                                      properties:
+                                                        command:
+                                                          description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                    failureThreshold:
+                                                      description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    grpc:
+                                                      description: GRPC specifies an action involving a GRPC port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        port:
+                                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                                          type: integer
+                                                          format: int32
+                                                        service:
+                                                          description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC."
+                                                          type: string
+                                                    httpGet:
+                                                      description: HTTPGet specifies the http request to perform.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                          type: string
+                                                        httpHeaders:
+                                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                          type: array
+                                                          items:
+                                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                            type: object
+                                                            required:
+                                                              - name
+                                                              - value
+                                                            properties:
+                                                              name:
+                                                                description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                type: string
+                                                              value:
+                                                                description: The header field value
+                                                                type: string
+                                                        path:
+                                                          description: Path to access on the HTTP server.
+                                                          type: string
+                                                        port:
+                                                          description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                        scheme:
+                                                          description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                          type: string
+                                                    initialDelaySeconds:
+                                                      description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                    periodSeconds:
+                                                      description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    successThreshold:
+                                                      description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    tcpSocket:
+                                                      description: TCPSocket specifies an action involving a TCP port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                          type: string
+                                                        port:
+                                                          description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                    terminationGracePeriodSeconds:
+                                                      description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. The grace period is the duration in seconds after the processes running in the pod are sent a termination signal and the time when the processes are forcibly halted with a kill signal. Set this value longer than the expected cleanup time for your process. If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this value overrides the value provided by the pod spec. Value must be non-negative integer. The value zero indicates stop immediately via the kill signal (no opportunity to shut down). This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                                      type: integer
+                                                      format: int64
+                                                    timeoutSeconds:
+                                                      description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                resizePolicy:
+                                                  description: Resources resize policy for the container.
+                                                  type: array
+                                                  items:
+                                                    description: ContainerResizePolicy represents resource resize policy for the container.
+                                                    type: object
+                                                    required:
+                                                      - resourceName
+                                                      - restartPolicy
+                                                    properties:
+                                                      resourceName:
+                                                        description: 'Name of the resource to which this resource resize policy applies. Supported values: cpu, memory.'
+                                                        type: string
+                                                      restartPolicy:
+                                                        description: Restart policy to apply when specified resource is resized. If not specified, it defaults to NotRequired.
+                                                        type: string
+                                                  x-kubernetes-list-type: atomic
+                                                resources:
+                                                  description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                                  type: object
+                                                  properties:
+                                                    claims:
+                                                      description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers."
+                                                      type: array
+                                                      items:
+                                                        description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                                        type: object
+                                                        required:
+                                                          - name
+                                                        properties:
+                                                          name:
+                                                            description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container.
+                                                            type: string
+                                                      x-kubernetes-list-map-keys:
+                                                        - name
+                                                      x-kubernetes-list-type: map
+                                                    limits:
+                                                      description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                                      type: object
+                                                      additionalProperties:
+                                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                        anyOf:
+                                                          - type: integer
+                                                          - type: string
+                                                        x-kubernetes-int-or-string: true
+                                                    requests:
+                                                      description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                                      type: object
+                                                      additionalProperties:
+                                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                        anyOf:
+                                                          - type: integer
+                                                          - type: string
+                                                        x-kubernetes-int-or-string: true
+                                                restartPolicy:
+                                                  description: 'RestartPolicy defines the restart behavior of individual containers in a pod. This field may only be set for init containers, and the only allowed value is "Always". For non-init containers or when this field is not specified, the restart behavior is defined by the Pod''s restart policy and the container type. Setting the RestartPolicy as "Always" for the init container will have the following effect: this init container will be continually restarted on exit until all regular containers have terminated. Once all regular containers have completed, all init containers with restartPolicy "Always" will be shut down. This lifecycle differs from normal init containers and is often referred to as a "sidecar" container. Although this init container still starts in the init container sequence, it does not wait for the container to complete before proceeding to the next init container. Instead, the next init container starts immediately after this init container is started, or after any startupProbe has successfully completed.'
+                                                  type: string
+                                                securityContext:
+                                                  description: 'SecurityContext defines the security options the container should be run with. If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext. More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
+                                                  type: object
+                                                  properties:
+                                                    allowPrivilegeEscalation:
+                                                      description: 'AllowPrivilegeEscalation controls whether a process can gain more privileges than its parent process. This bool directly controls if the no_new_privs flag will be set on the container process. AllowPrivilegeEscalation is true always when the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN Note that this field cannot be set when spec.os.name is windows.'
+                                                      type: boolean
+                                                    capabilities:
+                                                      description: The capabilities to add/drop when running containers. Defaults to the default set of capabilities granted by the container runtime. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: object
+                                                      properties:
+                                                        add:
+                                                          description: Added capabilities
+                                                          type: array
+                                                          items:
+                                                            description: Capability represent POSIX capabilities type
+                                                            type: string
+                                                        drop:
+                                                          description: Removed capabilities
+                                                          type: array
+                                                          items:
+                                                            description: Capability represent POSIX capabilities type
+                                                            type: string
+                                                    privileged:
+                                                      description: Run container in privileged mode. Processes in privileged containers are essentially equivalent to root on the host. Defaults to false. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: boolean
+                                                    procMount:
+                                                      description: procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: string
+                                                    readOnlyRootFilesystem:
+                                                      description: Whether this container has a read-only root filesystem. Default is false. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: boolean
+                                                    runAsGroup:
+                                                      description: The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: integer
+                                                      format: int64
+                                                    runAsNonRoot:
+                                                      description: Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                                      type: boolean
+                                                    runAsUser:
+                                                      description: The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: integer
+                                                      format: int64
+                                                    seLinuxOptions:
+                                                      description: The SELinux context to be applied to the container. If unspecified, the container runtime will allocate a random SELinux context for each container.  May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: object
+                                                      properties:
+                                                        level:
+                                                          description: Level is SELinux level label that applies to the container.
+                                                          type: string
+                                                        role:
+                                                          description: Role is a SELinux role label that applies to the container.
+                                                          type: string
+                                                        type:
+                                                          description: Type is a SELinux type label that applies to the container.
+                                                          type: string
+                                                        user:
+                                                          description: User is a SELinux user label that applies to the container.
+                                                          type: string
+                                                    seccompProfile:
+                                                      description: The seccomp options to use by this container. If seccomp options are provided at both the pod & container level, the container options override the pod options. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: object
+                                                      required:
+                                                        - type
+                                                      properties:
+                                                        localhostProfile:
+                                                          description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must be set if type is "Localhost". Must NOT be set for any other type.
+                                                          type: string
+                                                        type:
+                                                          description: "type indicates which kind of seccomp profile will be applied. Valid options are: \n Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied."
+                                                          type: string
+                                                    windowsOptions:
+                                                      description: The Windows specific settings applied to all containers. If unspecified, the options from the PodSecurityContext will be used. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. Note that this field cannot be set when spec.os.name is linux.
+                                                      type: object
+                                                      properties:
+                                                        gmsaCredentialSpec:
+                                                          description: GMSACredentialSpec is where the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the GMSA credential spec named by the GMSACredentialSpecName field.
+                                                          type: string
+                                                        gmsaCredentialSpecName:
+                                                          description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                                          type: string
+                                                        hostProcess:
+                                                          description: HostProcess determines if a container should be run as a 'Host Process' container. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                                          type: boolean
+                                                        runAsUserName:
+                                                          description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                                          type: string
+                                                startupProbe:
+                                                  description: 'StartupProbe indicates that the Pod has successfully initialized. If specified, no other probes are executed until this completes successfully. If this probe fails, the Pod will be restarted, just as if the livenessProbe failed. This can be used to provide different probe parameters at the beginning of a Pod''s lifecycle, when it might take a long time to load data or warm a cache, than during steady-state operation. This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                  type: object
+                                                  properties:
+                                                    exec:
+                                                      description: Exec specifies the action to take.
+                                                      type: object
+                                                      properties:
+                                                        command:
+                                                          description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                    failureThreshold:
+                                                      description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    grpc:
+                                                      description: GRPC specifies an action involving a GRPC port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        port:
+                                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                                          type: integer
+                                                          format: int32
+                                                        service:
+                                                          description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC."
+                                                          type: string
+                                                    httpGet:
+                                                      description: HTTPGet specifies the http request to perform.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                          type: string
+                                                        httpHeaders:
+                                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                          type: array
+                                                          items:
+                                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                            type: object
+                                                            required:
+                                                              - name
+                                                              - value
+                                                            properties:
+                                                              name:
+                                                                description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                type: string
+                                                              value:
+                                                                description: The header field value
+                                                                type: string
+                                                        path:
+                                                          description: Path to access on the HTTP server.
+                                                          type: string
+                                                        port:
+                                                          description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                        scheme:
+                                                          description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                          type: string
+                                                    initialDelaySeconds:
+                                                      description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                    periodSeconds:
+                                                      description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    successThreshold:
+                                                      description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    tcpSocket:
+                                                      description: TCPSocket specifies an action involving a TCP port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                          type: string
+                                                        port:
+                                                          description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                    terminationGracePeriodSeconds:
+                                                      description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. The grace period is the duration in seconds after the processes running in the pod are sent a termination signal and the time when the processes are forcibly halted with a kill signal. Set this value longer than the expected cleanup time for your process. If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this value overrides the value provided by the pod spec. Value must be non-negative integer. The value zero indicates stop immediately via the kill signal (no opportunity to shut down). This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                                      type: integer
+                                                      format: int64
+                                                    timeoutSeconds:
+                                                      description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                stdin:
+                                                  description: Whether this container should allocate a buffer for stdin in the container runtime. If this is not set, reads from stdin in the container will always result in EOF. Default is false.
+                                                  type: boolean
+                                                stdinOnce:
+                                                  description: Whether the container runtime should close the stdin channel after it has been opened by a single attach. When stdin is true the stdin stream will remain open across multiple attach sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the first client attaches to stdin, and then remains open and accepts data until the client disconnects, at which time stdin is closed and remains closed until the container is restarted. If this flag is false, a container processes that reads from stdin will never receive an EOF. Default is false
+                                                  type: boolean
+                                                terminationMessagePath:
+                                                  description: 'Optional: Path at which the file to which the container''s termination message will be written is mounted into the container''s filesystem. Message written is intended to be brief final status, such as an assertion failure message. Will be truncated by the node if greater than 4096 bytes. The total message length across all containers will be limited to 12kb. Defaults to /dev/termination-log. Cannot be updated.'
+                                                  type: string
+                                                terminationMessagePolicy:
+                                                  description: Indicate how the termination message should be populated. File will use the contents of terminationMessagePath to populate the container status message on both success and failure. FallbackToLogsOnError will use the last chunk of container log output if the termination message file is empty and the container exited with an error. The log output is limited to 2048 bytes or 80 lines, whichever is smaller. Defaults to File. Cannot be updated.
+                                                  type: string
+                                                tty:
+                                                  description: Whether this container should allocate a TTY for itself, also requires 'stdin' to be true. Default is false.
+                                                  type: boolean
+                                                volumeDevices:
+                                                  description: volumeDevices is the list of block devices to be used by the container.
+                                                  type: array
+                                                  items:
+                                                    description: volumeDevice describes a mapping of a raw block device within a container.
+                                                    type: object
+                                                    required:
+                                                      - devicePath
+                                                      - name
+                                                    properties:
+                                                      devicePath:
+                                                        description: devicePath is the path inside of the container that the device will be mapped to.
+                                                        type: string
+                                                      name:
+                                                        description: name must match the name of a persistentVolumeClaim in the pod
+                                                        type: string
+                                                volumeMounts:
+                                                  description: Pod volumes to mount into the container's filesystem. Cannot be updated.
+                                                  type: array
+                                                  items:
+                                                    description: VolumeMount describes a mounting of a Volume within a container.
+                                                    type: object
+                                                    required:
+                                                      - mountPath
+                                                      - name
+                                                    properties:
+                                                      mountPath:
+                                                        description: Path within the container at which the volume should be mounted.  Must not contain ':'.
+                                                        type: string
+                                                      mountPropagation:
+                                                        description: mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10.
+                                                        type: string
+                                                      name:
+                                                        description: This must match the Name of a Volume.
+                                                        type: string
+                                                      readOnly:
+                                                        description: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false.
+                                                        type: boolean
+                                                      subPath:
+                                                        description: Path within the volume from which the container's volume should be mounted. Defaults to "" (volume's root).
+                                                        type: string
+                                                      subPathExpr:
+                                                        description: Expanded path within the volume from which the container's volume should be mounted. Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment. Defaults to "" (volume's root). SubPathExpr and SubPath are mutually exclusive.
+                                                        type: string
+                                                workingDir:
+                                                  description: Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated.
+                                                  type: string
+                                          dnsConfig:
+                                            description: Specifies the DNS parameters of a pod. Parameters specified here will be merged to the generated DNS configuration based on DNSPolicy.
+                                            type: object
+                                            properties:
+                                              nameservers:
+                                                description: A list of DNS name server IP addresses. This will be appended to the base nameservers generated from DNSPolicy. Duplicated nameservers will be removed.
+                                                type: array
+                                                items:
+                                                  type: string
+                                              options:
+                                                description: A list of DNS resolver options. This will be merged with the base options generated from DNSPolicy. Duplicated entries will be removed. Resolution options given in Options will override those that appear in the base DNSPolicy.
+                                                type: array
+                                                items:
+                                                  description: PodDNSConfigOption defines DNS resolver options of a pod.
+                                                  type: object
+                                                  properties:
+                                                    name:
+                                                      description: Required.
+                                                      type: string
+                                                    value:
+                                                      type: string
+                                              searches:
+                                                description: A list of DNS search domains for host-name lookup. This will be appended to the base search paths generated from DNSPolicy. Duplicated search paths will be removed.
+                                                type: array
+                                                items:
+                                                  type: string
+                                          dnsPolicy:
+                                            description: Set DNS policy for the pod. Defaults to "ClusterFirst". Valid values are 'ClusterFirstWithHostNet', 'ClusterFirst', 'Default' or 'None'. DNS parameters given in DNSConfig will be merged with the policy selected with DNSPolicy. To have DNS options set along with hostNetwork, you have to specify DNS policy explicitly to 'ClusterFirstWithHostNet'.
+                                            type: string
+                                          enableServiceLinks:
+                                            description: 'EnableServiceLinks indicates whether information about services should be injected into pod''s environment variables, matching the syntax of Docker links. Optional: Defaults to true.'
+                                            type: boolean
+                                          ephemeralContainers:
+                                            description: List of ephemeral containers run in this pod. Ephemeral containers may be run in an existing pod to perform user-initiated actions such as debugging. This list cannot be specified when creating a pod, and it cannot be modified by updating the pod spec. In order to add an ephemeral container to an existing pod, use the pod's ephemeralcontainers subresource.
+                                            type: array
+                                            items:
+                                              description: "An EphemeralContainer is a temporary container that you may add to an existing Pod for user-initiated activities such as debugging. Ephemeral containers have no resource or scheduling guarantees, and they will not be restarted when they exit or when a Pod is removed or restarted. The kubelet may evict a Pod if an ephemeral container causes the Pod to exceed its resource allocation. \n To add an ephemeral container, use the ephemeralcontainers subresource of an existing Pod. Ephemeral containers may not be removed or restarted."
+                                              type: object
+                                              required:
+                                                - name
+                                              properties:
+                                                args:
+                                                  description: 'Arguments to the entrypoint. The image''s CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                                command:
+                                                  description: 'Entrypoint array. Not executed within a shell. The image''s ENTRYPOINT is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                                env:
+                                                  description: List of environment variables to set in the container. Cannot be updated.
+                                                  type: array
+                                                  items:
+                                                    description: EnvVar represents an environment variable present in a Container.
+                                                    type: object
+                                                    required:
+                                                      - name
+                                                    properties:
+                                                      name:
+                                                        description: Name of the environment variable. Must be a C_IDENTIFIER.
+                                                        type: string
+                                                      value:
+                                                        description: 'Variable references $(VAR_NAME) are expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".'
+                                                        type: string
+                                                      valueFrom:
+                                                        description: Source for the environment variable's value. Cannot be used if value is not empty.
+                                                        type: object
+                                                        properties:
+                                                          configMapKeyRef:
+                                                            description: Selects a key of a ConfigMap.
+                                                            type: object
+                                                            required:
+                                                              - key
+                                                            properties:
+                                                              key:
+                                                                description: The key to select.
+                                                                type: string
+                                                              name:
+                                                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                                type: string
+                                                              optional:
+                                                                description: Specify whether the ConfigMap or its key must be defined
+                                                                type: boolean
+                                                          fieldRef:
+                                                            description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.'
+                                                            type: object
+                                                            required:
+                                                              - fieldPath
+                                                            properties:
+                                                              apiVersion:
+                                                                description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                                                type: string
+                                                              fieldPath:
+                                                                description: Path of the field to select in the specified API version.
+                                                                type: string
+                                                          resourceFieldRef:
+                                                            description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.'
+                                                            type: object
+                                                            required:
+                                                              - resource
+                                                            properties:
+                                                              containerName:
+                                                                description: 'Container name: required for volumes, optional for env vars'
+                                                                type: string
+                                                              divisor:
+                                                                description: Specifies the output format of the exposed resources, defaults to "1"
+                                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                                anyOf:
+                                                                  - type: integer
+                                                                  - type: string
+                                                                x-kubernetes-int-or-string: true
+                                                              resource:
+                                                                description: 'Required: resource to select'
+                                                                type: string
+                                                          secretKeyRef:
+                                                            description: Selects a key of a secret in the pod's namespace
+                                                            type: object
+                                                            required:
+                                                              - key
+                                                            properties:
+                                                              key:
+                                                                description: The key of the secret to select from.  Must be a valid secret key.
+                                                                type: string
+                                                              name:
+                                                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                                type: string
+                                                              optional:
+                                                                description: Specify whether the Secret or its key must be defined
+                                                                type: boolean
+                                                envFrom:
+                                                  description: List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated.
+                                                  type: array
+                                                  items:
+                                                    description: EnvFromSource represents the source of a set of ConfigMaps
+                                                    type: object
+                                                    properties:
+                                                      configMapRef:
+                                                        description: The ConfigMap to select from
+                                                        type: object
+                                                        properties:
+                                                          name:
+                                                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                            type: string
+                                                          optional:
+                                                            description: Specify whether the ConfigMap must be defined
+                                                            type: boolean
+                                                      prefix:
+                                                        description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.
+                                                        type: string
+                                                      secretRef:
+                                                        description: The Secret to select from
+                                                        type: object
+                                                        properties:
+                                                          name:
+                                                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                            type: string
+                                                          optional:
+                                                            description: Specify whether the Secret must be defined
+                                                            type: boolean
+                                                image:
+                                                  description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images'
+                                                  type: string
+                                                imagePullPolicy:
+                                                  description: 'Image pull policy. One of Always, Never, IfNotPresent. Defaults to Always if :latest tag is specified, or IfNotPresent otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images'
+                                                  type: string
+                                                lifecycle:
+                                                  description: Lifecycle is not allowed for ephemeral containers.
+                                                  type: object
+                                                  properties:
+                                                    postStart:
+                                                      description: 'PostStart is called immediately after a container is created. If the handler fails, the container is terminated and restarted according to its restart policy. Other management of the container blocks until the hook completes. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                                                      type: object
+                                                      properties:
+                                                        exec:
+                                                          description: Exec specifies the action to take.
+                                                          type: object
+                                                          properties:
+                                                            command:
+                                                              description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                        httpGet:
+                                                          description: HTTPGet specifies the http request to perform.
+                                                          type: object
+                                                          required:
+                                                            - port
+                                                          properties:
+                                                            host:
+                                                              description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                              type: string
+                                                            httpHeaders:
+                                                              description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                              type: array
+                                                              items:
+                                                                description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                                type: object
+                                                                required:
+                                                                  - name
+                                                                  - value
+                                                                properties:
+                                                                  name:
+                                                                    description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                    type: string
+                                                                  value:
+                                                                    description: The header field value
+                                                                    type: string
+                                                            path:
+                                                              description: Path to access on the HTTP server.
+                                                              type: string
+                                                            port:
+                                                              description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                              anyOf:
+                                                                - type: integer
+                                                                - type: string
+                                                              x-kubernetes-int-or-string: true
+                                                            scheme:
+                                                              description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                              type: string
+                                                        tcpSocket:
+                                                          description: Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept for the backward compatibility. There are no validation of this field and lifecycle hooks will fail in runtime when tcp handler is specified.
+                                                          type: object
+                                                          required:
+                                                            - port
+                                                          properties:
+                                                            host:
+                                                              description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                              type: string
+                                                            port:
+                                                              description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                              anyOf:
+                                                                - type: integer
+                                                                - type: string
+                                                              x-kubernetes-int-or-string: true
+                                                    preStop:
+                                                      description: 'PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The Pod''s termination grace period countdown begins before the PreStop hook is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod''s termination grace period (unless delayed by finalizers). Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                                                      type: object
+                                                      properties:
+                                                        exec:
+                                                          description: Exec specifies the action to take.
+                                                          type: object
+                                                          properties:
+                                                            command:
+                                                              description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                        httpGet:
+                                                          description: HTTPGet specifies the http request to perform.
+                                                          type: object
+                                                          required:
+                                                            - port
+                                                          properties:
+                                                            host:
+                                                              description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                              type: string
+                                                            httpHeaders:
+                                                              description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                              type: array
+                                                              items:
+                                                                description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                                type: object
+                                                                required:
+                                                                  - name
+                                                                  - value
+                                                                properties:
+                                                                  name:
+                                                                    description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                    type: string
+                                                                  value:
+                                                                    description: The header field value
+                                                                    type: string
+                                                            path:
+                                                              description: Path to access on the HTTP server.
+                                                              type: string
+                                                            port:
+                                                              description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                              anyOf:
+                                                                - type: integer
+                                                                - type: string
+                                                              x-kubernetes-int-or-string: true
+                                                            scheme:
+                                                              description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                              type: string
+                                                        tcpSocket:
+                                                          description: Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept for the backward compatibility. There are no validation of this field and lifecycle hooks will fail in runtime when tcp handler is specified.
+                                                          type: object
+                                                          required:
+                                                            - port
+                                                          properties:
+                                                            host:
+                                                              description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                              type: string
+                                                            port:
+                                                              description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                              anyOf:
+                                                                - type: integer
+                                                                - type: string
+                                                              x-kubernetes-int-or-string: true
+                                                livenessProbe:
+                                                  description: Probes are not allowed for ephemeral containers.
+                                                  type: object
+                                                  properties:
+                                                    exec:
+                                                      description: Exec specifies the action to take.
+                                                      type: object
+                                                      properties:
+                                                        command:
+                                                          description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                    failureThreshold:
+                                                      description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    grpc:
+                                                      description: GRPC specifies an action involving a GRPC port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        port:
+                                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                                          type: integer
+                                                          format: int32
+                                                        service:
+                                                          description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC."
+                                                          type: string
+                                                    httpGet:
+                                                      description: HTTPGet specifies the http request to perform.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                          type: string
+                                                        httpHeaders:
+                                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                          type: array
+                                                          items:
+                                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                            type: object
+                                                            required:
+                                                              - name
+                                                              - value
+                                                            properties:
+                                                              name:
+                                                                description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                type: string
+                                                              value:
+                                                                description: The header field value
+                                                                type: string
+                                                        path:
+                                                          description: Path to access on the HTTP server.
+                                                          type: string
+                                                        port:
+                                                          description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                        scheme:
+                                                          description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                          type: string
+                                                    initialDelaySeconds:
+                                                      description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                    periodSeconds:
+                                                      description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    successThreshold:
+                                                      description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    tcpSocket:
+                                                      description: TCPSocket specifies an action involving a TCP port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                          type: string
+                                                        port:
+                                                          description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                    terminationGracePeriodSeconds:
+                                                      description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. The grace period is the duration in seconds after the processes running in the pod are sent a termination signal and the time when the processes are forcibly halted with a kill signal. Set this value longer than the expected cleanup time for your process. If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this value overrides the value provided by the pod spec. Value must be non-negative integer. The value zero indicates stop immediately via the kill signal (no opportunity to shut down). This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                                      type: integer
+                                                      format: int64
+                                                    timeoutSeconds:
+                                                      description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                name:
+                                                  description: Name of the ephemeral container specified as a DNS_LABEL. This name must be unique among all containers, init containers and ephemeral containers.
+                                                  type: string
+                                                ports:
+                                                  description: Ports are not allowed for ephemeral containers.
+                                                  type: array
+                                                  items:
+                                                    description: ContainerPort represents a network port in a single container.
+                                                    type: object
+                                                    required:
+                                                      - containerPort
+                                                    properties:
+                                                      containerPort:
+                                                        description: Number of port to expose on the pod's IP address. This must be a valid port number, 0 < x < 65536.
+                                                        type: integer
+                                                        format: int32
+                                                      hostIP:
+                                                        description: What host IP to bind the external port to.
+                                                        type: string
+                                                      hostPort:
+                                                        description: Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this.
+                                                        type: integer
+                                                        format: int32
+                                                      name:
+                                                        description: If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services.
+                                                        type: string
+                                                      protocol:
+                                                        description: Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP".
+                                                        type: string
+                                                        default: TCP
+                                                  x-kubernetes-list-map-keys:
+                                                    - containerPort
+                                                    - protocol
+                                                  x-kubernetes-list-type: map
+                                                readinessProbe:
+                                                  description: Probes are not allowed for ephemeral containers.
+                                                  type: object
+                                                  properties:
+                                                    exec:
+                                                      description: Exec specifies the action to take.
+                                                      type: object
+                                                      properties:
+                                                        command:
+                                                          description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                    failureThreshold:
+                                                      description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    grpc:
+                                                      description: GRPC specifies an action involving a GRPC port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        port:
+                                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                                          type: integer
+                                                          format: int32
+                                                        service:
+                                                          description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC."
+                                                          type: string
+                                                    httpGet:
+                                                      description: HTTPGet specifies the http request to perform.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                          type: string
+                                                        httpHeaders:
+                                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                          type: array
+                                                          items:
+                                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                            type: object
+                                                            required:
+                                                              - name
+                                                              - value
+                                                            properties:
+                                                              name:
+                                                                description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                type: string
+                                                              value:
+                                                                description: The header field value
+                                                                type: string
+                                                        path:
+                                                          description: Path to access on the HTTP server.
+                                                          type: string
+                                                        port:
+                                                          description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                        scheme:
+                                                          description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                          type: string
+                                                    initialDelaySeconds:
+                                                      description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                    periodSeconds:
+                                                      description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    successThreshold:
+                                                      description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    tcpSocket:
+                                                      description: TCPSocket specifies an action involving a TCP port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                          type: string
+                                                        port:
+                                                          description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                    terminationGracePeriodSeconds:
+                                                      description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. The grace period is the duration in seconds after the processes running in the pod are sent a termination signal and the time when the processes are forcibly halted with a kill signal. Set this value longer than the expected cleanup time for your process. If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this value overrides the value provided by the pod spec. Value must be non-negative integer. The value zero indicates stop immediately via the kill signal (no opportunity to shut down). This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                                      type: integer
+                                                      format: int64
+                                                    timeoutSeconds:
+                                                      description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                resizePolicy:
+                                                  description: Resources resize policy for the container.
+                                                  type: array
+                                                  items:
+                                                    description: ContainerResizePolicy represents resource resize policy for the container.
+                                                    type: object
+                                                    required:
+                                                      - resourceName
+                                                      - restartPolicy
+                                                    properties:
+                                                      resourceName:
+                                                        description: 'Name of the resource to which this resource resize policy applies. Supported values: cpu, memory.'
+                                                        type: string
+                                                      restartPolicy:
+                                                        description: Restart policy to apply when specified resource is resized. If not specified, it defaults to NotRequired.
+                                                        type: string
+                                                  x-kubernetes-list-type: atomic
+                                                resources:
+                                                  description: Resources are not allowed for ephemeral containers. Ephemeral containers use spare resources already allocated to the pod.
+                                                  type: object
+                                                  properties:
+                                                    claims:
+                                                      description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers."
+                                                      type: array
+                                                      items:
+                                                        description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                                        type: object
+                                                        required:
+                                                          - name
+                                                        properties:
+                                                          name:
+                                                            description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container.
+                                                            type: string
+                                                      x-kubernetes-list-map-keys:
+                                                        - name
+                                                      x-kubernetes-list-type: map
+                                                    limits:
+                                                      description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                                      type: object
+                                                      additionalProperties:
+                                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                        anyOf:
+                                                          - type: integer
+                                                          - type: string
+                                                        x-kubernetes-int-or-string: true
+                                                    requests:
+                                                      description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                                      type: object
+                                                      additionalProperties:
+                                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                        anyOf:
+                                                          - type: integer
+                                                          - type: string
+                                                        x-kubernetes-int-or-string: true
+                                                restartPolicy:
+                                                  description: Restart policy for the container to manage the restart behavior of each container within a pod. This may only be set for init containers. You cannot set this field on ephemeral containers.
+                                                  type: string
+                                                securityContext:
+                                                  description: 'Optional: SecurityContext defines the security options the ephemeral container should be run with. If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.'
+                                                  type: object
+                                                  properties:
+                                                    allowPrivilegeEscalation:
+                                                      description: 'AllowPrivilegeEscalation controls whether a process can gain more privileges than its parent process. This bool directly controls if the no_new_privs flag will be set on the container process. AllowPrivilegeEscalation is true always when the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN Note that this field cannot be set when spec.os.name is windows.'
+                                                      type: boolean
+                                                    capabilities:
+                                                      description: The capabilities to add/drop when running containers. Defaults to the default set of capabilities granted by the container runtime. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: object
+                                                      properties:
+                                                        add:
+                                                          description: Added capabilities
+                                                          type: array
+                                                          items:
+                                                            description: Capability represent POSIX capabilities type
+                                                            type: string
+                                                        drop:
+                                                          description: Removed capabilities
+                                                          type: array
+                                                          items:
+                                                            description: Capability represent POSIX capabilities type
+                                                            type: string
+                                                    privileged:
+                                                      description: Run container in privileged mode. Processes in privileged containers are essentially equivalent to root on the host. Defaults to false. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: boolean
+                                                    procMount:
+                                                      description: procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: string
+                                                    readOnlyRootFilesystem:
+                                                      description: Whether this container has a read-only root filesystem. Default is false. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: boolean
+                                                    runAsGroup:
+                                                      description: The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: integer
+                                                      format: int64
+                                                    runAsNonRoot:
+                                                      description: Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                                      type: boolean
+                                                    runAsUser:
+                                                      description: The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: integer
+                                                      format: int64
+                                                    seLinuxOptions:
+                                                      description: The SELinux context to be applied to the container. If unspecified, the container runtime will allocate a random SELinux context for each container.  May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: object
+                                                      properties:
+                                                        level:
+                                                          description: Level is SELinux level label that applies to the container.
+                                                          type: string
+                                                        role:
+                                                          description: Role is a SELinux role label that applies to the container.
+                                                          type: string
+                                                        type:
+                                                          description: Type is a SELinux type label that applies to the container.
+                                                          type: string
+                                                        user:
+                                                          description: User is a SELinux user label that applies to the container.
+                                                          type: string
+                                                    seccompProfile:
+                                                      description: The seccomp options to use by this container. If seccomp options are provided at both the pod & container level, the container options override the pod options. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: object
+                                                      required:
+                                                        - type
+                                                      properties:
+                                                        localhostProfile:
+                                                          description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must be set if type is "Localhost". Must NOT be set for any other type.
+                                                          type: string
+                                                        type:
+                                                          description: "type indicates which kind of seccomp profile will be applied. Valid options are: \n Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied."
+                                                          type: string
+                                                    windowsOptions:
+                                                      description: The Windows specific settings applied to all containers. If unspecified, the options from the PodSecurityContext will be used. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. Note that this field cannot be set when spec.os.name is linux.
+                                                      type: object
+                                                      properties:
+                                                        gmsaCredentialSpec:
+                                                          description: GMSACredentialSpec is where the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the GMSA credential spec named by the GMSACredentialSpecName field.
+                                                          type: string
+                                                        gmsaCredentialSpecName:
+                                                          description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                                          type: string
+                                                        hostProcess:
+                                                          description: HostProcess determines if a container should be run as a 'Host Process' container. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                                          type: boolean
+                                                        runAsUserName:
+                                                          description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                                          type: string
+                                                startupProbe:
+                                                  description: Probes are not allowed for ephemeral containers.
+                                                  type: object
+                                                  properties:
+                                                    exec:
+                                                      description: Exec specifies the action to take.
+                                                      type: object
+                                                      properties:
+                                                        command:
+                                                          description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                    failureThreshold:
+                                                      description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    grpc:
+                                                      description: GRPC specifies an action involving a GRPC port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        port:
+                                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                                          type: integer
+                                                          format: int32
+                                                        service:
+                                                          description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC."
+                                                          type: string
+                                                    httpGet:
+                                                      description: HTTPGet specifies the http request to perform.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                          type: string
+                                                        httpHeaders:
+                                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                          type: array
+                                                          items:
+                                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                            type: object
+                                                            required:
+                                                              - name
+                                                              - value
+                                                            properties:
+                                                              name:
+                                                                description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                type: string
+                                                              value:
+                                                                description: The header field value
+                                                                type: string
+                                                        path:
+                                                          description: Path to access on the HTTP server.
+                                                          type: string
+                                                        port:
+                                                          description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                        scheme:
+                                                          description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                          type: string
+                                                    initialDelaySeconds:
+                                                      description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                    periodSeconds:
+                                                      description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    successThreshold:
+                                                      description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    tcpSocket:
+                                                      description: TCPSocket specifies an action involving a TCP port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                          type: string
+                                                        port:
+                                                          description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                    terminationGracePeriodSeconds:
+                                                      description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. The grace period is the duration in seconds after the processes running in the pod are sent a termination signal and the time when the processes are forcibly halted with a kill signal. Set this value longer than the expected cleanup time for your process. If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this value overrides the value provided by the pod spec. Value must be non-negative integer. The value zero indicates stop immediately via the kill signal (no opportunity to shut down). This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                                      type: integer
+                                                      format: int64
+                                                    timeoutSeconds:
+                                                      description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                stdin:
+                                                  description: Whether this container should allocate a buffer for stdin in the container runtime. If this is not set, reads from stdin in the container will always result in EOF. Default is false.
+                                                  type: boolean
+                                                stdinOnce:
+                                                  description: Whether the container runtime should close the stdin channel after it has been opened by a single attach. When stdin is true the stdin stream will remain open across multiple attach sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the first client attaches to stdin, and then remains open and accepts data until the client disconnects, at which time stdin is closed and remains closed until the container is restarted. If this flag is false, a container processes that reads from stdin will never receive an EOF. Default is false
+                                                  type: boolean
+                                                targetContainerName:
+                                                  description: "If set, the name of the container from PodSpec that this ephemeral container targets. The ephemeral container will be run in the namespaces (IPC, PID, etc) of this container. If not set then the ephemeral container uses the namespaces configured in the Pod spec. \n The container runtime must implement support for this feature. If the runtime does not support namespace targeting then the result of setting this field is undefined."
+                                                  type: string
+                                                terminationMessagePath:
+                                                  description: 'Optional: Path at which the file to which the container''s termination message will be written is mounted into the container''s filesystem. Message written is intended to be brief final status, such as an assertion failure message. Will be truncated by the node if greater than 4096 bytes. The total message length across all containers will be limited to 12kb. Defaults to /dev/termination-log. Cannot be updated.'
+                                                  type: string
+                                                terminationMessagePolicy:
+                                                  description: Indicate how the termination message should be populated. File will use the contents of terminationMessagePath to populate the container status message on both success and failure. FallbackToLogsOnError will use the last chunk of container log output if the termination message file is empty and the container exited with an error. The log output is limited to 2048 bytes or 80 lines, whichever is smaller. Defaults to File. Cannot be updated.
+                                                  type: string
+                                                tty:
+                                                  description: Whether this container should allocate a TTY for itself, also requires 'stdin' to be true. Default is false.
+                                                  type: boolean
+                                                volumeDevices:
+                                                  description: volumeDevices is the list of block devices to be used by the container.
+                                                  type: array
+                                                  items:
+                                                    description: volumeDevice describes a mapping of a raw block device within a container.
+                                                    type: object
+                                                    required:
+                                                      - devicePath
+                                                      - name
+                                                    properties:
+                                                      devicePath:
+                                                        description: devicePath is the path inside of the container that the device will be mapped to.
+                                                        type: string
+                                                      name:
+                                                        description: name must match the name of a persistentVolumeClaim in the pod
+                                                        type: string
+                                                volumeMounts:
+                                                  description: Pod volumes to mount into the container's filesystem. Subpath mounts are not allowed for ephemeral containers. Cannot be updated.
+                                                  type: array
+                                                  items:
+                                                    description: VolumeMount describes a mounting of a Volume within a container.
+                                                    type: object
+                                                    required:
+                                                      - mountPath
+                                                      - name
+                                                    properties:
+                                                      mountPath:
+                                                        description: Path within the container at which the volume should be mounted.  Must not contain ':'.
+                                                        type: string
+                                                      mountPropagation:
+                                                        description: mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10.
+                                                        type: string
+                                                      name:
+                                                        description: This must match the Name of a Volume.
+                                                        type: string
+                                                      readOnly:
+                                                        description: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false.
+                                                        type: boolean
+                                                      subPath:
+                                                        description: Path within the volume from which the container's volume should be mounted. Defaults to "" (volume's root).
+                                                        type: string
+                                                      subPathExpr:
+                                                        description: Expanded path within the volume from which the container's volume should be mounted. Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment. Defaults to "" (volume's root). SubPathExpr and SubPath are mutually exclusive.
+                                                        type: string
+                                                workingDir:
+                                                  description: Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated.
+                                                  type: string
+                                          hostAliases:
+                                            description: HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts file if specified. This is only valid for non-hostNetwork pods.
+                                            type: array
+                                            items:
+                                              description: HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the pod's hosts file.
+                                              type: object
+                                              properties:
+                                                hostnames:
+                                                  description: Hostnames for the above IP address.
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                                ip:
+                                                  description: IP address of the host file entry.
+                                                  type: string
+                                          hostIPC:
+                                            description: 'Use the host''s ipc namespace. Optional: Default to false.'
+                                            type: boolean
+                                          hostNetwork:
+                                            description: Host networking requested for this pod. Use the host's network namespace. If this option is set, the ports that will be used must be specified. Default to false.
+                                            type: boolean
+                                          hostPID:
+                                            description: 'Use the host''s pid namespace. Optional: Default to false.'
+                                            type: boolean
+                                          hostUsers:
+                                            description: 'Use the host''s user namespace. Optional: Default to true. If set to true or not present, the pod will be run in the host user namespace, useful for when the pod needs a feature only available to the host user namespace, such as loading a kernel module with CAP_SYS_MODULE. When set to false, a new userns is created for the pod. Setting false is useful for mitigating container breakout vulnerabilities even allowing users to run their containers as root without actually having root privileges on the host. This field is alpha-level and is only honored by servers that enable the UserNamespacesSupport feature.'
+                                            type: boolean
+                                          hostname:
+                                            description: Specifies the hostname of the Pod If not specified, the pod's hostname will be set to a system-defined value.
+                                            type: string
+                                          imagePullSecrets:
+                                            description: 'ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the images used by this PodSpec. If specified, these secrets will be passed to individual puller implementations for them to use. More info: https://kubernetes.io/docs/concepts/containers/images#specifying-imagepullsecrets-on-a-pod'
+                                            type: array
+                                            items:
+                                              description: LocalObjectReference contains enough information to let you locate the referenced object inside the same namespace.
+                                              type: object
+                                              properties:
+                                                name:
+                                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                  type: string
+                                          initContainers:
+                                            description: 'List of initialization containers belonging to the pod. Init containers are executed in order prior to containers being started. If any init container fails, the pod is considered to have failed and is handled according to its restartPolicy. The name for an init container or normal container must be unique among all containers. Init containers may not have Lifecycle actions, Readiness probes, Liveness probes, or Startup probes. The resourceRequirements of an init container are taken into account during scheduling by finding the highest request/limit for each resource type, and then using the max of of that value or the sum of the normal containers. Limits are applied to init containers in a similar fashion. Init containers cannot currently be added or removed. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/'
+                                            type: array
+                                            items:
+                                              description: A single application container that you want to run within a pod.
+                                              type: object
+                                              required:
+                                                - name
+                                              properties:
+                                                args:
+                                                  description: 'Arguments to the entrypoint. The container image''s CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                                command:
+                                                  description: 'Entrypoint array. Not executed within a shell. The container image''s ENTRYPOINT is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container''s environment. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                                env:
+                                                  description: List of environment variables to set in the container. Cannot be updated.
+                                                  type: array
+                                                  items:
+                                                    description: EnvVar represents an environment variable present in a Container.
+                                                    type: object
+                                                    required:
+                                                      - name
+                                                    properties:
+                                                      name:
+                                                        description: Name of the environment variable. Must be a C_IDENTIFIER.
+                                                        type: string
+                                                      value:
+                                                        description: 'Variable references $(VAR_NAME) are expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".'
+                                                        type: string
+                                                      valueFrom:
+                                                        description: Source for the environment variable's value. Cannot be used if value is not empty.
+                                                        type: object
+                                                        properties:
+                                                          configMapKeyRef:
+                                                            description: Selects a key of a ConfigMap.
+                                                            type: object
+                                                            required:
+                                                              - key
+                                                            properties:
+                                                              key:
+                                                                description: The key to select.
+                                                                type: string
+                                                              name:
+                                                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                                type: string
+                                                              optional:
+                                                                description: Specify whether the ConfigMap or its key must be defined
+                                                                type: boolean
+                                                          fieldRef:
+                                                            description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.'
+                                                            type: object
+                                                            required:
+                                                              - fieldPath
+                                                            properties:
+                                                              apiVersion:
+                                                                description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                                                type: string
+                                                              fieldPath:
+                                                                description: Path of the field to select in the specified API version.
+                                                                type: string
+                                                          resourceFieldRef:
+                                                            description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.'
+                                                            type: object
+                                                            required:
+                                                              - resource
+                                                            properties:
+                                                              containerName:
+                                                                description: 'Container name: required for volumes, optional for env vars'
+                                                                type: string
+                                                              divisor:
+                                                                description: Specifies the output format of the exposed resources, defaults to "1"
+                                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                                anyOf:
+                                                                  - type: integer
+                                                                  - type: string
+                                                                x-kubernetes-int-or-string: true
+                                                              resource:
+                                                                description: 'Required: resource to select'
+                                                                type: string
+                                                          secretKeyRef:
+                                                            description: Selects a key of a secret in the pod's namespace
+                                                            type: object
+                                                            required:
+                                                              - key
+                                                            properties:
+                                                              key:
+                                                                description: The key of the secret to select from.  Must be a valid secret key.
+                                                                type: string
+                                                              name:
+                                                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                                type: string
+                                                              optional:
+                                                                description: Specify whether the Secret or its key must be defined
+                                                                type: boolean
+                                                envFrom:
+                                                  description: List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated.
+                                                  type: array
+                                                  items:
+                                                    description: EnvFromSource represents the source of a set of ConfigMaps
+                                                    type: object
+                                                    properties:
+                                                      configMapRef:
+                                                        description: The ConfigMap to select from
+                                                        type: object
+                                                        properties:
+                                                          name:
+                                                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                            type: string
+                                                          optional:
+                                                            description: Specify whether the ConfigMap must be defined
+                                                            type: boolean
+                                                      prefix:
+                                                        description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.
+                                                        type: string
+                                                      secretRef:
+                                                        description: The Secret to select from
+                                                        type: object
+                                                        properties:
+                                                          name:
+                                                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                            type: string
+                                                          optional:
+                                                            description: Specify whether the Secret must be defined
+                                                            type: boolean
+                                                image:
+                                                  description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.'
+                                                  type: string
+                                                imagePullPolicy:
+                                                  description: 'Image pull policy. One of Always, Never, IfNotPresent. Defaults to Always if :latest tag is specified, or IfNotPresent otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images'
+                                                  type: string
+                                                lifecycle:
+                                                  description: Actions that the management system should take in response to container lifecycle events. Cannot be updated.
+                                                  type: object
+                                                  properties:
+                                                    postStart:
+                                                      description: 'PostStart is called immediately after a container is created. If the handler fails, the container is terminated and restarted according to its restart policy. Other management of the container blocks until the hook completes. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                                                      type: object
+                                                      properties:
+                                                        exec:
+                                                          description: Exec specifies the action to take.
+                                                          type: object
+                                                          properties:
+                                                            command:
+                                                              description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                        httpGet:
+                                                          description: HTTPGet specifies the http request to perform.
+                                                          type: object
+                                                          required:
+                                                            - port
+                                                          properties:
+                                                            host:
+                                                              description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                              type: string
+                                                            httpHeaders:
+                                                              description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                              type: array
+                                                              items:
+                                                                description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                                type: object
+                                                                required:
+                                                                  - name
+                                                                  - value
+                                                                properties:
+                                                                  name:
+                                                                    description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                    type: string
+                                                                  value:
+                                                                    description: The header field value
+                                                                    type: string
+                                                            path:
+                                                              description: Path to access on the HTTP server.
+                                                              type: string
+                                                            port:
+                                                              description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                              anyOf:
+                                                                - type: integer
+                                                                - type: string
+                                                              x-kubernetes-int-or-string: true
+                                                            scheme:
+                                                              description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                              type: string
+                                                        tcpSocket:
+                                                          description: Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept for the backward compatibility. There are no validation of this field and lifecycle hooks will fail in runtime when tcp handler is specified.
+                                                          type: object
+                                                          required:
+                                                            - port
+                                                          properties:
+                                                            host:
+                                                              description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                              type: string
+                                                            port:
+                                                              description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                              anyOf:
+                                                                - type: integer
+                                                                - type: string
+                                                              x-kubernetes-int-or-string: true
+                                                    preStop:
+                                                      description: 'PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The Pod''s termination grace period countdown begins before the PreStop hook is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod''s termination grace period (unless delayed by finalizers). Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                                                      type: object
+                                                      properties:
+                                                        exec:
+                                                          description: Exec specifies the action to take.
+                                                          type: object
+                                                          properties:
+                                                            command:
+                                                              description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                        httpGet:
+                                                          description: HTTPGet specifies the http request to perform.
+                                                          type: object
+                                                          required:
+                                                            - port
+                                                          properties:
+                                                            host:
+                                                              description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                              type: string
+                                                            httpHeaders:
+                                                              description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                              type: array
+                                                              items:
+                                                                description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                                type: object
+                                                                required:
+                                                                  - name
+                                                                  - value
+                                                                properties:
+                                                                  name:
+                                                                    description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                    type: string
+                                                                  value:
+                                                                    description: The header field value
+                                                                    type: string
+                                                            path:
+                                                              description: Path to access on the HTTP server.
+                                                              type: string
+                                                            port:
+                                                              description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                              anyOf:
+                                                                - type: integer
+                                                                - type: string
+                                                              x-kubernetes-int-or-string: true
+                                                            scheme:
+                                                              description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                              type: string
+                                                        tcpSocket:
+                                                          description: Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept for the backward compatibility. There are no validation of this field and lifecycle hooks will fail in runtime when tcp handler is specified.
+                                                          type: object
+                                                          required:
+                                                            - port
+                                                          properties:
+                                                            host:
+                                                              description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                              type: string
+                                                            port:
+                                                              description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                              anyOf:
+                                                                - type: integer
+                                                                - type: string
+                                                              x-kubernetes-int-or-string: true
+                                                livenessProbe:
+                                                  description: 'Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                  type: object
+                                                  properties:
+                                                    exec:
+                                                      description: Exec specifies the action to take.
+                                                      type: object
+                                                      properties:
+                                                        command:
+                                                          description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                    failureThreshold:
+                                                      description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    grpc:
+                                                      description: GRPC specifies an action involving a GRPC port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        port:
+                                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                                          type: integer
+                                                          format: int32
+                                                        service:
+                                                          description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC."
+                                                          type: string
+                                                    httpGet:
+                                                      description: HTTPGet specifies the http request to perform.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                          type: string
+                                                        httpHeaders:
+                                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                          type: array
+                                                          items:
+                                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                            type: object
+                                                            required:
+                                                              - name
+                                                              - value
+                                                            properties:
+                                                              name:
+                                                                description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                type: string
+                                                              value:
+                                                                description: The header field value
+                                                                type: string
+                                                        path:
+                                                          description: Path to access on the HTTP server.
+                                                          type: string
+                                                        port:
+                                                          description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                        scheme:
+                                                          description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                          type: string
+                                                    initialDelaySeconds:
+                                                      description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                    periodSeconds:
+                                                      description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    successThreshold:
+                                                      description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    tcpSocket:
+                                                      description: TCPSocket specifies an action involving a TCP port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                          type: string
+                                                        port:
+                                                          description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                    terminationGracePeriodSeconds:
+                                                      description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. The grace period is the duration in seconds after the processes running in the pod are sent a termination signal and the time when the processes are forcibly halted with a kill signal. Set this value longer than the expected cleanup time for your process. If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this value overrides the value provided by the pod spec. Value must be non-negative integer. The value zero indicates stop immediately via the kill signal (no opportunity to shut down). This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                                      type: integer
+                                                      format: int64
+                                                    timeoutSeconds:
+                                                      description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                name:
+                                                  description: Name of the container specified as a DNS_LABEL. Each container in a pod must have a unique name (DNS_LABEL). Cannot be updated.
+                                                  type: string
+                                                ports:
+                                                  description: List of ports to expose from the container. Not specifying a port here DOES NOT prevent that port from being exposed. Any port which is listening on the default "0.0.0.0" address inside a container will be accessible from the network. Modifying this array with strategic merge patch may corrupt the data. For more information See https://github.com/kubernetes/kubernetes/issues/108255. Cannot be updated.
+                                                  type: array
+                                                  items:
+                                                    description: ContainerPort represents a network port in a single container.
+                                                    type: object
+                                                    required:
+                                                      - containerPort
+                                                    properties:
+                                                      containerPort:
+                                                        description: Number of port to expose on the pod's IP address. This must be a valid port number, 0 < x < 65536.
+                                                        type: integer
+                                                        format: int32
+                                                      hostIP:
+                                                        description: What host IP to bind the external port to.
+                                                        type: string
+                                                      hostPort:
+                                                        description: Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this.
+                                                        type: integer
+                                                        format: int32
+                                                      name:
+                                                        description: If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services.
+                                                        type: string
+                                                      protocol:
+                                                        description: Protocol for port. Must be UDP, TCP, or SCTP. Defaults to "TCP".
+                                                        type: string
+                                                        default: TCP
+                                                  x-kubernetes-list-map-keys:
+                                                    - containerPort
+                                                    - protocol
+                                                  x-kubernetes-list-type: map
+                                                readinessProbe:
+                                                  description: 'Periodic probe of container service readiness. Container will be removed from service endpoints if the probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                  type: object
+                                                  properties:
+                                                    exec:
+                                                      description: Exec specifies the action to take.
+                                                      type: object
+                                                      properties:
+                                                        command:
+                                                          description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                    failureThreshold:
+                                                      description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    grpc:
+                                                      description: GRPC specifies an action involving a GRPC port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        port:
+                                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                                          type: integer
+                                                          format: int32
+                                                        service:
+                                                          description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC."
+                                                          type: string
+                                                    httpGet:
+                                                      description: HTTPGet specifies the http request to perform.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                          type: string
+                                                        httpHeaders:
+                                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                          type: array
+                                                          items:
+                                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                            type: object
+                                                            required:
+                                                              - name
+                                                              - value
+                                                            properties:
+                                                              name:
+                                                                description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                type: string
+                                                              value:
+                                                                description: The header field value
+                                                                type: string
+                                                        path:
+                                                          description: Path to access on the HTTP server.
+                                                          type: string
+                                                        port:
+                                                          description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                        scheme:
+                                                          description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                          type: string
+                                                    initialDelaySeconds:
+                                                      description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                    periodSeconds:
+                                                      description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    successThreshold:
+                                                      description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    tcpSocket:
+                                                      description: TCPSocket specifies an action involving a TCP port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                          type: string
+                                                        port:
+                                                          description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                    terminationGracePeriodSeconds:
+                                                      description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. The grace period is the duration in seconds after the processes running in the pod are sent a termination signal and the time when the processes are forcibly halted with a kill signal. Set this value longer than the expected cleanup time for your process. If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this value overrides the value provided by the pod spec. Value must be non-negative integer. The value zero indicates stop immediately via the kill signal (no opportunity to shut down). This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                                      type: integer
+                                                      format: int64
+                                                    timeoutSeconds:
+                                                      description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                resizePolicy:
+                                                  description: Resources resize policy for the container.
+                                                  type: array
+                                                  items:
+                                                    description: ContainerResizePolicy represents resource resize policy for the container.
+                                                    type: object
+                                                    required:
+                                                      - resourceName
+                                                      - restartPolicy
+                                                    properties:
+                                                      resourceName:
+                                                        description: 'Name of the resource to which this resource resize policy applies. Supported values: cpu, memory.'
+                                                        type: string
+                                                      restartPolicy:
+                                                        description: Restart policy to apply when specified resource is resized. If not specified, it defaults to NotRequired.
+                                                        type: string
+                                                  x-kubernetes-list-type: atomic
+                                                resources:
+                                                  description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                                  type: object
+                                                  properties:
+                                                    claims:
+                                                      description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers."
+                                                      type: array
+                                                      items:
+                                                        description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                                        type: object
+                                                        required:
+                                                          - name
+                                                        properties:
+                                                          name:
+                                                            description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container.
+                                                            type: string
+                                                      x-kubernetes-list-map-keys:
+                                                        - name
+                                                      x-kubernetes-list-type: map
+                                                    limits:
+                                                      description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                                      type: object
+                                                      additionalProperties:
+                                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                        anyOf:
+                                                          - type: integer
+                                                          - type: string
+                                                        x-kubernetes-int-or-string: true
+                                                    requests:
+                                                      description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                                      type: object
+                                                      additionalProperties:
+                                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                        anyOf:
+                                                          - type: integer
+                                                          - type: string
+                                                        x-kubernetes-int-or-string: true
+                                                restartPolicy:
+                                                  description: 'RestartPolicy defines the restart behavior of individual containers in a pod. This field may only be set for init containers, and the only allowed value is "Always". For non-init containers or when this field is not specified, the restart behavior is defined by the Pod''s restart policy and the container type. Setting the RestartPolicy as "Always" for the init container will have the following effect: this init container will be continually restarted on exit until all regular containers have terminated. Once all regular containers have completed, all init containers with restartPolicy "Always" will be shut down. This lifecycle differs from normal init containers and is often referred to as a "sidecar" container. Although this init container still starts in the init container sequence, it does not wait for the container to complete before proceeding to the next init container. Instead, the next init container starts immediately after this init container is started, or after any startupProbe has successfully completed.'
+                                                  type: string
+                                                securityContext:
+                                                  description: 'SecurityContext defines the security options the container should be run with. If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext. More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
+                                                  type: object
+                                                  properties:
+                                                    allowPrivilegeEscalation:
+                                                      description: 'AllowPrivilegeEscalation controls whether a process can gain more privileges than its parent process. This bool directly controls if the no_new_privs flag will be set on the container process. AllowPrivilegeEscalation is true always when the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN Note that this field cannot be set when spec.os.name is windows.'
+                                                      type: boolean
+                                                    capabilities:
+                                                      description: The capabilities to add/drop when running containers. Defaults to the default set of capabilities granted by the container runtime. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: object
+                                                      properties:
+                                                        add:
+                                                          description: Added capabilities
+                                                          type: array
+                                                          items:
+                                                            description: Capability represent POSIX capabilities type
+                                                            type: string
+                                                        drop:
+                                                          description: Removed capabilities
+                                                          type: array
+                                                          items:
+                                                            description: Capability represent POSIX capabilities type
+                                                            type: string
+                                                    privileged:
+                                                      description: Run container in privileged mode. Processes in privileged containers are essentially equivalent to root on the host. Defaults to false. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: boolean
+                                                    procMount:
+                                                      description: procMount denotes the type of proc mount to use for the containers. The default is DefaultProcMount which uses the container runtime defaults for readonly paths and masked paths. This requires the ProcMountType feature flag to be enabled. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: string
+                                                    readOnlyRootFilesystem:
+                                                      description: Whether this container has a read-only root filesystem. Default is false. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: boolean
+                                                    runAsGroup:
+                                                      description: The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: integer
+                                                      format: int64
+                                                    runAsNonRoot:
+                                                      description: Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                                      type: boolean
+                                                    runAsUser:
+                                                      description: The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: integer
+                                                      format: int64
+                                                    seLinuxOptions:
+                                                      description: The SELinux context to be applied to the container. If unspecified, the container runtime will allocate a random SELinux context for each container.  May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: object
+                                                      properties:
+                                                        level:
+                                                          description: Level is SELinux level label that applies to the container.
+                                                          type: string
+                                                        role:
+                                                          description: Role is a SELinux role label that applies to the container.
+                                                          type: string
+                                                        type:
+                                                          description: Type is a SELinux type label that applies to the container.
+                                                          type: string
+                                                        user:
+                                                          description: User is a SELinux user label that applies to the container.
+                                                          type: string
+                                                    seccompProfile:
+                                                      description: The seccomp options to use by this container. If seccomp options are provided at both the pod & container level, the container options override the pod options. Note that this field cannot be set when spec.os.name is windows.
+                                                      type: object
+                                                      required:
+                                                        - type
+                                                      properties:
+                                                        localhostProfile:
+                                                          description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must be set if type is "Localhost". Must NOT be set for any other type.
+                                                          type: string
+                                                        type:
+                                                          description: "type indicates which kind of seccomp profile will be applied. Valid options are: \n Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied."
+                                                          type: string
+                                                    windowsOptions:
+                                                      description: The Windows specific settings applied to all containers. If unspecified, the options from the PodSecurityContext will be used. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. Note that this field cannot be set when spec.os.name is linux.
+                                                      type: object
+                                                      properties:
+                                                        gmsaCredentialSpec:
+                                                          description: GMSACredentialSpec is where the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the GMSA credential spec named by the GMSACredentialSpecName field.
+                                                          type: string
+                                                        gmsaCredentialSpecName:
+                                                          description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                                          type: string
+                                                        hostProcess:
+                                                          description: HostProcess determines if a container should be run as a 'Host Process' container. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                                          type: boolean
+                                                        runAsUserName:
+                                                          description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                                          type: string
+                                                startupProbe:
+                                                  description: 'StartupProbe indicates that the Pod has successfully initialized. If specified, no other probes are executed until this completes successfully. If this probe fails, the Pod will be restarted, just as if the livenessProbe failed. This can be used to provide different probe parameters at the beginning of a Pod''s lifecycle, when it might take a long time to load data or warm a cache, than during steady-state operation. This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                  type: object
+                                                  properties:
+                                                    exec:
+                                                      description: Exec specifies the action to take.
+                                                      type: object
+                                                      properties:
+                                                        command:
+                                                          description: Command is the command line to execute inside the container, the working directory for the command  is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                    failureThreshold:
+                                                      description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    grpc:
+                                                      description: GRPC specifies an action involving a GRPC port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        port:
+                                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                                          type: integer
+                                                          format: int32
+                                                        service:
+                                                          description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC."
+                                                          type: string
+                                                    httpGet:
+                                                      description: HTTPGet specifies the http request to perform.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead.
+                                                          type: string
+                                                        httpHeaders:
+                                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                                          type: array
+                                                          items:
+                                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                            type: object
+                                                            required:
+                                                              - name
+                                                              - value
+                                                            properties:
+                                                              name:
+                                                                description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                                type: string
+                                                              value:
+                                                                description: The header field value
+                                                                type: string
+                                                        path:
+                                                          description: Path to access on the HTTP server.
+                                                          type: string
+                                                        port:
+                                                          description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                        scheme:
+                                                          description: Scheme to use for connecting to the host. Defaults to HTTP.
+                                                          type: string
+                                                    initialDelaySeconds:
+                                                      description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                    periodSeconds:
+                                                      description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    successThreshold:
+                                                      description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                                      type: integer
+                                                      format: int32
+                                                    tcpSocket:
+                                                      description: TCPSocket specifies an action involving a TCP port.
+                                                      type: object
+                                                      required:
+                                                        - port
+                                                      properties:
+                                                        host:
+                                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                                          type: string
+                                                        port:
+                                                          description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                                          anyOf:
+                                                            - type: integer
+                                                            - type: string
+                                                          x-kubernetes-int-or-string: true
+                                                    terminationGracePeriodSeconds:
+                                                      description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. The grace period is the duration in seconds after the processes running in the pod are sent a termination signal and the time when the processes are forcibly halted with a kill signal. Set this value longer than the expected cleanup time for your process. If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this value overrides the value provided by the pod spec. Value must be non-negative integer. The value zero indicates stop immediately via the kill signal (no opportunity to shut down). This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                                      type: integer
+                                                      format: int64
+                                                    timeoutSeconds:
+                                                      description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                                      type: integer
+                                                      format: int32
+                                                stdin:
+                                                  description: Whether this container should allocate a buffer for stdin in the container runtime. If this is not set, reads from stdin in the container will always result in EOF. Default is false.
+                                                  type: boolean
+                                                stdinOnce:
+                                                  description: Whether the container runtime should close the stdin channel after it has been opened by a single attach. When stdin is true the stdin stream will remain open across multiple attach sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the first client attaches to stdin, and then remains open and accepts data until the client disconnects, at which time stdin is closed and remains closed until the container is restarted. If this flag is false, a container processes that reads from stdin will never receive an EOF. Default is false
+                                                  type: boolean
+                                                terminationMessagePath:
+                                                  description: 'Optional: Path at which the file to which the container''s termination message will be written is mounted into the container''s filesystem. Message written is intended to be brief final status, such as an assertion failure message. Will be truncated by the node if greater than 4096 bytes. The total message length across all containers will be limited to 12kb. Defaults to /dev/termination-log. Cannot be updated.'
+                                                  type: string
+                                                terminationMessagePolicy:
+                                                  description: Indicate how the termination message should be populated. File will use the contents of terminationMessagePath to populate the container status message on both success and failure. FallbackToLogsOnError will use the last chunk of container log output if the termination message file is empty and the container exited with an error. The log output is limited to 2048 bytes or 80 lines, whichever is smaller. Defaults to File. Cannot be updated.
+                                                  type: string
+                                                tty:
+                                                  description: Whether this container should allocate a TTY for itself, also requires 'stdin' to be true. Default is false.
+                                                  type: boolean
+                                                volumeDevices:
+                                                  description: volumeDevices is the list of block devices to be used by the container.
+                                                  type: array
+                                                  items:
+                                                    description: volumeDevice describes a mapping of a raw block device within a container.
+                                                    type: object
+                                                    required:
+                                                      - devicePath
+                                                      - name
+                                                    properties:
+                                                      devicePath:
+                                                        description: devicePath is the path inside of the container that the device will be mapped to.
+                                                        type: string
+                                                      name:
+                                                        description: name must match the name of a persistentVolumeClaim in the pod
+                                                        type: string
+                                                volumeMounts:
+                                                  description: Pod volumes to mount into the container's filesystem. Cannot be updated.
+                                                  type: array
+                                                  items:
+                                                    description: VolumeMount describes a mounting of a Volume within a container.
+                                                    type: object
+                                                    required:
+                                                      - mountPath
+                                                      - name
+                                                    properties:
+                                                      mountPath:
+                                                        description: Path within the container at which the volume should be mounted.  Must not contain ':'.
+                                                        type: string
+                                                      mountPropagation:
+                                                        description: mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10.
+                                                        type: string
+                                                      name:
+                                                        description: This must match the Name of a Volume.
+                                                        type: string
+                                                      readOnly:
+                                                        description: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false.
+                                                        type: boolean
+                                                      subPath:
+                                                        description: Path within the volume from which the container's volume should be mounted. Defaults to "" (volume's root).
+                                                        type: string
+                                                      subPathExpr:
+                                                        description: Expanded path within the volume from which the container's volume should be mounted. Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment. Defaults to "" (volume's root). SubPathExpr and SubPath are mutually exclusive.
+                                                        type: string
+                                                workingDir:
+                                                  description: Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated.
+                                                  type: string
+                                          nodeName:
+                                            description: NodeName is a request to schedule this pod onto a specific node. If it is non-empty, the scheduler simply schedules this pod onto that node, assuming that it fits resource requirements.
+                                            type: string
+                                          nodeSelector:
+                                            description: 'NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node''s labels for the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/'
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                            x-kubernetes-map-type: atomic
+                                          os:
+                                            description: "Specifies the OS of the containers in the pod. Some pod and container fields are restricted if this is set. \n If the OS field is set to linux, the following fields must be unset: -securityContext.windowsOptions \n If the OS field is set to windows, following fields must be unset: - spec.hostPID - spec.hostIPC - spec.hostUsers - spec.securityContext.seLinuxOptions - spec.securityContext.seccompProfile - spec.securityContext.fsGroup - spec.securityContext.fsGroupChangePolicy - spec.securityContext.sysctls - spec.shareProcessNamespace - spec.securityContext.runAsUser - spec.securityContext.runAsGroup - spec.securityContext.supplementalGroups - spec.containers[*].securityContext.seLinuxOptions - spec.containers[*].securityContext.seccompProfile - spec.containers[*].securityContext.capabilities - spec.containers[*].securityContext.readOnlyRootFilesystem - spec.containers[*].securityContext.privileged - spec.containers[*].securityContext.allowPrivilegeEscalation - spec.containers[*].securityContext.procMount - spec.containers[*].securityContext.runAsUser - spec.containers[*].securityContext.runAsGroup"
+                                            type: object
+                                            required:
+                                              - name
+                                            properties:
+                                              name:
+                                                description: 'Name is the name of the operating system. The currently supported values are linux and windows. Additional value may be defined in future and can be one of: https://github.com/opencontainers/runtime-spec/blob/master/config.md#platform-specific-configuration Clients should expect to handle additional values and treat unrecognized values in this field as os: null'
+                                                type: string
+                                          overhead:
+                                            description: 'Overhead represents the resource overhead associated with running a pod for a given RuntimeClass. This field will be autopopulated at admission time by the RuntimeClass admission controller. If the RuntimeClass admission controller is enabled, overhead must not be set in Pod create requests. The RuntimeClass admission controller will reject Pod create requests which have the overhead already set. If RuntimeClass is configured and selected in the PodSpec, Overhead will be set to the value defined in the corresponding RuntimeClass, otherwise it will remain unset and treated as zero. More info: https://git.k8s.io/enhancements/keps/sig-node/688-pod-overhead/README.md'
+                                            type: object
+                                            additionalProperties:
+                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                              anyOf:
+                                                - type: integer
+                                                - type: string
+                                              x-kubernetes-int-or-string: true
+                                          preemptionPolicy:
+                                            description: PreemptionPolicy is the Policy for preempting pods with lower priority. One of Never, PreemptLowerPriority. Defaults to PreemptLowerPriority if unset.
+                                            type: string
+                                          priority:
+                                            description: The priority value. Various system components use this field to find the priority of the pod. When Priority Admission Controller is enabled, it prevents users from setting this field. The admission controller populates this field from PriorityClassName. The higher the value, the higher the priority.
+                                            type: integer
+                                            format: int32
+                                          priorityClassName:
+                                            description: If specified, indicates the pod's priority. "system-node-critical" and "system-cluster-critical" are two special keywords which indicate the highest priorities with the former being the highest priority. Any other name must be defined by creating a PriorityClass object with that name. If not specified, the pod priority will be default or zero if there is no default.
+                                            type: string
+                                          readinessGates:
+                                            description: 'If specified, all readiness gates will be evaluated for pod readiness. A pod is ready when all its containers are ready AND all conditions specified in the readiness gates have status equal to "True" More info: https://git.k8s.io/enhancements/keps/sig-network/580-pod-readiness-gates'
+                                            type: array
+                                            items:
+                                              description: PodReadinessGate contains the reference to a pod condition
+                                              type: object
+                                              required:
+                                                - conditionType
+                                              properties:
+                                                conditionType:
+                                                  description: ConditionType refers to a condition in the pod's condition list with matching type.
+                                                  type: string
+                                          resourceClaims:
+                                            description: "ResourceClaims defines which ResourceClaims must be allocated and reserved before the Pod is allowed to start. The resources will be made available to those containers which consume them by name. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable."
+                                            type: array
+                                            items:
+                                              description: PodResourceClaim references exactly one ResourceClaim through a ClaimSource. It adds a name to it that uniquely identifies the ResourceClaim inside the Pod. Containers that need access to the ResourceClaim reference it with this name.
+                                              type: object
+                                              required:
+                                                - name
+                                              properties:
+                                                name:
+                                                  description: Name uniquely identifies this resource claim inside the pod. This must be a DNS_LABEL.
+                                                  type: string
+                                                source:
+                                                  description: Source describes where to find the ResourceClaim.
+                                                  type: object
+                                                  properties:
+                                                    resourceClaimName:
+                                                      description: ResourceClaimName is the name of a ResourceClaim object in the same namespace as this pod.
+                                                      type: string
+                                                    resourceClaimTemplateName:
+                                                      description: "ResourceClaimTemplateName is the name of a ResourceClaimTemplate object in the same namespace as this pod. \n The template will be used to create a new ResourceClaim, which will be bound to this pod. When this pod is deleted, the ResourceClaim will also be deleted. The pod name and resource name, along with a generated component, will be used to form a unique name for the ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses. \n This field is immutable and no changes will be made to the corresponding ResourceClaim by the control plane after creating the ResourceClaim."
+                                                      type: string
+                                            x-kubernetes-list-map-keys:
+                                              - name
+                                            x-kubernetes-list-type: map
+                                          restartPolicy:
+                                            description: 'Restart policy for all containers within the pod. One of Always, OnFailure, Never. In some contexts, only a subset of those values may be permitted. Default to Always. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#restart-policy'
+                                            type: string
+                                          runtimeClassName:
+                                            description: 'RuntimeClassName refers to a RuntimeClass object in the node.k8s.io group, which should be used to run this pod.  If no RuntimeClass resource matches the named class, the pod will not be run. If unset or empty, the "legacy" RuntimeClass will be used, which is an implicit class with an empty definition that uses the default runtime handler. More info: https://git.k8s.io/enhancements/keps/sig-node/585-runtime-class'
+                                            type: string
+                                          schedulerName:
+                                            description: If specified, the pod will be dispatched by specified scheduler. If not specified, the pod will be dispatched by default scheduler.
+                                            type: string
+                                          schedulingGates:
+                                            description: "SchedulingGates is an opaque list of values that if specified will block scheduling the pod. If schedulingGates is not empty, the pod will stay in the SchedulingGated state and the scheduler will not attempt to schedule the pod. \n SchedulingGates can only be set at pod creation time, and be removed only afterwards. \n This is a beta feature enabled by the PodSchedulingReadiness feature gate."
+                                            type: array
+                                            items:
+                                              description: PodSchedulingGate is associated to a Pod to guard its scheduling.
+                                              type: object
+                                              required:
+                                                - name
+                                              properties:
+                                                name:
+                                                  description: Name of the scheduling gate. Each scheduling gate must have a unique name field.
+                                                  type: string
+                                            x-kubernetes-list-map-keys:
+                                              - name
+                                            x-kubernetes-list-type: map
+                                          securityContext:
+                                            description: 'SecurityContext holds pod-level security attributes and common container settings. Optional: Defaults to empty.  See type description for default values of each field.'
+                                            type: object
+                                            properties:
+                                              fsGroup:
+                                                description: "A special supplemental group that applies to all containers in a pod. Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod: \n 1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw---- \n If unset, the Kubelet will not modify the ownership and permissions of any volume. Note that this field cannot be set when spec.os.name is windows."
+                                                type: integer
+                                                format: int64
+                                              fsGroupChangePolicy:
+                                                description: 'fsGroupChangePolicy defines behavior of changing ownership and permission of the volume before being exposed inside Pod. This field will only apply to volume types which support fsGroup based ownership(and permissions). It will have no effect on ephemeral volume types such as: secret, configmaps and emptydir. Valid values are "OnRootMismatch" and "Always". If not specified, "Always" is used. Note that this field cannot be set when spec.os.name is windows.'
+                                                type: string
+                                              runAsGroup:
+                                                description: The GID to run the entrypoint of the container process. Uses runtime default if unset. May also be set in SecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container. Note that this field cannot be set when spec.os.name is windows.
+                                                type: integer
+                                                format: int64
+                                              runAsNonRoot:
+                                                description: Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in SecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                                type: boolean
+                                              runAsUser:
+                                                description: The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in SecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container. Note that this field cannot be set when spec.os.name is windows.
+                                                type: integer
+                                                format: int64
+                                              seLinuxOptions:
+                                                description: The SELinux context to be applied to all containers. If unspecified, the container runtime will allocate a random SELinux context for each container.  May also be set in SecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container. Note that this field cannot be set when spec.os.name is windows.
+                                                type: object
+                                                properties:
+                                                  level:
+                                                    description: Level is SELinux level label that applies to the container.
+                                                    type: string
+                                                  role:
+                                                    description: Role is a SELinux role label that applies to the container.
+                                                    type: string
+                                                  type:
+                                                    description: Type is a SELinux type label that applies to the container.
+                                                    type: string
+                                                  user:
+                                                    description: User is a SELinux user label that applies to the container.
+                                                    type: string
+                                              seccompProfile:
+                                                description: The seccomp options to use by the containers in this pod. Note that this field cannot be set when spec.os.name is windows.
+                                                type: object
+                                                required:
+                                                  - type
+                                                properties:
+                                                  localhostProfile:
+                                                    description: localhostProfile indicates a profile defined in a file on the node should be used. The profile must be preconfigured on the node to work. Must be a descending path, relative to the kubelet's configured seccomp profile location. Must be set if type is "Localhost". Must NOT be set for any other type.
+                                                    type: string
+                                                  type:
+                                                    description: "type indicates which kind of seccomp profile will be applied. Valid options are: \n Localhost - a profile defined in a file on the node should be used. RuntimeDefault - the container runtime default profile should be used. Unconfined - no profile should be applied."
+                                                    type: string
+                                              supplementalGroups:
+                                                description: A list of groups applied to the first process run in each container, in addition to the container's primary GID, the fsGroup (if specified), and group memberships defined in the container image for the uid of the container process. If unspecified, no additional groups are added to any container. Note that group memberships defined in the container image for the uid of the container process are still effective, even if they are not included in this list. Note that this field cannot be set when spec.os.name is windows.
+                                                type: array
+                                                items:
+                                                  type: integer
+                                                  format: int64
+                                              sysctls:
+                                                description: Sysctls hold a list of namespaced sysctls used for the pod. Pods with unsupported sysctls (by the container runtime) might fail to launch. Note that this field cannot be set when spec.os.name is windows.
+                                                type: array
+                                                items:
+                                                  description: Sysctl defines a kernel parameter to be set
+                                                  type: object
+                                                  required:
+                                                    - name
+                                                    - value
+                                                  properties:
+                                                    name:
+                                                      description: Name of a property to set
+                                                      type: string
+                                                    value:
+                                                      description: Value of a property to set
+                                                      type: string
+                                              windowsOptions:
+                                                description: The Windows specific settings applied to all containers. If unspecified, the options within a container's SecurityContext will be used. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence. Note that this field cannot be set when spec.os.name is linux.
+                                                type: object
+                                                properties:
+                                                  gmsaCredentialSpec:
+                                                    description: GMSACredentialSpec is where the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the GMSA credential spec named by the GMSACredentialSpecName field.
+                                                    type: string
+                                                  gmsaCredentialSpecName:
+                                                    description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                                    type: string
+                                                  hostProcess:
+                                                    description: HostProcess determines if a container should be run as a 'Host Process' container. All of a Pod's containers must have the same effective HostProcess value (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers). In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                                    type: boolean
+                                                  runAsUserName:
+                                                    description: The UserName in Windows to run the entrypoint of the container process. Defaults to the user specified in image metadata if unspecified. May also be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                                    type: string
+                                          serviceAccount:
+                                            description: 'DeprecatedServiceAccount is a depreciated alias for ServiceAccountName. Deprecated: Use serviceAccountName instead.'
+                                            type: string
+                                          serviceAccountName:
+                                            description: 'ServiceAccountName is the name of the ServiceAccount to use to run this pod. More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/'
+                                            type: string
+                                          setHostnameAsFQDN:
+                                            description: If true the pod's hostname will be configured as the pod's FQDN, rather than the leaf name (the default). In Linux containers, this means setting the FQDN in the hostname field of the kernel (the nodename field of struct utsname). In Windows containers, this means setting the registry value of hostname for the registry key HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters to FQDN. If a pod does not have FQDN, this has no effect. Default to false.
+                                            type: boolean
+                                          shareProcessNamespace:
+                                            description: 'Share a single process namespace between all of the containers in a pod. When this is set containers will be able to view and signal processes from other containers in the same pod, and the first process in each container will not be assigned PID 1. HostPID and ShareProcessNamespace cannot both be set. Optional: Default to false.'
+                                            type: boolean
+                                          subdomain:
+                                            description: If specified, the fully qualified Pod hostname will be "<hostname>.<subdomain>.<pod namespace>.svc.<cluster domain>". If not specified, the pod will not have a domainname at all.
+                                            type: string
+                                          terminationGracePeriodSeconds:
+                                            description: Optional duration in seconds the pod needs to terminate gracefully. May be decreased in delete request. Value must be non-negative integer. The value zero indicates stop immediately via the kill signal (no opportunity to shut down). If this value is nil, the default grace period will be used instead. The grace period is the duration in seconds after the processes running in the pod are sent a termination signal and the time when the processes are forcibly halted with a kill signal. Set this value longer than the expected cleanup time for your process. Defaults to 30 seconds.
+                                            type: integer
+                                            format: int64
+                                          tolerations:
+                                            description: If specified, the pod's tolerations.
+                                            type: array
+                                            items:
+                                              description: The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
+                                              type: object
+                                              properties:
+                                                effect:
+                                                  description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
+                                                  type: string
+                                                key:
+                                                  description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.
+                                                  type: string
+                                                operator:
+                                                  description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.
+                                                  type: string
+                                                tolerationSeconds:
+                                                  description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.
+                                                  type: integer
+                                                  format: int64
+                                                value:
+                                                  description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.
+                                                  type: string
+                                          topologySpreadConstraints:
+                                            description: TopologySpreadConstraints describes how a group of pods ought to spread across topology domains. Scheduler will schedule pods in a way which abides by the constraints. All topologySpreadConstraints are ANDed.
+                                            type: array
+                                            items:
+                                              description: TopologySpreadConstraint specifies how to spread matching pods among the given topology.
+                                              type: object
+                                              required:
+                                                - maxSkew
+                                                - topologyKey
+                                                - whenUnsatisfiable
+                                              properties:
+                                                labelSelector:
+                                                  description: LabelSelector is used to find matching pods. Pods that match this label selector are counted to determine the number of pods in their corresponding topology domain.
+                                                  type: object
+                                                  properties:
+                                                    matchExpressions:
+                                                      description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                      type: array
+                                                      items:
+                                                        description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                        type: object
+                                                        required:
+                                                          - key
+                                                          - operator
+                                                        properties:
+                                                          key:
+                                                            description: key is the label key that the selector applies to.
+                                                            type: string
+                                                          operator:
+                                                            description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                            type: string
+                                                          values:
+                                                            description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                            type: array
+                                                            items:
+                                                              type: string
+                                                    matchLabels:
+                                                      description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                      type: object
+                                                      additionalProperties:
+                                                        type: string
+                                                matchLabelKeys:
+                                                  description: "MatchLabelKeys is a set of pod label keys to select the pods over which spreading will be calculated. The keys are used to lookup values from the incoming pod labels, those key-value labels are ANDed with labelSelector to select the group of existing pods over which spreading will be calculated for the incoming pod. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector. MatchLabelKeys cannot be set when LabelSelector isn't set. Keys that don't exist in the incoming pod labels will be ignored. A null or empty list means only match against labelSelector. \n This is a beta field and requires the MatchLabelKeysInPodTopologySpread feature gate to be enabled (enabled by default)."
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                                  x-kubernetes-list-type: atomic
+                                                maxSkew:
+                                                  description: 'MaxSkew describes the degree to which pods may be unevenly distributed. When `whenUnsatisfiable=DoNotSchedule`, it is the maximum permitted difference between the number of matching pods in the target topology and the global minimum. The global minimum is the minimum number of matching pods in an eligible domain or zero if the number of eligible domains is less than MinDomains. For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 2/2/1: In this case, the global minimum is 1. | zone1 | zone2 | zone3 | |  P P  |  P P  |   P   | - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 2/2/2; scheduling it onto zone1(zone2) would make the ActualSkew(3-1) on zone1(zone2) violate MaxSkew(1). - if MaxSkew is 2, incoming pod can be scheduled onto any zone. When `whenUnsatisfiable=ScheduleAnyway`, it is used to give higher precedence to topologies that satisfy it. It''s a required field. Default value is 1 and 0 is not allowed.'
+                                                  type: integer
+                                                  format: int32
+                                                minDomains:
+                                                  description: "MinDomains indicates a minimum number of eligible domains. When the number of eligible domains with matching topology keys is less than minDomains, Pod Topology Spread treats \"global minimum\" as 0, and then the calculation of Skew is performed. And when the number of eligible domains with matching topology keys equals or greater than minDomains, this value has no effect on scheduling. As a result, when the number of eligible domains is less than minDomains, scheduler won't schedule more than maxSkew Pods to those domains. If value is nil, the constraint behaves as if MinDomains is equal to 1. Valid values are integers greater than 0. When value is not nil, WhenUnsatisfiable must be DoNotSchedule. \n For example, in a 3-zone cluster, MaxSkew is set to 2, MinDomains is set to 5 and pods with the same labelSelector spread as 2/2/2: | zone1 | zone2 | zone3 | |  P P  |  P P  |  P P  | The number of domains is less than 5(MinDomains), so \"global minimum\" is treated as 0. In this situation, new pod with the same labelSelector cannot be scheduled, because computed skew will be 3(3 - 0) if new Pod is scheduled to any of the three zones, it will violate MaxSkew. \n This is a beta field and requires the MinDomainsInPodTopologySpread feature gate to be enabled (enabled by default)."
+                                                  type: integer
+                                                  format: int32
+                                                nodeAffinityPolicy:
+                                                  description: "NodeAffinityPolicy indicates how we will treat Pod's nodeAffinity/nodeSelector when calculating pod topology spread skew. Options are: - Honor: only nodes matching nodeAffinity/nodeSelector are included in the calculations. - Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations. \n If this value is nil, the behavior is equivalent to the Honor policy. This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag."
+                                                  type: string
+                                                nodeTaintsPolicy:
+                                                  description: "NodeTaintsPolicy indicates how we will treat node taints when calculating pod topology spread skew. Options are: - Honor: nodes without taints, along with tainted nodes for which the incoming pod has a toleration, are included. - Ignore: node taints are ignored. All nodes are included. \n If this value is nil, the behavior is equivalent to the Ignore policy. This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag."
+                                                  type: string
+                                                topologyKey:
+                                                  description: TopologyKey is the key of node labels. Nodes that have a label with this key and identical values are considered to be in the same topology. We consider each <key, value> as a "bucket", and try to put balanced number of pods into each bucket. We define a domain as a particular instance of a topology. Also, we define an eligible domain as a domain whose nodes meet the requirements of nodeAffinityPolicy and nodeTaintsPolicy. e.g. If TopologyKey is "kubernetes.io/hostname", each Node is a domain of that topology. And, if TopologyKey is "topology.kubernetes.io/zone", each zone is a domain of that topology. It's a required field.
+                                                  type: string
+                                                whenUnsatisfiable:
+                                                  description: 'WhenUnsatisfiable indicates how to deal with a pod if it doesn''t satisfy the spread constraint. - DoNotSchedule (default) tells the scheduler not to schedule it. - ScheduleAnyway tells the scheduler to schedule the pod in any location, but giving higher precedence to topologies that would help reduce the skew. A constraint is considered "Unsatisfiable" for an incoming pod if and only if every possible node assignment for that pod would violate "MaxSkew" on some topology. For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 3/1/1: | zone1 | zone2 | zone3 | | P P P |   P   |   P   | If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler won''t make it *more* imbalanced. It''s a required field.'
+                                                  type: string
+                                            x-kubernetes-list-map-keys:
+                                              - topologyKey
+                                              - whenUnsatisfiable
+                                            x-kubernetes-list-type: map
+                                          volumes:
+                                            description: 'List of volumes that can be mounted by containers belonging to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes'
+                                            type: array
+                                            items:
+                                              description: Volume represents a named volume in a pod that may be accessed by any container in the pod.
+                                              type: object
+                                              required:
+                                                - name
+                                              properties:
+                                                awsElasticBlockStore:
+                                                  description: 'awsElasticBlockStore represents an AWS Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                                                  type: object
+                                                  required:
+                                                    - volumeID
+                                                  properties:
+                                                    fsType:
+                                                      description: 'fsType is the filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore TODO: how do we prevent errors in the filesystem from compromising the machine'
+                                                      type: string
+                                                    partition:
+                                                      description: 'partition is the partition in the volume that you want to mount. If omitted, the default is to mount by volume name. Examples: For volume /dev/sda1, you specify the partition as "1". Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).'
+                                                      type: integer
+                                                      format: int32
+                                                    readOnly:
+                                                      description: 'readOnly value true will force the readOnly setting in VolumeMounts. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                                                      type: boolean
+                                                    volumeID:
+                                                      description: 'volumeID is unique ID of the persistent disk resource in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                                                      type: string
+                                                azureDisk:
+                                                  description: azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+                                                  type: object
+                                                  required:
+                                                    - diskName
+                                                    - diskURI
+                                                  properties:
+                                                    cachingMode:
+                                                      description: 'cachingMode is the Host Caching mode: None, Read Only, Read Write.'
+                                                      type: string
+                                                    diskName:
+                                                      description: diskName is the Name of the data disk in the blob storage
+                                                      type: string
+                                                    diskURI:
+                                                      description: diskURI is the URI of data disk in the blob storage
+                                                      type: string
+                                                    fsType:
+                                                      description: fsType is Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                                      type: string
+                                                    kind:
+                                                      description: 'kind expected values are Shared: multiple blob disks per storage account  Dedicated: single blob disk per storage account  Managed: azure managed data disk (only in managed availability set). defaults to shared'
+                                                      type: string
+                                                    readOnly:
+                                                      description: readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                                                      type: boolean
+                                                azureFile:
+                                                  description: azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+                                                  type: object
+                                                  required:
+                                                    - secretName
+                                                    - shareName
+                                                  properties:
+                                                    readOnly:
+                                                      description: readOnly defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                                                      type: boolean
+                                                    secretName:
+                                                      description: secretName is the  name of secret that contains Azure Storage Account Name and Key
+                                                      type: string
+                                                    shareName:
+                                                      description: shareName is the azure share Name
+                                                      type: string
+                                                cephfs:
+                                                  description: cephFS represents a Ceph FS mount on the host that shares a pod's lifetime
+                                                  type: object
+                                                  required:
+                                                    - monitors
+                                                  properties:
+                                                    monitors:
+                                                      description: 'monitors is Required: Monitors is a collection of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                                                      type: array
+                                                      items:
+                                                        type: string
+                                                    path:
+                                                      description: 'path is Optional: Used as the mounted root, rather than the full Ceph tree, default is /'
+                                                      type: string
+                                                    readOnly:
+                                                      description: 'readOnly is Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                                                      type: boolean
+                                                    secretFile:
+                                                      description: 'secretFile is Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                                                      type: string
+                                                    secretRef:
+                                                      description: 'secretRef is Optional: SecretRef is reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                                                      type: object
+                                                      properties:
+                                                        name:
+                                                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                          type: string
+                                                    user:
+                                                      description: 'user is optional: User is the rados user name, default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                                                      type: string
+                                                cinder:
+                                                  description: 'cinder represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                                                  type: object
+                                                  required:
+                                                    - volumeID
+                                                  properties:
+                                                    fsType:
+                                                      description: 'fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                                                      type: string
+                                                    readOnly:
+                                                      description: 'readOnly defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                                                      type: boolean
+                                                    secretRef:
+                                                      description: 'secretRef is optional: points to a secret object containing parameters used to connect to OpenStack.'
+                                                      type: object
+                                                      properties:
+                                                        name:
+                                                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                          type: string
+                                                    volumeID:
+                                                      description: 'volumeID used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                                                      type: string
+                                                configMap:
+                                                  description: configMap represents a configMap that should populate this volume
+                                                  type: object
+                                                  properties:
+                                                    defaultMode:
+                                                      description: 'defaultMode is optional: mode bits used to set permissions on created files by default. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                                      type: integer
+                                                      format: int32
+                                                    items:
+                                                      description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'.
+                                                      type: array
+                                                      items:
+                                                        description: Maps a string key to a path within a volume.
+                                                        type: object
+                                                        required:
+                                                          - key
+                                                          - path
+                                                        properties:
+                                                          key:
+                                                            description: key is the key to project.
+                                                            type: string
+                                                          mode:
+                                                            description: 'mode is Optional: mode bits used to set permissions on this file. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                                            type: integer
+                                                            format: int32
+                                                          path:
+                                                            description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'.
+                                                            type: string
+                                                    name:
+                                                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                      type: string
+                                                    optional:
+                                                      description: optional specify whether the ConfigMap or its keys must be defined
+                                                      type: boolean
+                                                csi:
+                                                  description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external CSI drivers (Beta feature).
+                                                  type: object
+                                                  required:
+                                                    - driver
+                                                  properties:
+                                                    driver:
+                                                      description: driver is the name of the CSI driver that handles this volume. Consult with your admin for the correct name as registered in the cluster.
+                                                      type: string
+                                                    fsType:
+                                                      description: fsType to mount. Ex. "ext4", "xfs", "ntfs". If not provided, the empty value is passed to the associated CSI driver which will determine the default filesystem to apply.
+                                                      type: string
+                                                    nodePublishSecretRef:
+                                                      description: nodePublishSecretRef is a reference to the secret object containing sensitive information to pass to the CSI driver to complete the CSI NodePublishVolume and NodeUnpublishVolume calls. This field is optional, and  may be empty if no secret is required. If the secret object contains more than one secret, all secret references are passed.
+                                                      type: object
+                                                      properties:
+                                                        name:
+                                                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                          type: string
+                                                    readOnly:
+                                                      description: readOnly specifies a read-only configuration for the volume. Defaults to false (read/write).
+                                                      type: boolean
+                                                    volumeAttributes:
+                                                      description: volumeAttributes stores driver-specific properties that are passed to the CSI driver. Consult your driver's documentation for supported values.
+                                                      type: object
+                                                      additionalProperties:
+                                                        type: string
+                                                downwardAPI:
+                                                  description: downwardAPI represents downward API about the pod that should populate this volume
+                                                  type: object
+                                                  properties:
+                                                    defaultMode:
+                                                      description: 'Optional: mode bits to use on created files by default. Must be a Optional: mode bits used to set permissions on created files by default. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                                      type: integer
+                                                      format: int32
+                                                    items:
+                                                      description: Items is a list of downward API volume file
+                                                      type: array
+                                                      items:
+                                                        description: DownwardAPIVolumeFile represents information to create the file containing the pod field
+                                                        type: object
+                                                        required:
+                                                          - path
+                                                        properties:
+                                                          fieldRef:
+                                                            description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.'
+                                                            type: object
+                                                            required:
+                                                              - fieldPath
+                                                            properties:
+                                                              apiVersion:
+                                                                description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                                                type: string
+                                                              fieldPath:
+                                                                description: Path of the field to select in the specified API version.
+                                                                type: string
+                                                          mode:
+                                                            description: 'Optional: mode bits used to set permissions on this file, must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                                            type: integer
+                                                            format: int32
+                                                          path:
+                                                            description: 'Required: Path is  the relative path name of the file to be created. Must not be absolute or contain the ''..'' path. Must be utf-8 encoded. The first item of the relative path must not start with ''..'''
+                                                            type: string
+                                                          resourceFieldRef:
+                                                            description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.'
+                                                            type: object
+                                                            required:
+                                                              - resource
+                                                            properties:
+                                                              containerName:
+                                                                description: 'Container name: required for volumes, optional for env vars'
+                                                                type: string
+                                                              divisor:
+                                                                description: Specifies the output format of the exposed resources, defaults to "1"
+                                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                                anyOf:
+                                                                  - type: integer
+                                                                  - type: string
+                                                                x-kubernetes-int-or-string: true
+                                                              resource:
+                                                                description: 'Required: resource to select'
+                                                                type: string
+                                                emptyDir:
+                                                  description: 'emptyDir represents a temporary directory that shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                                                  type: object
+                                                  properties:
+                                                    medium:
+                                                      description: 'medium represents what type of storage medium should back this directory. The default is "" which means to use the node''s default medium. Must be an empty string (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                                                      type: string
+                                                    sizeLimit:
+                                                      description: 'sizeLimit is the total amount of local storage required for this EmptyDir volume. The size limit is also applicable for memory medium. The maximum usage on memory medium EmptyDir would be the minimum value between the SizeLimit specified here and the sum of memory limits of all containers in a pod. The default is nil which means that the limit is undefined. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                      anyOf:
+                                                        - type: integer
+                                                        - type: string
+                                                      x-kubernetes-int-or-string: true
+                                                ephemeral:
+                                                  description: "ephemeral represents a volume that is handled by a cluster storage driver. The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts, and deleted when the pod is removed. \n Use this if: a) the volume is only needed while the pod runs, b) features of normal volumes like restoring from snapshot or capacity tracking are needed, c) the storage driver is specified through a storage class, and d) the storage driver supports dynamic volume provisioning through a PersistentVolumeClaim (see EphemeralVolumeSource for more information on the connection between this volume type and PersistentVolumeClaim). \n Use PersistentVolumeClaim or one of the vendor-specific APIs for volumes that persist for longer than the lifecycle of an individual pod. \n Use CSI for light-weight local ephemeral volumes if the CSI driver is meant to be used that way - see the documentation of the driver for more information. \n A pod can use both types of ephemeral volumes and persistent volumes at the same time."
+                                                  type: object
+                                                  properties:
+                                                    volumeClaimTemplate:
+                                                      description: "Will be used to create a stand-alone PVC to provision the volume. The pod in which this EphemeralVolumeSource is embedded will be the owner of the PVC, i.e. the PVC will be deleted together with the pod.  The name of the PVC will be `<pod name>-<volume name>` where `<volume name>` is the name from the `PodSpec.Volumes` array entry. Pod validation will reject the pod if the concatenated name is not valid for a PVC (for example, too long). \n An existing PVC with that name that is not owned by the pod will *not* be used for the pod to avoid using an unrelated volume by mistake. Starting the pod is then blocked until the unrelated PVC is removed. If such a pre-created PVC is meant to be used by the pod, the PVC has to updated with an owner reference to the pod once the pod exists. Normally this should not be necessary, but it may be useful when manually reconstructing a broken cluster. \n This field is read-only and no changes will be made by Kubernetes to the PVC after it has been created. \n Required, must not be nil."
+                                                      type: object
+                                                      required:
+                                                        - spec
+                                                      properties:
+                                                        metadata:
+                                                          description: May contain labels and annotations that will be copied into the PVC when creating it. No other fields are allowed and will be rejected during validation.
+                                                          type: object
+                                                        spec:
+                                                          description: The specification for the PersistentVolumeClaim. The entire content is copied unchanged into the PVC that gets created from this template. The same fields as in a PersistentVolumeClaim are also valid here.
+                                                          type: object
+                                                          properties:
+                                                            accessModes:
+                                                              description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1'
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                            dataSource:
+                                                              description: 'dataSource field can be used to specify either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot) * An existing PVC (PersistentVolumeClaim) If the provisioner or an external controller can support the specified data source, it will create a new volume based on the contents of the specified data source. When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified. If the namespace is specified, then dataSourceRef will not be copied to dataSource.'
+                                                              type: object
+                                                              required:
+                                                                - kind
+                                                                - name
+                                                              properties:
+                                                                apiGroup:
+                                                                  description: APIGroup is the group for the resource being referenced. If APIGroup is not specified, the specified Kind must be in the core API group. For any other third-party types, APIGroup is required.
+                                                                  type: string
+                                                                kind:
+                                                                  description: Kind is the type of resource being referenced
+                                                                  type: string
+                                                                name:
+                                                                  description: Name is the name of resource being referenced
+                                                                  type: string
+                                                            dataSourceRef:
+                                                              description: 'dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volume is desired. This may be any object from a non-empty API group (non core object) or a PersistentVolumeClaim object. When this field is specified, volume binding will only succeed if the type of the specified object matches some installed volume populator or dynamic provisioner. This field will replace the functionality of the dataSource field and as such if both fields are non-empty, they must have the same value. For backwards compatibility, when namespace isn''t specified in dataSourceRef, both fields (dataSource and dataSourceRef) will be set to the same value automatically if one of them is empty and the other is non-empty. When namespace is specified in dataSourceRef, dataSource isn''t set to the same value and must be empty. There are three important differences between dataSource and dataSourceRef: * While dataSource only allows two specific types of objects, dataSourceRef allows any non-core object, as well as PersistentVolumeClaim objects. * While dataSource ignores disallowed values (dropping them), dataSourceRef preserves all values, and generates an error if a disallowed value is specified. * While dataSource only allows local objects, dataSourceRef allows objects in any namespaces. (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled. (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.'
+                                                              type: object
+                                                              required:
+                                                                - kind
+                                                                - name
+                                                              properties:
+                                                                apiGroup:
+                                                                  description: APIGroup is the group for the resource being referenced. If APIGroup is not specified, the specified Kind must be in the core API group. For any other third-party types, APIGroup is required.
+                                                                  type: string
+                                                                kind:
+                                                                  description: Kind is the type of resource being referenced
+                                                                  type: string
+                                                                name:
+                                                                  description: Name is the name of resource being referenced
+                                                                  type: string
+                                                                namespace:
+                                                                  description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details. (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                                                  type: string
+                                                            resources:
+                                                              description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
+                                                              type: object
+                                                              properties:
+                                                                claims:
+                                                                  description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers."
+                                                                  type: array
+                                                                  items:
+                                                                    description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                                                    type: object
+                                                                    required:
+                                                                      - name
+                                                                    properties:
+                                                                      name:
+                                                                        description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container.
+                                                                        type: string
+                                                                  x-kubernetes-list-map-keys:
+                                                                    - name
+                                                                  x-kubernetes-list-type: map
+                                                                limits:
+                                                                  description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                                    anyOf:
+                                                                      - type: integer
+                                                                      - type: string
+                                                                    x-kubernetes-int-or-string: true
+                                                                requests:
+                                                                  description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                                    anyOf:
+                                                                      - type: integer
+                                                                      - type: string
+                                                                    x-kubernetes-int-or-string: true
+                                                            selector:
+                                                              description: selector is a label query over volumes to consider for binding.
+                                                              type: object
+                                                              properties:
+                                                                matchExpressions:
+                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                                  type: array
+                                                                  items:
+                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                    type: object
+                                                                    required:
+                                                                      - key
+                                                                      - operator
+                                                                    properties:
+                                                                      key:
+                                                                        description: key is the label key that the selector applies to.
+                                                                        type: string
+                                                                      operator:
+                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                        type: string
+                                                                      values:
+                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                        type: array
+                                                                        items:
+                                                                          type: string
+                                                                matchLabels:
+                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    type: string
+                                                            storageClassName:
+                                                              description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
+                                                              type: string
+                                                            volumeMode:
+                                                              description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec.
+                                                              type: string
+                                                            volumeName:
+                                                              description: volumeName is the binding reference to the PersistentVolume backing this claim.
+                                                              type: string
+                                                fc:
+                                                  description: fc represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod.
+                                                  type: object
+                                                  properties:
+                                                    fsType:
+                                                      description: 'fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. TODO: how do we prevent errors in the filesystem from compromising the machine'
+                                                      type: string
+                                                    lun:
+                                                      description: 'lun is Optional: FC target lun number'
+                                                      type: integer
+                                                      format: int32
+                                                    readOnly:
+                                                      description: 'readOnly is Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.'
+                                                      type: boolean
+                                                    targetWWNs:
+                                                      description: 'targetWWNs is Optional: FC target worldwide names (WWNs)'
+                                                      type: array
+                                                      items:
+                                                        type: string
+                                                    wwids:
+                                                      description: 'wwids Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.'
+                                                      type: array
+                                                      items:
+                                                        type: string
+                                                flexVolume:
+                                                  description: flexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin.
+                                                  type: object
+                                                  required:
+                                                    - driver
+                                                  properties:
+                                                    driver:
+                                                      description: driver is the name of the driver to use for this volume.
+                                                      type: string
+                                                    fsType:
+                                                      description: fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script.
+                                                      type: string
+                                                    options:
+                                                      description: 'options is Optional: this field holds extra command options if any.'
+                                                      type: object
+                                                      additionalProperties:
+                                                        type: string
+                                                    readOnly:
+                                                      description: 'readOnly is Optional: defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.'
+                                                      type: boolean
+                                                    secretRef:
+                                                      description: 'secretRef is Optional: secretRef is reference to the secret object containing sensitive information to pass to the plugin scripts. This may be empty if no secret object is specified. If the secret object contains more than one secret, all secrets are passed to the plugin scripts.'
+                                                      type: object
+                                                      properties:
+                                                        name:
+                                                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                          type: string
+                                                flocker:
+                                                  description: flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running
+                                                  type: object
+                                                  properties:
+                                                    datasetName:
+                                                      description: datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker should be considered as deprecated
+                                                      type: string
+                                                    datasetUUID:
+                                                      description: datasetUUID is the UUID of the dataset. This is unique identifier of a Flocker dataset
+                                                      type: string
+                                                gcePersistentDisk:
+                                                  description: 'gcePersistentDisk represents a GCE Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                                                  type: object
+                                                  required:
+                                                    - pdName
+                                                  properties:
+                                                    fsType:
+                                                      description: 'fsType is filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk TODO: how do we prevent errors in the filesystem from compromising the machine'
+                                                      type: string
+                                                    partition:
+                                                      description: 'partition is the partition in the volume that you want to mount. If omitted, the default is to mount by volume name. Examples: For volume /dev/sda1, you specify the partition as "1". Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty). More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                                                      type: integer
+                                                      format: int32
+                                                    pdName:
+                                                      description: 'pdName is unique name of the PD resource in GCE. Used to identify the disk in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                                                      type: string
+                                                    readOnly:
+                                                      description: 'readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                                                      type: boolean
+                                                gitRepo:
+                                                  description: 'gitRepo represents a git repository at a particular revision. DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir into the Pod''s container.'
+                                                  type: object
+                                                  required:
+                                                    - repository
+                                                  properties:
+                                                    directory:
+                                                      description: directory is the target directory name. Must not contain or start with '..'.  If '.' is supplied, the volume directory will be the git repository.  Otherwise, if specified, the volume will contain the git repository in the subdirectory with the given name.
+                                                      type: string
+                                                    repository:
+                                                      description: repository is the URL
+                                                      type: string
+                                                    revision:
+                                                      description: revision is the commit hash for the specified revision.
+                                                      type: string
+                                                glusterfs:
+                                                  description: 'glusterfs represents a Glusterfs mount on the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md'
+                                                  type: object
+                                                  required:
+                                                    - endpoints
+                                                    - path
+                                                  properties:
+                                                    endpoints:
+                                                      description: 'endpoints is the endpoint name that details Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                                                      type: string
+                                                    path:
+                                                      description: 'path is the Glusterfs volume path. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                                                      type: string
+                                                    readOnly:
+                                                      description: 'readOnly here will force the Glusterfs volume to be mounted with read-only permissions. Defaults to false. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                                                      type: boolean
+                                                hostPath:
+                                                  description: 'hostPath represents a pre-existing file or directory on the host machine that is directly exposed to the container. This is generally used for system agents or other privileged things that are allowed to see the host machine. Most containers will NOT need this. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath --- TODO(jonesdl) We need to restrict who can use host directory mounts and who can/can not mount host directories as read/write.'
+                                                  type: object
+                                                  required:
+                                                    - path
+                                                  properties:
+                                                    path:
+                                                      description: 'path of the directory on the host. If the path is a symlink, it will follow the link to the real path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                                                      type: string
+                                                    type:
+                                                      description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                                                      type: string
+                                                iscsi:
+                                                  description: 'iscsi represents an ISCSI Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://examples.k8s.io/volumes/iscsi/README.md'
+                                                  type: object
+                                                  required:
+                                                    - iqn
+                                                    - lun
+                                                    - targetPortal
+                                                  properties:
+                                                    chapAuthDiscovery:
+                                                      description: chapAuthDiscovery defines whether support iSCSI Discovery CHAP authentication
+                                                      type: boolean
+                                                    chapAuthSession:
+                                                      description: chapAuthSession defines whether support iSCSI Session CHAP authentication
+                                                      type: boolean
+                                                    fsType:
+                                                      description: 'fsType is the filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi TODO: how do we prevent errors in the filesystem from compromising the machine'
+                                                      type: string
+                                                    initiatorName:
+                                                      description: initiatorName is the custom iSCSI Initiator Name. If initiatorName is specified with iscsiInterface simultaneously, new iSCSI interface <target portal>:<volume name> will be created for the connection.
+                                                      type: string
+                                                    iqn:
+                                                      description: iqn is the target iSCSI Qualified Name.
+                                                      type: string
+                                                    iscsiInterface:
+                                                      description: iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).
+                                                      type: string
+                                                    lun:
+                                                      description: lun represents iSCSI Target Lun number.
+                                                      type: integer
+                                                      format: int32
+                                                    portals:
+                                                      description: portals is the iSCSI Target Portal List. The portal is either an IP or ip_addr:port if the port is other than default (typically TCP ports 860 and 3260).
+                                                      type: array
+                                                      items:
+                                                        type: string
+                                                    readOnly:
+                                                      description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false.
+                                                      type: boolean
+                                                    secretRef:
+                                                      description: secretRef is the CHAP Secret for iSCSI target and initiator authentication
+                                                      type: object
+                                                      properties:
+                                                        name:
+                                                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                          type: string
+                                                    targetPortal:
+                                                      description: targetPortal is iSCSI Target Portal. The Portal is either an IP or ip_addr:port if the port is other than default (typically TCP ports 860 and 3260).
+                                                      type: string
+                                                name:
+                                                  description: 'name of the volume. Must be a DNS_LABEL and unique within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                                  type: string
+                                                nfs:
+                                                  description: 'nfs represents an NFS mount on the host that shares a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                                                  type: object
+                                                  required:
+                                                    - path
+                                                    - server
+                                                  properties:
+                                                    path:
+                                                      description: 'path that is exported by the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                                                      type: string
+                                                    readOnly:
+                                                      description: 'readOnly here will force the NFS export to be mounted with read-only permissions. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                                                      type: boolean
+                                                    server:
+                                                      description: 'server is the hostname or IP address of the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                                                      type: string
+                                                persistentVolumeClaim:
+                                                  description: 'persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same namespace. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                                                  type: object
+                                                  required:
+                                                    - claimName
+                                                  properties:
+                                                    claimName:
+                                                      description: 'claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                                                      type: string
+                                                    readOnly:
+                                                      description: readOnly Will force the ReadOnly setting in VolumeMounts. Default false.
+                                                      type: boolean
+                                                photonPersistentDisk:
+                                                  description: photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine
+                                                  type: object
+                                                  required:
+                                                    - pdID
+                                                  properties:
+                                                    fsType:
+                                                      description: fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                                      type: string
+                                                    pdID:
+                                                      description: pdID is the ID that identifies Photon Controller persistent disk
+                                                      type: string
+                                                portworxVolume:
+                                                  description: portworxVolume represents a portworx volume attached and mounted on kubelets host machine
+                                                  type: object
+                                                  required:
+                                                    - volumeID
+                                                  properties:
+                                                    fsType:
+                                                      description: fSType represents the filesystem type to mount Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs". Implicitly inferred to be "ext4" if unspecified.
+                                                      type: string
+                                                    readOnly:
+                                                      description: readOnly defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                                                      type: boolean
+                                                    volumeID:
+                                                      description: volumeID uniquely identifies a Portworx volume
+                                                      type: string
+                                                projected:
+                                                  description: projected items for all in one resources secrets, configmaps, and downward API
+                                                  type: object
+                                                  properties:
+                                                    defaultMode:
+                                                      description: defaultMode are the mode bits used to set permissions on created files by default. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.
+                                                      type: integer
+                                                      format: int32
+                                                    sources:
+                                                      description: sources is the list of volume projections
+                                                      type: array
+                                                      items:
+                                                        description: Projection that may be projected along with other supported volume types
+                                                        type: object
+                                                        properties:
+                                                          configMap:
+                                                            description: configMap information about the configMap data to project
+                                                            type: object
+                                                            properties:
+                                                              items:
+                                                                description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'.
+                                                                type: array
+                                                                items:
+                                                                  description: Maps a string key to a path within a volume.
+                                                                  type: object
+                                                                  required:
+                                                                    - key
+                                                                    - path
+                                                                  properties:
+                                                                    key:
+                                                                      description: key is the key to project.
+                                                                      type: string
+                                                                    mode:
+                                                                      description: 'mode is Optional: mode bits used to set permissions on this file. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                                                      type: integer
+                                                                      format: int32
+                                                                    path:
+                                                                      description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'.
+                                                                      type: string
+                                                              name:
+                                                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                                type: string
+                                                              optional:
+                                                                description: optional specify whether the ConfigMap or its keys must be defined
+                                                                type: boolean
+                                                          downwardAPI:
+                                                            description: downwardAPI information about the downwardAPI data to project
+                                                            type: object
+                                                            properties:
+                                                              items:
+                                                                description: Items is a list of DownwardAPIVolume file
+                                                                type: array
+                                                                items:
+                                                                  description: DownwardAPIVolumeFile represents information to create the file containing the pod field
+                                                                  type: object
+                                                                  required:
+                                                                    - path
+                                                                  properties:
+                                                                    fieldRef:
+                                                                      description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.'
+                                                                      type: object
+                                                                      required:
+                                                                        - fieldPath
+                                                                      properties:
+                                                                        apiVersion:
+                                                                          description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                                                          type: string
+                                                                        fieldPath:
+                                                                          description: Path of the field to select in the specified API version.
+                                                                          type: string
+                                                                    mode:
+                                                                      description: 'Optional: mode bits used to set permissions on this file, must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                                                      type: integer
+                                                                      format: int32
+                                                                    path:
+                                                                      description: 'Required: Path is  the relative path name of the file to be created. Must not be absolute or contain the ''..'' path. Must be utf-8 encoded. The first item of the relative path must not start with ''..'''
+                                                                      type: string
+                                                                    resourceFieldRef:
+                                                                      description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.'
+                                                                      type: object
+                                                                      required:
+                                                                        - resource
+                                                                      properties:
+                                                                        containerName:
+                                                                          description: 'Container name: required for volumes, optional for env vars'
+                                                                          type: string
+                                                                        divisor:
+                                                                          description: Specifies the output format of the exposed resources, defaults to "1"
+                                                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                                          anyOf:
+                                                                            - type: integer
+                                                                            - type: string
+                                                                          x-kubernetes-int-or-string: true
+                                                                        resource:
+                                                                          description: 'Required: resource to select'
+                                                                          type: string
+                                                          secret:
+                                                            description: secret information about the secret data to project
+                                                            type: object
+                                                            properties:
+                                                              items:
+                                                                description: items if unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the Secret, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'.
+                                                                type: array
+                                                                items:
+                                                                  description: Maps a string key to a path within a volume.
+                                                                  type: object
+                                                                  required:
+                                                                    - key
+                                                                    - path
+                                                                  properties:
+                                                                    key:
+                                                                      description: key is the key to project.
+                                                                      type: string
+                                                                    mode:
+                                                                      description: 'mode is Optional: mode bits used to set permissions on this file. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                                                      type: integer
+                                                                      format: int32
+                                                                    path:
+                                                                      description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'.
+                                                                      type: string
+                                                              name:
+                                                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                                type: string
+                                                              optional:
+                                                                description: optional field specify whether the Secret or its key must be defined
+                                                                type: boolean
+                                                          serviceAccountToken:
+                                                            description: serviceAccountToken is information about the serviceAccountToken data to project
+                                                            type: object
+                                                            required:
+                                                              - path
+                                                            properties:
+                                                              audience:
+                                                                description: audience is the intended audience of the token. A recipient of a token must identify itself with an identifier specified in the audience of the token, and otherwise should reject the token. The audience defaults to the identifier of the apiserver.
+                                                                type: string
+                                                              expirationSeconds:
+                                                                description: expirationSeconds is the requested duration of validity of the service account token. As the token approaches expiration, the kubelet volume plugin will proactively rotate the service account token. The kubelet will start trying to rotate the token if the token is older than 80 percent of its time to live or if the token is older than 24 hours.Defaults to 1 hour and must be at least 10 minutes.
+                                                                type: integer
+                                                                format: int64
+                                                              path:
+                                                                description: path is the path relative to the mount point of the file to project the token into.
+                                                                type: string
+                                                quobyte:
+                                                  description: quobyte represents a Quobyte mount on the host that shares a pod's lifetime
+                                                  type: object
+                                                  required:
+                                                    - registry
+                                                    - volume
+                                                  properties:
+                                                    group:
+                                                      description: group to map volume access to Default is no group
+                                                      type: string
+                                                    readOnly:
+                                                      description: readOnly here will force the Quobyte volume to be mounted with read-only permissions. Defaults to false.
+                                                      type: boolean
+                                                    registry:
+                                                      description: registry represents a single or multiple Quobyte Registry services specified as a string as host:port pair (multiple entries are separated with commas) which acts as the central registry for volumes
+                                                      type: string
+                                                    tenant:
+                                                      description: tenant owning the given Quobyte volume in the Backend Used with dynamically provisioned Quobyte volumes, value is set by the plugin
+                                                      type: string
+                                                    user:
+                                                      description: user to map volume access to Defaults to serivceaccount user
+                                                      type: string
+                                                    volume:
+                                                      description: volume is a string that references an already created Quobyte volume by name.
+                                                      type: string
+                                                rbd:
+                                                  description: 'rbd represents a Rados Block Device mount on the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md'
+                                                  type: object
+                                                  required:
+                                                    - image
+                                                    - monitors
+                                                  properties:
+                                                    fsType:
+                                                      description: 'fsType is the filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd TODO: how do we prevent errors in the filesystem from compromising the machine'
+                                                      type: string
+                                                    image:
+                                                      description: 'image is the rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                                                      type: string
+                                                    keyring:
+                                                      description: 'keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                                                      type: string
+                                                    monitors:
+                                                      description: 'monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                                                      type: array
+                                                      items:
+                                                        type: string
+                                                    pool:
+                                                      description: 'pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                                                      type: string
+                                                    readOnly:
+                                                      description: 'readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                                                      type: boolean
+                                                    secretRef:
+                                                      description: 'secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                                                      type: object
+                                                      properties:
+                                                        name:
+                                                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                          type: string
+                                                    user:
+                                                      description: 'user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                                                      type: string
+                                                scaleIO:
+                                                  description: scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+                                                  type: object
+                                                  required:
+                                                    - gateway
+                                                    - secretRef
+                                                    - system
+                                                  properties:
+                                                    fsType:
+                                                      description: fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Default is "xfs".
+                                                      type: string
+                                                    gateway:
+                                                      description: gateway is the host address of the ScaleIO API Gateway.
+                                                      type: string
+                                                    protectionDomain:
+                                                      description: protectionDomain is the name of the ScaleIO Protection Domain for the configured storage.
+                                                      type: string
+                                                    readOnly:
+                                                      description: readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                                                      type: boolean
+                                                    secretRef:
+                                                      description: secretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail.
+                                                      type: object
+                                                      properties:
+                                                        name:
+                                                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                          type: string
+                                                    sslEnabled:
+                                                      description: sslEnabled Flag enable/disable SSL communication with Gateway, default false
+                                                      type: boolean
+                                                    storageMode:
+                                                      description: storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.
+                                                      type: string
+                                                    storagePool:
+                                                      description: storagePool is the ScaleIO Storage Pool associated with the protection domain.
+                                                      type: string
+                                                    system:
+                                                      description: system is the name of the storage system as configured in ScaleIO.
+                                                      type: string
+                                                    volumeName:
+                                                      description: volumeName is the name of a volume already created in the ScaleIO system that is associated with this volume source.
+                                                      type: string
+                                                secret:
+                                                  description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                                                  type: object
+                                                  properties:
+                                                    defaultMode:
+                                                      description: 'defaultMode is Optional: mode bits used to set permissions on created files by default. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                                      type: integer
+                                                      format: int32
+                                                    items:
+                                                      description: items If unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the Secret, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'.
+                                                      type: array
+                                                      items:
+                                                        description: Maps a string key to a path within a volume.
+                                                        type: object
+                                                        required:
+                                                          - key
+                                                          - path
+                                                        properties:
+                                                          key:
+                                                            description: key is the key to project.
+                                                            type: string
+                                                          mode:
+                                                            description: 'mode is Optional: mode bits used to set permissions on this file. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                                            type: integer
+                                                            format: int32
+                                                          path:
+                                                            description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'.
+                                                            type: string
+                                                    optional:
+                                                      description: optional field specify whether the Secret or its keys must be defined
+                                                      type: boolean
+                                                    secretName:
+                                                      description: 'secretName is the name of the secret in the pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                                                      type: string
+                                                storageos:
+                                                  description: storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+                                                  type: object
+                                                  properties:
+                                                    fsType:
+                                                      description: fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                                      type: string
+                                                    readOnly:
+                                                      description: readOnly defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                                                      type: boolean
+                                                    secretRef:
+                                                      description: secretRef specifies the secret to use for obtaining the StorageOS API credentials.  If not specified, default values will be attempted.
+                                                      type: object
+                                                      properties:
+                                                        name:
+                                                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                                          type: string
+                                                    volumeName:
+                                                      description: volumeName is the human-readable name of the StorageOS volume.  Volume names are only unique within a namespace.
+                                                      type: string
+                                                    volumeNamespace:
+                                                      description: volumeNamespace specifies the scope of the volume within StorageOS.  If no namespace is specified then the Pod's namespace will be used.  This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to "default" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created.
+                                                      type: string
+                                                vsphereVolume:
+                                                  description: vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine
+                                                  type: object
+                                                  required:
+                                                    - volumePath
+                                                  properties:
+                                                    fsType:
+                                                      description: fsType is filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                                      type: string
+                                                    storagePolicyID:
+                                                      description: storagePolicyID is the storage Policy Based Management (SPBM) profile ID associated with the StoragePolicyName.
+                                                      type: string
+                                                    storagePolicyName:
+                                                      description: storagePolicyName is the storage Policy Based Management (SPBM) profile name.
+                                                      type: string
+                                                    volumePath:
+                                                      description: volumePath is the path that identifies vSphere volume vmdk
+                                                      type: string
+                        permissions:
+                          type: array
+                          items:
+                            description: StrategyDeploymentPermissions describe the rbac rules and service account needed by the install strategy
+                            type: object
+                            required:
+                              - rules
+                              - serviceAccountName
+                            properties:
+                              rules:
+                                type: array
+                                items:
+                                  description: PolicyRule holds information that describes a policy rule, but does not contain information about who the rule applies to or which namespace the rule applies to.
+                                  type: object
+                                  required:
+                                    - verbs
+                                  properties:
+                                    apiGroups:
+                                      description: APIGroups is the name of the APIGroup that contains the resources.  If multiple API groups are specified, any action requested against one of the enumerated resources in any API group will be allowed. "" represents the core API group and "*" represents all API groups.
+                                      type: array
+                                      items:
+                                        type: string
+                                    nonResourceURLs:
+                                      description: NonResourceURLs is a set of partial urls that a user should have access to.  *s are allowed, but only as the full, final step in the path Since non-resource URLs are not namespaced, this field is only applicable for ClusterRoles referenced from a ClusterRoleBinding. Rules can either apply to API resources (such as "pods" or "secrets") or non-resource URL paths (such as "/api"),  but not both.
+                                      type: array
+                                      items:
+                                        type: string
+                                    resourceNames:
+                                      description: ResourceNames is an optional white list of names that the rule applies to.  An empty set means that everything is allowed.
+                                      type: array
+                                      items:
+                                        type: string
+                                    resources:
+                                      description: Resources is a list of resources this rule applies to. '*' represents all resources.
+                                      type: array
+                                      items:
+                                        type: string
+                                    verbs:
+                                      description: Verbs is a list of Verbs that apply to ALL the ResourceKinds contained in this rule. '*' represents all verbs.
+                                      type: array
+                                      items:
+                                        type: string
+                              serviceAccountName:
+                                type: string
+                    strategy:
+                      type: string
+                installModes:
+                  description: InstallModes specify supported installation types
+                  type: array
+                  items:
+                    description: InstallMode associates an InstallModeType with a flag representing if the CSV supports it
+                    type: object
+                    required:
+                      - supported
+                      - type
+                    properties:
+                      supported:
+                        type: boolean
+                      type:
+                        description: InstallModeType is a supported type of install mode for CSV installation
+                        type: string
+                keywords:
+                  description: A list of keywords describing the operator.
+                  type: array
+                  items:
+                    type: string
+                labels:
+                  description: Map of string keys and values that can be used to organize and categorize (scope and select) objects.
+                  type: object
+                  additionalProperties:
+                    type: string
+                links:
+                  description: A list of links related to the operator.
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      name:
+                        type: string
+                      url:
+                        type: string
+                maintainers:
+                  description: A list of organizational entities maintaining the operator.
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      email:
+                        type: string
+                      name:
+                        type: string
+                maturity:
+                  type: string
+                minKubeVersion:
+                  type: string
+                nativeAPIs:
+                  type: array
+                  items:
+                    description: GroupVersionKind unambiguously identifies a kind.  It doesn't anonymously include GroupVersion to avoid automatic coercion.  It doesn't use a GroupVersion to avoid custom marshalling
+                    type: object
+                    required:
+                      - group
+                      - kind
+                      - version
+                    properties:
+                      group:
+                        type: string
+                      kind:
+                        type: string
+                      version:
+                        type: string
+                provider:
+                  description: The publishing entity behind the operator.
+                  type: object
+                  properties:
+                    name:
+                      type: string
+                    url:
+                      type: string
+                relatedImages:
+                  description: List any related images, or other container images that your Operator might require to perform their functions. This list should also include operand images as well. All image references should be specified by digest (SHA) and not by tag. This field is only used during catalog creation and plays no part in cluster runtime.
+                  type: array
+                  items:
+                    type: object
+                    required:
+                      - image
+                      - name
+                    properties:
+                      image:
+                        type: string
+                      name:
+                        type: string
+                replaces:
+                  description: The name of a CSV this one replaces. Should match the `metadata.Name` field of the old CSV.
+                  type: string
+                selector:
+                  description: Label selector for related resources.
+                  type: object
+                  properties:
+                    matchExpressions:
+                      description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                      type: array
+                      items:
+                        description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                        type: object
+                        required:
+                          - key
+                          - operator
+                        properties:
+                          key:
+                            description: key is the label key that the selector applies to.
+                            type: string
+                          operator:
+                            description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                            type: string
+                          values:
+                            description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                            type: array
+                            items:
+                              type: string
+                    matchLabels:
+                      description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                      type: object
+                      additionalProperties:
+                        type: string
+                skips:
+                  description: The name(s) of one or more CSV(s) that should be skipped in the upgrade graph. Should match the `metadata.Name` field of the CSV that should be skipped. This field is only used during catalog creation and plays no part in cluster runtime.
+                  type: array
+                  items:
+                    type: string
+                version:
+                  type: string
+                webhookdefinitions:
+                  type: array
+                  items:
+                    description: WebhookDescription provides details to OLM about required webhooks
+                    type: object
+                    required:
+                      - admissionReviewVersions
+                      - generateName
+                      - sideEffects
+                      - type
+                    properties:
+                      admissionReviewVersions:
+                        type: array
+                        items:
+                          type: string
+                      containerPort:
+                        type: integer
+                        format: int32
+                        default: 443
+                        maximum: 65535
+                        minimum: 1
+                      conversionCRDs:
+                        type: array
+                        items:
+                          type: string
+                      deploymentName:
+                        type: string
+                      failurePolicy:
+                        description: FailurePolicyType specifies a failure policy that defines how unrecognized errors from the admission endpoint are handled.
+                        type: string
+                      generateName:
+                        type: string
+                      matchPolicy:
+                        description: MatchPolicyType specifies the type of match policy.
+                        type: string
+                      objectSelector:
+                        description: A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.
+                        type: object
+                        properties:
+                          matchExpressions:
+                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                            type: array
+                            items:
+                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                              type: object
+                              required:
+                                - key
+                                - operator
+                              properties:
+                                key:
+                                  description: key is the label key that the selector applies to.
+                                  type: string
+                                operator:
+                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                  type: string
+                                values:
+                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                  type: array
+                                  items:
+                                    type: string
+                          matchLabels:
+                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                            type: object
+                            additionalProperties:
+                              type: string
+                      reinvocationPolicy:
+                        description: ReinvocationPolicyType specifies what type of policy the admission hook uses.
+                        type: string
+                      rules:
+                        type: array
+                        items:
+                          description: RuleWithOperations is a tuple of Operations and Resources. It is recommended to make sure that all the tuple expansions are valid.
+                          type: object
+                          properties:
+                            apiGroups:
+                              description: APIGroups is the API groups the resources belong to. '*' is all groups. If '*' is present, the length of the slice must be one. Required.
+                              type: array
+                              items:
+                                type: string
+                              x-kubernetes-list-type: atomic
+                            apiVersions:
+                              description: APIVersions is the API versions the resources belong to. '*' is all versions. If '*' is present, the length of the slice must be one. Required.
+                              type: array
+                              items:
+                                type: string
+                              x-kubernetes-list-type: atomic
+                            operations:
+                              description: Operations is the operations the admission hook cares about - CREATE, UPDATE, DELETE, CONNECT or * for all of those operations and any future admission operations that are added. If '*' is present, the length of the slice must be one. Required.
+                              type: array
+                              items:
+                                description: OperationType specifies an operation for a request.
+                                type: string
+                              x-kubernetes-list-type: atomic
+                            resources:
+                              description: "Resources is a list of resources this rule applies to. \n For example: 'pods' means pods. 'pods/log' means the log subresource of pods. '*' means all resources, but not subresources. 'pods/*' means all subresources of pods. '*/scale' means all scale subresources. '*/*' means all resources and their subresources. \n If wildcard is present, the validation rule will ensure resources do not overlap with each other. \n Depending on the enclosing object, subresources might not be allowed. Required."
+                              type: array
+                              items:
+                                type: string
+                              x-kubernetes-list-type: atomic
+                            scope:
+                              description: scope specifies the scope of this rule. Valid values are "Cluster", "Namespaced", and "*" "Cluster" means that only cluster-scoped resources will match this rule. Namespace API objects are cluster-scoped. "Namespaced" means that only namespaced resources will match this rule. "*" means that there are no scope restrictions. Subresources match the scope of their parent resource. Default is "*".
+                              type: string
+                      sideEffects:
+                        description: SideEffectClass specifies the types of side effects a webhook may have.
+                        type: string
+                      targetPort:
+                        anyOf:
+                          - type: integer
+                          - type: string
+                        x-kubernetes-int-or-string: true
+                      timeoutSeconds:
+                        type: integer
+                        format: int32
+                      type:
+                        description: WebhookAdmissionType is the type of admission webhooks supported by OLM
+                        type: string
+                        enum:
+                          - ValidatingAdmissionWebhook
+                          - MutatingAdmissionWebhook
+                          - ConversionWebhook
+                      webhookPath:
+                        type: string
+            status:
+              description: ClusterServiceVersionStatus represents information about the status of a CSV. Status may trail the actual state of a system.
+              type: object
+              properties:
+                certsLastUpdated:
+                  description: Last time the owned APIService certs were updated
+                  type: string
+                  format: date-time
+                certsRotateAt:
+                  description: Time the owned APIService certs will rotate next
+                  type: string
+                  format: date-time
+                cleanup:
+                  description: CleanupStatus represents information about the status of cleanup while a CSV is pending deletion
+                  type: object
+                  properties:
+                    pendingDeletion:
+                      description: PendingDeletion is the list of custom resource objects that are pending deletion and blocked on finalizers. This indicates the progress of cleanup that is blocking CSV deletion or operator uninstall.
+                      type: array
+                      items:
+                        description: ResourceList represents a list of resources which are of the same Group/Kind
+                        type: object
+                        required:
+                          - group
+                          - instances
+                          - kind
+                        properties:
+                          group:
+                            type: string
+                          instances:
+                            type: array
+                            items:
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                name:
+                                  type: string
+                                namespace:
+                                  description: Namespace can be empty for cluster-scoped resources
+                                  type: string
+                          kind:
+                            type: string
+                conditions:
+                  description: List of conditions, a history of state transitions
+                  type: array
+                  items:
+                    description: Conditions appear in the status as a record of state transitions on the ClusterServiceVersion
+                    type: object
+                    properties:
+                      lastTransitionTime:
+                        description: Last time the status transitioned from one status to another.
+                        type: string
+                        format: date-time
+                      lastUpdateTime:
+                        description: Last time we updated the status
+                        type: string
+                        format: date-time
+                      message:
+                        description: A human readable message indicating details about why the ClusterServiceVersion is in this condition.
+                        type: string
+                      phase:
+                        description: Condition of the ClusterServiceVersion
+                        type: string
+                      reason:
+                        description: A brief CamelCase message indicating details about why the ClusterServiceVersion is in this state. e.g. 'RequirementsNotMet'
+                        type: string
+                lastTransitionTime:
+                  description: Last time the status transitioned from one status to another.
+                  type: string
+                  format: date-time
+                lastUpdateTime:
+                  description: Last time we updated the status
+                  type: string
+                  format: date-time
+                message:
+                  description: A human readable message indicating details about why the ClusterServiceVersion is in this condition.
+                  type: string
+                phase:
+                  description: Current condition of the ClusterServiceVersion
+                  type: string
+                reason:
+                  description: A brief CamelCase message indicating details about why the ClusterServiceVersion is in this state. e.g. 'RequirementsNotMet'
+                  type: string
+                requirementStatus:
+                  description: The status of each requirement for this CSV
+                  type: array
+                  items:
+                    type: object
+                    required:
+                      - group
+                      - kind
+                      - message
+                      - name
+                      - status
+                      - version
+                    properties:
+                      dependents:
+                        type: array
+                        items:
+                          description: DependentStatus is the status for a dependent requirement (to prevent infinite nesting)
+                          type: object
+                          required:
+                            - group
+                            - kind
+                            - status
+                            - version
+                          properties:
+                            group:
+                              type: string
+                            kind:
+                              type: string
+                            message:
+                              type: string
+                            status:
+                              description: StatusReason is a camelcased reason for the status of a RequirementStatus or DependentStatus
+                              type: string
+                            uuid:
+                              type: string
+                            version:
+                              type: string
+                      group:
+                        type: string
+                      kind:
+                        type: string
+                      message:
+                        type: string
+                      name:
+                        type: string
+                      status:
+                        description: StatusReason is a camelcased reason for the status of a RequirementStatus or DependentStatus
+                        type: string
+                      uuid:
+                        type: string
+                      version:
+                        type: string
+      served: true
+      storage: true
+      subresources:
+        status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.9.0
+  creationTimestamp: null
+  name: installplans.operators.coreos.com
+spec:
+  group: operators.coreos.com
+  names:
+    categories:
+      - olm
+    kind: InstallPlan
+    listKind: InstallPlanList
+    plural: installplans
+    shortNames:
+      - ip
+    singular: installplan
+  scope: Namespaced
+  versions:
+    - additionalPrinterColumns:
+        - description: The first CSV in the list of clusterServiceVersionNames
+          jsonPath: .spec.clusterServiceVersionNames[0]
+          name: CSV
+          type: string
+        - description: The approval mode
+          jsonPath: .spec.approval
+          name: Approval
+          type: string
+        - jsonPath: .spec.approved
+          name: Approved
+          type: boolean
+      name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: InstallPlan defines the installation of a set of operators.
+          type: object
+          required:
+            - metadata
+            - spec
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: InstallPlanSpec defines a set of Application resources to be installed
+              type: object
+              required:
+                - approval
+                - approved
+                - clusterServiceVersionNames
+              properties:
+                approval:
+                  description: Approval is the user approval policy for an InstallPlan. It must be one of "Automatic" or "Manual".
+                  type: string
+                approved:
+                  type: boolean
+                clusterServiceVersionNames:
+                  type: array
+                  items:
+                    type: string
+                generation:
+                  type: integer
+                source:
+                  type: string
+                sourceNamespace:
+                  type: string
+            status:
+              description: "InstallPlanStatus represents the information about the status of steps required to complete installation. \n Status may trail the actual state of a system."
+              type: object
+              required:
+                - catalogSources
+                - phase
+              properties:
+                attenuatedServiceAccountRef:
+                  description: AttenuatedServiceAccountRef references the service account that is used to do scoped operator install.
+                  type: object
+                  properties:
+                    apiVersion:
+                      description: API version of the referent.
+                      type: string
+                    fieldPath:
+                      description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
+                      type: string
+                    kind:
+                      description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                      type: string
+                    name:
+                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                      type: string
+                    namespace:
+                      description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                      type: string
+                    resourceVersion:
+                      description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                      type: string
+                    uid:
+                      description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                      type: string
+                bundleLookups:
+                  description: BundleLookups is the set of in-progress requests to pull and unpackage bundle content to the cluster.
+                  type: array
+                  items:
+                    description: BundleLookup is a request to pull and unpackage the content of a bundle to the cluster.
+                    type: object
+                    required:
+                      - catalogSourceRef
+                      - identifier
+                      - path
+                      - replaces
+                    properties:
+                      catalogSourceRef:
+                        description: CatalogSourceRef is a reference to the CatalogSource the bundle path was resolved from.
+                        type: object
+                        properties:
+                          apiVersion:
+                            description: API version of the referent.
+                            type: string
+                          fieldPath:
+                            description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
+                            type: string
+                          kind:
+                            description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                            type: string
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                            type: string
+                          namespace:
+                            description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                            type: string
+                          resourceVersion:
+                            description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                            type: string
+                          uid:
+                            description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                            type: string
+                      conditions:
+                        description: Conditions represents the overall state of a BundleLookup.
+                        type: array
+                        items:
+                          type: object
+                          required:
+                            - status
+                            - type
+                          properties:
+                            lastTransitionTime:
+                              description: Last time the condition transitioned from one status to another.
+                              type: string
+                              format: date-time
+                            lastUpdateTime:
+                              description: Last time the condition was probed.
+                              type: string
+                              format: date-time
+                            message:
+                              description: A human readable message indicating details about the transition.
+                              type: string
+                            reason:
+                              description: The reason for the condition's last transition.
+                              type: string
+                            status:
+                              description: Status of the condition, one of True, False, Unknown.
+                              type: string
+                            type:
+                              description: Type of condition.
+                              type: string
+                      identifier:
+                        description: Identifier is the catalog-unique name of the operator (the name of the CSV for bundles that contain CSVs)
+                        type: string
+                      path:
+                        description: Path refers to the location of a bundle to pull. It's typically an image reference.
+                        type: string
+                      properties:
+                        description: The effective properties of the unpacked bundle.
+                        type: string
+                      replaces:
+                        description: Replaces is the name of the bundle to replace with the one found at Path.
+                        type: string
+                catalogSources:
+                  type: array
+                  items:
+                    type: string
+                conditions:
+                  type: array
+                  items:
+                    description: InstallPlanCondition represents the overall status of the execution of an InstallPlan.
+                    type: object
+                    properties:
+                      lastTransitionTime:
+                        type: string
+                        format: date-time
+                      lastUpdateTime:
+                        type: string
+                        format: date-time
+                      message:
+                        type: string
+                      reason:
+                        description: ConditionReason is a camelcased reason for the state transition.
+                        type: string
+                      status:
+                        type: string
+                      type:
+                        description: InstallPlanConditionType describes the state of an InstallPlan at a certain point as a whole.
+                        type: string
+                message:
+                  description: Message is a human-readable message containing detailed information that may be important to understanding why the plan has its current status.
+                  type: string
+                phase:
+                  description: InstallPlanPhase is the current status of a InstallPlan as a whole.
+                  type: string
+                plan:
+                  type: array
+                  items:
+                    description: Step represents the status of an individual step in an InstallPlan.
+                    type: object
+                    required:
+                      - resolving
+                      - resource
+                      - status
+                    properties:
+                      optional:
+                        type: boolean
+                      resolving:
+                        type: string
+                      resource:
+                        description: StepResource represents the status of a resource to be tracked by an InstallPlan.
+                        type: object
+                        required:
+                          - group
+                          - kind
+                          - name
+                          - sourceName
+                          - sourceNamespace
+                          - version
+                        properties:
+                          group:
+                            type: string
+                          kind:
+                            type: string
+                          manifest:
+                            type: string
+                          name:
+                            type: string
+                          sourceName:
+                            type: string
+                          sourceNamespace:
+                            type: string
+                          version:
+                            type: string
+                      status:
+                        description: StepStatus is the current status of a particular resource an in InstallPlan
+                        type: string
+                startTime:
+                  description: StartTime is the time when the controller began applying the resources listed in the plan to the cluster.
+                  type: string
+                  format: date-time
+      served: true
+      storage: true
+      subresources:
+        status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.9.0
+  creationTimestamp: null
+  name: olmconfigs.operators.coreos.com
+spec:
+  group: operators.coreos.com
+  names:
+    categories:
+      - olm
+    kind: OLMConfig
+    listKind: OLMConfigList
+    plural: olmconfigs
+    singular: olmconfig
+  scope: Cluster
+  versions:
+    - name: v1
+      schema:
+        openAPIV3Schema:
+          description: OLMConfig is a resource responsible for configuring OLM.
+          type: object
+          required:
+            - metadata
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: OLMConfigSpec is the spec for an OLMConfig resource.
+              type: object
+              properties:
+                features:
+                  description: Features contains the list of configurable OLM features.
+                  type: object
+                  properties:
+                    disableCopiedCSVs:
+                      description: DisableCopiedCSVs is used to disable OLM's "Copied CSV" feature for operators installed at the cluster scope, where a cluster scoped operator is one that has been installed in an OperatorGroup that targets all namespaces. When reenabled, OLM will recreate the "Copied CSVs" for each cluster scoped operator.
+                      type: boolean
+                    packageServerSyncInterval:
+                      description: PackageServerSyncInterval is used to define the sync interval for packagerserver pods. Packageserver pods periodically check the status of CatalogSources; this specifies the period using duration format (e.g. "60m"). For this parameter, only hours ("h"), minutes ("m"), and seconds ("s") may be specified. When not specified, the period defaults to the value specified within the packageserver.
+                      type: string
+                      pattern: ^([0-9]+(\.[0-9]+)?(s|m|h))+$
+            status:
+              description: OLMConfigStatus is the status for an OLMConfig resource.
+              type: object
+              properties:
+                conditions:
+                  type: array
+                  items:
+                    description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+                    type: object
+                    required:
+                      - lastTransitionTime
+                      - message
+                      - reason
+                      - status
+                      - type
+                    properties:
+                      lastTransitionTime:
+                        description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                        type: string
+                        format: date-time
+                      message:
+                        description: message is a human readable message indicating details about the transition. This may be an empty string.
+                        type: string
+                        maxLength: 32768
+                      observedGeneration:
+                        description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
+                        type: integer
+                        format: int64
+                        minimum: 0
+                      reason:
+                        description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
+                        type: string
+                        maxLength: 1024
+                        minLength: 1
+                        pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      status:
+                        description: status of the condition, one of True, False, Unknown.
+                        type: string
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                      type:
+                        description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                        type: string
+                        maxLength: 316
+                        pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+      served: true
+      storage: true
+      subresources:
+        status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.9.0
+  creationTimestamp: null
+  name: operatorconditions.operators.coreos.com
+spec:
+  group: operators.coreos.com
+  names:
+    categories:
+      - olm
+    kind: OperatorCondition
+    listKind: OperatorConditionList
+    plural: operatorconditions
+    shortNames:
+      - condition
+    singular: operatorcondition
+  scope: Namespaced
+  versions:
+    - name: v1
+      schema:
+        openAPIV3Schema:
+          description: OperatorCondition is a Custom Resource of type `OperatorCondition` which is used to convey information to OLM about the state of an operator.
+          type: object
+          required:
+            - metadata
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: OperatorConditionSpec allows a cluster admin to convey information about the state of an operator to OLM, potentially overriding state reported by the operator.
+              type: object
+              properties:
+                deployments:
+                  type: array
+                  items:
+                    type: string
+                overrides:
+                  type: array
+                  items:
+                    description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+                    type: object
+                    required:
+                      - message
+                      - reason
+                      - status
+                      - type
+                    properties:
+                      lastTransitionTime:
+                        description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                        type: string
+                        format: date-time
+                      message:
+                        description: message is a human readable message indicating details about the transition. This may be an empty string.
+                        type: string
+                        maxLength: 32768
+                      observedGeneration:
+                        description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
+                        type: integer
+                        format: int64
+                        minimum: 0
+                      reason:
+                        description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
+                        type: string
+                        maxLength: 1024
+                        minLength: 1
+                        pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      status:
+                        description: status of the condition, one of True, False, Unknown.
+                        type: string
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                      type:
+                        description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                        type: string
+                        maxLength: 316
+                        pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                serviceAccounts:
+                  type: array
+                  items:
+                    type: string
+            status:
+              description: OperatorConditionStatus allows an operator to convey information its state to OLM. The status may trail the actual state of a system.
+              type: object
+              properties:
+                conditions:
+                  type: array
+                  items:
+                    description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+                    type: object
+                    required:
+                      - lastTransitionTime
+                      - message
+                      - reason
+                      - status
+                      - type
+                    properties:
+                      lastTransitionTime:
+                        description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                        type: string
+                        format: date-time
+                      message:
+                        description: message is a human readable message indicating details about the transition. This may be an empty string.
+                        type: string
+                        maxLength: 32768
+                      observedGeneration:
+                        description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
+                        type: integer
+                        format: int64
+                        minimum: 0
+                      reason:
+                        description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
+                        type: string
+                        maxLength: 1024
+                        minLength: 1
+                        pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      status:
+                        description: status of the condition, one of True, False, Unknown.
+                        type: string
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                      type:
+                        description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                        type: string
+                        maxLength: 316
+                        pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+      served: true
+      storage: false
+      subresources:
+        status: {}
+    - name: v2
+      schema:
+        openAPIV3Schema:
+          description: OperatorCondition is a Custom Resource of type `OperatorCondition` which is used to convey information to OLM about the state of an operator.
+          type: object
+          required:
+            - metadata
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: OperatorConditionSpec allows an operator to report state to OLM and provides cluster admin with the ability to manually override state reported by the operator.
+              type: object
+              properties:
+                conditions:
+                  type: array
+                  items:
+                    description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+                    type: object
+                    required:
+                      - lastTransitionTime
+                      - message
+                      - reason
+                      - status
+                      - type
+                    properties:
+                      lastTransitionTime:
+                        description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                        type: string
+                        format: date-time
+                      message:
+                        description: message is a human readable message indicating details about the transition. This may be an empty string.
+                        type: string
+                        maxLength: 32768
+                      observedGeneration:
+                        description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
+                        type: integer
+                        format: int64
+                        minimum: 0
+                      reason:
+                        description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
+                        type: string
+                        maxLength: 1024
+                        minLength: 1
+                        pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      status:
+                        description: status of the condition, one of True, False, Unknown.
+                        type: string
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                      type:
+                        description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                        type: string
+                        maxLength: 316
+                        pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                deployments:
+                  type: array
+                  items:
+                    type: string
+                overrides:
+                  type: array
+                  items:
+                    description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+                    type: object
+                    required:
+                      - message
+                      - reason
+                      - status
+                      - type
+                    properties:
+                      lastTransitionTime:
+                        description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                        type: string
+                        format: date-time
+                      message:
+                        description: message is a human readable message indicating details about the transition. This may be an empty string.
+                        type: string
+                        maxLength: 32768
+                      observedGeneration:
+                        description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
+                        type: integer
+                        format: int64
+                        minimum: 0
+                      reason:
+                        description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
+                        type: string
+                        maxLength: 1024
+                        minLength: 1
+                        pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      status:
+                        description: status of the condition, one of True, False, Unknown.
+                        type: string
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                      type:
+                        description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                        type: string
+                        maxLength: 316
+                        pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                serviceAccounts:
+                  type: array
+                  items:
+                    type: string
+            status:
+              description: OperatorConditionStatus allows OLM to convey which conditions have been observed.
+              type: object
+              properties:
+                conditions:
+                  type: array
+                  items:
+                    description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+                    type: object
+                    required:
+                      - lastTransitionTime
+                      - message
+                      - reason
+                      - status
+                      - type
+                    properties:
+                      lastTransitionTime:
+                        description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                        type: string
+                        format: date-time
+                      message:
+                        description: message is a human readable message indicating details about the transition. This may be an empty string.
+                        type: string
+                        maxLength: 32768
+                      observedGeneration:
+                        description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
+                        type: integer
+                        format: int64
+                        minimum: 0
+                      reason:
+                        description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
+                        type: string
+                        maxLength: 1024
+                        minLength: 1
+                        pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      status:
+                        description: status of the condition, one of True, False, Unknown.
+                        type: string
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                      type:
+                        description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                        type: string
+                        maxLength: 316
+                        pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+      served: true
+      storage: true
+      subresources:
+        status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.9.0
+  creationTimestamp: null
+  name: operatorgroups.operators.coreos.com
+spec:
+  group: operators.coreos.com
+  names:
+    categories:
+      - olm
+    kind: OperatorGroup
+    listKind: OperatorGroupList
+    plural: operatorgroups
+    shortNames:
+      - og
+    singular: operatorgroup
+  scope: Namespaced
+  versions:
+    - name: v1
+      schema:
+        openAPIV3Schema:
+          description: OperatorGroup is the unit of multitenancy for OLM managed operators. It constrains the installation of operators in its namespace to a specified set of target namespaces.
+          type: object
+          required:
+            - metadata
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: OperatorGroupSpec is the spec for an OperatorGroup resource.
+              type: object
+              default:
+                upgradeStrategy: Default
+              properties:
+                selector:
+                  description: Selector selects the OperatorGroup's target namespaces.
+                  type: object
+                  properties:
+                    matchExpressions:
+                      description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                      type: array
+                      items:
+                        description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                        type: object
+                        required:
+                          - key
+                          - operator
+                        properties:
+                          key:
+                            description: key is the label key that the selector applies to.
+                            type: string
+                          operator:
+                            description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                            type: string
+                          values:
+                            description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                            type: array
+                            items:
+                              type: string
+                    matchLabels:
+                      description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                      type: object
+                      additionalProperties:
+                        type: string
+                serviceAccountName:
+                  description: ServiceAccountName is the admin specified service account which will be used to deploy operator(s) in this operator group.
+                  type: string
+                staticProvidedAPIs:
+                  description: Static tells OLM not to update the OperatorGroup's providedAPIs annotation
+                  type: boolean
+                targetNamespaces:
+                  description: TargetNamespaces is an explicit set of namespaces to target. If it is set, Selector is ignored.
+                  type: array
+                  items:
+                    type: string
+                  x-kubernetes-list-type: set
+                upgradeStrategy:
+                  description: "UpgradeStrategy defines the upgrade strategy for operators in the namespace. There are currently two supported upgrade strategies: \n Default: OLM will only allow clusterServiceVersions to move to the replacing phase from the succeeded phase. This effectively means that OLM will not allow operators to move to the next version if an installation or upgrade has failed. \n TechPreviewUnsafeFailForward: OLM will allow clusterServiceVersions to move to the replacing phase from the succeeded phase or from the failed phase. Additionally, OLM will generate new installPlans when a subscription references a failed installPlan and the catalog has been updated with a new upgrade for the existing set of operators. \n WARNING: The TechPreviewUnsafeFailForward upgrade strategy is unsafe and may result in unexpected behavior or unrecoverable data loss unless you have deep understanding of the set of operators being managed in the namespace."
+                  type: string
+                  default: Default
+                  enum:
+                    - Default
+                    - TechPreviewUnsafeFailForward
+            status:
+              description: OperatorGroupStatus is the status for an OperatorGroupResource.
+              type: object
+              required:
+                - lastUpdated
+              properties:
+                conditions:
+                  description: Conditions is an array of the OperatorGroup's conditions.
+                  type: array
+                  items:
+                    description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+                    type: object
+                    required:
+                      - lastTransitionTime
+                      - message
+                      - reason
+                      - status
+                      - type
+                    properties:
+                      lastTransitionTime:
+                        description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                        type: string
+                        format: date-time
+                      message:
+                        description: message is a human readable message indicating details about the transition. This may be an empty string.
+                        type: string
+                        maxLength: 32768
+                      observedGeneration:
+                        description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
+                        type: integer
+                        format: int64
+                        minimum: 0
+                      reason:
+                        description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
+                        type: string
+                        maxLength: 1024
+                        minLength: 1
+                        pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      status:
+                        description: status of the condition, one of True, False, Unknown.
+                        type: string
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                      type:
+                        description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                        type: string
+                        maxLength: 316
+                        pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                lastUpdated:
+                  description: LastUpdated is a timestamp of the last time the OperatorGroup's status was Updated.
+                  type: string
+                  format: date-time
+                namespaces:
+                  description: Namespaces is the set of target namespaces for the OperatorGroup.
+                  type: array
+                  items:
+                    type: string
+                  x-kubernetes-list-type: set
+                serviceAccountRef:
+                  description: ServiceAccountRef references the service account object specified.
+                  type: object
+                  properties:
+                    apiVersion:
+                      description: API version of the referent.
+                      type: string
+                    fieldPath:
+                      description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
+                      type: string
+                    kind:
+                      description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                      type: string
+                    name:
+                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                      type: string
+                    namespace:
+                      description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                      type: string
+                    resourceVersion:
+                      description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                      type: string
+                    uid:
+                      description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                      type: string
+      served: true
+      storage: true
+      subresources:
+        status: {}
+    - name: v1alpha2
+      schema:
+        openAPIV3Schema:
+          description: OperatorGroup is the unit of multitenancy for OLM managed operators. It constrains the installation of operators in its namespace to a specified set of target namespaces.
+          type: object
+          required:
+            - metadata
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: OperatorGroupSpec is the spec for an OperatorGroup resource.
+              type: object
+              properties:
+                selector:
+                  description: Selector selects the OperatorGroup's target namespaces.
+                  type: object
+                  properties:
+                    matchExpressions:
+                      description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                      type: array
+                      items:
+                        description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                        type: object
+                        required:
+                          - key
+                          - operator
+                        properties:
+                          key:
+                            description: key is the label key that the selector applies to.
+                            type: string
+                          operator:
+                            description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                            type: string
+                          values:
+                            description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                            type: array
+                            items:
+                              type: string
+                    matchLabels:
+                      description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                      type: object
+                      additionalProperties:
+                        type: string
+                serviceAccountName:
+                  description: ServiceAccountName is the admin specified service account which will be used to deploy operator(s) in this operator group.
+                  type: string
+                staticProvidedAPIs:
+                  description: Static tells OLM not to update the OperatorGroup's providedAPIs annotation
+                  type: boolean
+                targetNamespaces:
+                  description: TargetNamespaces is an explicit set of namespaces to target. If it is set, Selector is ignored.
+                  type: array
+                  items:
+                    type: string
+            status:
+              description: OperatorGroupStatus is the status for an OperatorGroupResource.
+              type: object
+              required:
+                - lastUpdated
+              properties:
+                lastUpdated:
+                  description: LastUpdated is a timestamp of the last time the OperatorGroup's status was Updated.
+                  type: string
+                  format: date-time
+                namespaces:
+                  description: Namespaces is the set of target namespaces for the OperatorGroup.
+                  type: array
+                  items:
+                    type: string
+                serviceAccountRef:
+                  description: ServiceAccountRef references the service account object specified.
+                  type: object
+                  properties:
+                    apiVersion:
+                      description: API version of the referent.
+                      type: string
+                    fieldPath:
+                      description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
+                      type: string
+                    kind:
+                      description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                      type: string
+                    name:
+                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                      type: string
+                    namespace:
+                      description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                      type: string
+                    resourceVersion:
+                      description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                      type: string
+                    uid:
+                      description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                      type: string
+      served: true
+      storage: false
+      subresources:
+        status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.9.0
+  creationTimestamp: null
+  name: operators.operators.coreos.com
+spec:
+  group: operators.coreos.com
+  names:
+    categories:
+      - olm
+    kind: Operator
+    listKind: OperatorList
+    plural: operators
+    singular: operator
+  scope: Cluster
+  versions:
+    - name: v1
+      schema:
+        openAPIV3Schema:
+          description: Operator represents a cluster operator.
+          type: object
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: OperatorSpec defines the desired state of Operator
+              type: object
+            status:
+              description: OperatorStatus defines the observed state of an Operator and its components
+              type: object
+              properties:
+                components:
+                  description: Components describes resources that compose the operator.
+                  type: object
+                  required:
+                    - labelSelector
+                  properties:
+                    labelSelector:
+                      description: LabelSelector is a label query over a set of resources used to select the operator's components
+                      type: object
+                      properties:
+                        matchExpressions:
+                          description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                          type: array
+                          items:
+                            description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                            type: object
+                            required:
+                              - key
+                              - operator
+                            properties:
+                              key:
+                                description: key is the label key that the selector applies to.
+                                type: string
+                              operator:
+                                description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                type: string
+                              values:
+                                description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                type: array
+                                items:
+                                  type: string
+                        matchLabels:
+                          description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                          type: object
+                          additionalProperties:
+                            type: string
+                    refs:
+                      description: Refs are a set of references to the operator's component resources, selected with LabelSelector.
+                      type: array
+                      items:
+                        description: RichReference is a reference to a resource, enriched with its status conditions.
+                        type: object
+                        properties:
+                          apiVersion:
+                            description: API version of the referent.
+                            type: string
+                          conditions:
+                            description: Conditions represents the latest state of the component.
+                            type: array
+                            items:
+                              description: Condition represent the latest available observations of an component's state.
+                              type: object
+                              required:
+                                - status
+                                - type
+                              properties:
+                                lastTransitionTime:
+                                  description: Last time the condition transitioned from one status to another.
+                                  type: string
+                                  format: date-time
+                                lastUpdateTime:
+                                  description: Last time the condition was probed
+                                  type: string
+                                  format: date-time
+                                message:
+                                  description: A human readable message indicating details about the transition.
+                                  type: string
+                                reason:
+                                  description: The reason for the condition's last transition.
+                                  type: string
+                                status:
+                                  description: Status of the condition, one of True, False, Unknown.
+                                  type: string
+                                type:
+                                  description: Type of condition.
+                                  type: string
+                          fieldPath:
+                            description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
+                            type: string
+                          kind:
+                            description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                            type: string
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                            type: string
+                          namespace:
+                            description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                            type: string
+                          resourceVersion:
+                            description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                            type: string
+                          uid:
+                            description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                            type: string
+      served: true
+      storage: true
+      subresources:
+        status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.9.0
+  creationTimestamp: null
+  name: subscriptions.operators.coreos.com
+spec:
+  group: operators.coreos.com
+  names:
+    categories:
+      - olm
+    kind: Subscription
+    listKind: SubscriptionList
+    plural: subscriptions
+    shortNames:
+      - sub
+      - subs
+    singular: subscription
+  scope: Namespaced
+  versions:
+    - additionalPrinterColumns:
+        - description: The package subscribed to
+          jsonPath: .spec.name
+          name: Package
+          type: string
+        - description: The catalog source for the specified package
+          jsonPath: .spec.source
+          name: Source
+          type: string
+        - description: The channel of updates to subscribe to
+          jsonPath: .spec.channel
+          name: Channel
+          type: string
+      name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: Subscription keeps operators up to date by tracking changes to Catalogs.
+          type: object
+          required:
+            - metadata
+            - spec
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: SubscriptionSpec defines an Application that can be installed
+              type: object
+              required:
+                - name
+                - source
+                - sourceNamespace
+              properties:
+                channel:
+                  type: string
+                config:
+                  description: SubscriptionConfig contains configuration specified for a subscription.
+                  type: object
+                  properties:
+                    affinity:
+                      description: If specified, overrides the pod's scheduling constraints. nil sub-attributes will *not* override the original values in the pod.spec for those sub-attributes. Use empty object ({}) to erase original sub-attribute values.
+                      type: object
+                      properties:
+                        nodeAffinity:
+                          description: Describes node affinity scheduling rules for the pod.
+                          type: object
+                          properties:
+                            preferredDuringSchedulingIgnoredDuringExecution:
+                              description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node matches the corresponding matchExpressions; the node(s) with the highest sum are the most preferred.
+                              type: array
+                              items:
+                                description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                                type: object
+                                required:
+                                  - preference
+                                  - weight
+                                properties:
+                                  preference:
+                                    description: A node selector term, associated with the corresponding weight.
+                                    type: object
+                                    properties:
+                                      matchExpressions:
+                                        description: A list of node selector requirements by node's labels.
+                                        type: array
+                                        items:
+                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: The label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                              type: string
+                                            values:
+                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                      matchFields:
+                                        description: A list of node selector requirements by node's fields.
+                                        type: array
+                                        items:
+                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: The label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                              type: string
+                                            values:
+                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                  weight:
+                                    description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100.
+                                    type: integer
+                                    format: int32
+                            requiredDuringSchedulingIgnoredDuringExecution:
+                              description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to an update), the system may or may not try to eventually evict the pod from its node.
+                              type: object
+                              required:
+                                - nodeSelectorTerms
+                              properties:
+                                nodeSelectorTerms:
+                                  description: Required. A list of node selector terms. The terms are ORed.
+                                  type: array
+                                  items:
+                                    description: A null or empty node selector term matches no objects. The requirements of them are ANDed. The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                                    type: object
+                                    properties:
+                                      matchExpressions:
+                                        description: A list of node selector requirements by node's labels.
+                                        type: array
+                                        items:
+                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: The label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                              type: string
+                                            values:
+                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                      matchFields:
+                                        description: A list of node selector requirements by node's fields.
+                                        type: array
+                                        items:
+                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: The label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                              type: string
+                                            values:
+                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                        podAffinity:
+                          description: Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).
+                          type: object
+                          properties:
+                            preferredDuringSchedulingIgnoredDuringExecution:
+                              description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
+                              type: array
+                              items:
+                                description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                                type: object
+                                required:
+                                  - podAffinityTerm
+                                  - weight
+                                properties:
+                                  podAffinityTerm:
+                                    description: Required. A pod affinity term, associated with the corresponding weight.
+                                    type: object
+                                    required:
+                                      - topologyKey
+                                    properties:
+                                      labelSelector:
+                                        description: A label query over a set of resources, in this case pods.
+                                        type: object
+                                        properties:
+                                          matchExpressions:
+                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                            type: array
+                                            items:
+                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                              type: object
+                                              required:
+                                                - key
+                                                - operator
+                                              properties:
+                                                key:
+                                                  description: key is the label key that the selector applies to.
+                                                  type: string
+                                                operator:
+                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                  type: string
+                                                values:
+                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                          matchLabels:
+                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                      namespaceSelector:
+                                        description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces.
+                                        type: object
+                                        properties:
+                                          matchExpressions:
+                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                            type: array
+                                            items:
+                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                              type: object
+                                              required:
+                                                - key
+                                                - operator
+                                              properties:
+                                                key:
+                                                  description: key is the label key that the selector applies to.
+                                                  type: string
+                                                operator:
+                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                  type: string
+                                                values:
+                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                          matchLabels:
+                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                      namespaces:
+                                        description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                        type: array
+                                        items:
+                                          type: string
+                                      topologyKey:
+                                        description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                        type: string
+                                  weight:
+                                    description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
+                                    type: integer
+                                    format: int32
+                            requiredDuringSchedulingIgnoredDuringExecution:
+                              description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                              type: array
+                              items:
+                                description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
+                                type: object
+                                required:
+                                  - topologyKey
+                                properties:
+                                  labelSelector:
+                                    description: A label query over a set of resources, in this case pods.
+                                    type: object
+                                    properties:
+                                      matchExpressions:
+                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                        type: array
+                                        items:
+                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: key is the label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                              type: string
+                                            values:
+                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                      matchLabels:
+                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                        type: object
+                                        additionalProperties:
+                                          type: string
+                                  namespaceSelector:
+                                    description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces.
+                                    type: object
+                                    properties:
+                                      matchExpressions:
+                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                        type: array
+                                        items:
+                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: key is the label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                              type: string
+                                            values:
+                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                      matchLabels:
+                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                        type: object
+                                        additionalProperties:
+                                          type: string
+                                  namespaces:
+                                    description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                    type: array
+                                    items:
+                                      type: string
+                                  topologyKey:
+                                    description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                    type: string
+                        podAntiAffinity:
+                          description: Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)).
+                          type: object
+                          properties:
+                            preferredDuringSchedulingIgnoredDuringExecution:
+                              description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling anti-affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
+                              type: array
+                              items:
+                                description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                                type: object
+                                required:
+                                  - podAffinityTerm
+                                  - weight
+                                properties:
+                                  podAffinityTerm:
+                                    description: Required. A pod affinity term, associated with the corresponding weight.
+                                    type: object
+                                    required:
+                                      - topologyKey
+                                    properties:
+                                      labelSelector:
+                                        description: A label query over a set of resources, in this case pods.
+                                        type: object
+                                        properties:
+                                          matchExpressions:
+                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                            type: array
+                                            items:
+                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                              type: object
+                                              required:
+                                                - key
+                                                - operator
+                                              properties:
+                                                key:
+                                                  description: key is the label key that the selector applies to.
+                                                  type: string
+                                                operator:
+                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                  type: string
+                                                values:
+                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                          matchLabels:
+                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                      namespaceSelector:
+                                        description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces.
+                                        type: object
+                                        properties:
+                                          matchExpressions:
+                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                            type: array
+                                            items:
+                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                              type: object
+                                              required:
+                                                - key
+                                                - operator
+                                              properties:
+                                                key:
+                                                  description: key is the label key that the selector applies to.
+                                                  type: string
+                                                operator:
+                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                  type: string
+                                                values:
+                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                          matchLabels:
+                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                      namespaces:
+                                        description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                        type: array
+                                        items:
+                                          type: string
+                                      topologyKey:
+                                        description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                        type: string
+                                  weight:
+                                    description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
+                                    type: integer
+                                    format: int32
+                            requiredDuringSchedulingIgnoredDuringExecution:
+                              description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the anti-affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                              type: array
+                              items:
+                                description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
+                                type: object
+                                required:
+                                  - topologyKey
+                                properties:
+                                  labelSelector:
+                                    description: A label query over a set of resources, in this case pods.
+                                    type: object
+                                    properties:
+                                      matchExpressions:
+                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                        type: array
+                                        items:
+                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: key is the label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                              type: string
+                                            values:
+                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                      matchLabels:
+                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                        type: object
+                                        additionalProperties:
+                                          type: string
+                                  namespaceSelector:
+                                    description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces.
+                                    type: object
+                                    properties:
+                                      matchExpressions:
+                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                        type: array
+                                        items:
+                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                          type: object
+                                          required:
+                                            - key
+                                            - operator
+                                          properties:
+                                            key:
+                                              description: key is the label key that the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                              type: string
+                                            values:
+                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                              type: array
+                                              items:
+                                                type: string
+                                      matchLabels:
+                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                        type: object
+                                        additionalProperties:
+                                          type: string
+                                  namespaces:
+                                    description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                    type: array
+                                    items:
+                                      type: string
+                                  topologyKey:
+                                    description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                    type: string
+                    annotations:
+                      description: Annotations is an unstructured key value map stored with each Deployment, Pod, APIService in the Operator. Typically, annotations may be set by external tools to store and retrieve arbitrary metadata. Use this field to pre-define annotations that OLM should add to each of the Subscription's deployments, pods, and apiservices.
+                      type: object
+                      additionalProperties:
+                        type: string
+                    env:
+                      description: Env is a list of environment variables to set in the container. Cannot be updated.
+                      type: array
+                      items:
+                        description: EnvVar represents an environment variable present in a Container.
+                        type: object
+                        required:
+                          - name
+                        properties:
+                          name:
+                            description: Name of the environment variable. Must be a C_IDENTIFIER.
+                            type: string
+                          value:
+                            description: 'Variable references $(VAR_NAME) are expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".'
+                            type: string
+                          valueFrom:
+                            description: Source for the environment variable's value. Cannot be used if value is not empty.
+                            type: object
+                            properties:
+                              configMapKeyRef:
+                                description: Selects a key of a ConfigMap.
+                                type: object
+                                required:
+                                  - key
+                                properties:
+                                  key:
+                                    description: The key to select.
+                                    type: string
+                                  name:
+                                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                    type: string
+                                  optional:
+                                    description: Specify whether the ConfigMap or its key must be defined
+                                    type: boolean
+                              fieldRef:
+                                description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.'
+                                type: object
+                                required:
+                                  - fieldPath
+                                properties:
+                                  apiVersion:
+                                    description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                    type: string
+                                  fieldPath:
+                                    description: Path of the field to select in the specified API version.
+                                    type: string
+                              resourceFieldRef:
+                                description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.'
+                                type: object
+                                required:
+                                  - resource
+                                properties:
+                                  containerName:
+                                    description: 'Container name: required for volumes, optional for env vars'
+                                    type: string
+                                  divisor:
+                                    description: Specifies the output format of the exposed resources, defaults to "1"
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    anyOf:
+                                      - type: integer
+                                      - type: string
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    description: 'Required: resource to select'
+                                    type: string
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's namespace
+                                type: object
+                                required:
+                                  - key
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must be a valid secret key.
+                                    type: string
+                                  name:
+                                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its key must be defined
+                                    type: boolean
+                    envFrom:
+                      description: EnvFrom is a list of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Immutable.
+                      type: array
+                      items:
+                        description: EnvFromSource represents the source of a set of ConfigMaps
+                        type: object
+                        properties:
+                          configMapRef:
+                            description: The ConfigMap to select from
+                            type: object
+                            properties:
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap must be defined
+                                type: boolean
+                          prefix:
+                            description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.
+                            type: string
+                          secretRef:
+                            description: The Secret to select from
+                            type: object
+                            properties:
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret must be defined
+                                type: boolean
+                    nodeSelector:
+                      description: 'NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node''s labels for the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/'
+                      type: object
+                      additionalProperties:
+                        type: string
+                    resources:
+                      description: 'Resources represents compute resources required by this container. Immutable. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+                      type: object
+                      properties:
+                        claims:
+                          description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers."
+                          type: array
+                          items:
+                            description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                            type: object
+                            required:
+                              - name
+                            properties:
+                              name:
+                                description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container.
+                                type: string
+                          x-kubernetes-list-map-keys:
+                            - name
+                          x-kubernetes-list-type: map
+                        limits:
+                          description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                          type: object
+                          additionalProperties:
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            anyOf:
+                              - type: integer
+                              - type: string
+                            x-kubernetes-int-or-string: true
+                        requests:
+                          description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                          type: object
+                          additionalProperties:
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            anyOf:
+                              - type: integer
+                              - type: string
+                            x-kubernetes-int-or-string: true
+                    selector:
+                      description: Selector is the label selector for pods to be configured. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment. It must match the pod template's labels.
+                      type: object
+                      properties:
+                        matchExpressions:
+                          description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                          type: array
+                          items:
+                            description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                            type: object
+                            required:
+                              - key
+                              - operator
+                            properties:
+                              key:
+                                description: key is the label key that the selector applies to.
+                                type: string
+                              operator:
+                                description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                type: string
+                              values:
+                                description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                type: array
+                                items:
+                                  type: string
+                        matchLabels:
+                          description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                          type: object
+                          additionalProperties:
+                            type: string
+                    tolerations:
+                      description: Tolerations are the pod's tolerations.
+                      type: array
+                      items:
+                        description: The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
+                        type: object
+                        properties:
+                          effect:
+                            description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
+                            type: string
+                          key:
+                            description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.
+                            type: string
+                          operator:
+                            description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.
+                            type: string
+                          tolerationSeconds:
+                            description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.
+                            type: integer
+                            format: int64
+                          value:
+                            description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.
+                            type: string
+                    volumeMounts:
+                      description: List of VolumeMounts to set in the container.
+                      type: array
+                      items:
+                        description: VolumeMount describes a mounting of a Volume within a container.
+                        type: object
+                        required:
+                          - mountPath
+                          - name
+                        properties:
+                          mountPath:
+                            description: Path within the container at which the volume should be mounted.  Must not contain ':'.
+                            type: string
+                          mountPropagation:
+                            description: mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10.
+                            type: string
+                          name:
+                            description: This must match the Name of a Volume.
+                            type: string
+                          readOnly:
+                            description: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false.
+                            type: boolean
+                          subPath:
+                            description: Path within the volume from which the container's volume should be mounted. Defaults to "" (volume's root).
+                            type: string
+                          subPathExpr:
+                            description: Expanded path within the volume from which the container's volume should be mounted. Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment. Defaults to "" (volume's root). SubPathExpr and SubPath are mutually exclusive.
+                            type: string
+                    volumes:
+                      description: List of Volumes to set in the podSpec.
+                      type: array
+                      items:
+                        description: Volume represents a named volume in a pod that may be accessed by any container in the pod.
+                        type: object
+                        required:
+                          - name
+                        properties:
+                          awsElasticBlockStore:
+                            description: 'awsElasticBlockStore represents an AWS Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                            type: object
+                            required:
+                              - volumeID
+                            properties:
+                              fsType:
+                                description: 'fsType is the filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore TODO: how do we prevent errors in the filesystem from compromising the machine'
+                                type: string
+                              partition:
+                                description: 'partition is the partition in the volume that you want to mount. If omitted, the default is to mount by volume name. Examples: For volume /dev/sda1, you specify the partition as "1". Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).'
+                                type: integer
+                                format: int32
+                              readOnly:
+                                description: 'readOnly value true will force the readOnly setting in VolumeMounts. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                                type: boolean
+                              volumeID:
+                                description: 'volumeID is unique ID of the persistent disk resource in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                                type: string
+                          azureDisk:
+                            description: azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+                            type: object
+                            required:
+                              - diskName
+                              - diskURI
+                            properties:
+                              cachingMode:
+                                description: 'cachingMode is the Host Caching mode: None, Read Only, Read Write.'
+                                type: string
+                              diskName:
+                                description: diskName is the Name of the data disk in the blob storage
+                                type: string
+                              diskURI:
+                                description: diskURI is the URI of data disk in the blob storage
+                                type: string
+                              fsType:
+                                description: fsType is Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                type: string
+                              kind:
+                                description: 'kind expected values are Shared: multiple blob disks per storage account  Dedicated: single blob disk per storage account  Managed: azure managed data disk (only in managed availability set). defaults to shared'
+                                type: string
+                              readOnly:
+                                description: readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                                type: boolean
+                          azureFile:
+                            description: azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+                            type: object
+                            required:
+                              - secretName
+                              - shareName
+                            properties:
+                              readOnly:
+                                description: readOnly defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                                type: boolean
+                              secretName:
+                                description: secretName is the  name of secret that contains Azure Storage Account Name and Key
+                                type: string
+                              shareName:
+                                description: shareName is the azure share Name
+                                type: string
+                          cephfs:
+                            description: cephFS represents a Ceph FS mount on the host that shares a pod's lifetime
+                            type: object
+                            required:
+                              - monitors
+                            properties:
+                              monitors:
+                                description: 'monitors is Required: Monitors is a collection of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                                type: array
+                                items:
+                                  type: string
+                              path:
+                                description: 'path is Optional: Used as the mounted root, rather than the full Ceph tree, default is /'
+                                type: string
+                              readOnly:
+                                description: 'readOnly is Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                                type: boolean
+                              secretFile:
+                                description: 'secretFile is Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                                type: string
+                              secretRef:
+                                description: 'secretRef is Optional: SecretRef is reference to the authentication secret for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                                type: object
+                                properties:
+                                  name:
+                                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                    type: string
+                              user:
+                                description: 'user is optional: User is the rados user name, default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                                type: string
+                          cinder:
+                            description: 'cinder represents a cinder volume attached and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                            type: object
+                            required:
+                              - volumeID
+                            properties:
+                              fsType:
+                                description: 'fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                                type: string
+                              readOnly:
+                                description: 'readOnly defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                                type: boolean
+                              secretRef:
+                                description: 'secretRef is optional: points to a secret object containing parameters used to connect to OpenStack.'
+                                type: object
+                                properties:
+                                  name:
+                                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                    type: string
+                              volumeID:
+                                description: 'volumeID used to identify the volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                                type: string
+                          configMap:
+                            description: configMap represents a configMap that should populate this volume
+                            type: object
+                            properties:
+                              defaultMode:
+                                description: 'defaultMode is optional: mode bits used to set permissions on created files by default. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                type: integer
+                                format: int32
+                              items:
+                                description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'.
+                                type: array
+                                items:
+                                  description: Maps a string key to a path within a volume.
+                                  type: object
+                                  required:
+                                    - key
+                                    - path
+                                  properties:
+                                    key:
+                                      description: key is the key to project.
+                                      type: string
+                                    mode:
+                                      description: 'mode is Optional: mode bits used to set permissions on this file. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                      type: integer
+                                      format: int32
+                                    path:
+                                      description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'.
+                                      type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                type: string
+                              optional:
+                                description: optional specify whether the ConfigMap or its keys must be defined
+                                type: boolean
+                          csi:
+                            description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external CSI drivers (Beta feature).
+                            type: object
+                            required:
+                              - driver
+                            properties:
+                              driver:
+                                description: driver is the name of the CSI driver that handles this volume. Consult with your admin for the correct name as registered in the cluster.
+                                type: string
+                              fsType:
+                                description: fsType to mount. Ex. "ext4", "xfs", "ntfs". If not provided, the empty value is passed to the associated CSI driver which will determine the default filesystem to apply.
+                                type: string
+                              nodePublishSecretRef:
+                                description: nodePublishSecretRef is a reference to the secret object containing sensitive information to pass to the CSI driver to complete the CSI NodePublishVolume and NodeUnpublishVolume calls. This field is optional, and  may be empty if no secret is required. If the secret object contains more than one secret, all secret references are passed.
+                                type: object
+                                properties:
+                                  name:
+                                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                    type: string
+                              readOnly:
+                                description: readOnly specifies a read-only configuration for the volume. Defaults to false (read/write).
+                                type: boolean
+                              volumeAttributes:
+                                description: volumeAttributes stores driver-specific properties that are passed to the CSI driver. Consult your driver's documentation for supported values.
+                                type: object
+                                additionalProperties:
+                                  type: string
+                          downwardAPI:
+                            description: downwardAPI represents downward API about the pod that should populate this volume
+                            type: object
+                            properties:
+                              defaultMode:
+                                description: 'Optional: mode bits to use on created files by default. Must be a Optional: mode bits used to set permissions on created files by default. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                type: integer
+                                format: int32
+                              items:
+                                description: Items is a list of downward API volume file
+                                type: array
+                                items:
+                                  description: DownwardAPIVolumeFile represents information to create the file containing the pod field
+                                  type: object
+                                  required:
+                                    - path
+                                  properties:
+                                    fieldRef:
+                                      description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.'
+                                      type: object
+                                      required:
+                                        - fieldPath
+                                      properties:
+                                        apiVersion:
+                                          description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                          type: string
+                                        fieldPath:
+                                          description: Path of the field to select in the specified API version.
+                                          type: string
+                                    mode:
+                                      description: 'Optional: mode bits used to set permissions on this file, must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                      type: integer
+                                      format: int32
+                                    path:
+                                      description: 'Required: Path is  the relative path name of the file to be created. Must not be absolute or contain the ''..'' path. Must be utf-8 encoded. The first item of the relative path must not start with ''..'''
+                                      type: string
+                                    resourceFieldRef:
+                                      description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.'
+                                      type: object
+                                      required:
+                                        - resource
+                                      properties:
+                                        containerName:
+                                          description: 'Container name: required for volumes, optional for env vars'
+                                          type: string
+                                        divisor:
+                                          description: Specifies the output format of the exposed resources, defaults to "1"
+                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                          anyOf:
+                                            - type: integer
+                                            - type: string
+                                          x-kubernetes-int-or-string: true
+                                        resource:
+                                          description: 'Required: resource to select'
+                                          type: string
+                          emptyDir:
+                            description: 'emptyDir represents a temporary directory that shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                            type: object
+                            properties:
+                              medium:
+                                description: 'medium represents what type of storage medium should back this directory. The default is "" which means to use the node''s default medium. Must be an empty string (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                                type: string
+                              sizeLimit:
+                                description: 'sizeLimit is the total amount of local storage required for this EmptyDir volume. The size limit is also applicable for memory medium. The maximum usage on memory medium EmptyDir would be the minimum value between the SizeLimit specified here and the sum of memory limits of all containers in a pod. The default is nil which means that the limit is undefined. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                anyOf:
+                                  - type: integer
+                                  - type: string
+                                x-kubernetes-int-or-string: true
+                          ephemeral:
+                            description: "ephemeral represents a volume that is handled by a cluster storage driver. The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts, and deleted when the pod is removed. \n Use this if: a) the volume is only needed while the pod runs, b) features of normal volumes like restoring from snapshot or capacity tracking are needed, c) the storage driver is specified through a storage class, and d) the storage driver supports dynamic volume provisioning through a PersistentVolumeClaim (see EphemeralVolumeSource for more information on the connection between this volume type and PersistentVolumeClaim). \n Use PersistentVolumeClaim or one of the vendor-specific APIs for volumes that persist for longer than the lifecycle of an individual pod. \n Use CSI for light-weight local ephemeral volumes if the CSI driver is meant to be used that way - see the documentation of the driver for more information. \n A pod can use both types of ephemeral volumes and persistent volumes at the same time."
+                            type: object
+                            properties:
+                              volumeClaimTemplate:
+                                description: "Will be used to create a stand-alone PVC to provision the volume. The pod in which this EphemeralVolumeSource is embedded will be the owner of the PVC, i.e. the PVC will be deleted together with the pod.  The name of the PVC will be `<pod name>-<volume name>` where `<volume name>` is the name from the `PodSpec.Volumes` array entry. Pod validation will reject the pod if the concatenated name is not valid for a PVC (for example, too long). \n An existing PVC with that name that is not owned by the pod will *not* be used for the pod to avoid using an unrelated volume by mistake. Starting the pod is then blocked until the unrelated PVC is removed. If such a pre-created PVC is meant to be used by the pod, the PVC has to updated with an owner reference to the pod once the pod exists. Normally this should not be necessary, but it may be useful when manually reconstructing a broken cluster. \n This field is read-only and no changes will be made by Kubernetes to the PVC after it has been created. \n Required, must not be nil."
+                                type: object
+                                required:
+                                  - spec
+                                properties:
+                                  metadata:
+                                    description: May contain labels and annotations that will be copied into the PVC when creating it. No other fields are allowed and will be rejected during validation.
+                                    type: object
+                                  spec:
+                                    description: The specification for the PersistentVolumeClaim. The entire content is copied unchanged into the PVC that gets created from this template. The same fields as in a PersistentVolumeClaim are also valid here.
+                                    type: object
+                                    properties:
+                                      accessModes:
+                                        description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1'
+                                        type: array
+                                        items:
+                                          type: string
+                                      dataSource:
+                                        description: 'dataSource field can be used to specify either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot) * An existing PVC (PersistentVolumeClaim) If the provisioner or an external controller can support the specified data source, it will create a new volume based on the contents of the specified data source. When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified. If the namespace is specified, then dataSourceRef will not be copied to dataSource.'
+                                        type: object
+                                        required:
+                                          - kind
+                                          - name
+                                        properties:
+                                          apiGroup:
+                                            description: APIGroup is the group for the resource being referenced. If APIGroup is not specified, the specified Kind must be in the core API group. For any other third-party types, APIGroup is required.
+                                            type: string
+                                          kind:
+                                            description: Kind is the type of resource being referenced
+                                            type: string
+                                          name:
+                                            description: Name is the name of resource being referenced
+                                            type: string
+                                      dataSourceRef:
+                                        description: 'dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volume is desired. This may be any object from a non-empty API group (non core object) or a PersistentVolumeClaim object. When this field is specified, volume binding will only succeed if the type of the specified object matches some installed volume populator or dynamic provisioner. This field will replace the functionality of the dataSource field and as such if both fields are non-empty, they must have the same value. For backwards compatibility, when namespace isn''t specified in dataSourceRef, both fields (dataSource and dataSourceRef) will be set to the same value automatically if one of them is empty and the other is non-empty. When namespace is specified in dataSourceRef, dataSource isn''t set to the same value and must be empty. There are three important differences between dataSource and dataSourceRef: * While dataSource only allows two specific types of objects, dataSourceRef allows any non-core object, as well as PersistentVolumeClaim objects. * While dataSource ignores disallowed values (dropping them), dataSourceRef preserves all values, and generates an error if a disallowed value is specified. * While dataSource only allows local objects, dataSourceRef allows objects in any namespaces. (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled. (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.'
+                                        type: object
+                                        required:
+                                          - kind
+                                          - name
+                                        properties:
+                                          apiGroup:
+                                            description: APIGroup is the group for the resource being referenced. If APIGroup is not specified, the specified Kind must be in the core API group. For any other third-party types, APIGroup is required.
+                                            type: string
+                                          kind:
+                                            description: Kind is the type of resource being referenced
+                                            type: string
+                                          name:
+                                            description: Name is the name of resource being referenced
+                                            type: string
+                                          namespace:
+                                            description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details. (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                            type: string
+                                      resources:
+                                        description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
+                                        type: object
+                                        properties:
+                                          claims:
+                                            description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers."
+                                            type: array
+                                            items:
+                                              description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                              type: object
+                                              required:
+                                                - name
+                                              properties:
+                                                name:
+                                                  description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container.
+                                                  type: string
+                                            x-kubernetes-list-map-keys:
+                                              - name
+                                            x-kubernetes-list-type: map
+                                          limits:
+                                            description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                            type: object
+                                            additionalProperties:
+                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                              anyOf:
+                                                - type: integer
+                                                - type: string
+                                              x-kubernetes-int-or-string: true
+                                          requests:
+                                            description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                            type: object
+                                            additionalProperties:
+                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                              anyOf:
+                                                - type: integer
+                                                - type: string
+                                              x-kubernetes-int-or-string: true
+                                      selector:
+                                        description: selector is a label query over volumes to consider for binding.
+                                        type: object
+                                        properties:
+                                          matchExpressions:
+                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                            type: array
+                                            items:
+                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                              type: object
+                                              required:
+                                                - key
+                                                - operator
+                                              properties:
+                                                key:
+                                                  description: key is the label key that the selector applies to.
+                                                  type: string
+                                                operator:
+                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                  type: string
+                                                values:
+                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                  type: array
+                                                  items:
+                                                    type: string
+                                          matchLabels:
+                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                      storageClassName:
+                                        description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
+                                        type: string
+                                      volumeMode:
+                                        description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec.
+                                        type: string
+                                      volumeName:
+                                        description: volumeName is the binding reference to the PersistentVolume backing this claim.
+                                        type: string
+                          fc:
+                            description: fc represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod.
+                            type: object
+                            properties:
+                              fsType:
+                                description: 'fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. TODO: how do we prevent errors in the filesystem from compromising the machine'
+                                type: string
+                              lun:
+                                description: 'lun is Optional: FC target lun number'
+                                type: integer
+                                format: int32
+                              readOnly:
+                                description: 'readOnly is Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.'
+                                type: boolean
+                              targetWWNs:
+                                description: 'targetWWNs is Optional: FC target worldwide names (WWNs)'
+                                type: array
+                                items:
+                                  type: string
+                              wwids:
+                                description: 'wwids Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.'
+                                type: array
+                                items:
+                                  type: string
+                          flexVolume:
+                            description: flexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin.
+                            type: object
+                            required:
+                              - driver
+                            properties:
+                              driver:
+                                description: driver is the name of the driver to use for this volume.
+                                type: string
+                              fsType:
+                                description: fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script.
+                                type: string
+                              options:
+                                description: 'options is Optional: this field holds extra command options if any.'
+                                type: object
+                                additionalProperties:
+                                  type: string
+                              readOnly:
+                                description: 'readOnly is Optional: defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.'
+                                type: boolean
+                              secretRef:
+                                description: 'secretRef is Optional: secretRef is reference to the secret object containing sensitive information to pass to the plugin scripts. This may be empty if no secret object is specified. If the secret object contains more than one secret, all secrets are passed to the plugin scripts.'
+                                type: object
+                                properties:
+                                  name:
+                                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                    type: string
+                          flocker:
+                            description: flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running
+                            type: object
+                            properties:
+                              datasetName:
+                                description: datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker should be considered as deprecated
+                                type: string
+                              datasetUUID:
+                                description: datasetUUID is the UUID of the dataset. This is unique identifier of a Flocker dataset
+                                type: string
+                          gcePersistentDisk:
+                            description: 'gcePersistentDisk represents a GCE Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                            type: object
+                            required:
+                              - pdName
+                            properties:
+                              fsType:
+                                description: 'fsType is filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk TODO: how do we prevent errors in the filesystem from compromising the machine'
+                                type: string
+                              partition:
+                                description: 'partition is the partition in the volume that you want to mount. If omitted, the default is to mount by volume name. Examples: For volume /dev/sda1, you specify the partition as "1". Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty). More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                                type: integer
+                                format: int32
+                              pdName:
+                                description: 'pdName is unique name of the PD resource in GCE. Used to identify the disk in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                                type: string
+                              readOnly:
+                                description: 'readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                                type: boolean
+                          gitRepo:
+                            description: 'gitRepo represents a git repository at a particular revision. DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir into the Pod''s container.'
+                            type: object
+                            required:
+                              - repository
+                            properties:
+                              directory:
+                                description: directory is the target directory name. Must not contain or start with '..'.  If '.' is supplied, the volume directory will be the git repository.  Otherwise, if specified, the volume will contain the git repository in the subdirectory with the given name.
+                                type: string
+                              repository:
+                                description: repository is the URL
+                                type: string
+                              revision:
+                                description: revision is the commit hash for the specified revision.
+                                type: string
+                          glusterfs:
+                            description: 'glusterfs represents a Glusterfs mount on the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md'
+                            type: object
+                            required:
+                              - endpoints
+                              - path
+                            properties:
+                              endpoints:
+                                description: 'endpoints is the endpoint name that details Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                                type: string
+                              path:
+                                description: 'path is the Glusterfs volume path. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                                type: string
+                              readOnly:
+                                description: 'readOnly here will force the Glusterfs volume to be mounted with read-only permissions. Defaults to false. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                                type: boolean
+                          hostPath:
+                            description: 'hostPath represents a pre-existing file or directory on the host machine that is directly exposed to the container. This is generally used for system agents or other privileged things that are allowed to see the host machine. Most containers will NOT need this. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath --- TODO(jonesdl) We need to restrict who can use host directory mounts and who can/can not mount host directories as read/write.'
+                            type: object
+                            required:
+                              - path
+                            properties:
+                              path:
+                                description: 'path of the directory on the host. If the path is a symlink, it will follow the link to the real path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                                type: string
+                              type:
+                                description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                                type: string
+                          iscsi:
+                            description: 'iscsi represents an ISCSI Disk resource that is attached to a kubelet''s host machine and then exposed to the pod. More info: https://examples.k8s.io/volumes/iscsi/README.md'
+                            type: object
+                            required:
+                              - iqn
+                              - lun
+                              - targetPortal
+                            properties:
+                              chapAuthDiscovery:
+                                description: chapAuthDiscovery defines whether support iSCSI Discovery CHAP authentication
+                                type: boolean
+                              chapAuthSession:
+                                description: chapAuthSession defines whether support iSCSI Session CHAP authentication
+                                type: boolean
+                              fsType:
+                                description: 'fsType is the filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi TODO: how do we prevent errors in the filesystem from compromising the machine'
+                                type: string
+                              initiatorName:
+                                description: initiatorName is the custom iSCSI Initiator Name. If initiatorName is specified with iscsiInterface simultaneously, new iSCSI interface <target portal>:<volume name> will be created for the connection.
+                                type: string
+                              iqn:
+                                description: iqn is the target iSCSI Qualified Name.
+                                type: string
+                              iscsiInterface:
+                                description: iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).
+                                type: string
+                              lun:
+                                description: lun represents iSCSI Target Lun number.
+                                type: integer
+                                format: int32
+                              portals:
+                                description: portals is the iSCSI Target Portal List. The portal is either an IP or ip_addr:port if the port is other than default (typically TCP ports 860 and 3260).
+                                type: array
+                                items:
+                                  type: string
+                              readOnly:
+                                description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false.
+                                type: boolean
+                              secretRef:
+                                description: secretRef is the CHAP Secret for iSCSI target and initiator authentication
+                                type: object
+                                properties:
+                                  name:
+                                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                    type: string
+                              targetPortal:
+                                description: targetPortal is iSCSI Target Portal. The Portal is either an IP or ip_addr:port if the port is other than default (typically TCP ports 860 and 3260).
+                                type: string
+                          name:
+                            description: 'name of the volume. Must be a DNS_LABEL and unique within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                            type: string
+                          nfs:
+                            description: 'nfs represents an NFS mount on the host that shares a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                            type: object
+                            required:
+                              - path
+                              - server
+                            properties:
+                              path:
+                                description: 'path that is exported by the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                                type: string
+                              readOnly:
+                                description: 'readOnly here will force the NFS export to be mounted with read-only permissions. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                                type: boolean
+                              server:
+                                description: 'server is the hostname or IP address of the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                                type: string
+                          persistentVolumeClaim:
+                            description: 'persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same namespace. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                            type: object
+                            required:
+                              - claimName
+                            properties:
+                              claimName:
+                                description: 'claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                                type: string
+                              readOnly:
+                                description: readOnly Will force the ReadOnly setting in VolumeMounts. Default false.
+                                type: boolean
+                          photonPersistentDisk:
+                            description: photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine
+                            type: object
+                            required:
+                              - pdID
+                            properties:
+                              fsType:
+                                description: fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                type: string
+                              pdID:
+                                description: pdID is the ID that identifies Photon Controller persistent disk
+                                type: string
+                          portworxVolume:
+                            description: portworxVolume represents a portworx volume attached and mounted on kubelets host machine
+                            type: object
+                            required:
+                              - volumeID
+                            properties:
+                              fsType:
+                                description: fSType represents the filesystem type to mount Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs". Implicitly inferred to be "ext4" if unspecified.
+                                type: string
+                              readOnly:
+                                description: readOnly defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                                type: boolean
+                              volumeID:
+                                description: volumeID uniquely identifies a Portworx volume
+                                type: string
+                          projected:
+                            description: projected items for all in one resources secrets, configmaps, and downward API
+                            type: object
+                            properties:
+                              defaultMode:
+                                description: defaultMode are the mode bits used to set permissions on created files by default. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.
+                                type: integer
+                                format: int32
+                              sources:
+                                description: sources is the list of volume projections
+                                type: array
+                                items:
+                                  description: Projection that may be projected along with other supported volume types
+                                  type: object
+                                  properties:
+                                    configMap:
+                                      description: configMap information about the configMap data to project
+                                      type: object
+                                      properties:
+                                        items:
+                                          description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the ConfigMap, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'.
+                                          type: array
+                                          items:
+                                            description: Maps a string key to a path within a volume.
+                                            type: object
+                                            required:
+                                              - key
+                                              - path
+                                            properties:
+                                              key:
+                                                description: key is the key to project.
+                                                type: string
+                                              mode:
+                                                description: 'mode is Optional: mode bits used to set permissions on this file. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                                type: integer
+                                                format: int32
+                                              path:
+                                                description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'.
+                                                type: string
+                                        name:
+                                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                          type: string
+                                        optional:
+                                          description: optional specify whether the ConfigMap or its keys must be defined
+                                          type: boolean
+                                    downwardAPI:
+                                      description: downwardAPI information about the downwardAPI data to project
+                                      type: object
+                                      properties:
+                                        items:
+                                          description: Items is a list of DownwardAPIVolume file
+                                          type: array
+                                          items:
+                                            description: DownwardAPIVolumeFile represents information to create the file containing the pod field
+                                            type: object
+                                            required:
+                                              - path
+                                            properties:
+                                              fieldRef:
+                                                description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.'
+                                                type: object
+                                                required:
+                                                  - fieldPath
+                                                properties:
+                                                  apiVersion:
+                                                    description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                                    type: string
+                                                  fieldPath:
+                                                    description: Path of the field to select in the specified API version.
+                                                    type: string
+                                              mode:
+                                                description: 'Optional: mode bits used to set permissions on this file, must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                                type: integer
+                                                format: int32
+                                              path:
+                                                description: 'Required: Path is  the relative path name of the file to be created. Must not be absolute or contain the ''..'' path. Must be utf-8 encoded. The first item of the relative path must not start with ''..'''
+                                                type: string
+                                              resourceFieldRef:
+                                                description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.'
+                                                type: object
+                                                required:
+                                                  - resource
+                                                properties:
+                                                  containerName:
+                                                    description: 'Container name: required for volumes, optional for env vars'
+                                                    type: string
+                                                  divisor:
+                                                    description: Specifies the output format of the exposed resources, defaults to "1"
+                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                    anyOf:
+                                                      - type: integer
+                                                      - type: string
+                                                    x-kubernetes-int-or-string: true
+                                                  resource:
+                                                    description: 'Required: resource to select'
+                                                    type: string
+                                    secret:
+                                      description: secret information about the secret data to project
+                                      type: object
+                                      properties:
+                                        items:
+                                          description: items if unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the Secret, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'.
+                                          type: array
+                                          items:
+                                            description: Maps a string key to a path within a volume.
+                                            type: object
+                                            required:
+                                              - key
+                                              - path
+                                            properties:
+                                              key:
+                                                description: key is the key to project.
+                                                type: string
+                                              mode:
+                                                description: 'mode is Optional: mode bits used to set permissions on this file. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                                type: integer
+                                                format: int32
+                                              path:
+                                                description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'.
+                                                type: string
+                                        name:
+                                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                          type: string
+                                        optional:
+                                          description: optional field specify whether the Secret or its key must be defined
+                                          type: boolean
+                                    serviceAccountToken:
+                                      description: serviceAccountToken is information about the serviceAccountToken data to project
+                                      type: object
+                                      required:
+                                        - path
+                                      properties:
+                                        audience:
+                                          description: audience is the intended audience of the token. A recipient of a token must identify itself with an identifier specified in the audience of the token, and otherwise should reject the token. The audience defaults to the identifier of the apiserver.
+                                          type: string
+                                        expirationSeconds:
+                                          description: expirationSeconds is the requested duration of validity of the service account token. As the token approaches expiration, the kubelet volume plugin will proactively rotate the service account token. The kubelet will start trying to rotate the token if the token is older than 80 percent of its time to live or if the token is older than 24 hours.Defaults to 1 hour and must be at least 10 minutes.
+                                          type: integer
+                                          format: int64
+                                        path:
+                                          description: path is the path relative to the mount point of the file to project the token into.
+                                          type: string
+                          quobyte:
+                            description: quobyte represents a Quobyte mount on the host that shares a pod's lifetime
+                            type: object
+                            required:
+                              - registry
+                              - volume
+                            properties:
+                              group:
+                                description: group to map volume access to Default is no group
+                                type: string
+                              readOnly:
+                                description: readOnly here will force the Quobyte volume to be mounted with read-only permissions. Defaults to false.
+                                type: boolean
+                              registry:
+                                description: registry represents a single or multiple Quobyte Registry services specified as a string as host:port pair (multiple entries are separated with commas) which acts as the central registry for volumes
+                                type: string
+                              tenant:
+                                description: tenant owning the given Quobyte volume in the Backend Used with dynamically provisioned Quobyte volumes, value is set by the plugin
+                                type: string
+                              user:
+                                description: user to map volume access to Defaults to serivceaccount user
+                                type: string
+                              volume:
+                                description: volume is a string that references an already created Quobyte volume by name.
+                                type: string
+                          rbd:
+                            description: 'rbd represents a Rados Block Device mount on the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md'
+                            type: object
+                            required:
+                              - image
+                              - monitors
+                            properties:
+                              fsType:
+                                description: 'fsType is the filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd TODO: how do we prevent errors in the filesystem from compromising the machine'
+                                type: string
+                              image:
+                                description: 'image is the rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                                type: string
+                              keyring:
+                                description: 'keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                                type: string
+                              monitors:
+                                description: 'monitors is a collection of Ceph monitors. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                                type: array
+                                items:
+                                  type: string
+                              pool:
+                                description: 'pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                                type: string
+                              readOnly:
+                                description: 'readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                                type: boolean
+                              secretRef:
+                                description: 'secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                                type: object
+                                properties:
+                                  name:
+                                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                    type: string
+                              user:
+                                description: 'user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                                type: string
+                          scaleIO:
+                            description: scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+                            type: object
+                            required:
+                              - gateway
+                              - secretRef
+                              - system
+                            properties:
+                              fsType:
+                                description: fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Default is "xfs".
+                                type: string
+                              gateway:
+                                description: gateway is the host address of the ScaleIO API Gateway.
+                                type: string
+                              protectionDomain:
+                                description: protectionDomain is the name of the ScaleIO Protection Domain for the configured storage.
+                                type: string
+                              readOnly:
+                                description: readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                                type: boolean
+                              secretRef:
+                                description: secretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail.
+                                type: object
+                                properties:
+                                  name:
+                                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                    type: string
+                              sslEnabled:
+                                description: sslEnabled Flag enable/disable SSL communication with Gateway, default false
+                                type: boolean
+                              storageMode:
+                                description: storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.
+                                type: string
+                              storagePool:
+                                description: storagePool is the ScaleIO Storage Pool associated with the protection domain.
+                                type: string
+                              system:
+                                description: system is the name of the storage system as configured in ScaleIO.
+                                type: string
+                              volumeName:
+                                description: volumeName is the name of a volume already created in the ScaleIO system that is associated with this volume source.
+                                type: string
+                          secret:
+                            description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                            type: object
+                            properties:
+                              defaultMode:
+                                description: 'defaultMode is Optional: mode bits used to set permissions on created files by default. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. Defaults to 0644. Directories within the path are not affected by this setting. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                type: integer
+                                format: int32
+                              items:
+                                description: items If unspecified, each key-value pair in the Data field of the referenced Secret will be projected into the volume as a file whose name is the key and content is the value. If specified, the listed keys will be projected into the specified paths, and unlisted keys will not be present. If a key is specified which is not present in the Secret, the volume setup will error unless it is marked optional. Paths must be relative and may not contain the '..' path or start with '..'.
+                                type: array
+                                items:
+                                  description: Maps a string key to a path within a volume.
+                                  type: object
+                                  required:
+                                    - key
+                                    - path
+                                  properties:
+                                    key:
+                                      description: key is the key to project.
+                                      type: string
+                                    mode:
+                                      description: 'mode is Optional: mode bits used to set permissions on this file. Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511. YAML accepts both octal and decimal values, JSON requires decimal values for mode bits. If not specified, the volume defaultMode will be used. This might be in conflict with other options that affect the file mode, like fsGroup, and the result can be other mode bits set.'
+                                      type: integer
+                                      format: int32
+                                    path:
+                                      description: path is the relative path of the file to map the key to. May not be an absolute path. May not contain the path element '..'. May not start with the string '..'.
+                                      type: string
+                              optional:
+                                description: optional field specify whether the Secret or its keys must be defined
+                                type: boolean
+                              secretName:
+                                description: 'secretName is the name of the secret in the pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                                type: string
+                          storageos:
+                            description: storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+                            type: object
+                            properties:
+                              fsType:
+                                description: fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                type: string
+                              readOnly:
+                                description: readOnly defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                                type: boolean
+                              secretRef:
+                                description: secretRef specifies the secret to use for obtaining the StorageOS API credentials.  If not specified, default values will be attempted.
+                                type: object
+                                properties:
+                                  name:
+                                    description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+                                    type: string
+                              volumeName:
+                                description: volumeName is the human-readable name of the StorageOS volume.  Volume names are only unique within a namespace.
+                                type: string
+                              volumeNamespace:
+                                description: volumeNamespace specifies the scope of the volume within StorageOS.  If no namespace is specified then the Pod's namespace will be used.  This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to "default" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created.
+                                type: string
+                          vsphereVolume:
+                            description: vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine
+                            type: object
+                            required:
+                              - volumePath
+                            properties:
+                              fsType:
+                                description: fsType is filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                type: string
+                              storagePolicyID:
+                                description: storagePolicyID is the storage Policy Based Management (SPBM) profile ID associated with the StoragePolicyName.
+                                type: string
+                              storagePolicyName:
+                                description: storagePolicyName is the storage Policy Based Management (SPBM) profile name.
+                                type: string
+                              volumePath:
+                                description: volumePath is the path that identifies vSphere volume vmdk
+                                type: string
+                installPlanApproval:
+                  description: Approval is the user approval policy for an InstallPlan. It must be one of "Automatic" or "Manual".
+                  type: string
+                name:
+                  type: string
+                source:
+                  type: string
+                sourceNamespace:
+                  type: string
+                startingCSV:
+                  type: string
+            status:
+              type: object
+              required:
+                - lastUpdated
+              properties:
+                catalogHealth:
+                  description: CatalogHealth contains the Subscription's view of its relevant CatalogSources' status. It is used to determine SubscriptionStatusConditions related to CatalogSources.
+                  type: array
+                  items:
+                    description: SubscriptionCatalogHealth describes the health of a CatalogSource the Subscription knows about.
+                    type: object
+                    required:
+                      - catalogSourceRef
+                      - healthy
+                      - lastUpdated
+                    properties:
+                      catalogSourceRef:
+                        description: CatalogSourceRef is a reference to a CatalogSource.
+                        type: object
+                        properties:
+                          apiVersion:
+                            description: API version of the referent.
+                            type: string
+                          fieldPath:
+                            description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
+                            type: string
+                          kind:
+                            description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                            type: string
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                            type: string
+                          namespace:
+                            description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                            type: string
+                          resourceVersion:
+                            description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                            type: string
+                          uid:
+                            description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                            type: string
+                      healthy:
+                        description: Healthy is true if the CatalogSource is healthy; false otherwise.
+                        type: boolean
+                      lastUpdated:
+                        description: LastUpdated represents the last time that the CatalogSourceHealth changed
+                        type: string
+                        format: date-time
+                conditions:
+                  description: Conditions is a list of the latest available observations about a Subscription's current state.
+                  type: array
+                  items:
+                    description: SubscriptionCondition represents the latest available observations of a Subscription's state.
+                    type: object
+                    required:
+                      - status
+                      - type
+                    properties:
+                      lastHeartbeatTime:
+                        description: LastHeartbeatTime is the last time we got an update on a given condition
+                        type: string
+                        format: date-time
+                      lastTransitionTime:
+                        description: LastTransitionTime is the last time the condition transit from one status to another
+                        type: string
+                        format: date-time
+                      message:
+                        description: Message is a human-readable message indicating details about last transition.
+                        type: string
+                      reason:
+                        description: Reason is a one-word CamelCase reason for the condition's last transition.
+                        type: string
+                      status:
+                        description: Status is the status of the condition, one of True, False, Unknown.
+                        type: string
+                      type:
+                        description: Type is the type of Subscription condition.
+                        type: string
+                currentCSV:
+                  description: CurrentCSV is the CSV the Subscription is progressing to.
+                  type: string
+                installPlanGeneration:
+                  description: InstallPlanGeneration is the current generation of the installplan
+                  type: integer
+                installPlanRef:
+                  description: InstallPlanRef is a reference to the latest InstallPlan that contains the Subscription's current CSV.
+                  type: object
+                  properties:
+                    apiVersion:
+                      description: API version of the referent.
+                      type: string
+                    fieldPath:
+                      description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
+                      type: string
+                    kind:
+                      description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                      type: string
+                    name:
+                      description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                      type: string
+                    namespace:
+                      description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                      type: string
+                    resourceVersion:
+                      description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                      type: string
+                    uid:
+                      description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                      type: string
+                installedCSV:
+                  description: InstalledCSV is the CSV currently installed by the Subscription.
+                  type: string
+                installplan:
+                  description: 'Install is a reference to the latest InstallPlan generated for the Subscription. DEPRECATED: InstallPlanRef'
+                  type: object
+                  required:
+                    - apiVersion
+                    - kind
+                    - name
+                    - uuid
+                  properties:
+                    apiVersion:
+                      type: string
+                    kind:
+                      type: string
+                    name:
+                      type: string
+                    uuid:
+                      description: UID is a type that holds unique ID values, including UUIDs.  Because we don't ONLY use UUIDs, this is an alias to string.  Being a type captures intent and helps make sure that UIDs and names do not get conflated.
+                      type: string
+                lastUpdated:
+                  description: LastUpdated represents the last time that the Subscription status was updated.
+                  type: string
+                  format: date-time
+                reason:
+                  description: Reason is the reason the Subscription was transitioned to its current state.
+                  type: string
+                state:
+                  description: State represents the current state of the Subscription
+                  type: string
+      served: true
+      storage: true
+      subresources:
+        status: {}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/crds/vizier_crd.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/crds/vizier_crd.yaml
new file mode 100644
index 000000000..b25d7b592
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/crds/vizier_crd.yaml
@@ -0,0 +1,347 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.4.1
+  creationTimestamp: null
+  name: viziers.px.dev
+spec:
+  group: px.dev
+  names:
+    kind: Vizier
+    listKind: VizierList
+    plural: viziers
+    singular: vizier
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: Vizier is the Schema for the viziers API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: VizierSpec defines the desired state of Vizier
+            properties:
+              autopilot:
+                description: Autopilot should be set if running Pixie on GKE Autopilot.
+                type: boolean
+              clockConverter:
+                description: ClockConverter specifies which routine to use for converting
+                  timestamps to a synced reference time.
+                enum:
+                - default
+                - grpc
+                type: string
+              cloudAddr:
+                description: CloudAddr is the address of the cloud instance that the
+                  Vizier should be pointing to.
+                type: string
+              clusterName:
+                description: ClusterName is a name for the Vizier instance, usually
+                  specifying which cluster the Vizier is deployed to. If not specified,
+                  a random name will be generated.
+                type: string
+              customDeployKeySecret:
+                description: CustomDeployKeySecret is the name of the secret where
+                  the deploy key is stored.
+                type: string
+              dataAccess:
+                description: DataAccess defines the level of data that may be accesssed
+                  when executing a script on the cluster. If none specified, assumes
+                  full data access.
+                enum:
+                - Full
+                - Restricted
+                type: string
+              dataCollectorParams:
+                description: DataCollectorParams specifies the set of params for configuring
+                  the dataCollector. If no params are specified, defaults are used.
+                properties:
+                  customPEMFlags:
+                    additionalProperties:
+                      type: string
+                    description: This contains custom flags that should be passed
+                      to the PEM via environment variables.
+                    type: object
+                  datastreamBufferSize:
+                    description: DatastreamBufferSize is the data buffer size per
+                      connection. Default size is 1 Mbyte. For high-throughput applications,
+                      try increasing this number if experiencing data loss.
+                    format: int32
+                    type: integer
+                  datastreamBufferSpikeSize:
+                    description: DatastreamBufferSpikeSize is the maximum temporary
+                      size of a data stream buffer before processing.
+                    format: int32
+                    type: integer
+                type: object
+              deployKey:
+                description: DeployKey is the deploy key associated with the Vizier
+                  instance. This is used to link the Vizier to a specific user/org.
+                  This is required unless specifying a CustomDeployKeySecret.
+                type: string
+              devCloudNamespace:
+                description: 'DevCloudNamespace should be specified only for dev versions
+                  of Pixie cloud which have no ingress to help redirect traffic to
+                  the correct service. The DevCloudNamespace is the namespace that
+                  the dev Pixie cloud is running on, for example: "plc-dev".'
+                type: string
+              disableAutoUpdate:
+                description: DisableAutoUpdate specifies whether auto update should
+                  be enabled for the Vizier instance.
+                type: boolean
+              leadershipElectionParams:
+                description: LeadershipElectionParams specifies configurable values
+                  for the K8s leaderships elections which Vizier uses manage pod leadership.
+                properties:
+                  electionPeriodMs:
+                    description: ElectionPeriodMs defines how frequently Vizier attempts
+                      to run a K8s leader election, in milliseconds. The period also
+                      determines how long Vizier waits for a leader election response
+                      back from the K8s API. If the K8s API is slow to respond, consider
+                      increasing this number.
+                    format: int64
+                    type: integer
+                type: object
+              patches:
+                additionalProperties:
+                  type: string
+                description: Patches defines patches that should be applied to Vizier
+                  resources. The key of the patch should be the name of the resource
+                  that is patched. The value of the patch is the patch, encoded as
+                  a string which follow the "strategic merge patch" rules for K8s.
+                type: object
+              pemMemoryLimit:
+                description: PemMemoryLimit is a memory limit applied specifically
+                  to PEM pods.
+                type: string
+              pemMemoryRequest:
+                description: PemMemoryRequest is a memory request applied specifically
+                  to PEM pods. It will automatically use the value of pemMemoryLimit
+                  if not specified.
+                type: string
+              pod:
+                description: Pod defines the policy for creating Vizier pods.
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations specifies the annotations to attach to
+                      pods the operator creates.
+                    type: object
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: Labels specifies the labels to attach to pods the
+                      operator creates.
+                    type: object
+                  nodeSelector:
+                    additionalProperties:
+                      type: string
+                    description: 'NodeSelector is a selector which must be true for
+                      the pod to fit on a node. Selector which must match a node''s
+                      labels for the pod to be scheduled on that node. More info:
+                      https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+                      This field cannot be updated once the cluster is created.'
+                    type: object
+                  resources:
+                    description: Resources is the resource requirements for a container.
+                      This field cannot be updated once the cluster is created.
+                    properties:
+                      claims:
+                        description: "Claims lists the names of resources, defined
+                          in spec.resourceClaims, that are used by this container.
+                          \n This is an alpha field and requires enabling the DynamicResourceAllocation
+                          feature gate. \n This field is immutable."
+                        items:
+                          description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                          properties:
+                            name:
+                              description: Name must match the name of one entry in
+                                pod.spec.resourceClaims of the Pod where this field
+                                is used. It makes that resource available inside a
+                                container.
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
+                      limits:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: 'Limits describes the maximum amount of compute
+                          resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                        type: object
+                      requests:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: 'Requests describes the minimum amount of compute
+                          resources required. If Requests is omitted for a container,
+                          it defaults to Limits if that is explicitly specified, otherwise
+                          to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                        type: object
+                    type: object
+                  securityContext:
+                    description: The securityContext which should be set on non-privileged
+                      pods. All pods which require privileged permissions will still
+                      require a privileged securityContext.
+                    properties:
+                      enabled:
+                        description: Whether a securityContext should be set on the
+                          pod. In cases where no PSPs are applied to the cluster,
+                          this is not necessary.
+                        type: boolean
+                      fsGroup:
+                        description: A special supplemental group that applies to
+                          all containers in a pod.
+                        format: int64
+                        type: integer
+                      runAsGroup:
+                        description: The GID to run the entrypoint of the container
+                          process.
+                        format: int64
+                        type: integer
+                      runAsUser:
+                        description: The UID to run the entrypoint of the container
+                          process.
+                        format: int64
+                        type: integer
+                    type: object
+                  tolerations:
+                    description: 'Tolerations allows scheduling pods on nodes with
+                      matching taints. More info: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/:
+                      This field cannot be updated once the cluster is created.'
+                    items:
+                      description: The pod this Toleration is attached to tolerates
+                        any taint that matches the triple <key,value,effect> using
+                        the matching operator <operator>.
+                      properties:
+                        effect:
+                          description: Effect indicates the taint effect to match.
+                            Empty means match all taint effects. When specified, allowed
+                            values are NoSchedule, PreferNoSchedule and NoExecute.
+                          type: string
+                        key:
+                          description: Key is the taint key that the toleration applies
+                            to. Empty means match all taint keys. If the key is empty,
+                            operator must be Exists; this combination means to match
+                            all values and all keys.
+                          type: string
+                        operator:
+                          description: Operator represents a key's relationship to
+                            the value. Valid operators are Exists and Equal. Defaults
+                            to Equal. Exists is equivalent to wildcard for value,
+                            so that a pod can tolerate all taints of a particular
+                            category.
+                          type: string
+                        tolerationSeconds:
+                          description: TolerationSeconds represents the period of
+                            time the toleration (which must be of effect NoExecute,
+                            otherwise this field is ignored) tolerates the taint.
+                            By default, it is not set, which means tolerate the taint
+                            forever (do not evict). Zero and negative values will
+                            be treated as 0 (evict immediately) by the system.
+                          format: int64
+                          type: integer
+                        value:
+                          description: Value is the taint value the toleration matches
+                            to. If the operator is Exists, the value should be empty,
+                            otherwise just a regular string.
+                          type: string
+                      type: object
+                    type: array
+                type: object
+              registry:
+                description: 'Registry specifies the image registry to use rather
+                  than Pixie''s default registry (gcr.io). We expect any forward slashes
+                  in Pixie''s image paths are replaced with a "-". For example: "gcr.io/pixie-oss/pixie-dev/vizier/metadata_server_image:latest"
+                  should be pushed to "$registry/gcr.io-pixie-oss-pixie-dev-vizier-metadata_server_image:latest".'
+                type: string
+              useEtcdOperator:
+                description: UseEtcdOperator specifies whether the metadata service
+                  should use etcd for storage.
+                type: boolean
+              version:
+                description: Version is the desired version of the Vizier instance.
+                type: string
+            type: object
+          status:
+            description: VizierStatus defines the observed state of Vizier
+            properties:
+              checksum:
+                description: A checksum of the last reconciled Vizier spec. If this
+                  checksum does not match the checksum of the current vizier spec,
+                  reconciliation should be performed.
+                format: byte
+                type: string
+              lastReconciliationPhaseTime:
+                description: LastReconciliationPhaseTime is the last time that the
+                  ReconciliationPhase changed.
+                format: date-time
+                type: string
+              message:
+                description: Message is a human-readable message with details about
+                  why the Vizier is in this condition.
+                type: string
+              operatorVersion:
+                description: OperatorVersion is the actual version of the Operator
+                  instance.
+                type: string
+              reconciliationPhase:
+                description: ReconciliationPhase describes the state the Reconciler
+                  is in for this Vizier. See the documentation above the ReconciliationPhase
+                  type for more information.
+                type: string
+              sentryDSN:
+                description: SentryDSN is key for Viziers that is used to send errors
+                  and stacktraces to Sentry.
+                type: string
+              version:
+                description: Version is the actual version of the Vizier instance.
+                type: string
+              vizierPhase:
+                description: VizierPhase is a high-level summary of where the Vizier
+                  is in its lifecycle.
+                type: string
+              vizierReason:
+                description: VizierReason is a short, machine understandable string
+                  that gives the reason for the transition into the Vizier's current
+                  status.
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/00_olm.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/00_olm.yaml
new file mode 100644
index 000000000..cd4ccafb2
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/00_olm.yaml
@@ -0,0 +1,236 @@
+{{- $olmCRDFound := false }} 
+{{- $nsLookup := len (lookup "v1" "Namespace" "" "") }} 
+{{- range $index, $crdLookup := (lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" "" "").items -}}{{ if eq $crdLookup.metadata.name "operators.operators.coreos.com"}}{{ $olmCRDFound = true }}{{ end }}{{end}} 
+{{ if and (not $olmCRDFound) (not (eq $nsLookup 0))}}{{ fail "CRDs missing! Please deploy CRDs from https://github.com/pixie-io/pixie/tree/main/k8s/operator/helm/crds to continue with deploy." }}{{end}} 
+{{- $lookupLen := 0 -}}{{- $opLookup := (lookup "operators.coreos.com/v1" "OperatorGroup" "" "").items -}}{{if $opLookup }}{{ $lookupLen = len $opLookup }}{{ end }}
+{{ if (or (eq (.Values.deployOLM | toString) "true") (and (not (eq (.Values.deployOLM | toString) "false")) (eq $lookupLen 0))) }}
+{{ if not (eq .Values.olmNamespace .Release.Namespace) }}
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.olmNamespace }}
+{{ end }}
+---
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: olm-operator-serviceaccount
+  namespace: {{ .Values.olmNamespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: system:controller:operator-lifecycle-manager
+rules:
+- apiGroups: ["*"]
+  resources: ["*"]
+  verbs: ["*"]
+- nonResourceURLs: ["*"]
+  verbs: ["*"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: olm-operator-cluster-binding-olm
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:controller:operator-lifecycle-manager
+subjects:
+- kind: ServiceAccount
+  name: olm-operator-serviceaccount
+  namespace: {{ .Values.olmNamespace }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: olm-operator
+  namespace: {{ .Values.olmNamespace }}
+  labels:
+    app: olm-operator
+spec:
+  strategy:
+    type: RollingUpdate
+  replicas: 1
+  selector:
+    matchLabels:
+      app: olm-operator
+  template:
+    metadata:
+      labels:
+        app: olm-operator
+    spec:
+      serviceAccountName: olm-operator-serviceaccount
+      containers:
+        - name: olm-operator
+          command:
+          - /bin/olm
+          args:
+          - --namespace
+          - $(OPERATOR_NAMESPACE)
+          - --writeStatusName
+          - ""
+          image: {{ if .Values.registry }}{{ .Values.registry }}/quay.io-operator-framework-{{ else }}quay.io/operator-framework/{{ end }}olm@sha256:1b6002156f568d722c29138575733591037c24b4bfabc67946f268ce4752c3e6
+          ports:
+            - containerPort: 8080
+            - containerPort: 8081
+              name: metrics
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8080
+          readinessProbe:
+            httpGet:
+              path: /healthz
+              port: 8080
+          terminationMessagePolicy: FallbackToLogsOnError
+          env:
+          - name: OPERATOR_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+          - name: OPERATOR_NAME
+            value: olm-operator
+          resources:
+            requests:
+              cpu: 10m
+              memory: 160Mi
+      {{- $selectorDefaults := dict "kubernetes.io/os" "linux" }}
+      {{- $nodeSelectors := merge $selectorDefaults .Values.olmNodeSelector }}
+      nodeSelector:
+      {{- $nodeSelectors | toYaml | nindent 8 }}
+      tolerations:
+      - key: "kubernetes.io/arch"
+        operator: "Equal"
+        value: "amd64"
+        effect: "NoSchedule"
+      - key: "kubernetes.io/arch"
+        operator: "Equal"
+        value: "amd64"
+        effect: "NoExecute"
+      - key: "kubernetes.io/arch"
+        operator: "Equal"
+        value: "arm64"
+        effect: "NoSchedule"
+      - key: "kubernetes.io/arch"
+        operator: "Equal"
+        value: "arm64"
+        effect: "NoExecute"
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: catalog-operator
+  namespace: {{ .Values.olmNamespace }}
+  labels:
+    app: catalog-operator
+spec:
+  strategy:
+    type: RollingUpdate
+  replicas: 1
+  selector:
+    matchLabels:
+      app: catalog-operator
+  template:
+    metadata:
+      labels:
+        app: catalog-operator
+    spec:
+      serviceAccountName: olm-operator-serviceaccount
+      containers:
+        - name: catalog-operator
+          command:
+          - /bin/catalog
+          args:
+          - '--namespace'
+          - {{ .Values.olmNamespace }}
+          - --configmapServerImage={{ if .Values.registry }}{{ .Values.registry }}/quay.io-operator-framework-{{ else }}quay.io/operator-framework/{{ end }}configmap-operator-registry:latest
+          - --util-image
+          -  {{ if .Values.registry }}{{ .Values.registry }}/quay.io-operator-framework-{{ else }}quay.io/operator-framework/{{ end }}olm@sha256:1b6002156f568d722c29138575733591037c24b4bfabc67946f268ce4752c3e6
+          - --opmImage
+          -  {{ if .Values.registry }}{{ .Values.registry }}/quay.io-operator-framework-{{ else }}quay.io/operator-framework/{{ end }}opm@sha256:d999588bd4e9509ec9e75e49adfb6582d256e9421e454c7fb5e9fe57e7b1aada
+          image: {{ if .Values.registry }}{{ .Values.registry }}/quay.io-operator-framework-{{ else }}quay.io/operator-framework/{{ end }}olm@sha256:1b6002156f568d722c29138575733591037c24b4bfabc67946f268ce4752c3e6
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 8080
+            - containerPort: 8081
+              name: metrics
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8080
+          readinessProbe:
+            httpGet:
+              path: /healthz
+              port: 8080
+          terminationMessagePolicy: FallbackToLogsOnError
+          env:
+          resources:
+            requests:
+              cpu: 10m
+              memory: 80Mi
+      {{- $selectorDefaults := dict "kubernetes.io/os" "linux" }}
+      {{- $nodeSelectors := merge $selectorDefaults .Values.olmNodeSelector }}
+      nodeSelector:
+      {{- $nodeSelectors | toYaml | nindent 8 }}
+      tolerations:
+      - key: "kubernetes.io/arch"
+        operator: "Equal"
+        value: "amd64"
+        effect: "NoSchedule"
+      - key: "kubernetes.io/arch"
+        operator: "Equal"
+        value: "amd64"
+        effect: "NoExecute"
+      - key: "kubernetes.io/arch"
+        operator: "Equal"
+        value: "arm64"
+        effect: "NoSchedule"
+      - key: "kubernetes.io/arch"
+        operator: "Equal"
+        value: "arm64"
+        effect: "NoExecute"
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: aggregate-olm-edit
+  labels:
+    rbac.authorization.k8s.io/aggregate-to-admin: "true"
+    rbac.authorization.k8s.io/aggregate-to-edit: "true"
+rules:
+- apiGroups: ["operators.coreos.com"]
+  resources: ["subscriptions"]
+  verbs: ["create", "update", "patch", "delete"]
+- apiGroups: ["operators.coreos.com"]
+  resources: ["clusterserviceversions", "catalogsources", "installplans", "subscriptions"]
+  verbs: ["delete"]
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: aggregate-olm-view
+  labels:
+    rbac.authorization.k8s.io/aggregate-to-admin: "true"
+    rbac.authorization.k8s.io/aggregate-to-edit: "true"
+    rbac.authorization.k8s.io/aggregate-to-view: "true"
+rules:
+- apiGroups: ["operators.coreos.com"]
+  resources: ["clusterserviceversions", "catalogsources", "installplans", "subscriptions", "operatorgroups"]
+  verbs: ["get", "list", "watch"]
+- apiGroups: ["packages.operators.coreos.com"]
+  resources: ["packagemanifests", "packagemanifests/icon"]
+  verbs: ["get", "list", "watch"]
+---
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  name: olm-operators
+  namespace: {{ .Values.olmNamespace }}
+spec:
+  targetNamespaces:
+    - {{ .Values.olmNamespace }}
+{{- end}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/01_px_olm.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/01_px_olm.yaml
new file mode 100644
index 000000000..2c2921958
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/01_px_olm.yaml
@@ -0,0 +1,13 @@
+{{ if not (eq .Values.olmOperatorNamespace .Release.Namespace) }}
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.olmOperatorNamespace }}
+{{ end }}
+---
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  name: global-operators
+  namespace: {{ .Values.olmOperatorNamespace }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/02_catalog.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/02_catalog.yaml
new file mode 100644
index 000000000..389eb7f2c
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/02_catalog.yaml
@@ -0,0 +1,40 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: pixie-operator-index
+  namespace: {{ .Values.olmOperatorNamespace }}
+  {{- if .Values.olmCatalogSource.annotations }}
+  annotations: {{ .Values.olmCatalogSource.annotations | toYaml | nindent 4 }}
+  {{- end }}
+  {{- if .Values.olmCatalogSource.labels }}
+  labels: {{ .Values.olmCatalogSource.labels | toYaml | nindent 4 }}
+  {{- end }}
+spec:
+  sourceType: grpc
+  image: {{ if .Values.registry }}{{ .Values.registry }}/gcr.io-pixie-oss-pixie-prod-operator-bundle_index:0.0.1{{ else }}gcr.io/pixie-oss/pixie-prod/operator/bundle_index:0.0.1{{ end }}
+  displayName: Pixie Vizier Operator
+  publisher: px.dev
+  updateStrategy:
+    registryPoll:
+      interval: 10m
+  grpcPodConfig:
+    {{- if .Values.olmCatalogSource.nodeSelector }}
+    nodeSelector: {{ .Values.olmCatalogSource.nodeSelector | toYaml | nindent 6 }}
+    {{- end }}
+    tolerations:
+    - key: "kubernetes.io/arch"
+      operator: "Equal"
+      value: "amd64"
+      effect: "NoSchedule"
+    - key: "kubernetes.io/arch"
+      operator: "Equal"
+      value: "amd64"
+      effect: "NoExecute"
+    - key: "kubernetes.io/arch"
+      operator: "Equal"
+      value: "arm64"
+      effect: "NoSchedule"
+    - key: "kubernetes.io/arch"
+      operator: "Equal"
+      value: "arm64"
+      effect: "NoExecute"
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/03_subscription.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/03_subscription.yaml
new file mode 100644
index 000000000..47cf4e249
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/03_subscription.yaml
@@ -0,0 +1,15 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: pixie-operator-subscription
+  namespace: {{ .Values.olmOperatorNamespace }}
+spec:
+  channel: {{ .Values.olmBundleChannel }}
+  name: pixie-operator
+  source: pixie-operator-index
+  sourceNamespace: {{ .Values.olmOperatorNamespace }}
+  installPlanApproval: Automatic
+  {{- if .Values.olmCatalogSource.nodeSelector }}
+  config:
+    nodeSelector: {{ .Values.olmCatalogSource.nodeSelector | toYaml | nindent 6 }}
+  {{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/04_vizier.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/04_vizier.yaml
new file mode 100644
index 000000000..7c8ca65ad
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/04_vizier.yaml
@@ -0,0 +1,100 @@
+apiVersion: px.dev/v1alpha1
+kind: Vizier
+metadata:
+  name: {{ .Values.name }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  {{- if .Values.version }}
+  version: {{ .Values.version }}
+  {{- end }}
+  {{- if .Values.deployKey }}
+  deployKey: {{ .Values.deployKey }}
+  {{- end }}
+  {{- if .Values.customDeployKeySecret }}
+  customDeployKeySecret: {{ .Values.customDeployKeySecret }}
+  {{- end }}
+  cloudAddr: {{ .Values.cloudAddr }}
+  disableAutoUpdate: {{ .Values.disableAutoUpdate }}
+  useEtcdOperator: {{ .Values.useEtcdOperator }}
+  {{- if (.Values.global).cluster }}
+  clusterName: {{ .Values.global.cluster }}
+  {{- else if .Values.clusterName }}
+  clusterName: {{ .Values.clusterName }}
+  {{- end }}
+  {{- if .Values.devCloudNamespace }}
+  devCloudNamespace: {{ .Values.devCloudNamespace }}
+  {{- end }}
+  {{- if .Values.pemMemoryLimit }}
+  pemMemoryLimit: {{ .Values.pemMemoryLimit }}
+  {{- end }}
+  {{- if .Values.pemMemoryRequest }}
+  pemMemoryRequest: {{ .Values.pemMemoryRequest }}
+  {{- end }}
+  {{- if .Values.dataAccess }}
+  dataAccess: {{ .Values.dataAccess }}
+  {{- end }}
+  {{- if .Values.patches }}
+  patches: {{ .Values.patches | toYaml | nindent 4 }}
+  {{- end }}
+  {{- if ((.Values.global).images).registry }}
+  registry: {{ .Values.global.images.registry }}
+  {{- else if .Values.registry }}
+  registry: {{ .Values.registry }}
+  {{- end}}
+  {{- if .Values.autopilot }}
+  autopilot: {{ .Values.autopilot }}
+  {{- end}}
+  {{- if .Values.dataCollectorParams }}
+  dataCollectorParams:
+    {{- if .Values.dataCollectorParams.datastreamBufferSize }}
+    datastreamBufferSize: {{ .Values.dataCollectorParams.datastreamBufferSize }}
+    {{- end }}
+    {{- if .Values.dataCollectorParams.datastreamBufferSpikeSize }}
+    datastreamBufferSpikeSize: {{ .Values.dataCollectorParams.datastreamBufferSpikeSize }}
+    {{- end }}
+    {{- if .Values.dataCollectorParams.customPEMFlags }}
+    customPEMFlags:
+    {{- range $key, $value := .Values.dataCollectorParams.customPEMFlags}}
+      {{$key}}: "{{$value}}"
+    {{- end}}
+    {{- end }}
+  {{- end}}
+  {{- if .Values.leadershipElectionParams }}
+  leadershipElectionParams:
+    {{- if .Values.leadershipElectionParams.electionPeriodMs }}
+    electionPeriodMs: {{ .Values.leadershipElectionParams.electionPeriodMs }}
+    {{- end }}
+  {{- end }}
+  {{- if or .Values.pod.securityContext (or .Values.pod.nodeSelector (or .Values.pod.tolerations (or .Values.pod.annotations (or .Values.pod.labels .Values.pod.resources)))) }}
+  pod:
+    {{- if .Values.pod.annotations }}
+    annotations: {{ .Values.pod.annotations | toYaml | nindent 6 }}
+    {{- end }}
+    {{- if .Values.pod.labels }}
+    labels: {{ .Values.pod.labels | toYaml | nindent 6 }}
+    {{- end }}
+    {{- if .Values.pod.resources }}
+    resources: {{ .Values.pod.resources | toYaml | nindent 6 }}
+    {{- end }}
+    {{- if .Values.pod.nodeSelector }}
+    nodeSelector: {{ .Values.pod.nodeSelector | toYaml | nindent 6 }}
+    {{- end }}
+    {{- if .Values.pod.tolerations }}
+    tolerations: {{ .Values.pod.tolerations | toYaml | nindent 4 }}
+    {{- end }}
+    {{- if .Values.pod.securityContext }}
+    securityContext:
+      enabled: {{ .Values.pod.securityContext.enabled }}
+      {{- if .Values.pod.securityContext.enabled }}
+      {{- if .Values.pod.securityContext.fsGroup }}
+      fsGroup: {{ .Values.pod.securityContext.fsGroup }}
+      {{- end }}
+      {{- if .Values.pod.securityContext.runAsUser }}
+      runAsUser: {{ .Values.pod.securityContext.runAsUser }}
+      {{- end }}
+      {{- if .Values.pod.securityContext.runAsGroup }}
+      runAsGroup: {{ .Values.pod.securityContext.runAsGroup }}
+      {{- end }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/csv-deleter.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/csv-deleter.yaml
new file mode 100644
index 000000000..5c0efb20e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/csv-deleter.yaml
@@ -0,0 +1,58 @@
+{{- $olmCRDFound := false }} 
+{{- $nsLookup := len (lookup "v1" "Namespace" "" "") }} 
+{{- range $index, $crdLookup := (lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" "" "").items -}}{{ if eq $crdLookup.metadata.name "operators.operators.coreos.com"}}{{ $olmCRDFound = true }}{{ end }}{{end}} 
+{{ if and (not $olmCRDFound) (not (eq $nsLookup 0))}}{{ fail "CRDs missing! Please deploy CRDs from https://github.com/pixie-io/pixie/tree/main/k8s/operator/helm/crds to continue with deploy." }}{{end}} 
+{{- $lookupLen := 0 -}}{{- $opLookup := (lookup "operators.coreos.com/v1" "OperatorGroup" "" "").items -}}{{if $opLookup }}{{ $lookupLen = len $opLookup }}{{ end }}
+{{ if (or (eq (.Values.deployOLM | toString) "true") (and (not (eq (.Values.deployOLM | toString) "false")) (eq $lookupLen 0))) }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: csv-deleter
+  namespace: {{ .Values.olmNamespace }}
+  annotations:
+    "helm.sh/hook": pre-delete
+    "helm.sh/hook-delete-policy": hook-succeeded,hook-failed
+spec:
+  template:
+    spec:
+      restartPolicy: Never
+      serviceAccountName: olm-operator-serviceaccount
+      containers:
+        - name: trigger-csv-finalizer
+          image: ghcr.io/pixie-io/pixie-oss-pixie-dev-public-curl:multiarch-7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd
+          command:
+            - /bin/sh
+            - -c
+            - |
+              NAMESPACE="{{ .Values.olmOperatorNamespace }}"
+              API_SERVER="https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_SERVICE_PORT"
+              CA_CERT=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+              TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
+
+              DELETE_STATUS=$(curl --cacert $CA_CERT \
+                                    -H "Authorization: Bearer $TOKEN" \
+                                    -X DELETE -s \
+                                    -o /dev/null -w "%{http_code}" \
+                                    $API_SERVER/api/v1/namespaces/$NAMESPACE)
+
+              if [ "$DELETE_STATUS" -ne 200 ] && [ "$DELETE_STATUS" -ne 202 ]; then
+                echo "Failed to initiate deletion for namespace $NAMESPACE. HTTP status code: $DELETE_STATUS"
+                exit 1
+              fi
+
+              echo "Waiting for finalizer in $NAMESPACE to complete..."
+              while true; do
+                STATUS=$(curl --cacert $CA_CERT \
+                              -H "Authorization: Bearer $TOKEN" \
+                              -o /dev/null -w "%{http_code}" -s \
+                              $API_SERVER/api/v1/namespaces/$NAMESPACE)
+                if [ "$STATUS" = "404" ]; then
+                  echo "Namespace $NAMESPACE finalizer completed."
+                  break
+                else
+                  echo "Finalizer still running in $NAMESPACE. Retrying in 5 seconds..."
+                  sleep 5
+                fi
+              done
+{{- end}}
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/deleter-role.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/deleter-role.yaml
new file mode 100644
index 000000000..73e5ec7e4
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/deleter-role.yaml
@@ -0,0 +1,77 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: pl-deleter-service-account
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: pl-deleter-cluster-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: pl-deleter-role
+subjects:
+- kind: ServiceAccount
+  name: pl-deleter-service-account
+  namespace: "{{ .Release.Namespace }}"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: pl-deleter-cluster-role
+rules:
+# Allow actions on Kubernetes objects
+- apiGroups:
+  - rbac.authorization.k8s.io
+  - etcd.database.coreos.com
+  - nats.io
+  resources:
+  - clusterroles
+  - clusterrolebindings
+  - persistentvolumes
+  - etcdclusters
+  - natsclusters
+  verbs: ["*"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: pl-deleter-role
+rules:
+- apiGroups:
+  - ""
+  - apps
+  - rbac.authorization.k8s.io
+  - extensions
+  - batch
+  - policy
+  resources:
+  - configmaps
+  - secrets
+  - pods
+  - services
+  - deployments
+  - daemonsets
+  - persistentvolumes
+  - roles
+  - rolebindings
+  - serviceaccounts
+  - statefulsets
+  - cronjobs
+  - jobs
+  verbs: ["*"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: pl-deleter-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: pl-deleter-role
+subjects:
+- kind: ServiceAccount
+  name: pl-deleter-service-account
+  namespace: "{{ .Release.Namespace }}"
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/deleter.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/deleter.yaml
new file mode 100644
index 000000000..43f6a25fb
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/templates/deleter.yaml
@@ -0,0 +1,25 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-delete-policy: hook-succeeded
+  name: vizier-deleter
+  namespace: '{{ .Release.Namespace }}'
+spec:
+  template:
+    metadata:
+      name: vizier-deleter
+    spec:
+      containers:
+      - env:
+        - name: PL_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: PL_VIZIER_NAME
+          value: '{{ .Values.name }}'
+        image: gcr.io/pixie-oss/pixie-prod/operator-vizier_deleter:0.1.7
+        name: delete-job
+      restartPolicy: Never
+      serviceAccountName: pl-deleter-service-account
diff --git a/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/values.yaml b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/values.yaml
new file mode 100644
index 000000000..d04230b98
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/charts/pixie-operator-chart/values.yaml
@@ -0,0 +1,78 @@
+## OLM configuration
+# OLM is used for deploying and ensuring the operator is up-to-date.
+# deployOLM indicates whether OLM should be deployed. This should only be
+# disabled if an instance of OLM is already configured on the cluster.
+# Should be string "true" if true, but "false" otherwise. If empty, defaults
+# to whether OLM is present in the cluster.
+deployOLM: ""
+# The namespace that olm should run in. If olm has already been deployed
+# to the cluster, this should be the namespace that olm is already running in.
+olmNamespace: "olm"
+olmNodeSelector: {}
+# The namespace which olm operators should run in. If olm has already
+# been deployed to the cluster, this should be the namespace that the olm operators
+# are running in.
+olmOperatorNamespace: "px-operator"
+# The bundle channel which OLM should listen to for the Vizier operator bundles.
+# Should be "stable" for production-versions of the operator, and "test" for release candidates.
+olmBundleChannel: "stable"
+# Optional annotations and labels for CatalogSource.
+olmCatalogSource:
+  # Optional custom annotations to add to deployed pods managed by CatalogSource object.
+  annotations: {}
+  # Optional custom labels to add to deployed pods managed by CatalogSource object.
+  labels: {}
+  # Node selectors to apply for pods managed by CatalogSource object
+  nodeSelector: {}
+## Vizier configuration
+# The name of the Vizier instance deployed to the cluster.
+name: "pixie"
+# The name of the cluster that the Vizier is monitoring. If empty,
+# a random name will be generated.
+clusterName: ""
+# The version of the Vizier instance deployed to the cluster. If empty,
+# the operator will automatically deploy the latest version.
+version: ""
+# The deploy key is used to link the deployed Vizier to a specific user/project.
+# This is required if not specifying a customDeployKeySecret, and can be generated through the UI or CLI.
+deployKey: ""
+# The deploy key may be read from a custom secret in the Pixie namespace. This secret should be formatted where the
+# key of the deploy key is "deploy-key".
+customDeployKeySecret: ""
+# Whether auto-update should be disabled.
+disableAutoUpdate: false
+# Whether the metadata service should use etcd for in-memory storage. Recommended
+# only for clusters which do not have persistent volumes configured.
+useEtcdOperator: false
+# The address of the Pixie cloud instance that the Vizier should be connected to.
+# This should only be updated when using a self-hosted version of Pixie Cloud.
+cloudAddr: "withpixie.ai:443"
+# DevCloudNamespace should be specified only for self-hosted versions of Pixie cloud which have no ingress to help
+# redirect traffic to the correct service. The DevCloudNamespace is the namespace that the dev Pixie cloud is
+# running on, for example: "plc-dev".
+devCloudNamespace: ""
+# A memory limit applied specifically to PEM pods. If none is specified, a default limit of 2Gi is set.
+pemMemoryLimit: ""
+# A memory request applied specifically to PEM pods. If none is specified, it will default to pemMemoryLimit.
+pemMemoryRequest: ""
+# DataAccess defines the level of data that may be accesssed when executing a script on the cluster.
+dataAccess: "Full"
+pod:
+  # Optional custom annotations to add to deployed pods.
+  annotations: {}
+  # Optional custom labels to add to deployed pods.
+  labels: {}
+  resources: {}
+  # limits:
+  #   cpu: 500m
+  #   memory: 7Gi
+  # requests:
+  #   cpu: 100m
+  #   memory: 5Gi
+  nodeSelector: {}
+  tolerations: []
+# A set of custom patches to apply to the deployed Vizier resources.
+# The key should be the name of the resource to apply the patch to, and the value is the patch to apply.
+# Currently, only a JSON format is accepted, such as:
+# `{"spec": {"template": {"spec": { "tolerations": [{"key": "test", "operator": "Exists", "effect": "NoExecute" }]}}}}`
+patches: {}
diff --git a/charts/new-relic/nri-bundle/5.0.107/ci/test-values.yaml b/charts/new-relic/nri-bundle/5.0.107/ci/test-values.yaml
new file mode 100644
index 000000000..7ba6c8c32
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/ci/test-values.yaml
@@ -0,0 +1,21 @@
+global:
+  licenseKey: 1234567890abcdef1234567890abcdef12345678
+  cluster: test-cluster
+
+infrastructure:
+  enabled: true
+
+prometheus:
+  enabled: true
+
+webhook:
+  enabled: true
+
+ksm:
+  enabled: true
+
+kubeEvents:
+  enabled: true
+
+logging:
+  enabled: true
diff --git a/charts/new-relic/nri-bundle/5.0.107/questions.yaml b/charts/new-relic/nri-bundle/5.0.107/questions.yaml
new file mode 100644
index 000000000..de3fa9fea
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/questions.yaml
@@ -0,0 +1,113 @@
+questions:
+- variable: infrastructure.enabled
+  default: true
+  required: false
+  type: boolean
+  label: Enable Infrastructure
+  group: "Select Components"
+- variable: prometheus.enabled
+  default: false
+  required: false
+  type: boolean
+  label: Enable Prometheus
+  group: "Select Components"
+- variable: ksm.enabled
+  default: false
+  required: false
+  type: boolean
+  label: Enable KSM
+  group: "Select Components"
+  description: "This is mandatory if `Enable Infrastructure` is set to `true` and the user does not provide its own instance of KSM version >=1.8 and <=2.0"
+- variable: webhook.enabled
+  default: true
+  required: false
+  type: boolean
+  label: Enable webhook
+  group: "Select Components"
+- variable: kubeEvents.enabled
+  default: false
+  required: false
+  type: boolean
+  label: Enable Kube Events
+  group: "Select Components"
+- variable: logging.enabled
+  default: false
+  required: false
+  type: boolean
+  label: Enable Logging
+  group: "Select Components"
+- variable: newrelic-pixie.enabled
+  default: false
+  required: false
+  type: boolean
+  label: Enable New Relic Pixie Integration
+  group: "Select Components"
+  show_subquestion_if: true
+  subquestions:
+  - variable: newrelic-pixie.apiKey
+    default: ""
+    required: false
+    type: string
+    label: New Relic Pixie API Key
+    group: "Select Components"
+    description: "Required if deploying Pixie."
+- variable: pixie-chart.enabled
+  default: false
+  required: false
+  type: boolean
+  label: Enable Pixie Chart
+  group: "Select Components"
+  show_subquestion_if: true
+  subquestions:
+  - variable: pixie-chart.deployKey
+    default: ""
+    required: false
+    type: string
+    label: Pixie Deploy Key
+    group: "Select Components"
+    description: "Required if deploying Pixie."
+  - variable: pixie-chart.clusterName
+    default: ""
+    required: false
+    type: string
+    label: Kubernetes Cluster Name for Pixie
+    group: "Select Components"
+    description: "Required if deploying Pixie."
+- variable: newrelic-infra-operator.enabled
+  default: false
+  required: false
+  type: boolean
+  label: Enable New Relic Infra Operator
+  group: "Select Components"
+- variable: metrics-adapter.enabled
+  default: false
+  required: false
+  type: boolean
+  label: Enable Metrics Adapter
+  group: "Select Components"
+- variable: global.licenseKey
+  default: "xxxx"
+  required: true
+  type: string
+  label: New Relic License Key
+  group: "Global Settings"
+- variable: global.cluster
+  default: "xxxx"
+  required: true
+  type: string
+  label: Name of Kubernetes Cluster for New Relic
+  group: "Global Settings"
+- variable: global.lowDataMode
+  default: false
+  required: false
+  type: boolean
+  label: Enable Low Data Mode
+  description: "Reduces amount of data ingest by New Relic."
+  group: "Global Settings"
+- variable: global.privileged
+  default: false
+  required: false
+  type: boolean
+  label: Enable Privileged Mode
+  description: "Allows for access to underlying node from container."
+  group: "Global Settings"
diff --git a/charts/new-relic/nri-bundle/5.0.107/values.yaml b/charts/new-relic/nri-bundle/5.0.107/values.yaml
new file mode 100644
index 000000000..47c58df8e
--- /dev/null
+++ b/charts/new-relic/nri-bundle/5.0.107/values.yaml
@@ -0,0 +1,169 @@
+newrelic-infrastructure:
+  # newrelic-infrastructure.enabled -- Install the [`newrelic-infrastructure` chart](https://github.com/newrelic/nri-kubernetes/tree/main/charts/newrelic-infrastructure)
+  enabled: true
+
+nri-prometheus:
+  # nri-prometheus.enabled -- Install the [`nri-prometheus` chart](https://github.com/newrelic/nri-prometheus/tree/main/charts/nri-prometheus)
+  enabled: false
+
+nri-metadata-injection:
+  # nri-metadata-injection.enabled -- Install the [`nri-metadata-injection` chart](https://github.com/newrelic/k8s-metadata-injection/tree/main/charts/nri-metadata-injection)
+  enabled: true
+
+kube-state-metrics:
+  # kube-state-metrics.enabled -- Install the [`kube-state-metrics` chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics) from the stable helm charts repository.
+  # This is mandatory if `infrastructure.enabled` is set to `true` and the user does not provide its own instance of KSM version >=1.8 and <=2.0. Note, kube-state-metrics v2+ disables labels/annotations
+  # metrics by default. You can enable the target labels/annotations metrics to be monitored by using the metricLabelsAllowlist/metricAnnotationsAllowList options described [here](https://github.com/prometheus-community/helm-charts/blob/159cd8e4fb89b8b107dcc100287504bb91bf30e0/charts/kube-state-metrics/values.yaml#L274) in
+  # your Kubernetes clusters.
+  enabled: false
+
+nri-kube-events:
+  # nri-kube-events.enabled -- Install the [`nri-kube-events` chart](https://github.com/newrelic/nri-kube-events/tree/main/charts/nri-kube-events)
+  enabled: false
+
+newrelic-logging:
+  # newrelic-logging.enabled -- Install the [`newrelic-logging` chart](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging)
+  enabled: false
+
+newrelic-pixie:
+  # newrelic-pixie.enabled -- Install the [`newrelic-pixie`](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie)
+  enabled: false
+
+k8s-agents-operator:
+  # k8s-agents-operator.enabled -- Install the [`k8s-agents-operator` chart](https://github.com/newrelic/k8s-agents-operator/tree/main/charts/k8s-agents-operator)
+  enabled: false
+
+pixie-chart:
+  # pixie-chart.enabled -- Install the [`pixie-chart` chart](https://docs.pixielabs.ai/installing-pixie/install-schemes/helm/#3.-deploy)
+  enabled: false
+
+newrelic-infra-operator:
+  # newrelic-infra-operator.enabled -- Install the [`newrelic-infra-operator` chart](https://github.com/newrelic/newrelic-infra-operator/tree/main/charts/newrelic-infra-operator) (Beta)
+  enabled: false
+
+newrelic-prometheus-agent:
+  # newrelic-prometheus-agent.enabled -- Install the [`newrelic-prometheus-agent` chart](https://github.com/newrelic/newrelic-prometheus-configurator/tree/main/charts/newrelic-prometheus-agent)
+  enabled: false
+
+newrelic-k8s-metrics-adapter:
+  # newrelic-k8s-metrics-adapter.enabled -- Install the [`newrelic-k8s-metrics-adapter.` chart](https://github.com/newrelic/newrelic-k8s-metrics-adapter/tree/main/charts/newrelic-k8s-metrics-adapter) (Beta)
+  enabled: false
+
+
+# -- change the behaviour globally to all the supported helm charts.
+# See [user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md) for further information.
+# @default -- See [`values.yaml`](values.yaml)
+global:
+  # -- The cluster name for the Kubernetes cluster.
+  cluster: ""
+
+  # -- The license key for your New Relic Account. This will be preferred configuration option if both `licenseKey` and `customSecret` are specified.
+  licenseKey: ""
+  # -- The license key for your New Relic Account. This will be preferred configuration option if both `insightsKey` and `customSecret` are specified.
+  insightsKey: ""
+  # -- Name of the Secret object where the license key is stored
+  customSecretName: ""
+  # -- Key in the Secret object where the license key is stored
+  customSecretLicenseKey: ""
+
+  # -- Additional labels for chart objects
+  labels: {}
+  # -- Additional labels for chart pods
+  podLabels: {}
+
+  images:
+    # -- Changes the registry where to get the images. Useful when there is an internal image cache/proxy
+    registry: ""
+    # -- Set secrets to be able to fetch images
+    pullSecrets: []
+
+  serviceAccount:
+    # -- Add these annotations to the service account we create
+    annotations: {}
+    # -- Configures if the service account should be created or not
+    create:
+    # -- Change the name of the service account. This is honored if you disable on this chart the creation of the service account so you can use your own
+    name:
+
+  # -- (bool) Sets pod's hostNetwork
+  # @default -- false
+  hostNetwork:
+  # -- Sets pod's dnsConfig
+  dnsConfig: {}
+
+  # -- Sets pod's priorityClassName
+  priorityClassName: ""
+  # -- Sets security context (at pod level)
+  podSecurityContext: {}
+  # -- Sets security context (at container level)
+  containerSecurityContext: {}
+
+  # -- Sets pod/node affinities
+  affinity: {}
+  # -- Sets pod's node selector
+  nodeSelector: {}
+  # -- Sets pod's tolerations to node taints
+  tolerations: []
+
+  # -- Adds extra attributes to the cluster and all the metrics emitted to the backend
+  customAttributes: {}
+
+  # -- (bool) Reduces number of metrics sent in order to reduce costs
+  # @default -- false
+  lowDataMode:
+
+  # -- (bool) In each integration it has different behavior. See [Further information](#values-managed-globally-3) but all aims to send less metrics to the backend to try to save costs |
+  # @default -- false
+  privileged:
+
+  # -- (bool) Must be set to `true` when deploying in an EKS Fargate environment
+  # @default -- false
+  fargate:
+
+  # -- Configures the integration to send all HTTP/HTTPS request through the proxy in that URL. The URL should have a standard format like `https://user:password@hostname:port`
+  proxy: ""
+
+  # -- (bool) Send the metrics to the staging backend. Requires a valid staging license key
+  # @default -- false
+  nrStaging:
+  fedramp:
+    # fedramp.enabled -- (bool) Enables FedRAMP
+    # @default -- false
+    enabled:
+
+  # -- (bool) Sets the debug logs to this integration or all integrations if it is set globally
+  # @default -- false
+  verboseLog:
+
+
+# To add values to the subcharts. Follow Helm's guide: https://helm.sh/docs/chart_template_guide/subcharts_and_globals
+
+# If you wish to monitor services running on Kubernetes you can provide integrations
+# configuration under `integrations_config` that it will passed down to the `newrelic-infrastructure` chart.
+#
+# You just need to create a new entry where the "name" is the filename of the configuration file and the data is the content of
+# the integration configuration. The name must end in ".yaml" as this will be the
+# filename generated and the Infrastructure agent only looks for YAML files.
+#
+# The data part is the actual integration configuration as described in the spec here:
+# https://docs.newrelic.com/docs/integrations/integrations-sdk/file-specifications/integration-configuration-file-specifications-agent-v180
+#
+# In the following example you can see how to monitor a Redis integration with autodiscovery
+#
+#
+# newrelic-infrastructure:
+#   integrations:
+#     nri-redis-sampleapp:
+#       discovery:
+#         command:
+#           exec: /var/db/newrelic-infra/nri-discovery-kubernetes --tls --port 10250
+#           match:
+#             label.app: sampleapp
+#       integrations:
+#         - name: nri-redis
+#           env:
+#             # using the discovered IP as the hostname address
+#             HOSTNAME: ${discovery.ip}
+#             PORT: 6379
+#           labels:
+#             env: test
diff --git a/charts/percona/psmdb-db/1.19.0/.helmignore b/charts/percona/psmdb-db/1.19.0/.helmignore
new file mode 100644
index 000000000..50af03172
--- /dev/null
+++ b/charts/percona/psmdb-db/1.19.0/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/percona/psmdb-db/1.19.0/Chart.yaml b/charts/percona/psmdb-db/1.19.0/Chart.yaml
new file mode 100644
index 000000000..7b44cc39a
--- /dev/null
+++ b/charts/percona/psmdb-db/1.19.0/Chart.yaml
@@ -0,0 +1,19 @@
+annotations:
+  catalog.cattle.io/certified: partner
+  catalog.cattle.io/display-name: Percona Server for MongoDB
+  catalog.cattle.io/kube-version: '>=1.21-0'
+  catalog.cattle.io/release-name: psmdb-db
+apiVersion: v2
+appVersion: 1.19.0
+description: A Helm chart for installing Percona Server MongoDB Cluster Databases
+  using the PSMDB Operator.
+home: https://www.percona.com/doc/kubernetes-operator-for-psmongodb/index.html
+icon: file://assets/icons/psmdb-db.png
+kubeVersion: '>=1.21-0'
+maintainers:
+- email: natalia.marukovich@percona.com
+  name: nmarukovich
+- email: julio.pasinatto@percona.com
+  name: jvpasinatto
+name: psmdb-db
+version: 1.19.0
diff --git a/charts/percona/psmdb-db/1.19.0/README.md b/charts/percona/psmdb-db/1.19.0/README.md
new file mode 100644
index 000000000..9a5fe330e
--- /dev/null
+++ b/charts/percona/psmdb-db/1.19.0/README.md
@@ -0,0 +1,329 @@
+# Percona Server for MongoDB
+
+This chart deploys Percona Server for MongoDB Cluster on Kubernetes controlled by Percona Operator for MongoDB.
+
+Useful links:
+
+- [Operator Github repository](https://github.com/percona/percona-server-mongodb-operator)
+- [Operator Documentation](https://www.percona.com/doc/kubernetes-operator-for-psmongodb/index.html)
+
+## Pre-requisites
+
+- Percona Operator for MongoDB running in your Kubernetes cluster. See installation details [here](https://github.com/percona/percona-helm-charts/blob/main/charts/psmdb-operator) or in the [Operator Documentation](https://www.percona.com/doc/kubernetes-operator-for-psmongodb/helm.html).
+- Kubernetes 1.28+
+- Helm v3
+
+# Chart Details
+
+This chart will deploy Percona Server for MongoDB Cluster in Kubernetes. It will create a Custom Resource, and the Operator will trigger the creation of corresponding Kubernetes primitives: StatefulSets, Pods, Secrets, etc.
+
+## Installing the Chart
+
+To install the chart with the `psmdb` release name using a dedicated namespace (recommended):
+
+```sh
+helm repo add percona https://percona.github.io/percona-helm-charts/
+helm install my-db percona/psmdb-db --version 1.19.0 --namespace my-namespace
+```
+
+The chart can be customized using the following configurable parameters:
+
+| Parameter                                           | Description                                                                                                                                                                                   | Default                               |
+| --------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------- |
+| `crVersion`                                         | CR Cluster Manifest version                                                                                                                                                                   | `1.19.0`                              |
+| `pause`                                             | Stop PSMDB Database safely                                                                                                                                                                    | `false`                               |
+| `unmanaged`                                         | Start cluster and don't manage it (cross cluster replication)                                                                                                                                 | `false`                               |
+| `enableVolumeExpansion`                             | Allows to resize `PersistentVolumeClaim`s by changing `.volumeSpec.persistentVolumeClaim.resources` field                                                                                     | `false`                               |
+| `unsafeFlags.tls`                                   | Allows users from configuring a cluster without TLS/SSL certificates                                                                                                                          | `false`                               |
+| `unsafeFlags.replsetSize`                           | Allows users from configuring a cluster with unsafe parameters: starting it with less than 3 replica set instances or with an even number of replica set instances without additional arbiter | `false`                               |
+| `unsafeFlags.mongosSize`                            | Allows users from configuring a sharded cluster with less than 3 config server Pods or less than 2 mongos Pods                                                                                | `false`                               |
+| `unsafeFlags.terminationGracePeriod`                | Allows users from configuring a sharded cluster without termination grace period for replica set                                                                                              | `false`                               |
+| `unsafeFlags.backupIfUnhealthy`                     | Allows running backup on a cluster with failed health checks                                                                                                                                  | `false`                               |
+| `clusterServiceDNSSuffix`                           | The (non-standard) cluster domain to be used as a suffix of the Service name                                                                                                                  | `""`                                  |
+| `clusterServiceDNSMode`                             | Mode for the cluster service dns (Internal/ServiceMesh)                                                                                                                                       | `""`                                  |
+| `annotations`                                       | PSMDB custom resource annotations                                                                                                                                                             | `{}`                                  |
+| `ignoreAnnotations`                                 | The list of annotations to be ignored by the Operator                                                                                                                                         | `[]`                                  |
+| `ignoreLabels`                                      | The list of labels to be ignored by the Operator                                                                                                                                              | `[]`                                  |
+| `multiCluster.enabled`                              | Enable Multi Cluster Services (MCS) cluster mode                                                                                                                                              | `false`                               |
+| `multiCluster.DNSSuffix`                            | The cluster domain to be used as a suffix for multi-cluster Services used by Kubernetes                                                                                                       | `""`                                  |
+| `updateStrategy`                                    | Regulates the way how PSMDB Cluster Pods will be updated after setting a new image                                                                                                            | `SmartUpdate`                         |
+| `upgradeOptions.versionServiceEndpoint`             | Endpoint for actual PSMDB Versions provider	                                                                                                                                                  | `https://check.percona.com/versions/` |
+| `upgradeOptions.apply`                              | PSMDB image to apply from version service - recommended, latest, actual version like 4.4.2-4                                                                                                  | `disabled`                            |
+| `upgradeOptions.schedule`                           | Cron formatted time to execute the update                                                                                                                                                     | `"0 2 * * *"`                         |
+| `upgradeOptions.setFCV`                             | Set feature compatibility version on major upgrade                                                                                                                                            | `false`                               |
+| `finalizers:percona.com/delete-psmdb-pvc`           | Set this if you want to delete database persistent volumes on cluster deletion                                                                                                                | `[]`                                  |
+| `finalizers:percona.com/delete-psmdb-pods-in-order` | Set this if you want to delete PSMDB pods in order (primary last)                                                                                                                             | `[]`                                  |
+| `finalizers:percona.com/delete-pitr-chunks`         | Set this if you want to delete all pitr chunks on cluster deletion                                                                                                                            | `[]`                                  |
+| `image.repository`                                  | PSMDB Container image repository                                                                                                                                                              | `percona/percona-server-mongodb`      |
+| `image.tag`                                         | PSMDB Container image tag                                                                                                                                                                     | `8.0.4-1-multi`                      |
+| `imagePullPolicy`                                   | The policy used to update images                                                                                                                                                              | `Always`                              |
+| `imagePullSecrets`                                  | PSMDB Container pull secret                                                                                                                                                                   | `[]`                                  |
+| `initImage.repository`                              | Repository for custom init image                                                                                                                                                              | `""`                                  |
+| `initImage.tag`                                     | Tag for custom init image                                                                                                                                                                     | `""`                                  |
+| `initContainerSecurityContext`                      | A custom Kubernetes Security Context for a Container for the initImage                                                                                                                        | `{}`                                  |
+| |
+| `tls.mode`                     | Control usage of TLS (allowTLS, preferTLS, requireTLS, disabled)                | `preferTLS` |
+| `tls.certValidityDuration`     | The validity duration of the external certificate for cert manager              | `""`        |
+| `tls.allowInvalidCertificates` | If enabled the mongo shell will not attempt to validate the server certificates | `true`      |
+| `tls.issuerConf.name`          | A cert-manager issuer name                                                      | `""`        |
+| `tls.issuerConf.kind`          | A cert-manager issuer kind                                                      | `""`        |
+| `tls.issuerConf.group`         | A cert-manager issuer group                                                     | `""`        |
+| |
+| `secrets.users`         | The name of the Secrets object for the MongoDB users required to run the operator          | `""` |
+| `secrets.encryptionKey` | Set secret for data at rest encryption key                                                 | `""` |
+| `secrets.keyFile`       | Specifies a secret key file for authenticating MongoDB instances                           | `""` |
+| `secrets.vault`         | Specifies a secret object to provide integration with HashiCorp Vault                      | `""` |
+| `secrets.ldapSecret`    | Specifies a secret object for LDAP over TLS connection between MongoDB and OpenLDAP server | `""` |
+| `secrets.sse`           | The name of the Secrets object for server side encryption credentials                      | `""` |
+| `secrets.ssl`           | A secret with TLS certificate generated for external communications                        | `""` |
+| `secrets.sslInternal`   | A secret with TLS certificate generated for internal communications                        | `""` |
+| |
+| `pmm.enabled`                  | Enable integration with [Percona Monitoring and Management software](https://www.percona.com/blog/2020/07/23/using-percona-kubernetes-operators-with-percona-monitoring-and-management/) | `false`              |
+| `pmm.image.repository`         | PMM Container image repository                                                                                                                                                           | `percona/pmm-client` |
+| `pmm.image.tag`                | PMM Container image tag                                                                                                                                                                  | `2.44.0`             |
+| `pmm.serverHost`               | PMM server related K8S service hostname                                                                                                                                                  | `monitoring-service` |
+| `pmm.containerSecurityContext` | Set the security context for PMM container                                                                                                                                               | `{}`                 |
+| `pmm.resources`                | Set resources for PMM container                                                                                                                                                          | `{}`                 |
+| `pmm.mongodParams`             | PMM mongod params                                                                                                                                                                        | `""`                 |
+| `pmm.mongosParams`             | PMM mongos params                                                                                                                                                                        | `""`                 |
+| |
+| `replsets.rs0.name`                                                | ReplicaSet name                                                                                                                                                                                                                                              | `rs0`                    |
+| `replsets.rs0.size`                                                | ReplicaSet size (pod quantity)                                                                                                                                                                                                                               | `3`                      |
+| `replsets.rs0.terminationGracePeriodSeconds`                       | The amount of seconds Kubernetes will wait for a clean replica set Pods termination                                                                                                                                                                          | `""`                     |
+| `replsets.rs0.externalNodes.host`                                  | The URL or IP address of the external replset instance                                                                                                                                                                                                       | `""`                     |
+| `replsets.rs0.externalNodes.port`                                  | The port number of the external replset instance                                                                                                                                                                                                             | `""`                     |
+| `replsets.rs0.externalNodes.votes`                                 | The number of [votes](https://docs.mongodb.com/manual/reference/replica-configuration/#mongodb-rsconf-rsconf.members-n-.votes) of the external replset instance                                                                                              | `""`                     |
+| `replsets.rs0.externalNodes.priority`                              | The [priority](https://docs.mongodb.com/manual/reference/replica-configuration/#mongodb-rsconf-rsconf.members-n-.priority) of the external replset instance                                                                                                  | `""`                     |
+| `replsets.rs0.configuration`                                       | Custom config for mongod in replica set                                                                                                                                                                                                                      | `""`                     |
+| `replsets.rs0.topologySpreadConstraints`                           | Control how Pods are spread across your cluster among failure-domains such as regions, zones, nodes, and other user-defined topology domains                                                                                                                 | `{}`                     |
+| `replsets.rs0.replsetOverrides`                                    | Use if you need tooverride the replica set members FQDNs with custom hostnames. Each key under `replsetOverrides` should be name of a Pod. The Operator won’t perform any validation for hostnames, so it's the user’s responsibility to ensure connectivity | `{}`                     |
+| `replsets.rs0.serviceAccountName`                                  | Run replicaset Containers under specified K8S SA                                                                                                                                                                                                             | `""`                     |
+| `replsets.rs0.affinity.antiAffinityTopologyKey`                    | ReplicaSet Pod affinity                                                                                                                                                                                                                                      | `kubernetes.io/hostname` |
+| `replsets.rs0.affinity.advanced`                                   | ReplicaSet Pod advanced affinity                                                                                                                                                                                                                             | `{}`                     |
+| `replsets.rs0.tolerations`                                         | ReplicaSet Pod tolerations                                                                                                                                                                                                                                   | `[]`                     |
+| `replsets.rs0.priorityClass`                                       | ReplicaSet Pod priorityClassName                                                                                                                                                                                                                             | `""`                     |
+| `replsets.rs0.annotations`                                         | ReplicaSet Pod annotations                                                                                                                                                                                                                                   | `{}`                     |
+| `replsets.rs0.labels`                                              | ReplicaSet Pod labels                                                                                                                                                                                                                                        | `{}`                     |
+| `replsets.rs0.nodeSelector`                                        | ReplicaSet Pod nodeSelector labels                                                                                                                                                                                                                           | `{}`                     |
+| `replsets.rs0.livenessProbe`                                       | ReplicaSet Pod livenessProbe structure                                                                                                                                                                                                                       | `{}`                     |
+| `replsets.rs0.readinessProbe`                                      | ReplicaSet Pod readinessProbe structure                                                                                                                                                                                                                      | `{}`                     |
+| `replsets.rs0.storage`                                             | Set cacheSizeRatio or other custom MongoDB storage options                                                                                                                                                                                                   | `{}`                     |
+| `replsets.rs0.podSecurityContext`                                  | Set the security context for a Pod                                                                                                                                                                                                                           | `{}`                     |
+| `replsets.rs0.containerSecurityContext`                            | Set the security context for a Container                                                                                                                                                                                                                     | `{}`                     |
+| `replsets.rs0.runtimeClass`                                        | ReplicaSet Pod runtimeClassName                                                                                                                                                                                                                              | `""`                     |
+| `replsets.rs0.sidecars`                                            | ReplicaSet Pod sidecars                                                                                                                                                                                                                                      | `{}`                     |
+| `replsets.rs0.sidecarVolumes`                                      | ReplicaSet Pod sidecar volumes                                                                                                                                                                                                                               | `[]`                     |
+| `replsets.rs0.sidecarVolumes.nfs.server`                           | The hostname of the NFS server that will provide remote filesystem to the custom sidecar container volume for Replica Set Pods.                                                                                                                              | `""`                     |
+| `replsets.rs0.sidecarVolumes.nfs.path`                             | The path on the NFS server that will be provided as a remote filesystem to the custom sidecar container volume for Replica Set Pods.                                                                                                                         | `""`                     |
+| `replsets.rs0.sidecarPVCs`                                         | ReplicaSet Pod sidecar PVCs                                                                                                                                                                                                                                  | `[]`                     |
+| `replsets.rs0.podDisruptionBudget.maxUnavailable`                  | ReplicaSet failed Pods maximum quantity                                                                                                                                                                                                                      | `1`                      |
+| `replsets.rs0.splitHorizons`                                       | External URI for Split-horizon for replica set Pods of the exposed cluster                                                                                                                                                                                   | `{}`                     |
+| `replsets.rs0.expose.enabled`                                      | Allow access to replicaSet from outside of Kubernetes                                                                                                                                                                                                        | `false`                  |
+| `replsets.rs0.expose.type`                                         | Network service access point type                                                                                                                                                                                                                            | `ClusterIP`              |
+| `replsets.rs0.expose.loadBalancerIP`                               | Set client IP to Load Balancer                                                                                                                                                                                                                               | `""`                     |
+| `replsets.rs0.expose.loadBalancerSourceRanges`                     | Limit client IP's access to Load Balancer                                                                                                                                                                                                                    | `{}`                     |
+| `replsets.rs0.expose.annotations`                                  | ReplicaSet service annotations                                                                                                                                                                                                                               | `{}`                     |
+| `replsets.rs0.expose.labels`                                       | ReplicaSet service labels                                                                                                                                                                                                                                    | `{}`                     |
+| `replsets.rs0.expose.internalTrafficPolicy`                        | ReplicaSet service internal traffic policy                                                                                                                                                                                                                   | `Local`                  |
+| `replsets.rs0.expose.externalTrafficPolicy`                        | ReplicaSet service external traffic policy                                                                                                                                                                                                                   | `Local`                  |
+| `replsets.rs0.schedulerName`                                       | ReplicaSet Pod schedulerName                                                                                                                                                                                                                                 | `""`                     |
+| `replsets.rs0.resources`                                           | ReplicaSet Pods resource requests and limits                                                                                                                                                                                                                 | `{}`                     |
+| `replsets.rs0.volumeSpec`                                          | ReplicaSet Pods storage resources                                                                                                                                                                                                                            | `{}`                     |
+| `replsets.rs0.volumeSpec.emptyDir`                                 | ReplicaSet Pods emptyDir K8S storage                                                                                                                                                                                                                         | `{}`                     |
+| `replsets.rs0.volumeSpec.hostPath`                                 | ReplicaSet Pods hostPath K8S storage                                                                                                                                                                                                                         |                          |
+| `replsets.rs0.volumeSpec.hostPath.path`                            | ReplicaSet Pods hostPath K8S storage path                                                                                                                                                                                                                    | `""`                     |
+| `replsets.rs0.volumeSpec.hostPath.type`                            | Type for hostPath volume                                                                                                                                                                                                                                     | `Directory`              |
+| `replsets.rs0.volumeSpec.pvc`                                      | ReplicaSet Pods PVC request parameters                                                                                                                                                                                                                       |                          |
+| `replsets.rs0.volumeSpec.pvc.annotations`                          | The Kubernetes annotations metadata for Persistent Volume Claim                                                                                                                                                                                              | `{}`                     |
+| `replsets.rs0.volumeSpec.pvc.labels`                               | The Kubernetes labels metadata for Persistent Volume Claim                                                                                                                                                                                                   | `{}`                     |
+| `replsets.rs0.volumeSpec.pvc.storageClassName`                     | ReplicaSet Pods PVC target storageClass                                                                                                                                                                                                                      | `""`                     |
+| `replsets.rs0.volumeSpec.pvc.accessModes`                          | ReplicaSet Pods PVC access policy                                                                                                                                                                                                                            | `[]`                     |
+| `replsets.rs0.volumeSpec.pvc.resources.requests.storage`           | ReplicaSet Pods PVC storage size                                                                                                                                                                                                                             | `3Gi`                    |
+| `replsets.rs0.hostAliases`                                         | The IP address for Kubernetes host aliases                                                                                                                                                                                                                   | `[]`                     |
+| `replsets.rs0.nonvoting.enabled`                                   | Add MongoDB nonvoting Pods                                                                                                                                                                                                                                   | `false`                  |
+| `replsets.rs0.nonvoting.podSecurityContext`                        | Set the security context for a Pod                                                                                                                                                                                                                           | `{}`                     |
+| `replsets.rs0.nonvoting.containerSecurityContext`                  | Set the security context for a Container                                                                                                                                                                                                                     | `{}`                     |
+| `replsets.rs0.nonvoting.size`                                      | Number of nonvoting Pods                                                                                                                                                                                                                                     | `1`                      |
+| `replsets.rs0.nonvoting.configuration`                             | Custom config for mongod nonvoting member                                                                                                                                                                                                                    | `""`                     |
+| `replsets.rs0.nonvoting.serviceAccountName`                        | Run replicaset nonvoting Container under specified K8S SA                                                                                                                                                                                                    | `""`                     |
+| `replsets.rs0.nonvoting.affinity.antiAffinityTopologyKey`          | Nonvoting Pods affinity                                                                                                                                                                                                                                      | `kubernetes.io/hostname` |
+| `replsets.rs0.nonvoting.affinity.advanced`                         | Nonvoting Pods advanced affinity                                                                                                                                                                                                                             | `{}`                     |
+| `replsets.rs0.nonvoting.tolerations`                               | Nonvoting Pod tolerations                                                                                                                                                                                                                                    | `[]`                     |
+| `replsets.rs0.nonvoting.priorityClass`                             | Nonvoting Pod priorityClassName                                                                                                                                                                                                                              | `""`                     |
+| `replsets.rs0.primaryPreferTagSelector.region`                     | Makes MongoDB instance to be selected as Primary based on specified region                                                                                                                                                                                   | `""`                     |
+| `replsets.rs0.primaryPreferTagSelector.zone`                       | Makes MongoDB instance to be selected as Primary based on specified zone                                                                                                                                                                                     | `""`                     |
+| `replsets.rs0.nonvoting.annotations`                               | Nonvoting Pod annotations                                                                                                                                                                                                                                    | `{}`                     |
+| `replsets.rs0.nonvoting.labels`                                    | Nonvoting Pod labels                                                                                                                                                                                                                                         | `{}`                     |
+| `replsets.rs0.nonvoting.nodeSelector`                              | Nonvoting Pod nodeSelector labels                                                                                                                                                                                                                            | `{}`                     |
+| `replsets.rs0.nonvoting.podDisruptionBudget.maxUnavailable`        | Nonvoting failed Pods maximum quantity                                                                                                                                                                                                                       | `1`                      |
+| `replsets.rs0.nonvoting.resources`                                 | Nonvoting Pods resource requests and limits                                                                                                                                                                                                                  | `{}`                     |
+| `replsets.rs0.nonvoting.volumeSpec`                                | Nonvoting Pods storage resources                                                                                                                                                                                                                             | `{}`                     |
+| `replsets.rs0.nonvoting.volumeSpec.emptyDir`                       | Nonvoting Pods emptyDir K8S storage                                                                                                                                                                                                                          | `{}`                     |
+| `replsets.rs0.nonvoting.volumeSpec.hostPath`                       | Nonvoting Pods hostPath K8S storage                                                                                                                                                                                                                          |                          |
+| `replsets.rs0.nonvoting.volumeSpec.hostPath.path`                  | Nonvoting Pods hostPath K8S storage path                                                                                                                                                                                                                     | `""`                     |
+| `replsets.rs0.nonvoting.volumeSpec.hostPath.type`                  | Type for hostPath volume                                                                                                                                                                                                                                     | `Directory`              |
+| `replsets.rs0.nonvoting.volumeSpec.pvc`                            | Nonvoting Pods PVC request parameters                                                                                                                                                                                                                        |                          |
+| `replsets.rs0.nonvoting.volumeSpec.pvc.annotations`                | The Kubernetes annotations metadata for Persistent Volume Claim                                                                                                                                                                                              | `{}`                     |
+| `replsets.rs0.nonvoting.volumeSpec.pvc.labels`                     | The Kubernetes labels metadata for Persistent Volume Claim                                                                                                                                                                                                   | `{}`                     |
+| `replsets.rs0.nonvoting.volumeSpec.pvc.storageClassName`           | Nonvoting Pods PVC target storageClass                                                                                                                                                                                                                       | `""`                     |
+| `replsets.rs0.nonvoting.volumeSpec.pvc.accessModes`                | Nonvoting Pods PVC access policy                                                                                                                                                                                                                             | `[]`                     |
+| `replsets.rs0.nonvoting.volumeSpec.pvc.resources.requests.storage` | Nonvoting Pods PVC storage size                                                                                                                                                                                                                              | `3Gi`                    |
+| `replsets.rs0.arbiter.enabled`                                     | Create MongoDB arbiter service                                                                                                                                                                                                                               | `false`                  |
+| `replsets.rs0.arbiter.size`                                        | MongoDB arbiter Pod quantity                                                                                                                                                                                                                                 | `1`                      |
+| `replsets.rs0.arbiter.serviceAccountName`                          | Run replicaset arbiter Container under specified K8S SA                                                                                                                                                                                                      | `""`                     |
+| `replsets.rs0.arbiter.affinity.antiAffinityTopologyKey`            | MongoDB arbiter Pod affinity                                                                                                                                                                                                                                 | `kubernetes.io/hostname` |
+| `replsets.rs0.arbiter.affinity.advanced`                           | MongoDB arbiter Pod advanced affinity                                                                                                                                                                                                                        | `{}`                     |
+| `replsets.rs0.arbiter.tolerations`                                 | MongoDB arbiter Pod tolerations                                                                                                                                                                                                                              | `[]`                     |
+| `replsets.rs0.arbiter.priorityClass`                               | MongoDB arbiter priorityClassName                                                                                                                                                                                                                            | `""`                     |
+| `replsets.rs0.arbiter.annotations`                                 | MongoDB arbiter Pod annotations                                                                                                                                                                                                                              | `{}`                     |
+| `replsets.rs0.arbiter.labels`                                      | MongoDB arbiter Pod labels                                                                                                                                                                                                                                   | `{}`                     |
+| `replsets.rs0.arbiter.nodeSelector`                                | MongoDB arbiter Pod nodeSelector labels                                                                                                                                                                                                                      | `{}`                     |
+| |
+| `sharding.enabled`                                            | Enable sharding setup                                                                                                                                                                                                    | `true`                   |
+| `sharding.balancer.enabled`                                   | Enable/disable balancer                                                                                                                                                                                                  | `true`                   |
+| `sharding.configrs.size`                                      | Config ReplicaSet size (pod quantity)                                                                                                                                                                                    | `3`                      |
+| `sharding.configrs.terminationGracePeriodSeconds`             | The amount of seconds Kubernetes will wait for a clean replica set Pods termination                                                                                                                                      | `""`                     |
+| `sharding.configrs.externalNodes.host`                        | The URL or IP address of the external config server instance                                                                                                                                                             | `""`                     |
+| `sharding.configrs.externalNodes.port`                        | The port number of the external config server instance                                                                                                                                                                   | `""`                     |
+| `sharding.configrs.externalNodes.votes`                       | The number of [votes :octicons-link-external-16:](https://docs.mongodb.com/manual/reference/replica-configuration/#mongodb-rsconf-rsconf.members-n-.votes) of the [external config server instance](replication-main.md) | `""`                     |
+| `sharding.configrs.externalNodes.priority`                    | The [priority :octicons-link-external-16:](https://docs.mongodb.com/manual/reference/replica-configuration/#mongodb-rsconf-rsconf.members-n-.priority) of the [external config server instance](replication-main.md)     | `""`                     |
+| `sharding.configrs.configuration`                             | Custom config for mongod in config replica set                                                                                                                                                                           | `""`                     |
+| `sharding.configrs.topologySpreadConstraints`                 | Control how Pods are spread across your cluster among failure-domains such as regions, zones, nodes, and other user-defined topology domains                                                                             | `{}`                     |
+| `sharding.configrs.serviceAccountName`                        | Run sharding configrs Containers under specified K8S SA                                                                                                                                                                  | `""`                     |
+| `sharding.configrs.affinity.antiAffinityTopologyKey`          | Config ReplicaSet Pod affinity                                                                                                                                                                                           | `kubernetes.io/hostname` |
+| `sharding.configrs.affinity.advanced`                         | Config ReplicaSet Pod advanced affinity                                                                                                                                                                                  | `{}`                     |
+| `sharding.configrs.tolerations`                               | Config ReplicaSet Pod tolerations                                                                                                                                                                                        | `[]`                     |
+| `sharding.configrs.priorityClass`                             | Config ReplicaSet Pod priorityClassName                                                                                                                                                                                  | `""`                     |
+| `sharding.configrs.annotations`                               | Config ReplicaSet Pod annotations                                                                                                                                                                                        | `{}`                     |
+| `sharding.configrs.labels`                                    | Config ReplicaSet Pod labels                                                                                                                                                                                             | `{}`                     |
+| `sharding.configrs.nodeSelector`                              | Config ReplicaSet Pod nodeSelector labels                                                                                                                                                                                | `{}`                     |
+| `sharding.configrs.livenessProbe`                             | Config ReplicaSet Pod livenessProbe structure                                                                                                                                                                            | `{}`                     |
+| `sharding.configrs.readinessProbe`                            | Config ReplicaSet Pod readinessProbe structure                                                                                                                                                                           | `{}`                     |
+| `sharding.configrs.storage`                                   | Set cacheSizeRatio or other custom MongoDB storage options                                                                                                                                                               | `{}`                     |
+| `sharding.configrs.podSecurityContext`                        | Set the security context for a Pod                                                                                                                                                                                       | `{}`                     |
+| `sharding.configrs.containerSecurityContext`                  | Set the security context for a Container                                                                                                                                                                                 | `{}`                     |
+| `sharding.configrs.runtimeClass`                              | Config ReplicaSet Pod runtimeClassName                                                                                                                                                                                   | `""`                     |
+| `sharding.configrs.sidecars`                                  | Config ReplicaSet Pod sidecars                                                                                                                                                                                           | `{}`                     |
+| `sharding.configrs.sidecarVolumes`                            | Config ReplicaSet Pod sidecar volumes                                                                                                                                                                                    | `[]`                     |
+| `sharding.configrs.sidecarVolumes.name`                       | Name of the custom sidecar container volume for Config Server Pods                                                                                                                                                       | `""`                     |
+| `sharding.configrs.sidecarVolumes.nfs.server`                 | The hostname of the NFS server that will provide remote filesystem to the custom sidecar container volume for Config Server Pods                                                                                         | `""`                     |
+| `sharding.configrs.sidecarVolumesnfs.path`                    | The path on the NFS server that will be provided as a remote filesystem to the custom sidecar container volume for Config Server Pods                                                                                    | `""`                     |
+| `sharding.configrs.sidecarPVCs`                               | Config ReplicaSet Pod sidecar PVCs                                                                                                                                                                                       | `[]`                     |
+| `sharding.configrs.podDisruptionBudget.maxUnavailable`        | Config ReplicaSet failed Pods maximum quantity                                                                                                                                                                           | `1`                      |
+| `sharding.configrs.expose.enabled`                            | Allow access to cfg replica from outside of Kubernetes                                                                                                                                                                   | `false`                  |
+| `sharding.configrs.expose.type`                               | Network service access point type                                                                                                                                                                                        | `ClusterIP`              |
+| `sharding.configrs.expose.loadBalancerIP`                     | Set client IP to Load Balancer                                                                                                                                                                                           | `""`                     |
+| `sharding.configrs.expose.loadBalancerSourceRanges`           | Limit client IP's access to Load Balancer                                                                                                                                                                                | `{}`                     |
+| `sharding.configrs.expose.annotations`                        | Config ReplicaSet service annotations                                                                                                                                                                                    | `{}`                     |
+| `sharding.configrs.expose.labels`                             | Config ReplicaSet service labels                                                                                                                                                                                         | `{}`                     |
+| `sharding.configrs.expose.internalTrafficPolicy`              | Config ReplicaSet service internal traffic policy                                                                                                                                                                        | `Local`                  |
+| `sharding.configrs.expose.externalTrafficPolicy`              | Config ReplicaSet service external traffic policy                                                                                                                                                                        | `Local`                  |
+| `sharding.configrs.resources.limits.cpu`                      | Config ReplicaSet resource limits CPU                                                                                                                                                                                    | `300m`                   |
+| `sharding.configrs.resources.limits.memory`                   | Config ReplicaSet resource limits memory                                                                                                                                                                                 | `0.5G`                   |
+| `sharding.configrs.resources.requests.cpu`                    | Config ReplicaSet resource requests CPU                                                                                                                                                                                  | `300m`                   |
+| `sharding.configrs.resources.requests.memory`                 | Config ReplicaSet resource requests memory                                                                                                                                                                               | `0.5G`                   |
+| `sharding.configrs.volumeSpec.hostPath`                       | Config ReplicaSet hostPath K8S storage                                                                                                                                                                                   |                          |
+| `sharding.configrs.volumeSpec.hostPath.path`                  | Config ReplicaSet hostPath K8S storage path                                                                                                                                                                              | `""`                     |
+| `sharding.configrs.volumeSpec.hostPath.type`                  | Type for hostPath volum                                                                                                                                                                                                  | `Directory`              |
+| `sharding.configrs.volumeSpec.emptyDir`                       | Config ReplicaSet Pods emptyDir K8S storage                                                                                                                                                                              |                          |
+| `sharding.configrs.volumeSpec.pvc`                            | Config ReplicaSet Pods PVC request parameters                                                                                                                                                                            |                          |
+| `sharding.configrs.volumeSpec.pvc.annotations`                | The Kubernetes annotations metadata for Persistent Volume Claim                                                                                                                                                          | `{}`                     |
+| `sharding.configrs.volumeSpec.pvc.labels`                     | The Kubernetes labels metadata for Persistent Volume Claim                                                                                                                                                               | `{}`                     |
+| `sharding.configrs.volumeSpec.pvc.storageClassName`           | Config ReplicaSet Pods PVC storageClass                                                                                                                                                                                  | `""`                     |
+| `sharding.configrs.volumeSpec.pvc.accessModes`                | Config ReplicaSet Pods PVC access policy                                                                                                                                                                                 | `[]`                     |
+| `sharding.configrs.volumeSpec.pvc.resources.requests.storage` | Config ReplicaSet Pods PVC storage size                                                                                                                                                                                  | `3Gi`                    |
+| `sharding.configrs.hostAliases`                               | The IP address for Kubernetes host aliases                                                                                                                                                                               | `[]`                     |
+| `sharding.mongos.size`                                        | Mongos size (pod quantity)                                                                                                                                                                                               | `3`                      |
+| `sharding.mongos.terminationGracePeriodSeconds`               | The amount of seconds Kubernetes will wait for a clean mongos Pods termination                                                                                                                                           | `""`                     |
+| `sharding.mongos.configuration`                               | Custom config for mongos                                                                                                                                                                                                 | `""`                     |
+| `sharding.mongos.topologySpreadConstraints`                   | Control how Pods are spread across your cluster among failure-domains such as regions, zones, nodes, and other user-defined topology domains                                                                             | `{}`                     |
+| `sharding.mongos.serviceAccountName`                          | Run sharding mongos Containers under specified K8S SA                                                                                                                                                                    | `""`                     |
+| `sharding.mongos.affinity.antiAffinityTopologyKey`            | Mongos Pods affinity                                                                                                                                                                                                     | `kubernetes.io/hostname` |
+| `sharding.mongos.affinity.advanced`                           | Mongos Pods advanced affinity                                                                                                                                                                                            | `{}`                     |
+| `sharding.mongos.tolerations`                                 | Mongos Pods tolerations                                                                                                                                                                                                  | `[]`                     |
+| `sharding.mongos.priorityClass`                               | Mongos Pods priorityClassName                                                                                                                                                                                            | `""`                     |
+| `sharding.mongos.annotations`                                 | Mongos Pods annotations                                                                                                                                                                                                  | `{}`                     |
+| `sharding.mongos.labels`                                      | Mongos Pods labels                                                                                                                                                                                                       | `{}`                     |
+| `sharding.mongos.nodeSelector`                                | Mongos Pods nodeSelector labels                                                                                                                                                                                          | `{}`                     |
+| `sharding.mongos.livenessProbe`                               | Mongos Pod livenessProbe structure                                                                                                                                                                                       | `{}`                     |
+| `sharding.mongos.readinessProbe`                              | Mongos Pod readinessProbe structure                                                                                                                                                                                      | `{}`                     |
+| `sharding.mongos.podSecurityContext`                          | Set the security context for a Pod                                                                                                                                                                                       | `{}`                     |
+| `sharding.mongos.containerSecurityContext`                    | Set the security context for a Container                                                                                                                                                                                 | `{}`                     |
+| `sharding.mongos.runtimeClass`                                | Mongos Pod runtimeClassName                                                                                                                                                                                              | `""`                     |
+| `sharding.mongos.sidecars`                                    | Mongos Pod sidecars                                                                                                                                                                                                      | `{}`                     |
+| `sharding.mongos.sidecarVolumes`                              | Mongos Pod sidecar volumes                                                                                                                                                                                               | `[]`                     |
+| `sharding.mongos.sidecarPVCs`                                 | Mongos Pod sidecar PVCs                                                                                                                                                                                                  | `[]`                     |
+| `sharding.mongos.podDisruptionBudget.maxUnavailable`          | Mongos failed Pods maximum quantity                                                                                                                                                                                      | `1`                      |
+| `sharding.mongos.resources.limits.cpu`                        | Mongos Pods resource limits CPU                                                                                                                                                                                          | `300m`                   |
+| `sharding.mongos.resources.limits.memory`                     | Mongos Pods resource limits memory                                                                                                                                                                                       | `0.5G`                   |
+| `sharding.mongos.resources.requests.cpu`                      | Mongos Pods resource requests CPU                                                                                                                                                                                        | `300m`                   |
+| `sharding.mongos.resources.requests.memory`                   | Mongos Pods resource requests memory                                                                                                                                                                                     | `0.5G`                   |
+| `sharding.mongos.expose.type`                                 | Mongos service type                                                                                                                                                                                                      | `ClusterIP`              |
+| `sharding.mongos.expose.loadBalancerIP`                       | Set client IP to Load Balancer                                                                                                                                                                                           | `""`                     |
+| `sharding.mongos.expose.servicePerPod`                        | Create a separate ClusterIP Service for each mongos instance                                                                                                                                                             | `false`                  |
+| `sharding.mongos.expose.loadBalancerSourceRanges`             | Limit client IP's access to Load Balancer                                                                                                                                                                                | `{}`                     |
+| `sharding.mongos.expose.annotations`                          | Mongos service annotations                                                                                                                                                                                               | `{}`                     |
+| `sharding.mongos.expose.labels`                               | Mongos service labels                                                                                                                                                                                                    | `{}`                     |
+| `sharding.mongos.expose.internalTrafficPolicy`                | Mongos service internal traffic policy                                                                                                                                                                                   | `Local`                  |
+| `sharding.mongos.expose.externalTrafficPolicy`                | Mongos service external traffic policy                                                                                                                                                                                   | `Local`                  |
+| `sharding.mongos.expose.nodePort`                             | Custom port if exposing mongos via NodePort                                                                                                                                                                              | `""`                     |
+| `sharding.mongos.hostAliases`                                 | The IP address for Kubernetes host aliases                                                                                                                                                                               | `[]`                     |
+| |
+| `users.name`                   | The username of the MongoDB application user                                                                                                                                                                                                                                                                 | `""` |
+| `users.db`                     | Database that the user authenticates against                                                                                                                                                                                                                                                                 | `""` |
+| `users.passwordSecretRef.name` | Name of the secret that contains the user's password                                                                                                                                                                                                                                                         | `""` |
+| `users.passwordSecretRef.key`  | Key in the secret that corresponds to the value of the user's password                                                                                                                                                                                                                                       | `""` |
+| `users.roles.role.name`        | Name of the MongoDB role assigned to the user. As [built-in roles](https://www.mongodb.com/docs/manual/reference/built-in-roles/#built-in-roles), so [custom roles](https://github.com/mongodb/mongodb-kubernetes-operator/blob/master/docs/deploy-configure.md#define-a-custom-database-role) are supported | `""` |
+| `users.roles.role.db`          | Database that the MongoDB role applies to                                                                                                                                                                                                                                                                    | `""` |
+| |
+| `roles.role`                                     | Name of the custom role.                                                                                                                                                                                                                                                                                                | `""`      |
+| `roles.db`                                       | Database in which you want to store the user-defined role.                                                                                                                                                                                                                                                              | `admin`   |
+| `roles.authenticationRestrictions.clientSource`  | Array of IP addresses or CIDR blocks from which users assigned this role can connect.MongoDB servers reject connection requests from users with this role if the requests come from a client that is not present in this array.                                                                                         | `""`      |
+| `roles.authenticationRestrictions.serverAddress` | Array of IP addresses or CIDR blocks to which users assigned this role can connect.MongoDB servers reject connection requests from users with this role if the client requests to connect to a server that is not present in this array.                                                                                | `""`      |
+| `roles.privileges.actions`                       | Name of the role. Valid values are built-in roles.                                                                                                                                                                                                                                                                      | `[]`      |
+| `roles.privileges.resource.db`                   | Database for which the privilege `security.roles.privileges.actions` apply. An empty string ("") indicates that the privilege actions apply to all databases.                                                                                                                                                           | `""`      |
+| `roles.privileges.resource.collection`           | Collection for which the privilege `security.roles.privileges.actions` apply. An empty string ("") indicates that the privilege actions apply to all of the database's collections.                                                                                                                                     | `""`      |
+| `roles.privileges.resource.cluster`              | Flag that indicates that the privilege `security.roles.privileges.actions` apply to all databases and collections in the MongoDB deployment. If omitted, defaults to false.If set to true, do not provide values for `security.roles.privileges.resource.database` and `security.roles.privileges.resource.collection`. | `""`      |
+| `roles.roles.role`                               | Name of the role to inherit from.                                                                                                                                                                                                                                                                                       | `""`      |
+| `roles.roles.db`                                 | Name of database that contains the role to inherit from.                                                                                                                                                                                                                                                                | `""`      |
+| |
+| `backup.enabled`                      | Enable backup PBM agent                                           | `true`                           |
+| `backup.annotations`                  | Backup job annotations                                            | `{}`                             |
+| `backup.podSecurityContext`           | Set the security context for a Pod                                | `{}`                             |
+| `backup.containerSecurityContext`     | Set the security context for a Container                          | `{}`                             |
+| `backup.restartOnFailure`             | Backup Pods restart policy                                        | `true`                           |
+| `backup.image.repository`             | PBM Container image repository                                    | `percona/percona-backup-mongodb` |
+| `backup.image.tag`                    | PBM Container image tag                                           | `2.8.0-multi`                    |
+| `backup.storages`                     | Local/remote backup storages settings                             | `{}`                             |
+| `backup.volumeMounts`                 | Name of the remote backup storage                                 | `""`                             |
+| `backup.pitr.enabled`                 | Enable point in time recovery for backup                          | `false`                          |
+| `backup.pitr.oplogOnly`               | Start collecting oplogs even if full logical backup doesn't exist | `false`                          |
+| `backup.pitr.oplogSpanMin`            | Number of minutes between the uploads of oplogs                   | `10`                             |
+| `backup.pitr.compressionType`         | The point-in-time-recovery chunks compression format              | `""`                             |
+| `backup.pitr.compressionLevel`        | The point-in-time-recovery chunks compression level               | `""`                             |
+| `backup.configuration.backupOptions`  | Custom configuration settings for backup                          | `{}`                             |
+| `backup.configuration.restoreOptions` | Custom configuration settings for restore                         | `{}`                             |
+| `backup.tasks`                        | Backup working schedule                                           | `{}`                             |
+| `systemUsers`                         | PSMDB operator system users                                       | `{}`                             |
+
+Specify parameters using `--set key=value[,key=value]` argument to `helm install`
+Notice that you can use multiple replica sets only with sharding enabled.
+
+## Examples
+
+### Deploy a replica set with disabled backups and no mongos pods
+
+This is great for a dev PSMDB/MongoDB cluster as it doesn't bother with backups and sharding setup.
+
+```bash
+$ helm install dev  --namespace psmdb . \
+    --set runUid=1001 --set "replsets.rs0.volumeSpec.pvc.resources.requests.storage=20Gi" \
+    --set backup.enabled=false --set sharding.enabled=false
+```
+
+# Need help?
+
+**Commercial Support**  | **Community Support** |
+:-: | :-: |
+| <br/>Enterprise-grade assistance for your mission-critical database deployments in containers and Kubernetes. Get expert guidance for complex tasks like multi-cloud replication, database migration and building platforms.<br/><br/>  | <br/>Connect with our engineers and fellow users for general questions, troubleshooting, and sharing feedback and ideas.<br/><br/>  | 
+| **[Get Percona Support](https://hubs.ly/Q02ZTH8Q0)** | **[Visit our Forum](https://forums.percona.com/)** |
diff --git a/charts/percona/psmdb-db/1.19.0/templates/NOTES.txt b/charts/percona/psmdb-db/1.19.0/templates/NOTES.txt
new file mode 100644
index 000000000..3f294ce22
--- /dev/null
+++ b/charts/percona/psmdb-db/1.19.0/templates/NOTES.txt
@@ -0,0 +1,40 @@
+#
+
+                    %                        _____
+                   %%%                      |  __ \
+                 ###%%%%%%%%%%%%*           | |__) |__ _ __ ___ ___  _ __   __ _
+                ###  ##%%      %%%%         |  ___/ _ \ '__/ __/ _ \| '_ \ / _` |
+              ####     ##%       %%%%       | |  |  __/ | | (_| (_) | | | | (_| |
+             ###        ####      %%%       |_|   \___|_|  \___\___/|_| |_|\__,_|
+           ,((###         ###     %%%        _      _          _____                       _
+          (((( (###        ####  %%%%       | |   / _ \       / ____|                     | |
+         (((     ((#         ######         | | _| (_) |___  | (___   __ _ _   _  __ _  __| |
+       ((((       (((#        ####          | |/ /> _ </ __|  \___ \ / _` | | | |/ _` |/ _` |
+      /((          ,(((        *###         |   <| (_) \__ \  ____) | (_| | |_| | (_| | (_| |
+    ////             (((         ####       |_|\_\\___/|___/ |_____/ \__, |\__,_|\__,_|\__,_|
+   ///                ((((        ####                                  | |
+ /////////////(((((((((((((((((########                                 |_|   Join @ percona.com/k8s
+
+
+Join Percona Squad! Get early access to new product features, invite-only ”ask me anything” sessions with Percona Kubernetes experts, and monthly swag raffles.
+
+>>> https://percona.com/k8s <<<
+
+Percona Server for MongoDB cluster is deployed now. Get the username and password:
+
+  ADMIN_USER=$(kubectl -n {{ .Release.Namespace }} get secrets {{ include "psmdb-database.fullname" . }}-secrets -o jsonpath="{.data.MONGODB_USER_ADMIN_USER}" | base64 --decode)
+  ADMIN_PASSWORD=$(kubectl -n {{ .Release.Namespace }} get secrets {{ include "psmdb-database.fullname" . }}-secrets -o jsonpath="{.data.MONGODB_USER_ADMIN_PASSWORD}" | base64 --decode)
+
+Connect to the cluster:
+{{- if .Values.sharding.enabled }}
+
+  kubectl run -i --rm --tty percona-client --image=percona/percona-server-mongodb:7.0 --restart=Never \
+  -- mongosh "mongodb://${ADMIN_USER}:${ADMIN_PASSWORD}@{{ include "psmdb-database.fullname" . }}-mongos.{{ .Release.Namespace }}.svc.cluster.local/admin?ssl=false"
+
+{{- else }}
+
+  kubectl run -i --rm --tty percona-client --image=percona/percona-server-mongodb:7.0 --restart=Never \
+  -- mongosh "mongodb+srv://${ADMIN_USER}:${ADMIN_PASSWORD}@{{ include "psmdb-database.fullname" . }}-{{ .Values.replsets.rs0.name }}.{{ .Release.Namespace }}.svc.cluster.local/admin?replicaSet=rs0&ssl=false"
+
+{{- end }}
+  
diff --git a/charts/percona/psmdb-db/1.19.0/templates/_helpers.tpl b/charts/percona/psmdb-db/1.19.0/templates/_helpers.tpl
new file mode 100644
index 000000000..47b33a5a7
--- /dev/null
+++ b/charts/percona/psmdb-db/1.19.0/templates/_helpers.tpl
@@ -0,0 +1,45 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "psmdb-database.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "psmdb-database.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 21 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 21 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 21 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "psmdb-database.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 21 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "psmdb-database.labels" -}}
+app.kubernetes.io/name: {{ include "psmdb-database.name" . }}
+helm.sh/chart: {{ include "psmdb-database.chart" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
diff --git a/charts/percona/psmdb-db/1.19.0/templates/cluster-secret.yaml b/charts/percona/psmdb-db/1.19.0/templates/cluster-secret.yaml
new file mode 100644
index 000000000..a3bf7a79e
--- /dev/null
+++ b/charts/percona/psmdb-db/1.19.0/templates/cluster-secret.yaml
@@ -0,0 +1,12 @@
+{{- if hasKey .Values "systemUsers" }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "psmdb-database.fullname" . }}-secrets
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ include "psmdb-database.labels" . | indent 4 }}
+type: Opaque
+stringData:
+{{ .Values.systemUsers | toYaml | indent 2 }}
+{{- end -}}
diff --git a/charts/percona/psmdb-db/1.19.0/templates/cluster.yaml b/charts/percona/psmdb-db/1.19.0/templates/cluster.yaml
new file mode 100644
index 000000000..e5136d5aa
--- /dev/null
+++ b/charts/percona/psmdb-db/1.19.0/templates/cluster.yaml
@@ -0,0 +1,678 @@
+apiVersion: psmdb.percona.com/v1
+kind: PerconaServerMongoDB
+metadata:
+  {{- if .Values.annotations }}
+  annotations:
+{{ .Values.annotations | toYaml | indent 4 }}
+  {{- end }}
+  name: {{ include "psmdb-database.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ include "psmdb-database.labels" . | indent 4 }}
+  finalizers:
+{{ .Values.finalizers | toYaml | indent 4 }}
+spec:
+  crVersion: {{ .Values.crVersion }}
+  pause: {{ .Values.pause }}
+  unmanaged: {{ .Values.unmanaged }}
+  {{- if .Values.platform }}
+  platform: {{ .Values.platform }}
+  {{- end }}
+  enableVolumeExpansion: {{ .Values.enableVolumeExpansion }}
+  {{- if .Values.clusterServiceDNSSuffix }}
+  clusterServiceDNSSuffix: {{ .Values.clusterServiceDNSSuffix }}
+  {{- end }}
+  {{- if .Values.clusterServiceDNSMode }}
+  clusterServiceDNSMode: {{ .Values.clusterServiceDNSMode }}
+  {{- end }}
+  image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+  imagePullPolicy: "{{ .Values.imagePullPolicy }}"
+  {{- if .Values.unsafeFlags }}
+  unsafeFlags:
+{{ .Values.unsafeFlags | toYaml | indent 4 }}
+  {{- end }}
+  {{- if .Values.ignoreAnnotations }}
+  ignoreAnnotations:
+{{ .Values.ignoreAnnotations | toYaml | indent 4 }}
+  {{- end }}
+  {{- if .Values.ignoreLabels }}
+  ignoreLabels:
+{{ .Values.ignoreLabels | toYaml | indent 4 }}
+  {{- end }}
+  multiCluster:
+    enabled: {{ .Values.multiCluster.enabled }}
+    {{- if .Values.multiCluster.DNSSuffix }}
+    DNSSuffix: {{ .Values.multiCluster.DNSSuffix }}
+    {{- end }}
+  {{- if .Values.imagePullSecrets }}
+  imagePullSecrets:
+{{ .Values.imagePullSecrets | toYaml | indent 4 }}
+  {{- end }}
+  {{- if .Values.initImage }}
+  initImage: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
+  {{- end }}
+  {{- if .Values.initContainerSecurityContext }}
+  initContainerSecurityContext:
+{{ .Values.initContainerSecurityContext | toYaml | indent 4 }}
+  {{- end }}
+  {{- if .Values.tls }}
+  tls:
+{{ .Values.tls | toYaml | indent 4 }}
+  {{- end }}
+  {{- if .Values.secrets }}
+  secrets:
+{{ tpl (.Values.secrets | toYaml) . | indent 4 }}
+  {{- else }}
+  secrets:
+    users: {{ include "psmdb-database.fullname" . }}-secrets
+  {{- end }}
+  {{- if .Values.updateStrategy }}
+  updateStrategy: {{ .Values.updateStrategy }}
+  upgradeOptions:
+    versionServiceEndpoint: {{ .Values.upgradeOptions.versionServiceEndpoint }}
+    apply: {{ .Values.upgradeOptions.apply }}
+    schedule: {{ .Values.upgradeOptions.schedule }}
+    setFCV: {{ .Values.upgradeOptions.setFCV }}
+  {{- end }}
+  pmm:
+    enabled: {{ .Values.pmm.enabled }}
+    image: "{{ .Values.pmm.image.repository }}:{{ .Values.pmm.image.tag }}"
+    serverHost: {{ .Values.pmm.serverHost }}
+    {{- if .Values.pmm.mongodParams }}
+    mongodParams: {{ .Values.pmm.mongodParams }}
+    {{- end }}
+    {{- if .Values.pmm.mongosParams }}
+    mongosParams: {{ .Values.pmm.mongosParams }}
+    {{- end }}
+    {{- if .Values.pmm.resources }}
+    resources:
+{{ .Values.pmm.resources | toYaml | indent 6 }}
+    {{- end }}
+    {{- if .Values.pmm.containerSecurityContext }}
+    containerSecurityContext:
+{{ .Values.pmm.containerSecurityContext | toYaml | indent 6 }}
+    {{- end }}
+
+  replsets:
+  {{- range $k,$replset := .Values.replsets }}
+  {{- if $replset.name }}
+  - name: {{ $replset.name }}
+  {{- else }}
+  - name: {{ $k }}
+  {{- end }}
+    size: {{ $replset.size }}
+    {{- if $replset.terminationGracePeriodSeconds }}
+    terminationGracePeriodSeconds: {{ $replset.terminationGracePeriodSeconds }}
+    {{- end }}
+    {{- if $replset.externalNodes }}
+    externalNodes:
+{{ $replset.externalNodes | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.configuration }}
+    configuration: |
+{{ $replset.configuration | indent 6 }}
+    {{- end }}
+    {{- if $replset.topologySpreadConstraints }}
+    topologySpreadConstraints:
+{{ $replset.topologySpreadConstraints | toYaml | indent 6 }}
+    {{- end }}
+{{- if $replset.replsetOverrides }}
+    replsetOverrides:
+{{ $replset.replsetOverrides | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.serviceAccountName }}
+    serviceAccountName: {{ $replset.serviceAccountName }}
+    {{- end }}
+    {{- if $replset.affinity }}
+    affinity:
+{{ $replset.affinity | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.priorityClass }}
+    priorityClassName: {{ $replset.priorityClass }}
+    {{- end }}
+    {{- if $replset.primaryPreferTagSelector }}
+    primaryPreferTagSelector: 
+{{ $replset.primaryPreferTagSelector | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.annotations }}
+    annotations:
+{{ $replset.annotations | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.labels }}
+    labels:
+{{ $replset.labels | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.nodeSelector }}
+    nodeSelector:
+{{ $replset.nodeSelector | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.tolerations }}
+    tolerations:
+{{ $replset.tolerations | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.livenessProbe }}
+    livenessProbe:
+{{ $replset.livenessProbe | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.readinessProbe }}
+    readinessProbe:
+{{ $replset.readinessProbe | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.storage }}
+    storage:
+{{ $replset.storage | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.podSecurityContext }}
+    podSecurityContext:
+{{ $replset.podSecurityContext | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.containerSecurityContext }}
+    containerSecurityContext:
+{{ $replset.containerSecurityContext | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.runtimeClass }}
+    runtimeClassName: {{ $replset.runtimeClass }}
+    {{- end }}
+    {{- if $replset.sidecars }}
+    sidecars:
+{{ $replset.sidecars | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.sidecarVolumes }}
+    sidecarVolumes:
+{{ $replset.sidecarVolumes | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.sidecarPVCs }}
+    sidecarPVCs:
+{{ $replset.sidecarPVCs | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.podDisruptionBudget }}
+    podDisruptionBudget:
+      {{- if $replset.podDisruptionBudget.maxUnavailable }}
+      maxUnavailable: {{ $replset.podDisruptionBudget.maxUnavailable }}
+      {{- else }}
+      minAvailable: {{ $replset.podDisruptionBudget.minAvailable }}
+      {{- end }}
+    {{- end }}
+    {{- if $replset.splitHorizons }}
+    splitHorizons:
+{{ $replset.splitHorizons | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.expose }}
+    expose:
+      enabled: {{ $replset.expose.enabled }}
+      type: {{ $replset.expose.type }}
+      {{- if $replset.expose.loadBalancerIP }}
+      loadBalancerIP: {{ $replset.expose.loadBalancerIP }}
+      {{- end }}
+      {{- if $replset.expose.loadBalancerSourceRanges }}
+      loadBalancerSourceRanges:
+{{ $replset.expose.loadBalancerSourceRanges | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.expose.annotations }}
+      annotations:
+{{ $replset.expose.annotations | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.expose.labels }}
+      labels:
+{{ $replset.expose.labels | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.expose.internalTrafficPolicy }}
+      internalTrafficPolicy: {{ $replset.expose.internalTrafficPolicy }}
+      {{- end }}
+      {{- if $replset.expose.externalTrafficPolicy }}
+      externalTrafficPolicy: {{ $replset.expose.externalTrafficPolicy }}
+      {{- end }}
+    {{- end }}
+    {{- if $replset.schedulerName }}
+    schedulerName: {{ $replset.schedulerName }}
+    {{- end }}
+    resources:
+    {{- if $replset.resources }}
+{{ $replset.resources | toYaml | indent 6 }}
+    {{- end }}
+    volumeSpec:
+    {{- if $replset.volumeSpec }}
+      {{- if $replset.volumeSpec.hostPath }}
+      hostPath:
+        path: {{ $replset.volumeSpec.hostPath.path }}
+        {{- if $replset.volumeSpec.hostPath.type }}
+        type: {{ $replset.volumeSpec.hostPath.type }}
+        {{- else }}
+        type: Directory
+        {{- end }}
+      {{- else if $replset.volumeSpec.pvc }}
+      persistentVolumeClaim:
+{{ $replset.volumeSpec.pvc | toYaml | indent 8 }}
+      {{- else }}
+      emptyDir: {}
+      {{- end }}
+    {{- end }}
+    {{- if $replset.hostAliases }}
+    hostAliases:
+{{ $replset.hostAliases | toYaml | indent 6 }}
+    {{- end }}
+    {{- if $replset.nonvoting }}
+    nonvoting:
+      enabled: {{ $replset.nonvoting.enabled }}
+      size: {{ $replset.nonvoting.size }}
+      {{- if $replset.nonvoting.configuration }}
+      configuration: |
+{{ $replset.nonvoting.configuration | indent 8 }}
+      {{- end }}
+      {{- if $replset.nonvoting.serviceAccountName }}
+      serviceAccountName: {{ $replset.nonvoting.serviceAccountName }}
+      {{- end }}
+      affinity:
+      {{- if $replset.nonvoting.affinity }}
+{{ $replset.nonvoting.affinity | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.nonvoting.priorityClass }}
+      priorityClassName: {{ $replset.nonvoting.priorityClass }}
+      {{- end }}
+      {{- if $replset.nonvoting.annotations }}
+      annotations:
+{{ $replset.nonvoting.annotations | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.nonvoting.labels }}
+      labels:
+{{ $replset.nonvoting.labels | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.nonvoting.podSecurityContext }}
+      podSecurityContext:
+{{ $replset.nonvoting.podSecurityContext | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.nonvoting.containerSecurityContext }}
+      containerSecurityContext:
+{{ $replset.nonvoting.containerSecurityContext | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.nonvoting.nodeSelector }}
+      nodeSelector:
+{{ $replset.nonvoting.nodeSelector | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.nonvoting.tolerations }}
+      tolerations:
+{{ $replset.nonvoting.tolerations | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.nonvoting.podDisruptionBudget }}
+      podDisruptionBudget:
+        {{- if $replset.nonvoting.podDisruptionBudget.maxUnavailable }}
+        maxUnavailable: {{ $replset.nonvoting.podDisruptionBudget.maxUnavailable }}
+        {{- else }}
+        minAvailable: {{ $replset.nonvoting.podDisruptionBudget.minAvailable }}
+        {{- end }}
+      {{- end }}
+      {{- if $replset.nonvoting.resources }}
+      resources:
+{{ $replset.nonvoting.resources | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.nonvoting.volumeSpec }}
+      volumeSpec:
+        {{- if $replset.nonvoting.volumeSpec.hostPath }}
+        hostPath:
+          path: {{ $replset.nonvoting.volumeSpec.hostPath.path }}
+          {{- if $replset.nonvoting.volumeSpec.hostPath.type }}
+          type: {{ $replset.nonvoting.volumeSpec.hostPath.type }}
+          {{- else }}
+          type: Directory
+          {{- end }}
+        {{- else if $replset.nonvoting.volumeSpec.pvc }}
+        persistentVolumeClaim:
+{{ $replset.nonvoting.volumeSpec.pvc | toYaml | indent 10 }}
+        {{- else }}
+        emptyDir: {}
+        {{- end }}
+      {{- end }}
+    {{- end }}
+    {{- if $replset.arbiter }}
+    arbiter:
+      enabled: {{ $replset.arbiter.enabled }}
+      size: {{ $replset.arbiter.size }}
+      {{- if $replset.arbiter.serviceAccountName }}
+      serviceAccountName: {{ $replset.arbiter.serviceAccountName }}
+      {{- end }}
+      {{- if $replset.affinity }}
+      affinity:
+{{ $replset.arbiter.affinity | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.arbiter.priorityClass }}
+      priorityClassName: {{ $replset.arbiter.priorityClass }}
+      {{- end }}
+      {{- if $replset.arbiter.annotations }}
+      annotations:
+{{ $replset.arbiter.annotations | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.arbiter.labels }}
+      labels:
+{{ $replset.arbiter.labels | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.arbiter.nodeSelector }}
+      nodeSelector:
+{{ $replset.arbiter.nodeSelector | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.arbiter.tolerations }}
+      tolerations:
+{{ $replset.arbiter.tolerations | toYaml | indent 8 }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+
+  sharding:
+    enabled: {{ .Values.sharding.enabled }}
+    balancer:
+      enabled: {{ .Values.sharding.balancer.enabled }}
+
+    configsvrReplSet:
+      size: {{ .Values.sharding.configrs.size }}
+      {{- if .Values.sharding.configrs.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.sharding.configrs.terminationGracePeriodSeconds }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.externalNodes }}
+      externalNodes:
+{{ .Values.sharding.configrs.externalNodes | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.configuration }}
+      configuration: |
+{{ .Values.sharding.configrs.configuration | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.topologySpreadConstraints }}
+      topologySpreadConstraints:
+{{ .Values.sharding.configrs.topologySpreadConstraints | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.serviceAccountName }}
+      serviceAccountName: {{ .Values.sharding.configrs.serviceAccountName }}
+      {{- end }}
+      affinity:
+{{ .Values.sharding.configrs.affinity | toYaml | indent 8 }}
+      {{- if .Values.sharding.configrs.priorityClass }}
+      priorityClassName: {{ .Values.sharding.configrs.priorityClass }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.annotations }}
+      annotations:
+{{ .Values.sharding.configrs.annotations | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.labels }}
+      labels:
+{{ .Values.sharding.configrs.labels | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.nodeSelector }}
+      nodeSelector:
+{{ .Values.sharding.configrs.nodeSelector | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.tolerations }}
+      tolerations:
+{{ .Values.sharding.configrs.tolerations | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.livenessProbe }}
+      livenessProbe:
+{{ .Values.sharding.configrs.livenessProbe | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.readinessProbe }}
+      readinessProbe:
+{{ .Values.sharding.configrs.readinessProbe | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.storage }}
+      storage:
+{{ .Values.sharding.configrs.storage | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.podSecurityContext }}
+      podSecurityContext:
+{{ .Values.sharding.configrs.podSecurityContext | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.containerSecurityContext }}
+      containerSecurityContext:
+{{ .Values.sharding.configrs.containerSecurityContext | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.runtimeClass }}
+      runtimeClassName: {{ .Values.sharding.configrs.runtimeClass }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.sidecars }}
+      sidecars:
+{{ .Values.sharding.configrs.sidecars | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.sidecarVolumes }}
+      sidecarVolumes:
+{{ .Values.sharding.configrs.sidecarVolumes | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.sidecarPVCs }}
+      sidecarPVCs:
+{{ .Values.sharding.configrs.sidecarPVCs | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.podDisruptionBudget }}
+      podDisruptionBudget:
+        {{- if .Values.sharding.configrs.podDisruptionBudget.maxUnavailable }}
+        maxUnavailable: {{ .Values.sharding.configrs.podDisruptionBudget.maxUnavailable }}
+        {{- else }}
+        minAvailable: {{ .Values.sharding.configrs.podDisruptionBudget.minAvailable }}
+        {{- end }}
+      {{- end }}
+      {{- if .Values.sharding.configrs.expose }}
+      expose:
+        enabled: {{ .Values.sharding.configrs.expose.enabled }}
+        type: {{ .Values.sharding.configrs.expose.type }}
+        {{- if .Values.sharding.configrs.expose.loadBalancerIP }}
+        loadBalancerIP: {{ .Values.sharding.configrs.expose.loadBalancerIP }}
+        {{- end }}
+        {{- if .Values.sharding.configrs.expose.loadBalancerSourceRanges }}
+        loadBalancerSourceRanges:
+{{ .Values.sharding.configrs.expose.loadBalancerSourceRanges | toYaml | indent 10 }}
+        {{- end }}
+        {{- if .Values.sharding.configrs.expose.annotations }}
+        annotations:
+{{ .Values.sharding.configrs.expose.annotations | toYaml | indent 10 }}
+        {{- end }}
+        {{- if .Values.sharding.configrs.expose.labels }}
+        labels:
+{{ .Values.sharding.configrs.expose.labels | toYaml | indent 10 }}
+        {{- end }}
+        {{- if .Values.sharding.configrs.expose.internalTrafficPolicy }}
+        internalTrafficPolicy: {{ .Values.sharding.configrs.expose.internalTrafficPolicy }}
+        {{- end }}
+        {{- if .Values.sharding.configrs.expose.externalTrafficPolicy }}
+        externalTrafficPolicy: {{ .Values.sharding.configrs.expose.externalTrafficPolicy }}
+        {{- end }}
+      {{- end }}
+      resources:
+        limits:
+          cpu: {{ .Values.sharding.configrs.resources.limits.cpu }}
+          memory: {{ .Values.sharding.configrs.resources.limits.memory }}
+        requests:
+          cpu: {{ .Values.sharding.configrs.resources.requests.cpu }}
+          memory: {{ .Values.sharding.configrs.resources.requests.memory }}
+      volumeSpec:
+        {{- if .Values.sharding.configrs.volumeSpec.hostPath }}
+        hostPath:
+          path: {{ .Values.sharding.configrs.volumeSpec.hostPath.path }}
+          {{- if .Values.sharding.configrs.volumeSpec.hostPath.type }}
+          type: {{ .Values.sharding.configrs.volumeSpec.hostPath.type }}
+          {{- else }}
+          type: Directory
+          {{- end }}
+        {{- else if .Values.sharding.configrs.volumeSpec.pvc }}
+        persistentVolumeClaim:
+{{ .Values.sharding.configrs.volumeSpec.pvc | toYaml | indent 10 }}
+        {{- else }}
+        emptyDir: {}
+        {{- end }}
+      {{- if .Values.sharding.configrs.hostAliases }}
+      hostAliases:
+{{ .Values.sharding.configrs.hostAliases | toYaml | indent 8 }}
+      {{- end }}
+
+    mongos:
+      size: {{ .Values.sharding.mongos.size }}
+      {{- if .Values.sharding.mongos.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.sharding.mongos.terminationGracePeriodSeconds }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.configuration }}
+      configuration: |
+{{ .Values.sharding.mongos.configuration | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.topologySpreadConstraints }}
+      topologySpreadConstraints:
+{{ .Values.sharding.mongos.topologySpreadConstraints | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.serviceAccountName }}
+      serviceAccountName: {{ .Values.sharding.mongos.serviceAccountName }}
+      {{- end }}
+      affinity:
+{{ .Values.sharding.mongos.affinity | toYaml | indent 8 }}
+      {{- if .Values.sharding.mongos.priorityClass }}
+      priorityClassName: {{ .Values.sharding.mongos.priorityClass }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.annotations }}
+      annotations:
+{{ .Values.sharding.mongos.annotations | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.labels }}
+      labels:
+{{ .Values.sharding.mongos.labels | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.nodeSelector }}
+      nodeSelector:
+{{ .Values.sharding.mongos.nodeSelector | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.tolerations }}
+      tolerations:
+{{ .Values.sharding.mongos.tolerations | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.livenessProbe }}
+      livenessProbe:
+{{ .Values.sharding.mongos.livenessProbe | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.readinessProbe }}
+      readinessProbe:
+{{ .Values.sharding.mongos.readinessProbe | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.podSecurityContext }}
+      podSecurityContext:
+{{ .Values.sharding.mongos.podSecurityContext | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.containerSecurityContext }}
+      containerSecurityContext:
+{{ .Values.sharding.mongos.containerSecurityContext | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.runtimeClass }}
+      runtimeClassName: {{ .Values.sharding.mongos.runtimeClass }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.sidecars }}
+      sidecars:
+{{ .Values.sharding.mongos.sidecars | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.sidecarVolumes }}
+      sidecarVolumes:
+{{ .Values.sharding.mongos.sidecarVolumes | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.sidecarPVCs }}
+      sidecarPVCs:
+{{ .Values.sharding.mongos.sidecarPVCs | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.podDisruptionBudget }}
+      podDisruptionBudget:
+        {{- if .Values.sharding.mongos.podDisruptionBudget.maxUnavailable }}
+        maxUnavailable: {{ .Values.sharding.mongos.podDisruptionBudget.maxUnavailable }}
+        {{- else }}
+        minAvailable: {{ .Values.sharding.mongos.podDisruptionBudget.minAvailable }}
+        {{- end }}
+      {{- end }}
+      resources:
+        limits:
+          cpu: {{ .Values.sharding.mongos.resources.limits.cpu }}
+          memory: {{ .Values.sharding.mongos.resources.limits.memory }}
+        requests:
+          cpu: {{ .Values.sharding.mongos.resources.requests.cpu }}
+          memory: {{ .Values.sharding.mongos.resources.requests.memory }}
+      expose:
+        type: {{ .Values.sharding.mongos.expose.type }}
+        {{- if .Values.sharding.mongos.expose.loadBalancerIP }}
+        loadBalancerIP: {{ .Values.sharding.mongos.expose.loadBalancerIP }}
+        {{- end }}
+        {{- if .Values.sharding.mongos.expose.servicePerPod }}
+        servicePerPod: {{ .Values.sharding.mongos.expose.servicePerPod }}
+        {{- end }}
+        {{- if .Values.sharding.mongos.expose.loadBalancerSourceRanges }}
+        loadBalancerSourceRanges:
+{{ .Values.sharding.mongos.expose.loadBalancerSourceRanges | toYaml | indent 10 }}
+        {{- end }}
+        {{- if .Values.sharding.mongos.expose.annotations }}
+        annotations:
+{{ .Values.sharding.mongos.expose.annotations | toYaml | indent 10 }}
+        {{- end }}
+        {{- if .Values.sharding.mongos.expose.labels }}
+        labels:
+{{ .Values.sharding.mongos.expose.labels | toYaml | indent 10 }}
+        {{- end }}
+        {{- if .Values.sharding.mongos.expose.internalTrafficPolicy }}
+        internalTrafficPolicy: {{ .Values.sharding.mongos.expose.internalTrafficPolicy }}
+        {{- end }}
+        {{- if .Values.sharding.mongos.expose.externalTrafficPolicy }}
+        externalTrafficPolicy: {{ .Values.sharding.mongos.expose.externalTrafficPolicy }}
+        {{- end }}
+        {{- if .Values.sharding.mongos.expose.nodePort }}
+        nodePort: {{ .Values.sharding.mongos.expose.nodePort }}
+        {{- end }}
+      {{- if .Values.sharding.mongos.auditLog }}
+      auditLog:
+{{ .Values.sharding.mongos.auditLog | toYaml | indent 8 }}
+      {{- end }}
+      {{- if .Values.sharding.mongos.hostAliases }}
+      hostAliases:
+{{ .Values.sharding.mongos.hostAliases | toYaml | indent 8 }}
+      {{- end }}
+
+  {{- if .Values.users }}
+  users:
+{{ .Values.users | toYaml | indent 2 }}
+  {{- end }}
+
+  {{- if .Values.roles }}
+  roles:
+{{ .Values.roles | toYaml | indent 2 }}
+  {{- end }}
+
+  backup:
+    enabled: {{ .Values.backup.enabled }}
+    {{- if .Values.backup.annotations }}
+    annotations:
+{{ .Values.backup.annotations | toYaml | indent 6 }}
+    {{- end }}
+    {{- if .Values.backup.podSecurityContext }}
+    podSecurityContext:
+{{ .Values.backup.podSecurityContext | toYaml | indent 6 }}
+    {{- end }}
+    {{- if .Values.backup.containerSecurityContext }}
+    containerSecurityContext:
+{{ .Values.backup.containerSecurityContext | toYaml | indent 6 }}
+    {{- end }}
+    image: "{{ .Values.backup.image.repository }}:{{ .Values.backup.image.tag }}"
+    {{- if .Values.backup.resources }}
+    resources:
+{{ .Values.backup.resources | toYaml | indent 6 }}
+    {{- end }}
+    storages:
+{{ .Values.backup.storages | toYaml | indent 6 }}
+    volumeMounts:
+{{ .Values.backup.volumeMounts | toYaml | indent 6 }}
+    pitr:
+    {{- if and .Values.backup.enabled .Values.backup.pitr.enabled }}
+      enabled: true
+      {{- if .Values.backup.pitr.oplogOnly }}
+      oplogOnly: {{ .Values.backup.pitr.oplogOnly }}
+      {{- end }}
+      {{- if .Values.backup.pitr.oplogSpanMin }}
+      oplogSpanMin: {{ .Values.backup.pitr.oplogSpanMin }}
+      {{- end }}
+      {{- if .Values.backup.pitr.compressionType }}
+      compressionType: {{ .Values.backup.pitr.compressionType }}
+      {{- end }}
+      {{- if .Values.backup.pitr.compressionLevel }}
+      compressionLevel: {{ .Values.backup.pitr.compressionLevel }}
+      {{- end }}
+    {{- else }}
+      enabled: false
+    {{- end }}
+    {{- if .Values.backup.configuration }}
+    configuration:
+{{ .Values.backup.configuration | toYaml | indent 6 }}
+    {{- end }}
+    tasks:
+{{ .Values.backup.tasks | toYaml | indent 6 }}
diff --git a/charts/percona/psmdb-db/1.19.0/values.yaml b/charts/percona/psmdb-db/1.19.0/values.yaml
new file mode 100644
index 000000000..d4288bbe2
--- /dev/null
+++ b/charts/percona/psmdb-db/1.19.0/values.yaml
@@ -0,0 +1,695 @@
+# Default values for psmdb-cluster.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+# Platform type: kubernetes, openshift
+# platform: kubernetes
+
+# Cluster DNS Suffix
+# clusterServiceDNSSuffix: svc.cluster.local
+# clusterServiceDNSMode: "Internal"
+
+finalizers:
+## Set this if you want that operator deletes the primary pod last
+  - percona.com/delete-psmdb-pods-in-order
+## Set this if you want to delete database persistent volumes on cluster deletion
+#  - percona.com/delete-psmdb-pvc
+## Set this if you want to delete all pitr chunks on cluster deletion
+#  - percona.com/delete-pitr-chunks
+
+nameOverride: ""
+fullnameOverride: ""
+
+crVersion: 1.19.0
+pause: false
+unmanaged: false
+unsafeFlags:
+  tls: false
+  replsetSize: false
+  mongosSize: false
+  terminationGracePeriod: false
+  backupIfUnhealthy: false
+
+enableVolumeExpansion: false
+
+annotations: {}
+
+# ignoreAnnotations:
+#   - service.beta.kubernetes.io/aws-load-balancer-backend-protocol
+# ignoreLabels:
+#   - rack
+multiCluster:
+  enabled: false
+  # DNSSuffix: svc.clusterset.local
+updateStrategy: SmartUpdate
+upgradeOptions:
+  versionServiceEndpoint: https://check.percona.com
+  apply: disabled
+  schedule: "0 2 * * *"
+  setFCV: false
+
+image:
+  repository: percona/percona-server-mongodb
+  tag: 8.0.4-1-multi
+
+imagePullPolicy: Always
+# imagePullSecrets: []
+# initImage:
+#   repository: percona/percona-server-mongodb-operator
+#   tag: 1.19.0
+# initContainerSecurityContext: {}
+# tls:
+#   mode: preferTLS
+#   # 90 days in hours
+#   certValidityDuration: 2160h
+#   allowInvalidCertificates: true
+#   issuerConf:
+#     name: special-selfsigned-issuer
+#     kind: ClusterIssuer
+#     group: cert-manager.io
+secrets: {}
+  # If you set users secret here the operator will use existing one or generate random values
+  # If not set the operator generates the default secret with name <cluster_name>-secrets
+  # users: my-cluster-name-secrets
+  # encryptionKey: my-cluster-name-mongodb-encryption-key
+  # ssl: my-cluster-name-ssl
+  # sslInternal: my-cluster-name-ssl-internal
+  # keyFile: my-cluster-name-mongodb-keyfile
+  # vault: my-cluster-name-vault
+  # ldapSecret: my-ldap-secret
+  # sse: my-cluster-name-sse
+
+pmm:
+  enabled: false
+  image:
+    repository: percona/pmm-client
+    tag: 2.44.0
+  serverHost: monitoring-service
+#   mongodParams: ""
+#   mongosParams: ""
+#   resources: {}
+#   containerSecurityContext: {}
+
+replsets:
+  rs0:
+    name: rs0
+    size: 3
+    # terminationGracePeriodSeconds: 300
+    # externalNodes:
+    # - host: 34.124.76.90
+    # - host: 34.124.76.91
+    #   port: 27017
+    #   votes: 0
+    #   priority: 0
+    # - host: 34.124.76.92
+    # configuration: |
+    #   operationProfiling:
+    #     mode: slowOp
+    #   systemLog:
+    #     verbosity: 1
+    # serviceAccountName: percona-server-mongodb-operator
+    # topologySpreadConstraints:
+    #   - labelSelector:
+    #       matchLabels:
+    #         app.kubernetes.io/name: percona-server-mongodb
+    #     maxSkew: 1
+    #     topologyKey: kubernetes.io/hostname
+    #     whenUnsatisfiable: DoNotSchedule
+    # replsetOverrides:
+    #   my-cluster-name-rs0-0:
+    #     host: my-cluster-name-rs0-0.example.net:27017
+    #     priority: 3
+    #     tags:
+    #       key: value-0
+    #   my-cluster-name-rs0-1:
+    #     host: my-cluster-name-rs0-1.example.net:27017
+    #     tags:
+    #       key: value-1
+    #   my-cluster-name-rs0-2:
+    #     host: my-cluster-name-rs0-2.example.net:27017
+    #     tags:
+    #       key: value-2
+    affinity:
+      antiAffinityTopologyKey: "kubernetes.io/hostname"
+      # advanced:
+      #   podAffinity:
+      #     requiredDuringSchedulingIgnoredDuringExecution:
+      #     - labelSelector:
+      #         matchExpressions:
+      #         - key: security
+      #           operator: In
+      #           values:
+      #           - S1
+      #       topologyKey: failure-domain.beta.kubernetes.io/zone
+    # tolerations: []
+    # primaryPreferTagSelector:
+    #   region: us-west-2
+    #   zone: us-west-2c
+    # priorityClass: ""
+    # annotations: {}
+    # labels: {}
+    # podSecurityContext: {}
+    # containerSecurityContext: {}
+    # nodeSelector: {}
+    # livenessProbe:
+    #   failureThreshold: 4
+    #   initialDelaySeconds: 60
+    #   periodSeconds: 30
+    #   timeoutSeconds: 10
+    #   startupDelaySeconds: 7200
+    # readinessProbe:
+    #   failureThreshold: 8
+    #   initialDelaySeconds: 10
+    #   periodSeconds: 3
+    #   successThreshold: 1
+    #   timeoutSeconds: 2
+    # runtimeClassName: image-rc
+    # storage:
+    #   engine: wiredTiger
+    #   wiredTiger:
+    #     engineConfig:
+    #       cacheSizeRatio: 0.5
+    #       directoryForIndexes: false
+    #       journalCompressor: snappy
+    #     collectionConfig:
+    #       blockCompressor: snappy
+    #     indexConfig:
+    #       prefixCompression: true
+    #   inMemory:
+    #     engineConfig:
+    #        inMemorySizeRatio: 0.5
+    # sidecars:
+    # - image: busybox
+    #   command: ["/bin/sh"]
+    #   args: ["-c", "while true; do echo echo $(date -u) 'test' >> /dev/null; sleep 5;done"]
+    #   name: rs-sidecar-1
+    #   volumeMounts:
+    #     - mountPath: /volume1
+    #       name: sidecar-volume-claim
+    #     - mountPath: /secret
+    #       name: sidecar-secret
+    #     - mountPath: /configmap
+    #       name: sidecar-config
+    # sidecarVolumes:
+    # - name: sidecar-secret
+    #   secret:
+    #     secretName: mysecret
+    # - name: sidecar-config
+    #   configMap:
+    #     name: myconfigmap
+    # - name: backup-nfs
+    #   nfs:
+    #     server: "nfs-service.storage.svc.cluster.local"
+    #     path: "/psmdb-some-name-rs0"
+    # sidecarPVCs:
+    # - apiVersion: v1
+    #   kind: PersistentVolumeClaim
+    #   metadata:
+    #     name: sidecar-volume-claim
+    #   spec:
+    #     resources:
+    #       requests:
+    #         storage: 1Gi
+    #     volumeMode: Filesystem
+    #     accessModes:
+    #       - ReadWriteOnce
+    podDisruptionBudget:
+      maxUnavailable: 1
+    # splitHorizons:
+    #   my-cluster-name-rs0-0:
+    #     external: rs0-0.mycluster.xyz
+    #     external-2: rs0-0.mycluster2.xyz
+    #   my-cluster-name-rs0-1:
+    #     external: rs0-1.mycluster.xyz
+    #     external-2: rs0-1.mycluster2.xyz
+    #   my-cluster-name-rs0-2:
+    #     external: rs0-2.mycluster.xyz
+    #     external-2: rs0-2.mycluster2.xyz
+    expose:
+      enabled: false
+      type: ClusterIP
+      # loadBalancerIP: 10.0.0.0
+      # loadBalancerSourceRanges:
+      #   - 10.0.0.0/8
+      # annotations:
+      #   service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
+      # labels:
+      #   some-label: some-key
+      # internalTrafficPolicy: Local
+      # externalTrafficPolicy: Local
+    # schedulerName: ""
+    resources:
+      limits:
+        cpu: "300m"
+        memory: "0.5G"
+      requests:
+        cpu: "300m"
+        memory: "0.5G"
+    volumeSpec:
+      # emptyDir: {}
+      # hostPath:
+      #   path: /data
+      #   type: Directory
+      pvc:
+        # annotations:
+        #   volume.beta.kubernetes.io/storage-class: example-hostpath
+        # labels:
+        #   rack: rack-22
+        # storageClassName: standard
+        # accessModes: [ "ReadWriteOnce" ]
+        resources:
+          requests:
+            storage: 3Gi
+    # hostAliases:
+    # - ip: "10.10.0.2"
+    #   hostnames:
+    #   - "host1"
+    #   - "host2"
+    nonvoting:
+      enabled: false
+      # podSecurityContext: {}
+      # containerSecurityContext: {}
+      size: 3
+      # configuration: |
+      #   operationProfiling:
+      #     mode: slowOp
+      #   systemLog:
+      #     verbosity: 1
+      # serviceAccountName: percona-server-mongodb-operator
+      affinity:
+        antiAffinityTopologyKey: "kubernetes.io/hostname"
+        # advanced:
+        #   podAffinity:
+        #     requiredDuringSchedulingIgnoredDuringExecution:
+        #     - labelSelector:
+        #         matchExpressions:
+        #         - key: security
+        #           operator: In
+        #           values:
+        #           - S1
+        #       topologyKey: failure-domain.beta.kubernetes.io/zone
+      # tolerations: []
+      # priorityClass: ""
+      # annotations: {}
+      # labels: {}
+      # nodeSelector: {}
+      podDisruptionBudget:
+        maxUnavailable: 1
+      resources:
+        limits:
+          cpu: "300m"
+          memory: "0.5G"
+        requests:
+          cpu: "300m"
+          memory: "0.5G"
+      volumeSpec:
+        # emptyDir: {}
+        # hostPath:
+        #   path: /data
+        #   type: Directory
+        pvc:
+          # annotations:
+          #   volume.beta.kubernetes.io/storage-class: example-hostpath
+          # labels:
+          #   rack: rack-22
+          # storageClassName: standard
+          # accessModes: [ "ReadWriteOnce" ]
+          resources:
+            requests:
+              storage: 3Gi
+    arbiter:
+      enabled: false
+      size: 1
+      # serviceAccountName: percona-server-mongodb-operator
+      affinity:
+        antiAffinityTopologyKey: "kubernetes.io/hostname"
+        # advanced:
+        #   podAffinity:
+        #     requiredDuringSchedulingIgnoredDuringExecution:
+        #     - labelSelector:
+        #         matchExpressions:
+        #         - key: security
+        #           operator: In
+        #           values:
+        #           - S1
+        #       topologyKey: failure-domain.beta.kubernetes.io/zone
+      # tolerations: []
+      # priorityClass: ""
+      # annotations: {}
+      # labels: {}
+      # nodeSelector: {}
+
+sharding:
+  enabled: true
+  balancer:
+    enabled: true
+
+  configrs:
+    size: 3
+    # terminationGracePeriodSeconds: 300
+    # externalNodes:
+    # - host: 34.124.76.90
+    # - host: 34.124.76.91
+    #   port: 27017
+    #   votes: 0
+    #   priority: 0
+    # - host: 34.124.76.92
+    # configuration: |
+    #   operationProfiling:
+    #     mode: slowOp
+    #   systemLog:
+    #     verbosity: 1
+    # serviceAccountName: percona-server-mongodb-operator
+    # topologySpreadConstraints:
+    #   - labelSelector:
+    #       matchLabels:
+    #         app.kubernetes.io/name: percona-server-mongodb
+    #     maxSkew: 1
+    #     topologyKey: kubernetes.io/hostname
+    #     whenUnsatisfiable: DoNotSchedule
+    affinity:
+      antiAffinityTopologyKey: "kubernetes.io/hostname"
+      # advanced:
+      #   podAffinity:
+      #     requiredDuringSchedulingIgnoredDuringExecution:
+      #     - labelSelector:
+      #         matchExpressions:
+      #         - key: security
+      #           operator: In
+      #           values:
+      #           - S1
+      #       topologyKey: failure-domain.beta.kubernetes.io/zone
+    # tolerations: []
+    # priorityClass: ""
+    # annotations: {}
+    # labels: {}
+    # podSecurityContext: {}
+    # containerSecurityContext: {}
+    # nodeSelector: {}
+    # livenessProbe: {}
+    # readinessProbe: {}
+    # runtimeClassName: image-rc
+    # sidecars:
+    # - image: busybox
+    #   command: ["/bin/sh"]
+    #   args: ["-c", "while true; do echo echo $(date -u) 'test' >> /dev/null; sleep 5;done"]
+    #   name: rs-sidecar-1
+    #   volumeMounts:
+    #     - mountPath: /volume1
+    #       name: sidecar-volume-claim
+    # sidecarPVCs: []
+    # sidecarVolumes: []
+    podDisruptionBudget:
+      maxUnavailable: 1
+    expose:
+      enabled: false
+      type: ClusterIP
+      # loadBalancerIP: 10.0.0.0
+      # loadBalancerSourceRanges:
+      #   - 10.0.0.0/8
+      # annotations:
+      #   service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
+      # labels:
+      #   some-label: some-key
+      # internalTrafficPolicy: Local
+      # externalTrafficPolicy: Local
+    resources:
+      limits:
+        cpu: "300m"
+        memory: "0.5G"
+      requests:
+        cpu: "300m"
+        memory: "0.5G"
+    volumeSpec:
+      # emptyDir: {}
+      # hostPath:
+      #   path: /data
+      #   type: Directory
+      pvc:
+        # annotations:
+        #   volume.beta.kubernetes.io/storage-class: example-hostpath
+        # labels:
+        #   rack: rack-22
+        # storageClassName: standard
+        # accessModes: [ "ReadWriteOnce" ]
+        resources:
+          requests:
+            storage: 3Gi
+    # hostAliases:
+    # - ip: "10.10.0.2"
+    #   hostnames:
+    #   - "host1"
+    #   - "host2"
+
+  mongos:
+    size: 3
+    # terminationGracePeriodSeconds: 300
+    # configuration: |
+    #   systemLog:
+    #     verbosity: 1
+    # serviceAccountName: percona-server-mongodb-operator
+    # topologySpreadConstraints:
+    #   - labelSelector:
+    #       matchLabels:
+    #         app.kubernetes.io/name: percona-server-mongodb
+    #     maxSkew: 1
+    #     topologyKey: kubernetes.io/hostname
+    #     whenUnsatisfiable: DoNotSchedule
+    affinity:
+      antiAffinityTopologyKey: "kubernetes.io/hostname"
+      # advanced:
+      #   podAffinity:
+      #     requiredDuringSchedulingIgnoredDuringExecution:
+      #     - labelSelector:
+      #         matchExpressions:
+      #         - key: security
+      #           operator: In
+      #           values:
+      #           - S1
+      #       topologyKey: failure-domain.beta.kubernetes.io/zone
+    # tolerations: []
+    # priorityClass: ""
+    # annotations: {}
+    # labels: {}
+    # podSecurityContext: {}
+    # containerSecurityContext: {}
+    # nodeSelector: {}
+    # livenessProbe: {}
+    # readinessProbe: {}
+    # runtimeClassName: image-rc
+    # sidecars:
+    # - image: busybox
+    #   command: ["/bin/sh"]
+    #   args: ["-c", "while true; do echo echo $(date -u) 'test' >> /dev/null; sleep 5;done"]
+    #   name: rs-sidecar-1
+    #   volumeMounts:
+    #     - mountPath: /volume1
+    #       name: sidecar-volume-claim
+    # sidecarPVCs: []
+    # sidecarVolumes: []
+    podDisruptionBudget:
+      maxUnavailable: 1
+    resources:
+      limits:
+        cpu: "300m"
+        memory: "0.5G"
+      requests:
+        cpu: "300m"
+        memory: "0.5G"
+    expose:
+      enabled: false
+      type: ClusterIP
+      # loadBalancerIP: 10.0.0.0/8
+      # loadBalancerSourceRanges:
+      #   - 10.0.0.0/8
+      # annotations:
+      #   service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
+      # labels:
+      #   some-label: some-key
+      # internalTrafficPolicy: Local
+      # externalTrafficPolicy: Local
+      # nodePort: 32017
+    # auditLog:
+    #   destination: file
+    #   format: BSON
+    #   filter: '{}'
+    # hostAliases:
+    # - ip: "10.10.0.2"
+    #   hostnames:
+    #   - "host1"
+    #   - "host2"
+
+# users:
+# - name: my-user
+#   db: admin
+#   passwordSecretRef:
+#     name: my-user-password
+#     key: my-user-password-key
+#   roles:
+#     - name: clusterAdmin
+#       db: admin
+#     - name: userAdminAnyDatabase
+#       db: admin
+# - name: my-usr
+#   db: admin
+#   passwordSecretRef:
+#     name: my-user-pwd
+#     key: my-user-pwd-key
+#   roles:
+#     - name: dbOwner
+#       db: sometest
+
+#  roles:
+#    - role: myClusterwideAdmin
+#      db: admin
+#      privileges:
+#        - resource:
+#            cluster: true
+#          actions:
+#            - addShard
+#        - resource:
+#            db: config
+#            collection: ''
+#          actions:
+#            - find
+#            - update
+#            - insert
+#            - remove
+#      roles:
+#        - role: read
+#          db: admin
+#    - role: my-role
+#      db: myDb
+#      privileges:
+#        - resource:
+#            db: ''
+#            collection: ''
+#          actions:
+#            - find
+#      authenticationRestrictions:
+#        - clientSource:
+#            - 127.0.0.1
+#          serverAddress:
+#            - 127.0.0.1
+
+
+backup:
+  enabled: true
+  image:
+    repository: percona/percona-backup-mongodb
+    tag: 2.8.0-multi
+  # annotations:
+  #   iam.amazonaws.com/role: role-arn
+  # podSecurityContext: {}
+  # containerSecurityContext: {}
+  # resources:
+  #   limits:
+  #     cpu: "300m"
+  #     memory: "1.2G"
+  #   requests:
+  #     cpu: "300m"
+  #     memory: "1G"
+  storages:
+    # s3-us-west:
+    #   type: s3
+    #   s3:
+    #     bucket: S3-BACKUP-BUCKET-NAME-HERE
+    #     credentialsSecret: my-cluster-name-backup-s3
+    #     serverSideEncryption:
+    #       kmsKeyID: 1234abcd-12ab-34cd-56ef-1234567890ab
+    #       sseAlgorithm: aws:kms
+    #       sseCustomerAlgorithm: AES256
+    #       sseCustomerKey: Y3VzdG9tZXIta2V5
+    #     retryer:
+    #       numMaxRetries: 3
+    #       minRetryDelay: 30ms
+    #       maxRetryDelay: 5m
+    #     region: us-west-2
+    #     prefix: ""
+    #     uploadPartSize: 10485760
+    #     maxUploadParts: 10000
+    #     storageClass: STANDARD
+    #     insecureSkipTLSVerify: false
+    # minio:
+    #   type: s3
+    #   s3:
+    #     bucket: MINIO-BACKUP-BUCKET-NAME-HERE
+    #     region: us-east-1
+    #     credentialsSecret: my-cluster-name-backup-minio
+    #     endpointUrl: http://minio.psmdb.svc.cluster.local:9000/minio/
+    #     prefix: ""
+    #   azure-blob:
+    #     type: azure
+    #     azure:
+    #       container: CONTAINER-NAME
+    #       prefix: PREFIX-NAME
+    #       endpointUrl: https://accountName.blob.core.windows.net
+    #       credentialsSecret: SECRET-NAME
+    #  backup-nfs:
+    #    type: filesystem
+    #    filesystem:
+    #      path: /mnt/nfs/
+#    volumeMounts:
+#    - mountPath: /mnt/nfs/
+#      name: backup-nfs
+  pitr:
+    enabled: false
+    oplogOnly: false
+    # oplogSpanMin: 10
+    # compressionType: gzip
+    # compressionLevel: 6
+  # configuration:
+  #   backupOptions:
+  #     priority:
+  #       "localhost:28019": 2.5
+  #       "localhost:27018": 2.5
+  #     timeouts:
+  #       startingStatus: 33
+  #     oplogSpanMin: 10
+  #   restoreOptions:
+  #     batchSize: 500
+  #     numInsertionWorkers: 10
+  #     numDownloadWorkers: 4
+  #     maxDownloadBufferMb: 0
+  #     downloadChunkMb: 32
+  #     mongodLocation: /usr/bin/mongo
+  #     mongodLocationMap:
+  #       "node01:2017": /usr/bin/mongo
+  #       "node03:27017": /usr/bin/mongo
+  tasks:
+  # - name: daily-s3-us-west
+  #   enabled: true
+  #   schedule: "0 0 * * *"
+  #   keep: 3
+  #   storageName: s3-us-west
+  #   compressionType: gzip
+  # - name: weekly-s3-us-west
+  #   enabled: false
+  #   schedule: "0 0 * * 0"
+  #   keep: 5
+  #   storageName: s3-us-west
+  #   compressionType: gzip
+  # - name: weekly-s3-us-west-physical
+  #   enabled: false
+  #   schedule: "0 5 * * 0"
+  #   keep: 5
+  #   type: physical
+  #   storageName: s3-us-west
+  #   compressionType: gzip
+  #   compressionLevel: 6
+
+# If you set systemUsers here the secret will be constructed by helm with these values
+# systemUsers:
+#   MONGODB_BACKUP_USER: backup
+#   MONGODB_BACKUP_PASSWORD: backup123456
+#   MONGODB_DATABASE_ADMIN_USER: databaseAdmin
+#   MONGODB_DATABASE_ADMIN_PASSWORD: databaseAdmin123456
+#   MONGODB_CLUSTER_ADMIN_USER: clusterAdmin
+#   MONGODB_CLUSTER_ADMIN_PASSWORD: clusterAdmin123456
+#   MONGODB_CLUSTER_MONITOR_USER: clusterMonitor
+#   MONGODB_CLUSTER_MONITOR_PASSWORD: clusterMonitor123456
+#   MONGODB_USER_ADMIN_USER: userAdmin
+#   MONGODB_USER_ADMIN_PASSWORD: userAdmin123456
+#   PMM_SERVER_API_KEY: apikey
+#   # PMM_SERVER_USER: admin
+#   # PMM_SERVER_PASSWORD: admin
diff --git a/charts/percona/psmdb-operator/1.19.0/.helmignore b/charts/percona/psmdb-operator/1.19.0/.helmignore
new file mode 100644
index 000000000..50af03172
--- /dev/null
+++ b/charts/percona/psmdb-operator/1.19.0/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/percona/psmdb-operator/1.19.0/Chart.yaml b/charts/percona/psmdb-operator/1.19.0/Chart.yaml
new file mode 100644
index 000000000..f6f543d5e
--- /dev/null
+++ b/charts/percona/psmdb-operator/1.19.0/Chart.yaml
@@ -0,0 +1,20 @@
+annotations:
+  catalog.cattle.io/certified: partner
+  catalog.cattle.io/display-name: Percona Operator for MongoDB
+  catalog.cattle.io/kube-version: '>=1.21-0'
+  catalog.cattle.io/release-name: psmdb-operator
+apiVersion: v2
+appVersion: 1.19.0
+description: A Helm chart for deploying the Percona Operator for MongoDB
+home: https://docs.percona.com/percona-operator-for-mongodb/
+icon: file://assets/icons/psmdb-operator.png
+kubeVersion: '>=1.21-0'
+maintainers:
+- email: natalia.marukovich@percona.com
+  name: nmarukovich
+- email: sergey.pronin@percona.com
+  name: spron-in
+- email: julio.pasinatto@percona.com
+  name: jvpasinatto
+name: psmdb-operator
+version: 1.19.0
diff --git a/charts/percona/psmdb-operator/1.19.0/LICENSE.txt b/charts/percona/psmdb-operator/1.19.0/LICENSE.txt
new file mode 100644
index 000000000..6a31453af
--- /dev/null
+++ b/charts/percona/psmdb-operator/1.19.0/LICENSE.txt
@@ -0,0 +1,13 @@
+Copyright 2019 Paul Czarkowski <username.taken@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
diff --git a/charts/percona/psmdb-operator/1.19.0/README.md b/charts/percona/psmdb-operator/1.19.0/README.md
new file mode 100644
index 000000000..e167e5aab
--- /dev/null
+++ b/charts/percona/psmdb-operator/1.19.0/README.md
@@ -0,0 +1,76 @@
+# Percona Operator for MongoDB
+
+Percona Operator for MongoDB allows users to deploy and manage Percona Server for MongoDB Clusters on Kubernetes.
+Useful links:
+- [Operator Github repository](https://github.com/percona/percona-server-mongodb-operator)
+- [Operator Documentation](https://www.percona.com/doc/kubernetes-operator-for-psmongodb/index.html)
+
+## Pre-requisites
+* Kubernetes 1.28+
+* Helm v3
+
+# Installation
+
+This chart will deploy the Operator Pod for the further Percona Server for MongoDB creation in Kubernetes.
+
+## Installing the chart
+
+To install the chart with the `psmdb` release name using a dedicated namespace (recommended):
+
+```sh
+helm repo add percona https://percona.github.io/percona-helm-charts/
+helm install my-operator percona/psmdb-operator --version 1.19.0 --namespace my-namespace
+```
+
+The chart can be customized using the following configurable parameters:
+
+| Parameter                    | Description                                                                                         | Default                                   |
+| ---------------------------- | --------------------------------------------------------------------------------------------------- | ----------------------------------------- |
+| `image.repository`           | PSMDB Operator Container image name                                                                 | `percona/percona-server-mongodb-operator` |
+| `image.tag`                  | PSMDB Operator Container image tag                                                                  | `1.19.0`                                  |
+| `image.pullPolicy`           | PSMDB Operator Container pull policy                                                                | `Always`                                  |
+| `image.pullSecrets`          | PSMDB Operator Pod pull secret                                                                      | `[]`                                      |
+| `replicaCount`               | PSMDB Operator Pod quantity                                                                         | `1`                                       |
+| `tolerations`                | List of node taints to tolerate                                                                     | `[]`                                      |
+| `annotations`                | PSMDB Operator Deployment annotations                                                               | `{}`                                      |
+| `podAnnotations`             | PSMDB Operator Pod annotations                                                                      | `{}`                                      |
+| `labels`                     | PSMDB Operator Deployment labels                                                                    | `{}`                                      |
+| `podLabels`                  | PSMDB Operator Pod labels                                                                           | `{}`                                      |
+| `resources`                  | Resource requests and limits                                                                        | `{}`                                      |
+| `nodeSelector`               | Labels for Pod assignment                                                                           | `{}`                                      |
+| `podAnnotations`             | Annotations for pod                                                                                 | `{}`                                      |
+| `podSecurityContext`         | Pod Security Context                                                                                | `{}`                                      |
+| `watchNamespace`             | Set when a different from default namespace is needed to watch (comma separated if multiple needed) | `""`                                      |
+| `createNamespace`            | Set if you want to create watched namespaces with helm                                              | `false`                                   |
+| `rbac.create`                | If false RBAC will not be created. RBAC resources will need to be created manually                  | `true`                                    |
+| `securityContext`            | Container Security Context                                                                          | `{}`                                      |
+| `serviceAccount.create`      | If false the ServiceAccounts will not be created. The ServiceAccounts must be created manually      | `true`                                    |
+| `serviceAccount.annotations` | PSMDB Operator ServiceAccount annotations                                                           | `{}`                                      |
+| `logStructured`              | Force PSMDB operator to print JSON-wrapped log messages                                             | `false`                                   |
+| `logLevel`                   | PSMDB Operator logging level                                                                        | `INFO`                                    |
+| `disableTelemetry`           | Disable sending PSMDB Operator telemetry data to Percona                                            | `false`                                   |
+
+Specify parameters using `--set key=value[,key=value]` argument to `helm install`
+
+Alternatively a YAML file that specifies the values for the parameters can be provided like this:
+
+```sh
+helm install psmdb-operator -f values.yaml percona/psmdb-operator
+```
+
+## Deploy the database
+
+To deploy Percona Server for MongoDB run the following command:
+
+```sh
+helm install my-db percona/psmdb-db
+```
+
+See more about Percona Server for MongoDB deployment in its chart [here](https://github.com/percona/percona-helm-charts/tree/main/charts/psmdb-db) or in the [Helm chart installation guide](https://www.percona.com/doc/kubernetes-operator-for-psmongodb/helm.html).
+
+# Need help?
+
+**Commercial Support**  | **Community Support** |
+:-: | :-: |
+| <br/>Enterprise-grade assistance for your mission-critical database deployments in containers and Kubernetes. Get expert guidance for complex tasks like multi-cloud replication, database migration and building platforms.<br/><br/>  | <br/>Connect with our engineers and fellow users for general questions, troubleshooting, and sharing feedback and ideas.<br/><br/>  | 
+| **[Get Percona Support](https://hubs.ly/Q02ZTH8Q0)** | **[Visit our Forum](https://forums.percona.com/)** |
diff --git a/charts/percona/psmdb-operator/1.19.0/crds/crd.yaml b/charts/percona/psmdb-operator/1.19.0/crds/crd.yaml
new file mode 100644
index 000000000..cf2b796c8
--- /dev/null
+++ b/charts/percona/psmdb-operator/1.19.0/crds/crd.yaml
@@ -0,0 +1,19586 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: perconaservermongodbbackups.psmdb.percona.com
+spec:
+  group: psmdb.percona.com
+  names:
+    kind: PerconaServerMongoDBBackup
+    listKind: PerconaServerMongoDBBackupList
+    plural: perconaservermongodbbackups
+    shortNames:
+    - psmdb-backup
+    singular: perconaservermongodbbackup
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - description: Cluster name
+      jsonPath: .spec.clusterName
+      name: Cluster
+      type: string
+    - description: Storage name
+      jsonPath: .spec.storageName
+      name: Storage
+      type: string
+    - description: Backup destination
+      jsonPath: .status.destination
+      name: Destination
+      type: string
+    - description: Backup type
+      jsonPath: .status.type
+      name: Type
+      type: string
+    - description: Job status
+      jsonPath: .status.state
+      name: Status
+      type: string
+    - description: Completed time
+      jsonPath: .status.completed
+      name: Completed
+      type: date
+    - description: Created time
+      jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            type: string
+          kind:
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              clusterName:
+                type: string
+              compressionLevel:
+                type: integer
+              compressionType:
+                type: string
+              psmdbCluster:
+                type: string
+              storageName:
+                type: string
+              type:
+                enum:
+                - logical
+                - physical
+                type: string
+            type: object
+          status:
+            properties:
+              azure:
+                properties:
+                  container:
+                    type: string
+                  credentialsSecret:
+                    type: string
+                  endpointUrl:
+                    type: string
+                  prefix:
+                    type: string
+                required:
+                - credentialsSecret
+                type: object
+              completed:
+                format: date-time
+                type: string
+              destination:
+                type: string
+              error:
+                type: string
+              filesystem:
+                properties:
+                  path:
+                    type: string
+                required:
+                - path
+                type: object
+              lastTransition:
+                format: date-time
+                type: string
+              latestRestorableTime:
+                format: date-time
+                type: string
+              pbmName:
+                type: string
+              pbmPod:
+                type: string
+              pbmPods:
+                additionalProperties:
+                  type: string
+                type: object
+              replsetNames:
+                items:
+                  type: string
+                type: array
+              s3:
+                properties:
+                  bucket:
+                    type: string
+                  credentialsSecret:
+                    type: string
+                  debugLogLevels:
+                    type: string
+                  endpointUrl:
+                    type: string
+                  forcePathStyle:
+                    type: boolean
+                  insecureSkipTLSVerify:
+                    type: boolean
+                  maxUploadParts:
+                    type: integer
+                  prefix:
+                    type: string
+                  region:
+                    type: string
+                  retryer:
+                    properties:
+                      maxRetryDelay:
+                        type: string
+                      minRetryDelay:
+                        type: string
+                      numMaxRetries:
+                        type: integer
+                    type: object
+                  serverSideEncryption:
+                    properties:
+                      kmsKeyID:
+                        type: string
+                      sseAlgorithm:
+                        type: string
+                      sseCustomerAlgorithm:
+                        type: string
+                      sseCustomerKey:
+                        type: string
+                    type: object
+                  storageClass:
+                    type: string
+                  uploadPartSize:
+                    type: integer
+                required:
+                - bucket
+                type: object
+              start:
+                format: date-time
+                type: string
+              state:
+                type: string
+              storageName:
+                type: string
+              type:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: perconaservermongodbrestores.psmdb.percona.com
+spec:
+  group: psmdb.percona.com
+  names:
+    kind: PerconaServerMongoDBRestore
+    listKind: PerconaServerMongoDBRestoreList
+    plural: perconaservermongodbrestores
+    shortNames:
+    - psmdb-restore
+    singular: perconaservermongodbrestore
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - description: Cluster name
+      jsonPath: .spec.clusterName
+      name: Cluster
+      type: string
+    - description: Job status
+      jsonPath: .status.state
+      name: Status
+      type: string
+    - description: Created time
+      jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            type: string
+          kind:
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              backupName:
+                type: string
+              backupSource:
+                properties:
+                  azure:
+                    properties:
+                      container:
+                        type: string
+                      credentialsSecret:
+                        type: string
+                      endpointUrl:
+                        type: string
+                      prefix:
+                        type: string
+                    required:
+                    - credentialsSecret
+                    type: object
+                  completed:
+                    format: date-time
+                    type: string
+                  destination:
+                    type: string
+                  error:
+                    type: string
+                  filesystem:
+                    properties:
+                      path:
+                        type: string
+                    required:
+                    - path
+                    type: object
+                  lastTransition:
+                    format: date-time
+                    type: string
+                  latestRestorableTime:
+                    format: date-time
+                    type: string
+                  pbmName:
+                    type: string
+                  pbmPod:
+                    type: string
+                  pbmPods:
+                    additionalProperties:
+                      type: string
+                    type: object
+                  replsetNames:
+                    items:
+                      type: string
+                    type: array
+                  s3:
+                    properties:
+                      bucket:
+                        type: string
+                      credentialsSecret:
+                        type: string
+                      debugLogLevels:
+                        type: string
+                      endpointUrl:
+                        type: string
+                      forcePathStyle:
+                        type: boolean
+                      insecureSkipTLSVerify:
+                        type: boolean
+                      maxUploadParts:
+                        type: integer
+                      prefix:
+                        type: string
+                      region:
+                        type: string
+                      retryer:
+                        properties:
+                          maxRetryDelay:
+                            type: string
+                          minRetryDelay:
+                            type: string
+                          numMaxRetries:
+                            type: integer
+                        type: object
+                      serverSideEncryption:
+                        properties:
+                          kmsKeyID:
+                            type: string
+                          sseAlgorithm:
+                            type: string
+                          sseCustomerAlgorithm:
+                            type: string
+                          sseCustomerKey:
+                            type: string
+                        type: object
+                      storageClass:
+                        type: string
+                      uploadPartSize:
+                        type: integer
+                    required:
+                    - bucket
+                    type: object
+                  start:
+                    format: date-time
+                    type: string
+                  state:
+                    type: string
+                  storageName:
+                    type: string
+                  type:
+                    type: string
+                type: object
+              clusterName:
+                type: string
+              pitr:
+                properties:
+                  date:
+                    type: string
+                  type:
+                    type: string
+                type: object
+              replset:
+                type: string
+              selective:
+                properties:
+                  namespaces:
+                    items:
+                      type: string
+                    type: array
+                  withUsersAndRoles:
+                    type: boolean
+                type: object
+              storageName:
+                type: string
+            type: object
+          status:
+            properties:
+              completed:
+                format: date-time
+                type: string
+              error:
+                type: string
+              lastTransition:
+                format: date-time
+                type: string
+              pbmName:
+                type: string
+              pitrTarget:
+                type: string
+              state:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.3
+  name: perconaservermongodbs.psmdb.percona.com
+spec:
+  group: psmdb.percona.com
+  names:
+    kind: PerconaServerMongoDB
+    listKind: PerconaServerMongoDBList
+    plural: perconaservermongodbs
+    shortNames:
+    - psmdb
+    singular: perconaservermongodb
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.host
+      name: ENDPOINT
+      type: string
+    - jsonPath: .status.state
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    deprecated: true
+    deprecationWarning: psmdb.percona.com/v1-2-0 PerconaServerMongoDB is deprecated
+      and will be removed in v1.17.0; see v1.13.0 release notes for instructions to
+      migrate to psmdb.percona.com/v1
+    name: v1-2-0
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+          status:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: false
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - jsonPath: .status.host
+      name: ENDPOINT
+      type: string
+    - jsonPath: .status.state
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    deprecated: true
+    deprecationWarning: psmdb.percona.com/v1-3-0 PerconaServerMongoDB is deprecated
+      and will be removed in v1.17.0; see v1.13.0 release notes for instructions to
+      migrate to psmdb.percona.com/v1
+    name: v1-3-0
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+          status:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: false
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - jsonPath: .status.host
+      name: ENDPOINT
+      type: string
+    - jsonPath: .status.state
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    deprecated: true
+    deprecationWarning: psmdb.percona.com/v1-4-0 PerconaServerMongoDB is deprecated
+      and will be removed in v1.17.0; see v1.13.0 release notes for instructions to
+      migrate to psmdb.percona.com/v1
+    name: v1-4-0
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+          status:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: false
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - jsonPath: .status.host
+      name: ENDPOINT
+      type: string
+    - jsonPath: .status.state
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    deprecated: true
+    deprecationWarning: psmdb.percona.com/v1-5-0 PerconaServerMongoDB is deprecated
+      and will be removed in v1.17.0; see v1.13.0 release notes for instructions to
+      migrate to psmdb.percona.com/v1
+    name: v1-5-0
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+          status:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: false
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - jsonPath: .status.host
+      name: ENDPOINT
+      type: string
+    - jsonPath: .status.state
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    deprecated: true
+    deprecationWarning: psmdb.percona.com/v1-6-0 PerconaServerMongoDB is deprecated
+      and will be removed in v1.17.0; see v1.13.0 release notes for instructions to
+      migrate to psmdb.percona.com/v1
+    name: v1-6-0
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+          status:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: false
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - jsonPath: .status.host
+      name: ENDPOINT
+      type: string
+    - jsonPath: .status.state
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    deprecated: true
+    deprecationWarning: psmdb.percona.com/v1-7-0 PerconaServerMongoDB is deprecated
+      and will be removed in v1.17.0; see v1.13.0 release notes for instructions to
+      migrate to psmdb.percona.com/v1
+    name: v1-7-0
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+          status:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: false
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - jsonPath: .status.host
+      name: ENDPOINT
+      type: string
+    - jsonPath: .status.state
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    deprecated: true
+    deprecationWarning: psmdb.percona.com/v1-8-0 PerconaServerMongoDB is deprecated
+      and will be removed in v1.17.0; see v1.13.0 release notes for instructions to
+      migrate to psmdb.percona.com/v1
+    name: v1-8-0
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+          status:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: false
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - jsonPath: .status.host
+      name: ENDPOINT
+      type: string
+    - jsonPath: .status.state
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    deprecated: true
+    deprecationWarning: psmdb.percona.com/v1-9-0 PerconaServerMongoDB is deprecated
+      and will be removed in v1.17.0; see v1.13.0 release notes for instructions to
+      migrate to psmdb.percona.com/v1
+    name: v1-9-0
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+          status:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: false
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - jsonPath: .status.host
+      name: ENDPOINT
+      type: string
+    - jsonPath: .status.state
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    deprecated: true
+    deprecationWarning: psmdb.percona.com/v1-10-0 PerconaServerMongoDB is deprecated
+      and will be removed in v1.17.0; see v1.13.0 release notes for instructions to
+      migrate to psmdb.percona.com/v1
+    name: v1-10-0
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+          status:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - jsonPath: .status.host
+      name: ENDPOINT
+      type: string
+    - jsonPath: .status.state
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    deprecated: true
+    deprecationWarning: psmdb.percona.com/v1-11-0 PerconaServerMongoDB is deprecated
+      and will be removed in v1.17.0; see v1.13.0 release notes for instructions to
+      migrate to psmdb.percona.com/v1
+    name: v1-11-0
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+          status:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - jsonPath: .status.host
+      name: ENDPOINT
+      type: string
+    - jsonPath: .status.state
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    deprecated: true
+    deprecationWarning: psmdb.percona.com/v1-12-0 PerconaServerMongoDB is deprecated
+      and will be removed in v1.17.0; see v1.13.0 release notes for instructions to
+      migrate to psmdb.percona.com/v1
+    name: v1-12-0
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+          status:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - jsonPath: .status.host
+      name: ENDPOINT
+      type: string
+    - jsonPath: .status.state
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            type: string
+          kind:
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              allowUnsafeConfigurations:
+                type: boolean
+              backup:
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
+                  configuration:
+                    properties:
+                      backupOptions:
+                        properties:
+                          oplogSpanMin:
+                            type: number
+                          priority:
+                            additionalProperties:
+                              type: number
+                            type: object
+                          timeouts:
+                            properties:
+                              startingStatus:
+                                format: int32
+                                type: integer
+                            type: object
+                        required:
+                        - oplogSpanMin
+                        type: object
+                      restoreOptions:
+                        properties:
+                          batchSize:
+                            type: integer
+                          downloadChunkMb:
+                            type: integer
+                          maxDownloadBufferMb:
+                            type: integer
+                          mongodLocation:
+                            type: string
+                          mongodLocationMap:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          numDownloadWorkers:
+                            type: integer
+                          numInsertionWorkers:
+                            type: integer
+                        type: object
+                    type: object
+                  containerSecurityContext:
+                    properties:
+                      allowPrivilegeEscalation:
+                        type: boolean
+                      appArmorProfile:
+                        properties:
+                          localhostProfile:
+                            type: string
+                          type:
+                            type: string
+                        required:
+                        - type
+                        type: object
+                      capabilities:
+                        properties:
+                          add:
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          drop:
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        type: object
+                      privileged:
+                        type: boolean
+                      procMount:
+                        type: string
+                      readOnlyRootFilesystem:
+                        type: boolean
+                      runAsGroup:
+                        format: int64
+                        type: integer
+                      runAsNonRoot:
+                        type: boolean
+                      runAsUser:
+                        format: int64
+                        type: integer
+                      seLinuxOptions:
+                        properties:
+                          level:
+                            type: string
+                          role:
+                            type: string
+                          type:
+                            type: string
+                          user:
+                            type: string
+                        type: object
+                      seccompProfile:
+                        properties:
+                          localhostProfile:
+                            type: string
+                          type:
+                            type: string
+                        required:
+                        - type
+                        type: object
+                      windowsOptions:
+                        properties:
+                          gmsaCredentialSpec:
+                            type: string
+                          gmsaCredentialSpecName:
+                            type: string
+                          hostProcess:
+                            type: boolean
+                          runAsUserName:
+                            type: string
+                        type: object
+                    type: object
+                  enabled:
+                    type: boolean
+                  image:
+                    type: string
+                  labels:
+                    additionalProperties:
+                      type: string
+                    type: object
+                  pitr:
+                    properties:
+                      compressionLevel:
+                        type: integer
+                      compressionType:
+                        type: string
+                      enabled:
+                        type: boolean
+                      oplogOnly:
+                        type: boolean
+                      oplogSpanMin:
+                        type: number
+                    type: object
+                  podSecurityContext:
+                    properties:
+                      appArmorProfile:
+                        properties:
+                          localhostProfile:
+                            type: string
+                          type:
+                            type: string
+                        required:
+                        - type
+                        type: object
+                      fsGroup:
+                        format: int64
+                        type: integer
+                      fsGroupChangePolicy:
+                        type: string
+                      runAsGroup:
+                        format: int64
+                        type: integer
+                      runAsNonRoot:
+                        type: boolean
+                      runAsUser:
+                        format: int64
+                        type: integer
+                      seLinuxChangePolicy:
+                        type: string
+                      seLinuxOptions:
+                        properties:
+                          level:
+                            type: string
+                          role:
+                            type: string
+                          type:
+                            type: string
+                          user:
+                            type: string
+                        type: object
+                      seccompProfile:
+                        properties:
+                          localhostProfile:
+                            type: string
+                          type:
+                            type: string
+                        required:
+                        - type
+                        type: object
+                      supplementalGroups:
+                        items:
+                          format: int64
+                          type: integer
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      supplementalGroupsPolicy:
+                        type: string
+                      sysctls:
+                        items:
+                          properties:
+                            name:
+                              type: string
+                            value:
+                              type: string
+                          required:
+                          - name
+                          - value
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      windowsOptions:
+                        properties:
+                          gmsaCredentialSpec:
+                            type: string
+                          gmsaCredentialSpecName:
+                            type: string
+                          hostProcess:
+                            type: boolean
+                          runAsUserName:
+                            type: string
+                        type: object
+                    type: object
+                  resources:
+                    properties:
+                      claims:
+                        items:
+                          properties:
+                            name:
+                              type: string
+                            request:
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
+                      limits:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        type: object
+                      requests:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        type: object
+                    type: object
+                  runtimeClassName:
+                    type: string
+                  serviceAccountName:
+                    type: string
+                  storages:
+                    additionalProperties:
+                      properties:
+                        azure:
+                          properties:
+                            container:
+                              type: string
+                            credentialsSecret:
+                              type: string
+                            endpointUrl:
+                              type: string
+                            prefix:
+                              type: string
+                          required:
+                          - credentialsSecret
+                          type: object
+                        filesystem:
+                          properties:
+                            path:
+                              type: string
+                          required:
+                          - path
+                          type: object
+                        s3:
+                          properties:
+                            bucket:
+                              type: string
+                            credentialsSecret:
+                              type: string
+                            debugLogLevels:
+                              type: string
+                            endpointUrl:
+                              type: string
+                            forcePathStyle:
+                              type: boolean
+                            insecureSkipTLSVerify:
+                              type: boolean
+                            maxUploadParts:
+                              type: integer
+                            prefix:
+                              type: string
+                            region:
+                              type: string
+                            retryer:
+                              properties:
+                                maxRetryDelay:
+                                  type: string
+                                minRetryDelay:
+                                  type: string
+                                numMaxRetries:
+                                  type: integer
+                              type: object
+                            serverSideEncryption:
+                              properties:
+                                kmsKeyID:
+                                  type: string
+                                sseAlgorithm:
+                                  type: string
+                                sseCustomerAlgorithm:
+                                  type: string
+                                sseCustomerKey:
+                                  type: string
+                              type: object
+                            storageClass:
+                              type: string
+                            uploadPartSize:
+                              type: integer
+                          required:
+                          - bucket
+                          type: object
+                        type:
+                          type: string
+                      required:
+                      - type
+                      type: object
+                    type: object
+                  tasks:
+                    items:
+                      properties:
+                        compressionLevel:
+                          type: integer
+                        compressionType:
+                          type: string
+                        enabled:
+                          type: boolean
+                        keep:
+                          type: integer
+                        name:
+                          type: string
+                        schedule:
+                          type: string
+                        storageName:
+                          type: string
+                        type:
+                          enum:
+                          - logical
+                          - physical
+                          type: string
+                      required:
+                      - enabled
+                      - name
+                      type: object
+                    type: array
+                  volumeMounts:
+                    items:
+                      properties:
+                        mountPath:
+                          type: string
+                        mountPropagation:
+                          type: string
+                        name:
+                          type: string
+                        readOnly:
+                          type: boolean
+                        recursiveReadOnly:
+                          type: string
+                        subPath:
+                          type: string
+                        subPathExpr:
+                          type: string
+                      required:
+                      - mountPath
+                      - name
+                      type: object
+                    type: array
+                required:
+                - enabled
+                - image
+                type: object
+              clusterServiceDNSMode:
+                type: string
+              clusterServiceDNSSuffix:
+                type: string
+              crVersion:
+                type: string
+              enableVolumeExpansion:
+                type: boolean
+              ignoreAnnotations:
+                items:
+                  type: string
+                type: array
+              ignoreLabels:
+                items:
+                  type: string
+                type: array
+              image:
+                type: string
+              imagePullPolicy:
+                type: string
+              imagePullSecrets:
+                items:
+                  properties:
+                    name:
+                      default: ""
+                      type: string
+                  type: object
+                  x-kubernetes-map-type: atomic
+                type: array
+              initContainerSecurityContext:
+                properties:
+                  allowPrivilegeEscalation:
+                    type: boolean
+                  appArmorProfile:
+                    properties:
+                      localhostProfile:
+                        type: string
+                      type:
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  capabilities:
+                    properties:
+                      add:
+                        items:
+                          type: string
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      drop:
+                        items:
+                          type: string
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                  privileged:
+                    type: boolean
+                  procMount:
+                    type: string
+                  readOnlyRootFilesystem:
+                    type: boolean
+                  runAsGroup:
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    type: boolean
+                  runAsUser:
+                    format: int64
+                    type: integer
+                  seLinuxOptions:
+                    properties:
+                      level:
+                        type: string
+                      role:
+                        type: string
+                      type:
+                        type: string
+                      user:
+                        type: string
+                    type: object
+                  seccompProfile:
+                    properties:
+                      localhostProfile:
+                        type: string
+                      type:
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  windowsOptions:
+                    properties:
+                      gmsaCredentialSpec:
+                        type: string
+                      gmsaCredentialSpecName:
+                        type: string
+                      hostProcess:
+                        type: boolean
+                      runAsUserName:
+                        type: string
+                    type: object
+                type: object
+              initImage:
+                type: string
+              multiCluster:
+                properties:
+                  DNSSuffix:
+                    type: string
+                  enabled:
+                    type: boolean
+                required:
+                - enabled
+                type: object
+              pause:
+                type: boolean
+              platform:
+                type: string
+              pmm:
+                properties:
+                  containerSecurityContext:
+                    properties:
+                      allowPrivilegeEscalation:
+                        type: boolean
+                      appArmorProfile:
+                        properties:
+                          localhostProfile:
+                            type: string
+                          type:
+                            type: string
+                        required:
+                        - type
+                        type: object
+                      capabilities:
+                        properties:
+                          add:
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          drop:
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        type: object
+                      privileged:
+                        type: boolean
+                      procMount:
+                        type: string
+                      readOnlyRootFilesystem:
+                        type: boolean
+                      runAsGroup:
+                        format: int64
+                        type: integer
+                      runAsNonRoot:
+                        type: boolean
+                      runAsUser:
+                        format: int64
+                        type: integer
+                      seLinuxOptions:
+                        properties:
+                          level:
+                            type: string
+                          role:
+                            type: string
+                          type:
+                            type: string
+                          user:
+                            type: string
+                        type: object
+                      seccompProfile:
+                        properties:
+                          localhostProfile:
+                            type: string
+                          type:
+                            type: string
+                        required:
+                        - type
+                        type: object
+                      windowsOptions:
+                        properties:
+                          gmsaCredentialSpec:
+                            type: string
+                          gmsaCredentialSpecName:
+                            type: string
+                          hostProcess:
+                            type: boolean
+                          runAsUserName:
+                            type: string
+                        type: object
+                    type: object
+                  enabled:
+                    type: boolean
+                  image:
+                    type: string
+                  mongodParams:
+                    type: string
+                  mongosParams:
+                    type: string
+                  resources:
+                    properties:
+                      claims:
+                        items:
+                          properties:
+                            name:
+                              type: string
+                            request:
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
+                      limits:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        type: object
+                      requests:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        type: object
+                    type: object
+                  serverHost:
+                    type: string
+                required:
+                - image
+                type: object
+              replsets:
+                items:
+                  properties:
+                    affinity:
+                      properties:
+                        advanced:
+                          properties:
+                            nodeAffinity:
+                              properties:
+                                preferredDuringSchedulingIgnoredDuringExecution:
+                                  items:
+                                    properties:
+                                      preference:
+                                        properties:
+                                          matchExpressions:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              required:
+                                              - key
+                                              - operator
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          matchFields:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              required:
+                                              - key
+                                              - operator
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      weight:
+                                        format: int32
+                                        type: integer
+                                    required:
+                                    - preference
+                                    - weight
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                requiredDuringSchedulingIgnoredDuringExecution:
+                                  properties:
+                                    nodeSelectorTerms:
+                                      items:
+                                        properties:
+                                          matchExpressions:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              required:
+                                              - key
+                                              - operator
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          matchFields:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              required:
+                                              - key
+                                              - operator
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  required:
+                                  - nodeSelectorTerms
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            podAffinity:
+                              properties:
+                                preferredDuringSchedulingIgnoredDuringExecution:
+                                  items:
+                                    properties:
+                                      podAffinityTerm:
+                                        properties:
+                                          labelSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          matchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          mismatchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          namespaceSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          namespaces:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          topologyKey:
+                                            type: string
+                                        required:
+                                        - topologyKey
+                                        type: object
+                                      weight:
+                                        format: int32
+                                        type: integer
+                                    required:
+                                    - podAffinityTerm
+                                    - weight
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                requiredDuringSchedulingIgnoredDuringExecution:
+                                  items:
+                                    properties:
+                                      labelSelector:
+                                        properties:
+                                          matchExpressions:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              required:
+                                              - key
+                                              - operator
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          matchLabels:
+                                            additionalProperties:
+                                              type: string
+                                            type: object
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      matchLabelKeys:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      mismatchLabelKeys:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      namespaceSelector:
+                                        properties:
+                                          matchExpressions:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              required:
+                                              - key
+                                              - operator
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          matchLabels:
+                                            additionalProperties:
+                                              type: string
+                                            type: object
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      namespaces:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      topologyKey:
+                                        type: string
+                                    required:
+                                    - topologyKey
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            podAntiAffinity:
+                              properties:
+                                preferredDuringSchedulingIgnoredDuringExecution:
+                                  items:
+                                    properties:
+                                      podAffinityTerm:
+                                        properties:
+                                          labelSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          matchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          mismatchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          namespaceSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          namespaces:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          topologyKey:
+                                            type: string
+                                        required:
+                                        - topologyKey
+                                        type: object
+                                      weight:
+                                        format: int32
+                                        type: integer
+                                    required:
+                                    - podAffinityTerm
+                                    - weight
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                requiredDuringSchedulingIgnoredDuringExecution:
+                                  items:
+                                    properties:
+                                      labelSelector:
+                                        properties:
+                                          matchExpressions:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              required:
+                                              - key
+                                              - operator
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          matchLabels:
+                                            additionalProperties:
+                                              type: string
+                                            type: object
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      matchLabelKeys:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      mismatchLabelKeys:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      namespaceSelector:
+                                        properties:
+                                          matchExpressions:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              required:
+                                              - key
+                                              - operator
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          matchLabels:
+                                            additionalProperties:
+                                              type: string
+                                            type: object
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      namespaces:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      topologyKey:
+                                        type: string
+                                    required:
+                                    - topologyKey
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                          type: object
+                        antiAffinityTopologyKey:
+                          type: string
+                      type: object
+                    annotations:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    arbiter:
+                      properties:
+                        affinity:
+                          properties:
+                            advanced:
+                              properties:
+                                nodeAffinity:
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      items:
+                                        properties:
+                                          preference:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchFields:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          weight:
+                                            format: int32
+                                            type: integer
+                                        required:
+                                        - preference
+                                        - weight
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      properties:
+                                        nodeSelectorTerms:
+                                          items:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchFields:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      required:
+                                      - nodeSelectorTerms
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                  type: object
+                                podAffinity:
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      items:
+                                        properties:
+                                          podAffinityTerm:
+                                            properties:
+                                              labelSelector:
+                                                properties:
+                                                  matchExpressions:
+                                                    items:
+                                                      properties:
+                                                        key:
+                                                          type: string
+                                                        operator:
+                                                          type: string
+                                                        values:
+                                                          items:
+                                                            type: string
+                                                          type: array
+                                                          x-kubernetes-list-type: atomic
+                                                      required:
+                                                      - key
+                                                      - operator
+                                                      type: object
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                  matchLabels:
+                                                    additionalProperties:
+                                                      type: string
+                                                    type: object
+                                                type: object
+                                                x-kubernetes-map-type: atomic
+                                              matchLabelKeys:
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              mismatchLabelKeys:
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              namespaceSelector:
+                                                properties:
+                                                  matchExpressions:
+                                                    items:
+                                                      properties:
+                                                        key:
+                                                          type: string
+                                                        operator:
+                                                          type: string
+                                                        values:
+                                                          items:
+                                                            type: string
+                                                          type: array
+                                                          x-kubernetes-list-type: atomic
+                                                      required:
+                                                      - key
+                                                      - operator
+                                                      type: object
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                  matchLabels:
+                                                    additionalProperties:
+                                                      type: string
+                                                    type: object
+                                                type: object
+                                                x-kubernetes-map-type: atomic
+                                              namespaces:
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              topologyKey:
+                                                type: string
+                                            required:
+                                            - topologyKey
+                                            type: object
+                                          weight:
+                                            format: int32
+                                            type: integer
+                                        required:
+                                        - podAffinityTerm
+                                        - weight
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      items:
+                                        properties:
+                                          labelSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          matchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          mismatchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          namespaceSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          namespaces:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          topologyKey:
+                                            type: string
+                                        required:
+                                        - topologyKey
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                podAntiAffinity:
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      items:
+                                        properties:
+                                          podAffinityTerm:
+                                            properties:
+                                              labelSelector:
+                                                properties:
+                                                  matchExpressions:
+                                                    items:
+                                                      properties:
+                                                        key:
+                                                          type: string
+                                                        operator:
+                                                          type: string
+                                                        values:
+                                                          items:
+                                                            type: string
+                                                          type: array
+                                                          x-kubernetes-list-type: atomic
+                                                      required:
+                                                      - key
+                                                      - operator
+                                                      type: object
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                  matchLabels:
+                                                    additionalProperties:
+                                                      type: string
+                                                    type: object
+                                                type: object
+                                                x-kubernetes-map-type: atomic
+                                              matchLabelKeys:
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              mismatchLabelKeys:
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              namespaceSelector:
+                                                properties:
+                                                  matchExpressions:
+                                                    items:
+                                                      properties:
+                                                        key:
+                                                          type: string
+                                                        operator:
+                                                          type: string
+                                                        values:
+                                                          items:
+                                                            type: string
+                                                          type: array
+                                                          x-kubernetes-list-type: atomic
+                                                      required:
+                                                      - key
+                                                      - operator
+                                                      type: object
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                  matchLabels:
+                                                    additionalProperties:
+                                                      type: string
+                                                    type: object
+                                                type: object
+                                                x-kubernetes-map-type: atomic
+                                              namespaces:
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              topologyKey:
+                                                type: string
+                                            required:
+                                            - topologyKey
+                                            type: object
+                                          weight:
+                                            format: int32
+                                            type: integer
+                                        required:
+                                        - podAffinityTerm
+                                        - weight
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      items:
+                                        properties:
+                                          labelSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          matchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          mismatchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          namespaceSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          namespaces:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          topologyKey:
+                                            type: string
+                                        required:
+                                        - topologyKey
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                              type: object
+                            antiAffinityTopologyKey:
+                              type: string
+                          type: object
+                        annotations:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        enabled:
+                          type: boolean
+                        labels:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        nodeSelector:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        podDisruptionBudget:
+                          properties:
+                            maxUnavailable:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              x-kubernetes-int-or-string: true
+                            minAvailable:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              x-kubernetes-int-or-string: true
+                          type: object
+                        priorityClassName:
+                          type: string
+                        resources:
+                          properties:
+                            claims:
+                              items:
+                                properties:
+                                  name:
+                                    type: string
+                                  request:
+                                    type: string
+                                required:
+                                - name
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - name
+                              x-kubernetes-list-type: map
+                            limits:
+                              additionalProperties:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                x-kubernetes-int-or-string: true
+                              type: object
+                            requests:
+                              additionalProperties:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                x-kubernetes-int-or-string: true
+                              type: object
+                          type: object
+                        runtimeClassName:
+                          type: string
+                        serviceAccountName:
+                          type: string
+                        sidecarPVCs:
+                          items:
+                            properties:
+                              apiVersion:
+                                type: string
+                              kind:
+                                type: string
+                              metadata:
+                                type: object
+                              spec:
+                                properties:
+                                  accessModes:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  dataSource:
+                                    properties:
+                                      apiGroup:
+                                        type: string
+                                      kind:
+                                        type: string
+                                      name:
+                                        type: string
+                                    required:
+                                    - kind
+                                    - name
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  dataSourceRef:
+                                    properties:
+                                      apiGroup:
+                                        type: string
+                                      kind:
+                                        type: string
+                                      name:
+                                        type: string
+                                      namespace:
+                                        type: string
+                                    required:
+                                    - kind
+                                    - name
+                                    type: object
+                                  resources:
+                                    properties:
+                                      limits:
+                                        additionalProperties:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                          x-kubernetes-int-or-string: true
+                                        type: object
+                                      requests:
+                                        additionalProperties:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                          x-kubernetes-int-or-string: true
+                                        type: object
+                                    type: object
+                                  selector:
+                                    properties:
+                                      matchExpressions:
+                                        items:
+                                          properties:
+                                            key:
+                                              type: string
+                                            operator:
+                                              type: string
+                                            values:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          required:
+                                          - key
+                                          - operator
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      matchLabels:
+                                        additionalProperties:
+                                          type: string
+                                        type: object
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  storageClassName:
+                                    type: string
+                                  volumeAttributesClassName:
+                                    type: string
+                                  volumeMode:
+                                    type: string
+                                  volumeName:
+                                    type: string
+                                type: object
+                              status:
+                                properties:
+                                  accessModes:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  allocatedResourceStatuses:
+                                    additionalProperties:
+                                      type: string
+                                    type: object
+                                    x-kubernetes-map-type: granular
+                                  allocatedResources:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    type: object
+                                  capacity:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    type: object
+                                  conditions:
+                                    items:
+                                      properties:
+                                        lastProbeTime:
+                                          format: date-time
+                                          type: string
+                                        lastTransitionTime:
+                                          format: date-time
+                                          type: string
+                                        message:
+                                          type: string
+                                        reason:
+                                          type: string
+                                        status:
+                                          type: string
+                                        type:
+                                          type: string
+                                      required:
+                                      - status
+                                      - type
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-map-keys:
+                                    - type
+                                    x-kubernetes-list-type: map
+                                  currentVolumeAttributesClassName:
+                                    type: string
+                                  modifyVolumeStatus:
+                                    properties:
+                                      status:
+                                        type: string
+                                      targetVolumeAttributesClassName:
+                                        type: string
+                                    required:
+                                    - status
+                                    type: object
+                                  phase:
+                                    type: string
+                                type: object
+                            type: object
+                          type: array
+                        sidecarVolumes:
+                          items:
+                            properties:
+                              awsElasticBlockStore:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  partition:
+                                    format: int32
+                                    type: integer
+                                  readOnly:
+                                    type: boolean
+                                  volumeID:
+                                    type: string
+                                required:
+                                - volumeID
+                                type: object
+                              azureDisk:
+                                properties:
+                                  cachingMode:
+                                    type: string
+                                  diskName:
+                                    type: string
+                                  diskURI:
+                                    type: string
+                                  fsType:
+                                    default: ext4
+                                    type: string
+                                  kind:
+                                    type: string
+                                  readOnly:
+                                    default: false
+                                    type: boolean
+                                required:
+                                - diskName
+                                - diskURI
+                                type: object
+                              azureFile:
+                                properties:
+                                  readOnly:
+                                    type: boolean
+                                  secretName:
+                                    type: string
+                                  shareName:
+                                    type: string
+                                required:
+                                - secretName
+                                - shareName
+                                type: object
+                              cephfs:
+                                properties:
+                                  monitors:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  path:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  secretFile:
+                                    type: string
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  user:
+                                    type: string
+                                required:
+                                - monitors
+                                type: object
+                              cinder:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  volumeID:
+                                    type: string
+                                required:
+                                - volumeID
+                                type: object
+                              configMap:
+                                properties:
+                                  defaultMode:
+                                    format: int32
+                                    type: integer
+                                  items:
+                                    items:
+                                      properties:
+                                        key:
+                                          type: string
+                                        mode:
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          type: string
+                                      required:
+                                      - key
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  name:
+                                    default: ""
+                                    type: string
+                                  optional:
+                                    type: boolean
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              csi:
+                                properties:
+                                  driver:
+                                    type: string
+                                  fsType:
+                                    type: string
+                                  nodePublishSecretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  readOnly:
+                                    type: boolean
+                                  volumeAttributes:
+                                    additionalProperties:
+                                      type: string
+                                    type: object
+                                required:
+                                - driver
+                                type: object
+                              downwardAPI:
+                                properties:
+                                  defaultMode:
+                                    format: int32
+                                    type: integer
+                                  items:
+                                    items:
+                                      properties:
+                                        fieldRef:
+                                          properties:
+                                            apiVersion:
+                                              type: string
+                                            fieldPath:
+                                              type: string
+                                          required:
+                                          - fieldPath
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        mode:
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          type: string
+                                        resourceFieldRef:
+                                          properties:
+                                            containerName:
+                                              type: string
+                                            divisor:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                              x-kubernetes-int-or-string: true
+                                            resource:
+                                              type: string
+                                          required:
+                                          - resource
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                      required:
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              emptyDir:
+                                properties:
+                                  medium:
+                                    type: string
+                                  sizeLimit:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                type: object
+                              ephemeral:
+                                properties:
+                                  volumeClaimTemplate:
+                                    properties:
+                                      metadata:
+                                        type: object
+                                      spec:
+                                        properties:
+                                          accessModes:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          dataSource:
+                                            properties:
+                                              apiGroup:
+                                                type: string
+                                              kind:
+                                                type: string
+                                              name:
+                                                type: string
+                                            required:
+                                            - kind
+                                            - name
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          dataSourceRef:
+                                            properties:
+                                              apiGroup:
+                                                type: string
+                                              kind:
+                                                type: string
+                                              name:
+                                                type: string
+                                              namespace:
+                                                type: string
+                                            required:
+                                            - kind
+                                            - name
+                                            type: object
+                                          resources:
+                                            properties:
+                                              limits:
+                                                additionalProperties:
+                                                  anyOf:
+                                                  - type: integer
+                                                  - type: string
+                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                  x-kubernetes-int-or-string: true
+                                                type: object
+                                              requests:
+                                                additionalProperties:
+                                                  anyOf:
+                                                  - type: integer
+                                                  - type: string
+                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                  x-kubernetes-int-or-string: true
+                                                type: object
+                                            type: object
+                                          selector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          storageClassName:
+                                            type: string
+                                          volumeAttributesClassName:
+                                            type: string
+                                          volumeMode:
+                                            type: string
+                                          volumeName:
+                                            type: string
+                                        type: object
+                                    required:
+                                    - spec
+                                    type: object
+                                type: object
+                              fc:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  lun:
+                                    format: int32
+                                    type: integer
+                                  readOnly:
+                                    type: boolean
+                                  targetWWNs:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  wwids:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              flexVolume:
+                                properties:
+                                  driver:
+                                    type: string
+                                  fsType:
+                                    type: string
+                                  options:
+                                    additionalProperties:
+                                      type: string
+                                    type: object
+                                  readOnly:
+                                    type: boolean
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                required:
+                                - driver
+                                type: object
+                              flocker:
+                                properties:
+                                  datasetName:
+                                    type: string
+                                  datasetUUID:
+                                    type: string
+                                type: object
+                              gcePersistentDisk:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  partition:
+                                    format: int32
+                                    type: integer
+                                  pdName:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                required:
+                                - pdName
+                                type: object
+                              gitRepo:
+                                properties:
+                                  directory:
+                                    type: string
+                                  repository:
+                                    type: string
+                                  revision:
+                                    type: string
+                                required:
+                                - repository
+                                type: object
+                              glusterfs:
+                                properties:
+                                  endpoints:
+                                    type: string
+                                  path:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                required:
+                                - endpoints
+                                - path
+                                type: object
+                              hostPath:
+                                properties:
+                                  path:
+                                    type: string
+                                  type:
+                                    type: string
+                                required:
+                                - path
+                                type: object
+                              image:
+                                properties:
+                                  pullPolicy:
+                                    type: string
+                                  reference:
+                                    type: string
+                                type: object
+                              iscsi:
+                                properties:
+                                  chapAuthDiscovery:
+                                    type: boolean
+                                  chapAuthSession:
+                                    type: boolean
+                                  fsType:
+                                    type: string
+                                  initiatorName:
+                                    type: string
+                                  iqn:
+                                    type: string
+                                  iscsiInterface:
+                                    default: default
+                                    type: string
+                                  lun:
+                                    format: int32
+                                    type: integer
+                                  portals:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  readOnly:
+                                    type: boolean
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  targetPortal:
+                                    type: string
+                                required:
+                                - iqn
+                                - lun
+                                - targetPortal
+                                type: object
+                              name:
+                                type: string
+                              nfs:
+                                properties:
+                                  path:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  server:
+                                    type: string
+                                required:
+                                - path
+                                - server
+                                type: object
+                              persistentVolumeClaim:
+                                properties:
+                                  claimName:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                required:
+                                - claimName
+                                type: object
+                              photonPersistentDisk:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  pdID:
+                                    type: string
+                                required:
+                                - pdID
+                                type: object
+                              portworxVolume:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  volumeID:
+                                    type: string
+                                required:
+                                - volumeID
+                                type: object
+                              projected:
+                                properties:
+                                  defaultMode:
+                                    format: int32
+                                    type: integer
+                                  sources:
+                                    items:
+                                      properties:
+                                        clusterTrustBundle:
+                                          properties:
+                                            labelSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            name:
+                                              type: string
+                                            optional:
+                                              type: boolean
+                                            path:
+                                              type: string
+                                            signerName:
+                                              type: string
+                                          required:
+                                          - path
+                                          type: object
+                                        configMap:
+                                          properties:
+                                            items:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  mode:
+                                                    format: int32
+                                                    type: integer
+                                                  path:
+                                                    type: string
+                                                required:
+                                                - key
+                                                - path
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            name:
+                                              default: ""
+                                              type: string
+                                            optional:
+                                              type: boolean
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        downwardAPI:
+                                          properties:
+                                            items:
+                                              items:
+                                                properties:
+                                                  fieldRef:
+                                                    properties:
+                                                      apiVersion:
+                                                        type: string
+                                                      fieldPath:
+                                                        type: string
+                                                    required:
+                                                    - fieldPath
+                                                    type: object
+                                                    x-kubernetes-map-type: atomic
+                                                  mode:
+                                                    format: int32
+                                                    type: integer
+                                                  path:
+                                                    type: string
+                                                  resourceFieldRef:
+                                                    properties:
+                                                      containerName:
+                                                        type: string
+                                                      divisor:
+                                                        anyOf:
+                                                        - type: integer
+                                                        - type: string
+                                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                        x-kubernetes-int-or-string: true
+                                                      resource:
+                                                        type: string
+                                                    required:
+                                                    - resource
+                                                    type: object
+                                                    x-kubernetes-map-type: atomic
+                                                required:
+                                                - path
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                        secret:
+                                          properties:
+                                            items:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  mode:
+                                                    format: int32
+                                                    type: integer
+                                                  path:
+                                                    type: string
+                                                required:
+                                                - key
+                                                - path
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            name:
+                                              default: ""
+                                              type: string
+                                            optional:
+                                              type: boolean
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        serviceAccountToken:
+                                          properties:
+                                            audience:
+                                              type: string
+                                            expirationSeconds:
+                                              format: int64
+                                              type: integer
+                                            path:
+                                              type: string
+                                          required:
+                                          - path
+                                          type: object
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              quobyte:
+                                properties:
+                                  group:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  registry:
+                                    type: string
+                                  tenant:
+                                    type: string
+                                  user:
+                                    type: string
+                                  volume:
+                                    type: string
+                                required:
+                                - registry
+                                - volume
+                                type: object
+                              rbd:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  image:
+                                    type: string
+                                  keyring:
+                                    default: /etc/ceph/keyring
+                                    type: string
+                                  monitors:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  pool:
+                                    default: rbd
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  user:
+                                    default: admin
+                                    type: string
+                                required:
+                                - image
+                                - monitors
+                                type: object
+                              scaleIO:
+                                properties:
+                                  fsType:
+                                    default: xfs
+                                    type: string
+                                  gateway:
+                                    type: string
+                                  protectionDomain:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  sslEnabled:
+                                    type: boolean
+                                  storageMode:
+                                    default: ThinProvisioned
+                                    type: string
+                                  storagePool:
+                                    type: string
+                                  system:
+                                    type: string
+                                  volumeName:
+                                    type: string
+                                required:
+                                - gateway
+                                - secretRef
+                                - system
+                                type: object
+                              secret:
+                                properties:
+                                  defaultMode:
+                                    format: int32
+                                    type: integer
+                                  items:
+                                    items:
+                                      properties:
+                                        key:
+                                          type: string
+                                        mode:
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          type: string
+                                      required:
+                                      - key
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  optional:
+                                    type: boolean
+                                  secretName:
+                                    type: string
+                                type: object
+                              storageos:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  volumeName:
+                                    type: string
+                                  volumeNamespace:
+                                    type: string
+                                type: object
+                              vsphereVolume:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  storagePolicyID:
+                                    type: string
+                                  storagePolicyName:
+                                    type: string
+                                  volumePath:
+                                    type: string
+                                required:
+                                - volumePath
+                                type: object
+                            required:
+                            - name
+                            type: object
+                          type: array
+                        sidecars:
+                          items:
+                            properties:
+                              args:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              command:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              env:
+                                items:
+                                  properties:
+                                    name:
+                                      type: string
+                                    value:
+                                      type: string
+                                    valueFrom:
+                                      properties:
+                                        configMapKeyRef:
+                                          properties:
+                                            key:
+                                              type: string
+                                            name:
+                                              default: ""
+                                              type: string
+                                            optional:
+                                              type: boolean
+                                          required:
+                                          - key
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        fieldRef:
+                                          properties:
+                                            apiVersion:
+                                              type: string
+                                            fieldPath:
+                                              type: string
+                                          required:
+                                          - fieldPath
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        resourceFieldRef:
+                                          properties:
+                                            containerName:
+                                              type: string
+                                            divisor:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                              x-kubernetes-int-or-string: true
+                                            resource:
+                                              type: string
+                                          required:
+                                          - resource
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        secretKeyRef:
+                                          properties:
+                                            key:
+                                              type: string
+                                            name:
+                                              default: ""
+                                              type: string
+                                            optional:
+                                              type: boolean
+                                          required:
+                                          - key
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                      type: object
+                                  required:
+                                  - name
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - name
+                                x-kubernetes-list-type: map
+                              envFrom:
+                                items:
+                                  properties:
+                                    configMapRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                        optional:
+                                          type: boolean
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    prefix:
+                                      type: string
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                        optional:
+                                          type: boolean
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              image:
+                                type: string
+                              imagePullPolicy:
+                                type: string
+                              lifecycle:
+                                properties:
+                                  postStart:
+                                    properties:
+                                      exec:
+                                        properties:
+                                          command:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        type: object
+                                      httpGet:
+                                        properties:
+                                          host:
+                                            type: string
+                                          httpHeaders:
+                                            items:
+                                              properties:
+                                                name:
+                                                  type: string
+                                                value:
+                                                  type: string
+                                              required:
+                                              - name
+                                              - value
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          path:
+                                            type: string
+                                          port:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            x-kubernetes-int-or-string: true
+                                          scheme:
+                                            type: string
+                                        required:
+                                        - port
+                                        type: object
+                                      sleep:
+                                        properties:
+                                          seconds:
+                                            format: int64
+                                            type: integer
+                                        required:
+                                        - seconds
+                                        type: object
+                                      tcpSocket:
+                                        properties:
+                                          host:
+                                            type: string
+                                          port:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            x-kubernetes-int-or-string: true
+                                        required:
+                                        - port
+                                        type: object
+                                    type: object
+                                  preStop:
+                                    properties:
+                                      exec:
+                                        properties:
+                                          command:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        type: object
+                                      httpGet:
+                                        properties:
+                                          host:
+                                            type: string
+                                          httpHeaders:
+                                            items:
+                                              properties:
+                                                name:
+                                                  type: string
+                                                value:
+                                                  type: string
+                                              required:
+                                              - name
+                                              - value
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          path:
+                                            type: string
+                                          port:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            x-kubernetes-int-or-string: true
+                                          scheme:
+                                            type: string
+                                        required:
+                                        - port
+                                        type: object
+                                      sleep:
+                                        properties:
+                                          seconds:
+                                            format: int64
+                                            type: integer
+                                        required:
+                                        - seconds
+                                        type: object
+                                      tcpSocket:
+                                        properties:
+                                          host:
+                                            type: string
+                                          port:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            x-kubernetes-int-or-string: true
+                                        required:
+                                        - port
+                                        type: object
+                                    type: object
+                                type: object
+                              livenessProbe:
+                                properties:
+                                  exec:
+                                    properties:
+                                      command:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    type: object
+                                  failureThreshold:
+                                    format: int32
+                                    type: integer
+                                  grpc:
+                                    properties:
+                                      port:
+                                        format: int32
+                                        type: integer
+                                      service:
+                                        default: ""
+                                        type: string
+                                    required:
+                                    - port
+                                    type: object
+                                  httpGet:
+                                    properties:
+                                      host:
+                                        type: string
+                                      httpHeaders:
+                                        items:
+                                          properties:
+                                            name:
+                                              type: string
+                                            value:
+                                              type: string
+                                          required:
+                                          - name
+                                          - value
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      path:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                      scheme:
+                                        type: string
+                                    required:
+                                    - port
+                                    type: object
+                                  initialDelaySeconds:
+                                    format: int32
+                                    type: integer
+                                  periodSeconds:
+                                    format: int32
+                                    type: integer
+                                  successThreshold:
+                                    format: int32
+                                    type: integer
+                                  tcpSocket:
+                                    properties:
+                                      host:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                    required:
+                                    - port
+                                    type: object
+                                  terminationGracePeriodSeconds:
+                                    format: int64
+                                    type: integer
+                                  timeoutSeconds:
+                                    format: int32
+                                    type: integer
+                                type: object
+                              name:
+                                type: string
+                              ports:
+                                items:
+                                  properties:
+                                    containerPort:
+                                      format: int32
+                                      type: integer
+                                    hostIP:
+                                      type: string
+                                    hostPort:
+                                      format: int32
+                                      type: integer
+                                    name:
+                                      type: string
+                                    protocol:
+                                      default: TCP
+                                      type: string
+                                  required:
+                                  - containerPort
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - containerPort
+                                - protocol
+                                x-kubernetes-list-type: map
+                              readinessProbe:
+                                properties:
+                                  exec:
+                                    properties:
+                                      command:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    type: object
+                                  failureThreshold:
+                                    format: int32
+                                    type: integer
+                                  grpc:
+                                    properties:
+                                      port:
+                                        format: int32
+                                        type: integer
+                                      service:
+                                        default: ""
+                                        type: string
+                                    required:
+                                    - port
+                                    type: object
+                                  httpGet:
+                                    properties:
+                                      host:
+                                        type: string
+                                      httpHeaders:
+                                        items:
+                                          properties:
+                                            name:
+                                              type: string
+                                            value:
+                                              type: string
+                                          required:
+                                          - name
+                                          - value
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      path:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                      scheme:
+                                        type: string
+                                    required:
+                                    - port
+                                    type: object
+                                  initialDelaySeconds:
+                                    format: int32
+                                    type: integer
+                                  periodSeconds:
+                                    format: int32
+                                    type: integer
+                                  successThreshold:
+                                    format: int32
+                                    type: integer
+                                  tcpSocket:
+                                    properties:
+                                      host:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                    required:
+                                    - port
+                                    type: object
+                                  terminationGracePeriodSeconds:
+                                    format: int64
+                                    type: integer
+                                  timeoutSeconds:
+                                    format: int32
+                                    type: integer
+                                type: object
+                              resizePolicy:
+                                items:
+                                  properties:
+                                    resourceName:
+                                      type: string
+                                    restartPolicy:
+                                      type: string
+                                  required:
+                                  - resourceName
+                                  - restartPolicy
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              resources:
+                                properties:
+                                  claims:
+                                    items:
+                                      properties:
+                                        name:
+                                          type: string
+                                        request:
+                                          type: string
+                                      required:
+                                      - name
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-map-keys:
+                                    - name
+                                    x-kubernetes-list-type: map
+                                  limits:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    type: object
+                                  requests:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    type: object
+                                type: object
+                              restartPolicy:
+                                type: string
+                              securityContext:
+                                properties:
+                                  allowPrivilegeEscalation:
+                                    type: boolean
+                                  appArmorProfile:
+                                    properties:
+                                      localhostProfile:
+                                        type: string
+                                      type:
+                                        type: string
+                                    required:
+                                    - type
+                                    type: object
+                                  capabilities:
+                                    properties:
+                                      add:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      drop:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    type: object
+                                  privileged:
+                                    type: boolean
+                                  procMount:
+                                    type: string
+                                  readOnlyRootFilesystem:
+                                    type: boolean
+                                  runAsGroup:
+                                    format: int64
+                                    type: integer
+                                  runAsNonRoot:
+                                    type: boolean
+                                  runAsUser:
+                                    format: int64
+                                    type: integer
+                                  seLinuxOptions:
+                                    properties:
+                                      level:
+                                        type: string
+                                      role:
+                                        type: string
+                                      type:
+                                        type: string
+                                      user:
+                                        type: string
+                                    type: object
+                                  seccompProfile:
+                                    properties:
+                                      localhostProfile:
+                                        type: string
+                                      type:
+                                        type: string
+                                    required:
+                                    - type
+                                    type: object
+                                  windowsOptions:
+                                    properties:
+                                      gmsaCredentialSpec:
+                                        type: string
+                                      gmsaCredentialSpecName:
+                                        type: string
+                                      hostProcess:
+                                        type: boolean
+                                      runAsUserName:
+                                        type: string
+                                    type: object
+                                type: object
+                              startupProbe:
+                                properties:
+                                  exec:
+                                    properties:
+                                      command:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    type: object
+                                  failureThreshold:
+                                    format: int32
+                                    type: integer
+                                  grpc:
+                                    properties:
+                                      port:
+                                        format: int32
+                                        type: integer
+                                      service:
+                                        default: ""
+                                        type: string
+                                    required:
+                                    - port
+                                    type: object
+                                  httpGet:
+                                    properties:
+                                      host:
+                                        type: string
+                                      httpHeaders:
+                                        items:
+                                          properties:
+                                            name:
+                                              type: string
+                                            value:
+                                              type: string
+                                          required:
+                                          - name
+                                          - value
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      path:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                      scheme:
+                                        type: string
+                                    required:
+                                    - port
+                                    type: object
+                                  initialDelaySeconds:
+                                    format: int32
+                                    type: integer
+                                  periodSeconds:
+                                    format: int32
+                                    type: integer
+                                  successThreshold:
+                                    format: int32
+                                    type: integer
+                                  tcpSocket:
+                                    properties:
+                                      host:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                    required:
+                                    - port
+                                    type: object
+                                  terminationGracePeriodSeconds:
+                                    format: int64
+                                    type: integer
+                                  timeoutSeconds:
+                                    format: int32
+                                    type: integer
+                                type: object
+                              stdin:
+                                type: boolean
+                              stdinOnce:
+                                type: boolean
+                              terminationMessagePath:
+                                type: string
+                              terminationMessagePolicy:
+                                type: string
+                              tty:
+                                type: boolean
+                              volumeDevices:
+                                items:
+                                  properties:
+                                    devicePath:
+                                      type: string
+                                    name:
+                                      type: string
+                                  required:
+                                  - devicePath
+                                  - name
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - devicePath
+                                x-kubernetes-list-type: map
+                              volumeMounts:
+                                items:
+                                  properties:
+                                    mountPath:
+                                      type: string
+                                    mountPropagation:
+                                      type: string
+                                    name:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    recursiveReadOnly:
+                                      type: string
+                                    subPath:
+                                      type: string
+                                    subPathExpr:
+                                      type: string
+                                  required:
+                                  - mountPath
+                                  - name
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - mountPath
+                                x-kubernetes-list-type: map
+                              workingDir:
+                                type: string
+                            required:
+                            - name
+                            type: object
+                          type: array
+                        size:
+                          format: int32
+                          type: integer
+                        terminationGracePeriodSeconds:
+                          format: int64
+                          type: integer
+                        tolerations:
+                          items:
+                            properties:
+                              effect:
+                                type: string
+                              key:
+                                type: string
+                              operator:
+                                type: string
+                              tolerationSeconds:
+                                format: int64
+                                type: integer
+                              value:
+                                type: string
+                            type: object
+                          type: array
+                        topologySpreadConstraints:
+                          items:
+                            properties:
+                              labelSelector:
+                                properties:
+                                  matchExpressions:
+                                    items:
+                                      properties:
+                                        key:
+                                          type: string
+                                        operator:
+                                          type: string
+                                        values:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      required:
+                                      - key
+                                      - operator
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  matchLabels:
+                                    additionalProperties:
+                                      type: string
+                                    type: object
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              matchLabelKeys:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              maxSkew:
+                                format: int32
+                                type: integer
+                              minDomains:
+                                format: int32
+                                type: integer
+                              nodeAffinityPolicy:
+                                type: string
+                              nodeTaintsPolicy:
+                                type: string
+                              topologyKey:
+                                type: string
+                              whenUnsatisfiable:
+                                type: string
+                            required:
+                            - maxSkew
+                            - topologyKey
+                            - whenUnsatisfiable
+                            type: object
+                          type: array
+                      required:
+                      - enabled
+                      - size
+                      type: object
+                    clusterRole:
+                      type: string
+                    configuration:
+                      type: string
+                    containerSecurityContext:
+                      properties:
+                        allowPrivilegeEscalation:
+                          type: boolean
+                        appArmorProfile:
+                          properties:
+                            localhostProfile:
+                              type: string
+                            type:
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        capabilities:
+                          properties:
+                            add:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            drop:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        privileged:
+                          type: boolean
+                        procMount:
+                          type: string
+                        readOnlyRootFilesystem:
+                          type: boolean
+                        runAsGroup:
+                          format: int64
+                          type: integer
+                        runAsNonRoot:
+                          type: boolean
+                        runAsUser:
+                          format: int64
+                          type: integer
+                        seLinuxOptions:
+                          properties:
+                            level:
+                              type: string
+                            role:
+                              type: string
+                            type:
+                              type: string
+                            user:
+                              type: string
+                          type: object
+                        seccompProfile:
+                          properties:
+                            localhostProfile:
+                              type: string
+                            type:
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        windowsOptions:
+                          properties:
+                            gmsaCredentialSpec:
+                              type: string
+                            gmsaCredentialSpecName:
+                              type: string
+                            hostProcess:
+                              type: boolean
+                            runAsUserName:
+                              type: string
+                          type: object
+                      type: object
+                    expose:
+                      properties:
+                        annotations:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        enabled:
+                          type: boolean
+                        exposeType:
+                          type: string
+                        externalTrafficPolicy:
+                          type: string
+                        internalTrafficPolicy:
+                          type: string
+                        labels:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        loadBalancerSourceRanges:
+                          items:
+                            type: string
+                          type: array
+                        serviceAnnotations:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        serviceLabels:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        type:
+                          type: string
+                      required:
+                      - enabled
+                      type: object
+                    externalNodes:
+                      items:
+                        properties:
+                          horizons:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          host:
+                            type: string
+                          port:
+                            type: integer
+                          priority:
+                            type: integer
+                          tags:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          votes:
+                            type: integer
+                        required:
+                        - host
+                        - priority
+                        - votes
+                        type: object
+                      type: array
+                    hostAliases:
+                      items:
+                        properties:
+                          hostnames:
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          ip:
+                            type: string
+                        required:
+                        - ip
+                        type: object
+                      type: array
+                    labels:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    livenessProbe:
+                      properties:
+                        exec:
+                          properties:
+                            command:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          format: int32
+                          type: integer
+                        grpc:
+                          properties:
+                            port:
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          properties:
+                            host:
+                              type: string
+                            httpHeaders:
+                              items:
+                                properties:
+                                  name:
+                                    type: string
+                                  value:
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          format: int32
+                          type: integer
+                        startupDelaySeconds:
+                          type: integer
+                        successThreshold:
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          properties:
+                            host:
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          format: int32
+                          type: integer
+                      type: object
+                    name:
+                      type: string
+                    nodeSelector:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    nonvoting:
+                      properties:
+                        affinity:
+                          properties:
+                            advanced:
+                              properties:
+                                nodeAffinity:
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      items:
+                                        properties:
+                                          preference:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchFields:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          weight:
+                                            format: int32
+                                            type: integer
+                                        required:
+                                        - preference
+                                        - weight
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      properties:
+                                        nodeSelectorTerms:
+                                          items:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchFields:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      required:
+                                      - nodeSelectorTerms
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                  type: object
+                                podAffinity:
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      items:
+                                        properties:
+                                          podAffinityTerm:
+                                            properties:
+                                              labelSelector:
+                                                properties:
+                                                  matchExpressions:
+                                                    items:
+                                                      properties:
+                                                        key:
+                                                          type: string
+                                                        operator:
+                                                          type: string
+                                                        values:
+                                                          items:
+                                                            type: string
+                                                          type: array
+                                                          x-kubernetes-list-type: atomic
+                                                      required:
+                                                      - key
+                                                      - operator
+                                                      type: object
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                  matchLabels:
+                                                    additionalProperties:
+                                                      type: string
+                                                    type: object
+                                                type: object
+                                                x-kubernetes-map-type: atomic
+                                              matchLabelKeys:
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              mismatchLabelKeys:
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              namespaceSelector:
+                                                properties:
+                                                  matchExpressions:
+                                                    items:
+                                                      properties:
+                                                        key:
+                                                          type: string
+                                                        operator:
+                                                          type: string
+                                                        values:
+                                                          items:
+                                                            type: string
+                                                          type: array
+                                                          x-kubernetes-list-type: atomic
+                                                      required:
+                                                      - key
+                                                      - operator
+                                                      type: object
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                  matchLabels:
+                                                    additionalProperties:
+                                                      type: string
+                                                    type: object
+                                                type: object
+                                                x-kubernetes-map-type: atomic
+                                              namespaces:
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              topologyKey:
+                                                type: string
+                                            required:
+                                            - topologyKey
+                                            type: object
+                                          weight:
+                                            format: int32
+                                            type: integer
+                                        required:
+                                        - podAffinityTerm
+                                        - weight
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      items:
+                                        properties:
+                                          labelSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          matchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          mismatchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          namespaceSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          namespaces:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          topologyKey:
+                                            type: string
+                                        required:
+                                        - topologyKey
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                podAntiAffinity:
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      items:
+                                        properties:
+                                          podAffinityTerm:
+                                            properties:
+                                              labelSelector:
+                                                properties:
+                                                  matchExpressions:
+                                                    items:
+                                                      properties:
+                                                        key:
+                                                          type: string
+                                                        operator:
+                                                          type: string
+                                                        values:
+                                                          items:
+                                                            type: string
+                                                          type: array
+                                                          x-kubernetes-list-type: atomic
+                                                      required:
+                                                      - key
+                                                      - operator
+                                                      type: object
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                  matchLabels:
+                                                    additionalProperties:
+                                                      type: string
+                                                    type: object
+                                                type: object
+                                                x-kubernetes-map-type: atomic
+                                              matchLabelKeys:
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              mismatchLabelKeys:
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              namespaceSelector:
+                                                properties:
+                                                  matchExpressions:
+                                                    items:
+                                                      properties:
+                                                        key:
+                                                          type: string
+                                                        operator:
+                                                          type: string
+                                                        values:
+                                                          items:
+                                                            type: string
+                                                          type: array
+                                                          x-kubernetes-list-type: atomic
+                                                      required:
+                                                      - key
+                                                      - operator
+                                                      type: object
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                  matchLabels:
+                                                    additionalProperties:
+                                                      type: string
+                                                    type: object
+                                                type: object
+                                                x-kubernetes-map-type: atomic
+                                              namespaces:
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              topologyKey:
+                                                type: string
+                                            required:
+                                            - topologyKey
+                                            type: object
+                                          weight:
+                                            format: int32
+                                            type: integer
+                                        required:
+                                        - podAffinityTerm
+                                        - weight
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      items:
+                                        properties:
+                                          labelSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          matchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          mismatchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          namespaceSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          namespaces:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          topologyKey:
+                                            type: string
+                                        required:
+                                        - topologyKey
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                              type: object
+                            antiAffinityTopologyKey:
+                              type: string
+                          type: object
+                        annotations:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        configuration:
+                          type: string
+                        containerSecurityContext:
+                          properties:
+                            allowPrivilegeEscalation:
+                              type: boolean
+                            appArmorProfile:
+                              properties:
+                                localhostProfile:
+                                  type: string
+                                type:
+                                  type: string
+                              required:
+                              - type
+                              type: object
+                            capabilities:
+                              properties:
+                                add:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                drop:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            privileged:
+                              type: boolean
+                            procMount:
+                              type: string
+                            readOnlyRootFilesystem:
+                              type: boolean
+                            runAsGroup:
+                              format: int64
+                              type: integer
+                            runAsNonRoot:
+                              type: boolean
+                            runAsUser:
+                              format: int64
+                              type: integer
+                            seLinuxOptions:
+                              properties:
+                                level:
+                                  type: string
+                                role:
+                                  type: string
+                                type:
+                                  type: string
+                                user:
+                                  type: string
+                              type: object
+                            seccompProfile:
+                              properties:
+                                localhostProfile:
+                                  type: string
+                                type:
+                                  type: string
+                              required:
+                              - type
+                              type: object
+                            windowsOptions:
+                              properties:
+                                gmsaCredentialSpec:
+                                  type: string
+                                gmsaCredentialSpecName:
+                                  type: string
+                                hostProcess:
+                                  type: boolean
+                                runAsUserName:
+                                  type: string
+                              type: object
+                          type: object
+                        enabled:
+                          type: boolean
+                        labels:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        livenessProbe:
+                          properties:
+                            exec:
+                              properties:
+                                command:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            failureThreshold:
+                              format: int32
+                              type: integer
+                            grpc:
+                              properties:
+                                port:
+                                  format: int32
+                                  type: integer
+                                service:
+                                  default: ""
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            httpGet:
+                              properties:
+                                host:
+                                  type: string
+                                httpHeaders:
+                                  items:
+                                    properties:
+                                      name:
+                                        type: string
+                                      value:
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            initialDelaySeconds:
+                              format: int32
+                              type: integer
+                            periodSeconds:
+                              format: int32
+                              type: integer
+                            startupDelaySeconds:
+                              type: integer
+                            successThreshold:
+                              format: int32
+                              type: integer
+                            tcpSocket:
+                              properties:
+                                host:
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                            terminationGracePeriodSeconds:
+                              format: int64
+                              type: integer
+                            timeoutSeconds:
+                              format: int32
+                              type: integer
+                          type: object
+                        nodeSelector:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        podDisruptionBudget:
+                          properties:
+                            maxUnavailable:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              x-kubernetes-int-or-string: true
+                            minAvailable:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              x-kubernetes-int-or-string: true
+                          type: object
+                        podSecurityContext:
+                          properties:
+                            appArmorProfile:
+                              properties:
+                                localhostProfile:
+                                  type: string
+                                type:
+                                  type: string
+                              required:
+                              - type
+                              type: object
+                            fsGroup:
+                              format: int64
+                              type: integer
+                            fsGroupChangePolicy:
+                              type: string
+                            runAsGroup:
+                              format: int64
+                              type: integer
+                            runAsNonRoot:
+                              type: boolean
+                            runAsUser:
+                              format: int64
+                              type: integer
+                            seLinuxChangePolicy:
+                              type: string
+                            seLinuxOptions:
+                              properties:
+                                level:
+                                  type: string
+                                role:
+                                  type: string
+                                type:
+                                  type: string
+                                user:
+                                  type: string
+                              type: object
+                            seccompProfile:
+                              properties:
+                                localhostProfile:
+                                  type: string
+                                type:
+                                  type: string
+                              required:
+                              - type
+                              type: object
+                            supplementalGroups:
+                              items:
+                                format: int64
+                                type: integer
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            supplementalGroupsPolicy:
+                              type: string
+                            sysctls:
+                              items:
+                                properties:
+                                  name:
+                                    type: string
+                                  value:
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            windowsOptions:
+                              properties:
+                                gmsaCredentialSpec:
+                                  type: string
+                                gmsaCredentialSpecName:
+                                  type: string
+                                hostProcess:
+                                  type: boolean
+                                runAsUserName:
+                                  type: string
+                              type: object
+                          type: object
+                        priorityClassName:
+                          type: string
+                        readinessProbe:
+                          properties:
+                            exec:
+                              properties:
+                                command:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            failureThreshold:
+                              format: int32
+                              type: integer
+                            grpc:
+                              properties:
+                                port:
+                                  format: int32
+                                  type: integer
+                                service:
+                                  default: ""
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            httpGet:
+                              properties:
+                                host:
+                                  type: string
+                                httpHeaders:
+                                  items:
+                                    properties:
+                                      name:
+                                        type: string
+                                      value:
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            initialDelaySeconds:
+                              format: int32
+                              type: integer
+                            periodSeconds:
+                              format: int32
+                              type: integer
+                            successThreshold:
+                              format: int32
+                              type: integer
+                            tcpSocket:
+                              properties:
+                                host:
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                            terminationGracePeriodSeconds:
+                              format: int64
+                              type: integer
+                            timeoutSeconds:
+                              format: int32
+                              type: integer
+                          type: object
+                        resources:
+                          properties:
+                            claims:
+                              items:
+                                properties:
+                                  name:
+                                    type: string
+                                  request:
+                                    type: string
+                                required:
+                                - name
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - name
+                              x-kubernetes-list-type: map
+                            limits:
+                              additionalProperties:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                x-kubernetes-int-or-string: true
+                              type: object
+                            requests:
+                              additionalProperties:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                x-kubernetes-int-or-string: true
+                              type: object
+                          type: object
+                        runtimeClassName:
+                          type: string
+                        serviceAccountName:
+                          type: string
+                        sidecarPVCs:
+                          items:
+                            properties:
+                              apiVersion:
+                                type: string
+                              kind:
+                                type: string
+                              metadata:
+                                type: object
+                              spec:
+                                properties:
+                                  accessModes:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  dataSource:
+                                    properties:
+                                      apiGroup:
+                                        type: string
+                                      kind:
+                                        type: string
+                                      name:
+                                        type: string
+                                    required:
+                                    - kind
+                                    - name
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  dataSourceRef:
+                                    properties:
+                                      apiGroup:
+                                        type: string
+                                      kind:
+                                        type: string
+                                      name:
+                                        type: string
+                                      namespace:
+                                        type: string
+                                    required:
+                                    - kind
+                                    - name
+                                    type: object
+                                  resources:
+                                    properties:
+                                      limits:
+                                        additionalProperties:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                          x-kubernetes-int-or-string: true
+                                        type: object
+                                      requests:
+                                        additionalProperties:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                          x-kubernetes-int-or-string: true
+                                        type: object
+                                    type: object
+                                  selector:
+                                    properties:
+                                      matchExpressions:
+                                        items:
+                                          properties:
+                                            key:
+                                              type: string
+                                            operator:
+                                              type: string
+                                            values:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          required:
+                                          - key
+                                          - operator
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      matchLabels:
+                                        additionalProperties:
+                                          type: string
+                                        type: object
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  storageClassName:
+                                    type: string
+                                  volumeAttributesClassName:
+                                    type: string
+                                  volumeMode:
+                                    type: string
+                                  volumeName:
+                                    type: string
+                                type: object
+                              status:
+                                properties:
+                                  accessModes:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  allocatedResourceStatuses:
+                                    additionalProperties:
+                                      type: string
+                                    type: object
+                                    x-kubernetes-map-type: granular
+                                  allocatedResources:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    type: object
+                                  capacity:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    type: object
+                                  conditions:
+                                    items:
+                                      properties:
+                                        lastProbeTime:
+                                          format: date-time
+                                          type: string
+                                        lastTransitionTime:
+                                          format: date-time
+                                          type: string
+                                        message:
+                                          type: string
+                                        reason:
+                                          type: string
+                                        status:
+                                          type: string
+                                        type:
+                                          type: string
+                                      required:
+                                      - status
+                                      - type
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-map-keys:
+                                    - type
+                                    x-kubernetes-list-type: map
+                                  currentVolumeAttributesClassName:
+                                    type: string
+                                  modifyVolumeStatus:
+                                    properties:
+                                      status:
+                                        type: string
+                                      targetVolumeAttributesClassName:
+                                        type: string
+                                    required:
+                                    - status
+                                    type: object
+                                  phase:
+                                    type: string
+                                type: object
+                            type: object
+                          type: array
+                        sidecarVolumes:
+                          items:
+                            properties:
+                              awsElasticBlockStore:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  partition:
+                                    format: int32
+                                    type: integer
+                                  readOnly:
+                                    type: boolean
+                                  volumeID:
+                                    type: string
+                                required:
+                                - volumeID
+                                type: object
+                              azureDisk:
+                                properties:
+                                  cachingMode:
+                                    type: string
+                                  diskName:
+                                    type: string
+                                  diskURI:
+                                    type: string
+                                  fsType:
+                                    default: ext4
+                                    type: string
+                                  kind:
+                                    type: string
+                                  readOnly:
+                                    default: false
+                                    type: boolean
+                                required:
+                                - diskName
+                                - diskURI
+                                type: object
+                              azureFile:
+                                properties:
+                                  readOnly:
+                                    type: boolean
+                                  secretName:
+                                    type: string
+                                  shareName:
+                                    type: string
+                                required:
+                                - secretName
+                                - shareName
+                                type: object
+                              cephfs:
+                                properties:
+                                  monitors:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  path:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  secretFile:
+                                    type: string
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  user:
+                                    type: string
+                                required:
+                                - monitors
+                                type: object
+                              cinder:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  volumeID:
+                                    type: string
+                                required:
+                                - volumeID
+                                type: object
+                              configMap:
+                                properties:
+                                  defaultMode:
+                                    format: int32
+                                    type: integer
+                                  items:
+                                    items:
+                                      properties:
+                                        key:
+                                          type: string
+                                        mode:
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          type: string
+                                      required:
+                                      - key
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  name:
+                                    default: ""
+                                    type: string
+                                  optional:
+                                    type: boolean
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              csi:
+                                properties:
+                                  driver:
+                                    type: string
+                                  fsType:
+                                    type: string
+                                  nodePublishSecretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  readOnly:
+                                    type: boolean
+                                  volumeAttributes:
+                                    additionalProperties:
+                                      type: string
+                                    type: object
+                                required:
+                                - driver
+                                type: object
+                              downwardAPI:
+                                properties:
+                                  defaultMode:
+                                    format: int32
+                                    type: integer
+                                  items:
+                                    items:
+                                      properties:
+                                        fieldRef:
+                                          properties:
+                                            apiVersion:
+                                              type: string
+                                            fieldPath:
+                                              type: string
+                                          required:
+                                          - fieldPath
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        mode:
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          type: string
+                                        resourceFieldRef:
+                                          properties:
+                                            containerName:
+                                              type: string
+                                            divisor:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                              x-kubernetes-int-or-string: true
+                                            resource:
+                                              type: string
+                                          required:
+                                          - resource
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                      required:
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              emptyDir:
+                                properties:
+                                  medium:
+                                    type: string
+                                  sizeLimit:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                type: object
+                              ephemeral:
+                                properties:
+                                  volumeClaimTemplate:
+                                    properties:
+                                      metadata:
+                                        type: object
+                                      spec:
+                                        properties:
+                                          accessModes:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          dataSource:
+                                            properties:
+                                              apiGroup:
+                                                type: string
+                                              kind:
+                                                type: string
+                                              name:
+                                                type: string
+                                            required:
+                                            - kind
+                                            - name
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          dataSourceRef:
+                                            properties:
+                                              apiGroup:
+                                                type: string
+                                              kind:
+                                                type: string
+                                              name:
+                                                type: string
+                                              namespace:
+                                                type: string
+                                            required:
+                                            - kind
+                                            - name
+                                            type: object
+                                          resources:
+                                            properties:
+                                              limits:
+                                                additionalProperties:
+                                                  anyOf:
+                                                  - type: integer
+                                                  - type: string
+                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                  x-kubernetes-int-or-string: true
+                                                type: object
+                                              requests:
+                                                additionalProperties:
+                                                  anyOf:
+                                                  - type: integer
+                                                  - type: string
+                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                  x-kubernetes-int-or-string: true
+                                                type: object
+                                            type: object
+                                          selector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          storageClassName:
+                                            type: string
+                                          volumeAttributesClassName:
+                                            type: string
+                                          volumeMode:
+                                            type: string
+                                          volumeName:
+                                            type: string
+                                        type: object
+                                    required:
+                                    - spec
+                                    type: object
+                                type: object
+                              fc:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  lun:
+                                    format: int32
+                                    type: integer
+                                  readOnly:
+                                    type: boolean
+                                  targetWWNs:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  wwids:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              flexVolume:
+                                properties:
+                                  driver:
+                                    type: string
+                                  fsType:
+                                    type: string
+                                  options:
+                                    additionalProperties:
+                                      type: string
+                                    type: object
+                                  readOnly:
+                                    type: boolean
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                required:
+                                - driver
+                                type: object
+                              flocker:
+                                properties:
+                                  datasetName:
+                                    type: string
+                                  datasetUUID:
+                                    type: string
+                                type: object
+                              gcePersistentDisk:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  partition:
+                                    format: int32
+                                    type: integer
+                                  pdName:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                required:
+                                - pdName
+                                type: object
+                              gitRepo:
+                                properties:
+                                  directory:
+                                    type: string
+                                  repository:
+                                    type: string
+                                  revision:
+                                    type: string
+                                required:
+                                - repository
+                                type: object
+                              glusterfs:
+                                properties:
+                                  endpoints:
+                                    type: string
+                                  path:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                required:
+                                - endpoints
+                                - path
+                                type: object
+                              hostPath:
+                                properties:
+                                  path:
+                                    type: string
+                                  type:
+                                    type: string
+                                required:
+                                - path
+                                type: object
+                              image:
+                                properties:
+                                  pullPolicy:
+                                    type: string
+                                  reference:
+                                    type: string
+                                type: object
+                              iscsi:
+                                properties:
+                                  chapAuthDiscovery:
+                                    type: boolean
+                                  chapAuthSession:
+                                    type: boolean
+                                  fsType:
+                                    type: string
+                                  initiatorName:
+                                    type: string
+                                  iqn:
+                                    type: string
+                                  iscsiInterface:
+                                    default: default
+                                    type: string
+                                  lun:
+                                    format: int32
+                                    type: integer
+                                  portals:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  readOnly:
+                                    type: boolean
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  targetPortal:
+                                    type: string
+                                required:
+                                - iqn
+                                - lun
+                                - targetPortal
+                                type: object
+                              name:
+                                type: string
+                              nfs:
+                                properties:
+                                  path:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  server:
+                                    type: string
+                                required:
+                                - path
+                                - server
+                                type: object
+                              persistentVolumeClaim:
+                                properties:
+                                  claimName:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                required:
+                                - claimName
+                                type: object
+                              photonPersistentDisk:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  pdID:
+                                    type: string
+                                required:
+                                - pdID
+                                type: object
+                              portworxVolume:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  volumeID:
+                                    type: string
+                                required:
+                                - volumeID
+                                type: object
+                              projected:
+                                properties:
+                                  defaultMode:
+                                    format: int32
+                                    type: integer
+                                  sources:
+                                    items:
+                                      properties:
+                                        clusterTrustBundle:
+                                          properties:
+                                            labelSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            name:
+                                              type: string
+                                            optional:
+                                              type: boolean
+                                            path:
+                                              type: string
+                                            signerName:
+                                              type: string
+                                          required:
+                                          - path
+                                          type: object
+                                        configMap:
+                                          properties:
+                                            items:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  mode:
+                                                    format: int32
+                                                    type: integer
+                                                  path:
+                                                    type: string
+                                                required:
+                                                - key
+                                                - path
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            name:
+                                              default: ""
+                                              type: string
+                                            optional:
+                                              type: boolean
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        downwardAPI:
+                                          properties:
+                                            items:
+                                              items:
+                                                properties:
+                                                  fieldRef:
+                                                    properties:
+                                                      apiVersion:
+                                                        type: string
+                                                      fieldPath:
+                                                        type: string
+                                                    required:
+                                                    - fieldPath
+                                                    type: object
+                                                    x-kubernetes-map-type: atomic
+                                                  mode:
+                                                    format: int32
+                                                    type: integer
+                                                  path:
+                                                    type: string
+                                                  resourceFieldRef:
+                                                    properties:
+                                                      containerName:
+                                                        type: string
+                                                      divisor:
+                                                        anyOf:
+                                                        - type: integer
+                                                        - type: string
+                                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                        x-kubernetes-int-or-string: true
+                                                      resource:
+                                                        type: string
+                                                    required:
+                                                    - resource
+                                                    type: object
+                                                    x-kubernetes-map-type: atomic
+                                                required:
+                                                - path
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                        secret:
+                                          properties:
+                                            items:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  mode:
+                                                    format: int32
+                                                    type: integer
+                                                  path:
+                                                    type: string
+                                                required:
+                                                - key
+                                                - path
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            name:
+                                              default: ""
+                                              type: string
+                                            optional:
+                                              type: boolean
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        serviceAccountToken:
+                                          properties:
+                                            audience:
+                                              type: string
+                                            expirationSeconds:
+                                              format: int64
+                                              type: integer
+                                            path:
+                                              type: string
+                                          required:
+                                          - path
+                                          type: object
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              quobyte:
+                                properties:
+                                  group:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  registry:
+                                    type: string
+                                  tenant:
+                                    type: string
+                                  user:
+                                    type: string
+                                  volume:
+                                    type: string
+                                required:
+                                - registry
+                                - volume
+                                type: object
+                              rbd:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  image:
+                                    type: string
+                                  keyring:
+                                    default: /etc/ceph/keyring
+                                    type: string
+                                  monitors:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  pool:
+                                    default: rbd
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  user:
+                                    default: admin
+                                    type: string
+                                required:
+                                - image
+                                - monitors
+                                type: object
+                              scaleIO:
+                                properties:
+                                  fsType:
+                                    default: xfs
+                                    type: string
+                                  gateway:
+                                    type: string
+                                  protectionDomain:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  sslEnabled:
+                                    type: boolean
+                                  storageMode:
+                                    default: ThinProvisioned
+                                    type: string
+                                  storagePool:
+                                    type: string
+                                  system:
+                                    type: string
+                                  volumeName:
+                                    type: string
+                                required:
+                                - gateway
+                                - secretRef
+                                - system
+                                type: object
+                              secret:
+                                properties:
+                                  defaultMode:
+                                    format: int32
+                                    type: integer
+                                  items:
+                                    items:
+                                      properties:
+                                        key:
+                                          type: string
+                                        mode:
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          type: string
+                                      required:
+                                      - key
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  optional:
+                                    type: boolean
+                                  secretName:
+                                    type: string
+                                type: object
+                              storageos:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  volumeName:
+                                    type: string
+                                  volumeNamespace:
+                                    type: string
+                                type: object
+                              vsphereVolume:
+                                properties:
+                                  fsType:
+                                    type: string
+                                  storagePolicyID:
+                                    type: string
+                                  storagePolicyName:
+                                    type: string
+                                  volumePath:
+                                    type: string
+                                required:
+                                - volumePath
+                                type: object
+                            required:
+                            - name
+                            type: object
+                          type: array
+                        sidecars:
+                          items:
+                            properties:
+                              args:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              command:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              env:
+                                items:
+                                  properties:
+                                    name:
+                                      type: string
+                                    value:
+                                      type: string
+                                    valueFrom:
+                                      properties:
+                                        configMapKeyRef:
+                                          properties:
+                                            key:
+                                              type: string
+                                            name:
+                                              default: ""
+                                              type: string
+                                            optional:
+                                              type: boolean
+                                          required:
+                                          - key
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        fieldRef:
+                                          properties:
+                                            apiVersion:
+                                              type: string
+                                            fieldPath:
+                                              type: string
+                                          required:
+                                          - fieldPath
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        resourceFieldRef:
+                                          properties:
+                                            containerName:
+                                              type: string
+                                            divisor:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                              x-kubernetes-int-or-string: true
+                                            resource:
+                                              type: string
+                                          required:
+                                          - resource
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        secretKeyRef:
+                                          properties:
+                                            key:
+                                              type: string
+                                            name:
+                                              default: ""
+                                              type: string
+                                            optional:
+                                              type: boolean
+                                          required:
+                                          - key
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                      type: object
+                                  required:
+                                  - name
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - name
+                                x-kubernetes-list-type: map
+                              envFrom:
+                                items:
+                                  properties:
+                                    configMapRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                        optional:
+                                          type: boolean
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    prefix:
+                                      type: string
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                        optional:
+                                          type: boolean
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              image:
+                                type: string
+                              imagePullPolicy:
+                                type: string
+                              lifecycle:
+                                properties:
+                                  postStart:
+                                    properties:
+                                      exec:
+                                        properties:
+                                          command:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        type: object
+                                      httpGet:
+                                        properties:
+                                          host:
+                                            type: string
+                                          httpHeaders:
+                                            items:
+                                              properties:
+                                                name:
+                                                  type: string
+                                                value:
+                                                  type: string
+                                              required:
+                                              - name
+                                              - value
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          path:
+                                            type: string
+                                          port:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            x-kubernetes-int-or-string: true
+                                          scheme:
+                                            type: string
+                                        required:
+                                        - port
+                                        type: object
+                                      sleep:
+                                        properties:
+                                          seconds:
+                                            format: int64
+                                            type: integer
+                                        required:
+                                        - seconds
+                                        type: object
+                                      tcpSocket:
+                                        properties:
+                                          host:
+                                            type: string
+                                          port:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            x-kubernetes-int-or-string: true
+                                        required:
+                                        - port
+                                        type: object
+                                    type: object
+                                  preStop:
+                                    properties:
+                                      exec:
+                                        properties:
+                                          command:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        type: object
+                                      httpGet:
+                                        properties:
+                                          host:
+                                            type: string
+                                          httpHeaders:
+                                            items:
+                                              properties:
+                                                name:
+                                                  type: string
+                                                value:
+                                                  type: string
+                                              required:
+                                              - name
+                                              - value
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          path:
+                                            type: string
+                                          port:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            x-kubernetes-int-or-string: true
+                                          scheme:
+                                            type: string
+                                        required:
+                                        - port
+                                        type: object
+                                      sleep:
+                                        properties:
+                                          seconds:
+                                            format: int64
+                                            type: integer
+                                        required:
+                                        - seconds
+                                        type: object
+                                      tcpSocket:
+                                        properties:
+                                          host:
+                                            type: string
+                                          port:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            x-kubernetes-int-or-string: true
+                                        required:
+                                        - port
+                                        type: object
+                                    type: object
+                                type: object
+                              livenessProbe:
+                                properties:
+                                  exec:
+                                    properties:
+                                      command:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    type: object
+                                  failureThreshold:
+                                    format: int32
+                                    type: integer
+                                  grpc:
+                                    properties:
+                                      port:
+                                        format: int32
+                                        type: integer
+                                      service:
+                                        default: ""
+                                        type: string
+                                    required:
+                                    - port
+                                    type: object
+                                  httpGet:
+                                    properties:
+                                      host:
+                                        type: string
+                                      httpHeaders:
+                                        items:
+                                          properties:
+                                            name:
+                                              type: string
+                                            value:
+                                              type: string
+                                          required:
+                                          - name
+                                          - value
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      path:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                      scheme:
+                                        type: string
+                                    required:
+                                    - port
+                                    type: object
+                                  initialDelaySeconds:
+                                    format: int32
+                                    type: integer
+                                  periodSeconds:
+                                    format: int32
+                                    type: integer
+                                  successThreshold:
+                                    format: int32
+                                    type: integer
+                                  tcpSocket:
+                                    properties:
+                                      host:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                    required:
+                                    - port
+                                    type: object
+                                  terminationGracePeriodSeconds:
+                                    format: int64
+                                    type: integer
+                                  timeoutSeconds:
+                                    format: int32
+                                    type: integer
+                                type: object
+                              name:
+                                type: string
+                              ports:
+                                items:
+                                  properties:
+                                    containerPort:
+                                      format: int32
+                                      type: integer
+                                    hostIP:
+                                      type: string
+                                    hostPort:
+                                      format: int32
+                                      type: integer
+                                    name:
+                                      type: string
+                                    protocol:
+                                      default: TCP
+                                      type: string
+                                  required:
+                                  - containerPort
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - containerPort
+                                - protocol
+                                x-kubernetes-list-type: map
+                              readinessProbe:
+                                properties:
+                                  exec:
+                                    properties:
+                                      command:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    type: object
+                                  failureThreshold:
+                                    format: int32
+                                    type: integer
+                                  grpc:
+                                    properties:
+                                      port:
+                                        format: int32
+                                        type: integer
+                                      service:
+                                        default: ""
+                                        type: string
+                                    required:
+                                    - port
+                                    type: object
+                                  httpGet:
+                                    properties:
+                                      host:
+                                        type: string
+                                      httpHeaders:
+                                        items:
+                                          properties:
+                                            name:
+                                              type: string
+                                            value:
+                                              type: string
+                                          required:
+                                          - name
+                                          - value
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      path:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                      scheme:
+                                        type: string
+                                    required:
+                                    - port
+                                    type: object
+                                  initialDelaySeconds:
+                                    format: int32
+                                    type: integer
+                                  periodSeconds:
+                                    format: int32
+                                    type: integer
+                                  successThreshold:
+                                    format: int32
+                                    type: integer
+                                  tcpSocket:
+                                    properties:
+                                      host:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                    required:
+                                    - port
+                                    type: object
+                                  terminationGracePeriodSeconds:
+                                    format: int64
+                                    type: integer
+                                  timeoutSeconds:
+                                    format: int32
+                                    type: integer
+                                type: object
+                              resizePolicy:
+                                items:
+                                  properties:
+                                    resourceName:
+                                      type: string
+                                    restartPolicy:
+                                      type: string
+                                  required:
+                                  - resourceName
+                                  - restartPolicy
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              resources:
+                                properties:
+                                  claims:
+                                    items:
+                                      properties:
+                                        name:
+                                          type: string
+                                        request:
+                                          type: string
+                                      required:
+                                      - name
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-map-keys:
+                                    - name
+                                    x-kubernetes-list-type: map
+                                  limits:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    type: object
+                                  requests:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    type: object
+                                type: object
+                              restartPolicy:
+                                type: string
+                              securityContext:
+                                properties:
+                                  allowPrivilegeEscalation:
+                                    type: boolean
+                                  appArmorProfile:
+                                    properties:
+                                      localhostProfile:
+                                        type: string
+                                      type:
+                                        type: string
+                                    required:
+                                    - type
+                                    type: object
+                                  capabilities:
+                                    properties:
+                                      add:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      drop:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    type: object
+                                  privileged:
+                                    type: boolean
+                                  procMount:
+                                    type: string
+                                  readOnlyRootFilesystem:
+                                    type: boolean
+                                  runAsGroup:
+                                    format: int64
+                                    type: integer
+                                  runAsNonRoot:
+                                    type: boolean
+                                  runAsUser:
+                                    format: int64
+                                    type: integer
+                                  seLinuxOptions:
+                                    properties:
+                                      level:
+                                        type: string
+                                      role:
+                                        type: string
+                                      type:
+                                        type: string
+                                      user:
+                                        type: string
+                                    type: object
+                                  seccompProfile:
+                                    properties:
+                                      localhostProfile:
+                                        type: string
+                                      type:
+                                        type: string
+                                    required:
+                                    - type
+                                    type: object
+                                  windowsOptions:
+                                    properties:
+                                      gmsaCredentialSpec:
+                                        type: string
+                                      gmsaCredentialSpecName:
+                                        type: string
+                                      hostProcess:
+                                        type: boolean
+                                      runAsUserName:
+                                        type: string
+                                    type: object
+                                type: object
+                              startupProbe:
+                                properties:
+                                  exec:
+                                    properties:
+                                      command:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    type: object
+                                  failureThreshold:
+                                    format: int32
+                                    type: integer
+                                  grpc:
+                                    properties:
+                                      port:
+                                        format: int32
+                                        type: integer
+                                      service:
+                                        default: ""
+                                        type: string
+                                    required:
+                                    - port
+                                    type: object
+                                  httpGet:
+                                    properties:
+                                      host:
+                                        type: string
+                                      httpHeaders:
+                                        items:
+                                          properties:
+                                            name:
+                                              type: string
+                                            value:
+                                              type: string
+                                          required:
+                                          - name
+                                          - value
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      path:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                      scheme:
+                                        type: string
+                                    required:
+                                    - port
+                                    type: object
+                                  initialDelaySeconds:
+                                    format: int32
+                                    type: integer
+                                  periodSeconds:
+                                    format: int32
+                                    type: integer
+                                  successThreshold:
+                                    format: int32
+                                    type: integer
+                                  tcpSocket:
+                                    properties:
+                                      host:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                    required:
+                                    - port
+                                    type: object
+                                  terminationGracePeriodSeconds:
+                                    format: int64
+                                    type: integer
+                                  timeoutSeconds:
+                                    format: int32
+                                    type: integer
+                                type: object
+                              stdin:
+                                type: boolean
+                              stdinOnce:
+                                type: boolean
+                              terminationMessagePath:
+                                type: string
+                              terminationMessagePolicy:
+                                type: string
+                              tty:
+                                type: boolean
+                              volumeDevices:
+                                items:
+                                  properties:
+                                    devicePath:
+                                      type: string
+                                    name:
+                                      type: string
+                                  required:
+                                  - devicePath
+                                  - name
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - devicePath
+                                x-kubernetes-list-type: map
+                              volumeMounts:
+                                items:
+                                  properties:
+                                    mountPath:
+                                      type: string
+                                    mountPropagation:
+                                      type: string
+                                    name:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    recursiveReadOnly:
+                                      type: string
+                                    subPath:
+                                      type: string
+                                    subPathExpr:
+                                      type: string
+                                  required:
+                                  - mountPath
+                                  - name
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - mountPath
+                                x-kubernetes-list-type: map
+                              workingDir:
+                                type: string
+                            required:
+                            - name
+                            type: object
+                          type: array
+                        size:
+                          format: int32
+                          type: integer
+                        terminationGracePeriodSeconds:
+                          format: int64
+                          type: integer
+                        tolerations:
+                          items:
+                            properties:
+                              effect:
+                                type: string
+                              key:
+                                type: string
+                              operator:
+                                type: string
+                              tolerationSeconds:
+                                format: int64
+                                type: integer
+                              value:
+                                type: string
+                            type: object
+                          type: array
+                        topologySpreadConstraints:
+                          items:
+                            properties:
+                              labelSelector:
+                                properties:
+                                  matchExpressions:
+                                    items:
+                                      properties:
+                                        key:
+                                          type: string
+                                        operator:
+                                          type: string
+                                        values:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      required:
+                                      - key
+                                      - operator
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  matchLabels:
+                                    additionalProperties:
+                                      type: string
+                                    type: object
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              matchLabelKeys:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              maxSkew:
+                                format: int32
+                                type: integer
+                              minDomains:
+                                format: int32
+                                type: integer
+                              nodeAffinityPolicy:
+                                type: string
+                              nodeTaintsPolicy:
+                                type: string
+                              topologyKey:
+                                type: string
+                              whenUnsatisfiable:
+                                type: string
+                            required:
+                            - maxSkew
+                            - topologyKey
+                            - whenUnsatisfiable
+                            type: object
+                          type: array
+                        volumeSpec:
+                          properties:
+                            emptyDir:
+                              properties:
+                                medium:
+                                  type: string
+                                sizeLimit:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                              type: object
+                            hostPath:
+                              properties:
+                                path:
+                                  type: string
+                                type:
+                                  type: string
+                              required:
+                              - path
+                              type: object
+                            persistentVolumeClaim:
+                              properties:
+                                accessModes:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                annotations:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                                dataSource:
+                                  properties:
+                                    apiGroup:
+                                      type: string
+                                    kind:
+                                      type: string
+                                    name:
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                dataSourceRef:
+                                  properties:
+                                    apiGroup:
+                                      type: string
+                                    kind:
+                                      type: string
+                                    name:
+                                      type: string
+                                    namespace:
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                labels:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                                resources:
+                                  properties:
+                                    limits:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      type: object
+                                    requests:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      type: object
+                                  type: object
+                                selector:
+                                  properties:
+                                    matchExpressions:
+                                      items:
+                                        properties:
+                                          key:
+                                            type: string
+                                          operator:
+                                            type: string
+                                          values:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                storageClassName:
+                                  type: string
+                                volumeAttributesClassName:
+                                  type: string
+                                volumeMode:
+                                  type: string
+                                volumeName:
+                                  type: string
+                              type: object
+                          type: object
+                      required:
+                      - enabled
+                      - size
+                      type: object
+                    podDisruptionBudget:
+                      properties:
+                        maxUnavailable:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          x-kubernetes-int-or-string: true
+                        minAvailable:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          x-kubernetes-int-or-string: true
+                      type: object
+                    podSecurityContext:
+                      properties:
+                        appArmorProfile:
+                          properties:
+                            localhostProfile:
+                              type: string
+                            type:
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        fsGroup:
+                          format: int64
+                          type: integer
+                        fsGroupChangePolicy:
+                          type: string
+                        runAsGroup:
+                          format: int64
+                          type: integer
+                        runAsNonRoot:
+                          type: boolean
+                        runAsUser:
+                          format: int64
+                          type: integer
+                        seLinuxChangePolicy:
+                          type: string
+                        seLinuxOptions:
+                          properties:
+                            level:
+                              type: string
+                            role:
+                              type: string
+                            type:
+                              type: string
+                            user:
+                              type: string
+                          type: object
+                        seccompProfile:
+                          properties:
+                            localhostProfile:
+                              type: string
+                            type:
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        supplementalGroups:
+                          items:
+                            format: int64
+                            type: integer
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        supplementalGroupsPolicy:
+                          type: string
+                        sysctls:
+                          items:
+                            properties:
+                              name:
+                                type: string
+                              value:
+                                type: string
+                            required:
+                            - name
+                            - value
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        windowsOptions:
+                          properties:
+                            gmsaCredentialSpec:
+                              type: string
+                            gmsaCredentialSpecName:
+                              type: string
+                            hostProcess:
+                              type: boolean
+                            runAsUserName:
+                              type: string
+                          type: object
+                      type: object
+                    primaryPreferTagSelector:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    priorityClassName:
+                      type: string
+                    readinessProbe:
+                      properties:
+                        exec:
+                          properties:
+                            command:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          format: int32
+                          type: integer
+                        grpc:
+                          properties:
+                            port:
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          properties:
+                            host:
+                              type: string
+                            httpHeaders:
+                              items:
+                                properties:
+                                  name:
+                                    type: string
+                                  value:
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          properties:
+                            host:
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          format: int32
+                          type: integer
+                      type: object
+                    replsetOverrides:
+                      additionalProperties:
+                        properties:
+                          horizons:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          host:
+                            type: string
+                          priority:
+                            type: integer
+                          tags:
+                            additionalProperties:
+                              type: string
+                            type: object
+                        type: object
+                      type: object
+                    resources:
+                      properties:
+                        claims:
+                          items:
+                            properties:
+                              name:
+                                type: string
+                              request:
+                                type: string
+                            required:
+                            - name
+                            type: object
+                          type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
+                        limits:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          type: object
+                        requests:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          type: object
+                      type: object
+                    runtimeClassName:
+                      type: string
+                    serviceAccountName:
+                      type: string
+                    sidecarPVCs:
+                      items:
+                        properties:
+                          apiVersion:
+                            type: string
+                          kind:
+                            type: string
+                          metadata:
+                            type: object
+                          spec:
+                            properties:
+                              accessModes:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              dataSource:
+                                properties:
+                                  apiGroup:
+                                    type: string
+                                  kind:
+                                    type: string
+                                  name:
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              dataSourceRef:
+                                properties:
+                                  apiGroup:
+                                    type: string
+                                  kind:
+                                    type: string
+                                  name:
+                                    type: string
+                                  namespace:
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                              resources:
+                                properties:
+                                  limits:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    type: object
+                                  requests:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    type: object
+                                type: object
+                              selector:
+                                properties:
+                                  matchExpressions:
+                                    items:
+                                      properties:
+                                        key:
+                                          type: string
+                                        operator:
+                                          type: string
+                                        values:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      required:
+                                      - key
+                                      - operator
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  matchLabels:
+                                    additionalProperties:
+                                      type: string
+                                    type: object
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              storageClassName:
+                                type: string
+                              volumeAttributesClassName:
+                                type: string
+                              volumeMode:
+                                type: string
+                              volumeName:
+                                type: string
+                            type: object
+                          status:
+                            properties:
+                              accessModes:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              allocatedResourceStatuses:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                                x-kubernetes-map-type: granular
+                              allocatedResources:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                type: object
+                              capacity:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                type: object
+                              conditions:
+                                items:
+                                  properties:
+                                    lastProbeTime:
+                                      format: date-time
+                                      type: string
+                                    lastTransitionTime:
+                                      format: date-time
+                                      type: string
+                                    message:
+                                      type: string
+                                    reason:
+                                      type: string
+                                    status:
+                                      type: string
+                                    type:
+                                      type: string
+                                  required:
+                                  - status
+                                  - type
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - type
+                                x-kubernetes-list-type: map
+                              currentVolumeAttributesClassName:
+                                type: string
+                              modifyVolumeStatus:
+                                properties:
+                                  status:
+                                    type: string
+                                  targetVolumeAttributesClassName:
+                                    type: string
+                                required:
+                                - status
+                                type: object
+                              phase:
+                                type: string
+                            type: object
+                        type: object
+                      type: array
+                    sidecarVolumes:
+                      items:
+                        properties:
+                          awsElasticBlockStore:
+                            properties:
+                              fsType:
+                                type: string
+                              partition:
+                                format: int32
+                                type: integer
+                              readOnly:
+                                type: boolean
+                              volumeID:
+                                type: string
+                            required:
+                            - volumeID
+                            type: object
+                          azureDisk:
+                            properties:
+                              cachingMode:
+                                type: string
+                              diskName:
+                                type: string
+                              diskURI:
+                                type: string
+                              fsType:
+                                default: ext4
+                                type: string
+                              kind:
+                                type: string
+                              readOnly:
+                                default: false
+                                type: boolean
+                            required:
+                            - diskName
+                            - diskURI
+                            type: object
+                          azureFile:
+                            properties:
+                              readOnly:
+                                type: boolean
+                              secretName:
+                                type: string
+                              shareName:
+                                type: string
+                            required:
+                            - secretName
+                            - shareName
+                            type: object
+                          cephfs:
+                            properties:
+                              monitors:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              path:
+                                type: string
+                              readOnly:
+                                type: boolean
+                              secretFile:
+                                type: string
+                              secretRef:
+                                properties:
+                                  name:
+                                    default: ""
+                                    type: string
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              user:
+                                type: string
+                            required:
+                            - monitors
+                            type: object
+                          cinder:
+                            properties:
+                              fsType:
+                                type: string
+                              readOnly:
+                                type: boolean
+                              secretRef:
+                                properties:
+                                  name:
+                                    default: ""
+                                    type: string
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              volumeID:
+                                type: string
+                            required:
+                            - volumeID
+                            type: object
+                          configMap:
+                            properties:
+                              defaultMode:
+                                format: int32
+                                type: integer
+                              items:
+                                items:
+                                  properties:
+                                    key:
+                                      type: string
+                                    mode:
+                                      format: int32
+                                      type: integer
+                                    path:
+                                      type: string
+                                  required:
+                                  - key
+                                  - path
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              name:
+                                default: ""
+                                type: string
+                              optional:
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          csi:
+                            properties:
+                              driver:
+                                type: string
+                              fsType:
+                                type: string
+                              nodePublishSecretRef:
+                                properties:
+                                  name:
+                                    default: ""
+                                    type: string
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              readOnly:
+                                type: boolean
+                              volumeAttributes:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                            required:
+                            - driver
+                            type: object
+                          downwardAPI:
+                            properties:
+                              defaultMode:
+                                format: int32
+                                type: integer
+                              items:
+                                items:
+                                  properties:
+                                    fieldRef:
+                                      properties:
+                                        apiVersion:
+                                          type: string
+                                        fieldPath:
+                                          type: string
+                                      required:
+                                      - fieldPath
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    mode:
+                                      format: int32
+                                      type: integer
+                                    path:
+                                      type: string
+                                    resourceFieldRef:
+                                      properties:
+                                        containerName:
+                                          type: string
+                                        divisor:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                          x-kubernetes-int-or-string: true
+                                        resource:
+                                          type: string
+                                      required:
+                                      - resource
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                  required:
+                                  - path
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            type: object
+                          emptyDir:
+                            properties:
+                              medium:
+                                type: string
+                              sizeLimit:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                x-kubernetes-int-or-string: true
+                            type: object
+                          ephemeral:
+                            properties:
+                              volumeClaimTemplate:
+                                properties:
+                                  metadata:
+                                    type: object
+                                  spec:
+                                    properties:
+                                      accessModes:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      dataSource:
+                                        properties:
+                                          apiGroup:
+                                            type: string
+                                          kind:
+                                            type: string
+                                          name:
+                                            type: string
+                                        required:
+                                        - kind
+                                        - name
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      dataSourceRef:
+                                        properties:
+                                          apiGroup:
+                                            type: string
+                                          kind:
+                                            type: string
+                                          name:
+                                            type: string
+                                          namespace:
+                                            type: string
+                                        required:
+                                        - kind
+                                        - name
+                                        type: object
+                                      resources:
+                                        properties:
+                                          limits:
+                                            additionalProperties:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                              x-kubernetes-int-or-string: true
+                                            type: object
+                                          requests:
+                                            additionalProperties:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                              x-kubernetes-int-or-string: true
+                                            type: object
+                                        type: object
+                                      selector:
+                                        properties:
+                                          matchExpressions:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              required:
+                                              - key
+                                              - operator
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          matchLabels:
+                                            additionalProperties:
+                                              type: string
+                                            type: object
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      storageClassName:
+                                        type: string
+                                      volumeAttributesClassName:
+                                        type: string
+                                      volumeMode:
+                                        type: string
+                                      volumeName:
+                                        type: string
+                                    type: object
+                                required:
+                                - spec
+                                type: object
+                            type: object
+                          fc:
+                            properties:
+                              fsType:
+                                type: string
+                              lun:
+                                format: int32
+                                type: integer
+                              readOnly:
+                                type: boolean
+                              targetWWNs:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              wwids:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            type: object
+                          flexVolume:
+                            properties:
+                              driver:
+                                type: string
+                              fsType:
+                                type: string
+                              options:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              readOnly:
+                                type: boolean
+                              secretRef:
+                                properties:
+                                  name:
+                                    default: ""
+                                    type: string
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            required:
+                            - driver
+                            type: object
+                          flocker:
+                            properties:
+                              datasetName:
+                                type: string
+                              datasetUUID:
+                                type: string
+                            type: object
+                          gcePersistentDisk:
+                            properties:
+                              fsType:
+                                type: string
+                              partition:
+                                format: int32
+                                type: integer
+                              pdName:
+                                type: string
+                              readOnly:
+                                type: boolean
+                            required:
+                            - pdName
+                            type: object
+                          gitRepo:
+                            properties:
+                              directory:
+                                type: string
+                              repository:
+                                type: string
+                              revision:
+                                type: string
+                            required:
+                            - repository
+                            type: object
+                          glusterfs:
+                            properties:
+                              endpoints:
+                                type: string
+                              path:
+                                type: string
+                              readOnly:
+                                type: boolean
+                            required:
+                            - endpoints
+                            - path
+                            type: object
+                          hostPath:
+                            properties:
+                              path:
+                                type: string
+                              type:
+                                type: string
+                            required:
+                            - path
+                            type: object
+                          image:
+                            properties:
+                              pullPolicy:
+                                type: string
+                              reference:
+                                type: string
+                            type: object
+                          iscsi:
+                            properties:
+                              chapAuthDiscovery:
+                                type: boolean
+                              chapAuthSession:
+                                type: boolean
+                              fsType:
+                                type: string
+                              initiatorName:
+                                type: string
+                              iqn:
+                                type: string
+                              iscsiInterface:
+                                default: default
+                                type: string
+                              lun:
+                                format: int32
+                                type: integer
+                              portals:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              readOnly:
+                                type: boolean
+                              secretRef:
+                                properties:
+                                  name:
+                                    default: ""
+                                    type: string
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              targetPortal:
+                                type: string
+                            required:
+                            - iqn
+                            - lun
+                            - targetPortal
+                            type: object
+                          name:
+                            type: string
+                          nfs:
+                            properties:
+                              path:
+                                type: string
+                              readOnly:
+                                type: boolean
+                              server:
+                                type: string
+                            required:
+                            - path
+                            - server
+                            type: object
+                          persistentVolumeClaim:
+                            properties:
+                              claimName:
+                                type: string
+                              readOnly:
+                                type: boolean
+                            required:
+                            - claimName
+                            type: object
+                          photonPersistentDisk:
+                            properties:
+                              fsType:
+                                type: string
+                              pdID:
+                                type: string
+                            required:
+                            - pdID
+                            type: object
+                          portworxVolume:
+                            properties:
+                              fsType:
+                                type: string
+                              readOnly:
+                                type: boolean
+                              volumeID:
+                                type: string
+                            required:
+                            - volumeID
+                            type: object
+                          projected:
+                            properties:
+                              defaultMode:
+                                format: int32
+                                type: integer
+                              sources:
+                                items:
+                                  properties:
+                                    clusterTrustBundle:
+                                      properties:
+                                        labelSelector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        name:
+                                          type: string
+                                        optional:
+                                          type: boolean
+                                        path:
+                                          type: string
+                                        signerName:
+                                          type: string
+                                      required:
+                                      - path
+                                      type: object
+                                    configMap:
+                                      properties:
+                                        items:
+                                          items:
+                                            properties:
+                                              key:
+                                                type: string
+                                              mode:
+                                                format: int32
+                                                type: integer
+                                              path:
+                                                type: string
+                                            required:
+                                            - key
+                                            - path
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        name:
+                                          default: ""
+                                          type: string
+                                        optional:
+                                          type: boolean
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    downwardAPI:
+                                      properties:
+                                        items:
+                                          items:
+                                            properties:
+                                              fieldRef:
+                                                properties:
+                                                  apiVersion:
+                                                    type: string
+                                                  fieldPath:
+                                                    type: string
+                                                required:
+                                                - fieldPath
+                                                type: object
+                                                x-kubernetes-map-type: atomic
+                                              mode:
+                                                format: int32
+                                                type: integer
+                                              path:
+                                                type: string
+                                              resourceFieldRef:
+                                                properties:
+                                                  containerName:
+                                                    type: string
+                                                  divisor:
+                                                    anyOf:
+                                                    - type: integer
+                                                    - type: string
+                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                    x-kubernetes-int-or-string: true
+                                                  resource:
+                                                    type: string
+                                                required:
+                                                - resource
+                                                type: object
+                                                x-kubernetes-map-type: atomic
+                                            required:
+                                            - path
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    secret:
+                                      properties:
+                                        items:
+                                          items:
+                                            properties:
+                                              key:
+                                                type: string
+                                              mode:
+                                                format: int32
+                                                type: integer
+                                              path:
+                                                type: string
+                                            required:
+                                            - key
+                                            - path
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        name:
+                                          default: ""
+                                          type: string
+                                        optional:
+                                          type: boolean
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    serviceAccountToken:
+                                      properties:
+                                        audience:
+                                          type: string
+                                        expirationSeconds:
+                                          format: int64
+                                          type: integer
+                                        path:
+                                          type: string
+                                      required:
+                                      - path
+                                      type: object
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            type: object
+                          quobyte:
+                            properties:
+                              group:
+                                type: string
+                              readOnly:
+                                type: boolean
+                              registry:
+                                type: string
+                              tenant:
+                                type: string
+                              user:
+                                type: string
+                              volume:
+                                type: string
+                            required:
+                            - registry
+                            - volume
+                            type: object
+                          rbd:
+                            properties:
+                              fsType:
+                                type: string
+                              image:
+                                type: string
+                              keyring:
+                                default: /etc/ceph/keyring
+                                type: string
+                              monitors:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              pool:
+                                default: rbd
+                                type: string
+                              readOnly:
+                                type: boolean
+                              secretRef:
+                                properties:
+                                  name:
+                                    default: ""
+                                    type: string
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              user:
+                                default: admin
+                                type: string
+                            required:
+                            - image
+                            - monitors
+                            type: object
+                          scaleIO:
+                            properties:
+                              fsType:
+                                default: xfs
+                                type: string
+                              gateway:
+                                type: string
+                              protectionDomain:
+                                type: string
+                              readOnly:
+                                type: boolean
+                              secretRef:
+                                properties:
+                                  name:
+                                    default: ""
+                                    type: string
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              sslEnabled:
+                                type: boolean
+                              storageMode:
+                                default: ThinProvisioned
+                                type: string
+                              storagePool:
+                                type: string
+                              system:
+                                type: string
+                              volumeName:
+                                type: string
+                            required:
+                            - gateway
+                            - secretRef
+                            - system
+                            type: object
+                          secret:
+                            properties:
+                              defaultMode:
+                                format: int32
+                                type: integer
+                              items:
+                                items:
+                                  properties:
+                                    key:
+                                      type: string
+                                    mode:
+                                      format: int32
+                                      type: integer
+                                    path:
+                                      type: string
+                                  required:
+                                  - key
+                                  - path
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              optional:
+                                type: boolean
+                              secretName:
+                                type: string
+                            type: object
+                          storageos:
+                            properties:
+                              fsType:
+                                type: string
+                              readOnly:
+                                type: boolean
+                              secretRef:
+                                properties:
+                                  name:
+                                    default: ""
+                                    type: string
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              volumeName:
+                                type: string
+                              volumeNamespace:
+                                type: string
+                            type: object
+                          vsphereVolume:
+                            properties:
+                              fsType:
+                                type: string
+                              storagePolicyID:
+                                type: string
+                              storagePolicyName:
+                                type: string
+                              volumePath:
+                                type: string
+                            required:
+                            - volumePath
+                            type: object
+                        required:
+                        - name
+                        type: object
+                      type: array
+                    sidecars:
+                      items:
+                        properties:
+                          args:
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          command:
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          env:
+                            items:
+                              properties:
+                                name:
+                                  type: string
+                                value:
+                                  type: string
+                                valueFrom:
+                                  properties:
+                                    configMapKeyRef:
+                                      properties:
+                                        key:
+                                          type: string
+                                        name:
+                                          default: ""
+                                          type: string
+                                        optional:
+                                          type: boolean
+                                      required:
+                                      - key
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    fieldRef:
+                                      properties:
+                                        apiVersion:
+                                          type: string
+                                        fieldPath:
+                                          type: string
+                                      required:
+                                      - fieldPath
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    resourceFieldRef:
+                                      properties:
+                                        containerName:
+                                          type: string
+                                        divisor:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                          x-kubernetes-int-or-string: true
+                                        resource:
+                                          type: string
+                                      required:
+                                      - resource
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    secretKeyRef:
+                                      properties:
+                                        key:
+                                          type: string
+                                        name:
+                                          default: ""
+                                          type: string
+                                        optional:
+                                          type: boolean
+                                      required:
+                                      - key
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                  type: object
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
+                          envFrom:
+                            items:
+                              properties:
+                                configMapRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                prefix:
+                                  type: string
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          image:
+                            type: string
+                          imagePullPolicy:
+                            type: string
+                          lifecycle:
+                            properties:
+                              postStart:
+                                properties:
+                                  exec:
+                                    properties:
+                                      command:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    type: object
+                                  httpGet:
+                                    properties:
+                                      host:
+                                        type: string
+                                      httpHeaders:
+                                        items:
+                                          properties:
+                                            name:
+                                              type: string
+                                            value:
+                                              type: string
+                                          required:
+                                          - name
+                                          - value
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      path:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                      scheme:
+                                        type: string
+                                    required:
+                                    - port
+                                    type: object
+                                  sleep:
+                                    properties:
+                                      seconds:
+                                        format: int64
+                                        type: integer
+                                    required:
+                                    - seconds
+                                    type: object
+                                  tcpSocket:
+                                    properties:
+                                      host:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                    required:
+                                    - port
+                                    type: object
+                                type: object
+                              preStop:
+                                properties:
+                                  exec:
+                                    properties:
+                                      command:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    type: object
+                                  httpGet:
+                                    properties:
+                                      host:
+                                        type: string
+                                      httpHeaders:
+                                        items:
+                                          properties:
+                                            name:
+                                              type: string
+                                            value:
+                                              type: string
+                                          required:
+                                          - name
+                                          - value
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      path:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                      scheme:
+                                        type: string
+                                    required:
+                                    - port
+                                    type: object
+                                  sleep:
+                                    properties:
+                                      seconds:
+                                        format: int64
+                                        type: integer
+                                    required:
+                                    - seconds
+                                    type: object
+                                  tcpSocket:
+                                    properties:
+                                      host:
+                                        type: string
+                                      port:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        x-kubernetes-int-or-string: true
+                                    required:
+                                    - port
+                                    type: object
+                                type: object
+                            type: object
+                          livenessProbe:
+                            properties:
+                              exec:
+                                properties:
+                                  command:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              failureThreshold:
+                                format: int32
+                                type: integer
+                              grpc:
+                                properties:
+                                  port:
+                                    format: int32
+                                    type: integer
+                                  service:
+                                    default: ""
+                                    type: string
+                                required:
+                                - port
+                                type: object
+                              httpGet:
+                                properties:
+                                  host:
+                                    type: string
+                                  httpHeaders:
+                                    items:
+                                      properties:
+                                        name:
+                                          type: string
+                                        value:
+                                          type: string
+                                      required:
+                                      - name
+                                      - value
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  path:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    x-kubernetes-int-or-string: true
+                                  scheme:
+                                    type: string
+                                required:
+                                - port
+                                type: object
+                              initialDelaySeconds:
+                                format: int32
+                                type: integer
+                              periodSeconds:
+                                format: int32
+                                type: integer
+                              successThreshold:
+                                format: int32
+                                type: integer
+                              tcpSocket:
+                                properties:
+                                  host:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    x-kubernetes-int-or-string: true
+                                required:
+                                - port
+                                type: object
+                              terminationGracePeriodSeconds:
+                                format: int64
+                                type: integer
+                              timeoutSeconds:
+                                format: int32
+                                type: integer
+                            type: object
+                          name:
+                            type: string
+                          ports:
+                            items:
+                              properties:
+                                containerPort:
+                                  format: int32
+                                  type: integer
+                                hostIP:
+                                  type: string
+                                hostPort:
+                                  format: int32
+                                  type: integer
+                                name:
+                                  type: string
+                                protocol:
+                                  default: TCP
+                                  type: string
+                              required:
+                              - containerPort
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - containerPort
+                            - protocol
+                            x-kubernetes-list-type: map
+                          readinessProbe:
+                            properties:
+                              exec:
+                                properties:
+                                  command:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              failureThreshold:
+                                format: int32
+                                type: integer
+                              grpc:
+                                properties:
+                                  port:
+                                    format: int32
+                                    type: integer
+                                  service:
+                                    default: ""
+                                    type: string
+                                required:
+                                - port
+                                type: object
+                              httpGet:
+                                properties:
+                                  host:
+                                    type: string
+                                  httpHeaders:
+                                    items:
+                                      properties:
+                                        name:
+                                          type: string
+                                        value:
+                                          type: string
+                                      required:
+                                      - name
+                                      - value
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  path:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    x-kubernetes-int-or-string: true
+                                  scheme:
+                                    type: string
+                                required:
+                                - port
+                                type: object
+                              initialDelaySeconds:
+                                format: int32
+                                type: integer
+                              periodSeconds:
+                                format: int32
+                                type: integer
+                              successThreshold:
+                                format: int32
+                                type: integer
+                              tcpSocket:
+                                properties:
+                                  host:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    x-kubernetes-int-or-string: true
+                                required:
+                                - port
+                                type: object
+                              terminationGracePeriodSeconds:
+                                format: int64
+                                type: integer
+                              timeoutSeconds:
+                                format: int32
+                                type: integer
+                            type: object
+                          resizePolicy:
+                            items:
+                              properties:
+                                resourceName:
+                                  type: string
+                                restartPolicy:
+                                  type: string
+                              required:
+                              - resourceName
+                              - restartPolicy
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          resources:
+                            properties:
+                              claims:
+                                items:
+                                  properties:
+                                    name:
+                                      type: string
+                                    request:
+                                      type: string
+                                  required:
+                                  - name
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - name
+                                x-kubernetes-list-type: map
+                              limits:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                type: object
+                              requests:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                type: object
+                            type: object
+                          restartPolicy:
+                            type: string
+                          securityContext:
+                            properties:
+                              allowPrivilegeEscalation:
+                                type: boolean
+                              appArmorProfile:
+                                properties:
+                                  localhostProfile:
+                                    type: string
+                                  type:
+                                    type: string
+                                required:
+                                - type
+                                type: object
+                              capabilities:
+                                properties:
+                                  add:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  drop:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              privileged:
+                                type: boolean
+                              procMount:
+                                type: string
+                              readOnlyRootFilesystem:
+                                type: boolean
+                              runAsGroup:
+                                format: int64
+                                type: integer
+                              runAsNonRoot:
+                                type: boolean
+                              runAsUser:
+                                format: int64
+                                type: integer
+                              seLinuxOptions:
+                                properties:
+                                  level:
+                                    type: string
+                                  role:
+                                    type: string
+                                  type:
+                                    type: string
+                                  user:
+                                    type: string
+                                type: object
+                              seccompProfile:
+                                properties:
+                                  localhostProfile:
+                                    type: string
+                                  type:
+                                    type: string
+                                required:
+                                - type
+                                type: object
+                              windowsOptions:
+                                properties:
+                                  gmsaCredentialSpec:
+                                    type: string
+                                  gmsaCredentialSpecName:
+                                    type: string
+                                  hostProcess:
+                                    type: boolean
+                                  runAsUserName:
+                                    type: string
+                                type: object
+                            type: object
+                          startupProbe:
+                            properties:
+                              exec:
+                                properties:
+                                  command:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              failureThreshold:
+                                format: int32
+                                type: integer
+                              grpc:
+                                properties:
+                                  port:
+                                    format: int32
+                                    type: integer
+                                  service:
+                                    default: ""
+                                    type: string
+                                required:
+                                - port
+                                type: object
+                              httpGet:
+                                properties:
+                                  host:
+                                    type: string
+                                  httpHeaders:
+                                    items:
+                                      properties:
+                                        name:
+                                          type: string
+                                        value:
+                                          type: string
+                                      required:
+                                      - name
+                                      - value
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  path:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    x-kubernetes-int-or-string: true
+                                  scheme:
+                                    type: string
+                                required:
+                                - port
+                                type: object
+                              initialDelaySeconds:
+                                format: int32
+                                type: integer
+                              periodSeconds:
+                                format: int32
+                                type: integer
+                              successThreshold:
+                                format: int32
+                                type: integer
+                              tcpSocket:
+                                properties:
+                                  host:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    x-kubernetes-int-or-string: true
+                                required:
+                                - port
+                                type: object
+                              terminationGracePeriodSeconds:
+                                format: int64
+                                type: integer
+                              timeoutSeconds:
+                                format: int32
+                                type: integer
+                            type: object
+                          stdin:
+                            type: boolean
+                          stdinOnce:
+                            type: boolean
+                          terminationMessagePath:
+                            type: string
+                          terminationMessagePolicy:
+                            type: string
+                          tty:
+                            type: boolean
+                          volumeDevices:
+                            items:
+                              properties:
+                                devicePath:
+                                  type: string
+                                name:
+                                  type: string
+                              required:
+                              - devicePath
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - devicePath
+                            x-kubernetes-list-type: map
+                          volumeMounts:
+                            items:
+                              properties:
+                                mountPath:
+                                  type: string
+                                mountPropagation:
+                                  type: string
+                                name:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                recursiveReadOnly:
+                                  type: string
+                                subPath:
+                                  type: string
+                                subPathExpr:
+                                  type: string
+                              required:
+                              - mountPath
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - mountPath
+                            x-kubernetes-list-type: map
+                          workingDir:
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      type: array
+                    size:
+                      format: int32
+                      type: integer
+                    splitHorizons:
+                      additionalProperties:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      type: object
+                    storage:
+                      properties:
+                        directoryPerDB:
+                          type: boolean
+                        engine:
+                          type: string
+                        inMemory:
+                          properties:
+                            engineConfig:
+                              properties:
+                                inMemorySizeRatio:
+                                  type: number
+                              type: object
+                          type: object
+                        mmapv1:
+                          properties:
+                            nsSize:
+                              type: integer
+                            smallfiles:
+                              type: boolean
+                          type: object
+                        syncPeriodSecs:
+                          type: integer
+                        wiredTiger:
+                          properties:
+                            collectionConfig:
+                              properties:
+                                blockCompressor:
+                                  type: string
+                              type: object
+                            engineConfig:
+                              properties:
+                                cacheSizeRatio:
+                                  type: number
+                                directoryForIndexes:
+                                  type: boolean
+                                journalCompressor:
+                                  type: string
+                              type: object
+                            indexConfig:
+                              properties:
+                                prefixCompression:
+                                  type: boolean
+                              type: object
+                          type: object
+                      type: object
+                    terminationGracePeriodSeconds:
+                      format: int64
+                      type: integer
+                    tolerations:
+                      items:
+                        properties:
+                          effect:
+                            type: string
+                          key:
+                            type: string
+                          operator:
+                            type: string
+                          tolerationSeconds:
+                            format: int64
+                            type: integer
+                          value:
+                            type: string
+                        type: object
+                      type: array
+                    topologySpreadConstraints:
+                      items:
+                        properties:
+                          labelSelector:
+                            properties:
+                              matchExpressions:
+                                items:
+                                  properties:
+                                    key:
+                                      type: string
+                                    operator:
+                                      type: string
+                                    values:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  required:
+                                  - key
+                                  - operator
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              matchLabels:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          matchLabelKeys:
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          maxSkew:
+                            format: int32
+                            type: integer
+                          minDomains:
+                            format: int32
+                            type: integer
+                          nodeAffinityPolicy:
+                            type: string
+                          nodeTaintsPolicy:
+                            type: string
+                          topologyKey:
+                            type: string
+                          whenUnsatisfiable:
+                            type: string
+                        required:
+                        - maxSkew
+                        - topologyKey
+                        - whenUnsatisfiable
+                        type: object
+                      type: array
+                    volumeSpec:
+                      properties:
+                        emptyDir:
+                          properties:
+                            medium:
+                              type: string
+                            sizeLimit:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                          type: object
+                        hostPath:
+                          properties:
+                            path:
+                              type: string
+                            type:
+                              type: string
+                          required:
+                          - path
+                          type: object
+                        persistentVolumeClaim:
+                          properties:
+                            accessModes:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            annotations:
+                              additionalProperties:
+                                type: string
+                              type: object
+                            dataSource:
+                              properties:
+                                apiGroup:
+                                  type: string
+                                kind:
+                                  type: string
+                                name:
+                                  type: string
+                              required:
+                              - kind
+                              - name
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            dataSourceRef:
+                              properties:
+                                apiGroup:
+                                  type: string
+                                kind:
+                                  type: string
+                                name:
+                                  type: string
+                                namespace:
+                                  type: string
+                              required:
+                              - kind
+                              - name
+                              type: object
+                            labels:
+                              additionalProperties:
+                                type: string
+                              type: object
+                            resources:
+                              properties:
+                                limits:
+                                  additionalProperties:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  type: object
+                                requests:
+                                  additionalProperties:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  type: object
+                              type: object
+                            selector:
+                              properties:
+                                matchExpressions:
+                                  items:
+                                    properties:
+                                      key:
+                                        type: string
+                                      operator:
+                                        type: string
+                                      values:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            storageClassName:
+                              type: string
+                            volumeAttributesClassName:
+                              type: string
+                            volumeMode:
+                              type: string
+                            volumeName:
+                              type: string
+                          type: object
+                      type: object
+                  required:
+                  - size
+                  type: object
+                type: array
+              roles:
+                items:
+                  properties:
+                    authenticationRestrictions:
+                      items:
+                        properties:
+                          clientSource:
+                            items:
+                              type: string
+                            type: array
+                          serverAddress:
+                            items:
+                              type: string
+                            type: array
+                        type: object
+                      type: array
+                    db:
+                      type: string
+                    privileges:
+                      items:
+                        properties:
+                          actions:
+                            items:
+                              type: string
+                            type: array
+                          resource:
+                            properties:
+                              cluster:
+                                type: boolean
+                              collection:
+                                type: string
+                              db:
+                                type: string
+                            type: object
+                        required:
+                        - actions
+                        type: object
+                      type: array
+                    role:
+                      type: string
+                    roles:
+                      items:
+                        properties:
+                          db:
+                            type: string
+                          role:
+                            type: string
+                        required:
+                        - db
+                        - role
+                        type: object
+                      type: array
+                  required:
+                  - db
+                  - privileges
+                  - role
+                  type: object
+                type: array
+              schedulerName:
+                type: string
+              secrets:
+                properties:
+                  encryptionKey:
+                    type: string
+                  keyFile:
+                    type: string
+                  ldapSecret:
+                    type: string
+                  sse:
+                    type: string
+                  ssl:
+                    type: string
+                  sslInternal:
+                    type: string
+                  users:
+                    type: string
+                  vault:
+                    type: string
+                type: object
+              sharding:
+                properties:
+                  balancer:
+                    properties:
+                      enabled:
+                        type: boolean
+                    type: object
+                  configsvrReplSet:
+                    properties:
+                      affinity:
+                        properties:
+                          advanced:
+                            properties:
+                              nodeAffinity:
+                                properties:
+                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        preference:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchFields:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        weight:
+                                          format: int32
+                                          type: integer
+                                      required:
+                                      - preference
+                                      - weight
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                    properties:
+                                      nodeSelectorTerms:
+                                        items:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchFields:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - nodeSelectorTerms
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              podAffinity:
+                                properties:
+                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        podAffinityTerm:
+                                          properties:
+                                            labelSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            matchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            mismatchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            namespaceSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            namespaces:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            topologyKey:
+                                              type: string
+                                          required:
+                                          - topologyKey
+                                          type: object
+                                        weight:
+                                          format: int32
+                                          type: integer
+                                      required:
+                                      - podAffinityTerm
+                                      - weight
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        labelSelector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        matchLabelKeys:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        mismatchLabelKeys:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        namespaceSelector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        namespaces:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        topologyKey:
+                                          type: string
+                                      required:
+                                      - topologyKey
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              podAntiAffinity:
+                                properties:
+                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        podAffinityTerm:
+                                          properties:
+                                            labelSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            matchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            mismatchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            namespaceSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            namespaces:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            topologyKey:
+                                              type: string
+                                          required:
+                                          - topologyKey
+                                          type: object
+                                        weight:
+                                          format: int32
+                                          type: integer
+                                      required:
+                                      - podAffinityTerm
+                                      - weight
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        labelSelector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        matchLabelKeys:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        mismatchLabelKeys:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        namespaceSelector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        namespaces:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        topologyKey:
+                                          type: string
+                                      required:
+                                      - topologyKey
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                            type: object
+                          antiAffinityTopologyKey:
+                            type: string
+                        type: object
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      arbiter:
+                        properties:
+                          affinity:
+                            properties:
+                              advanced:
+                                properties:
+                                  nodeAffinity:
+                                    properties:
+                                      preferredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            preference:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchFields:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            weight:
+                                              format: int32
+                                              type: integer
+                                          required:
+                                          - preference
+                                          - weight
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      requiredDuringSchedulingIgnoredDuringExecution:
+                                        properties:
+                                          nodeSelectorTerms:
+                                            items:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchFields:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - nodeSelectorTerms
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  podAffinity:
+                                    properties:
+                                      preferredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            podAffinityTerm:
+                                              properties:
+                                                labelSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                            x-kubernetes-list-type: atomic
+                                                        required:
+                                                        - key
+                                                        - operator
+                                                        type: object
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                  x-kubernetes-map-type: atomic
+                                                matchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                mismatchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                namespaceSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                            x-kubernetes-list-type: atomic
+                                                        required:
+                                                        - key
+                                                        - operator
+                                                        type: object
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                  x-kubernetes-map-type: atomic
+                                                namespaces:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                topologyKey:
+                                                  type: string
+                                              required:
+                                              - topologyKey
+                                              type: object
+                                            weight:
+                                              format: int32
+                                              type: integer
+                                          required:
+                                          - podAffinityTerm
+                                          - weight
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      requiredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            labelSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            matchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            mismatchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            namespaceSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            namespaces:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            topologyKey:
+                                              type: string
+                                          required:
+                                          - topologyKey
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    type: object
+                                  podAntiAffinity:
+                                    properties:
+                                      preferredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            podAffinityTerm:
+                                              properties:
+                                                labelSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                            x-kubernetes-list-type: atomic
+                                                        required:
+                                                        - key
+                                                        - operator
+                                                        type: object
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                  x-kubernetes-map-type: atomic
+                                                matchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                mismatchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                namespaceSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                            x-kubernetes-list-type: atomic
+                                                        required:
+                                                        - key
+                                                        - operator
+                                                        type: object
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                  x-kubernetes-map-type: atomic
+                                                namespaces:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                topologyKey:
+                                                  type: string
+                                              required:
+                                              - topologyKey
+                                              type: object
+                                            weight:
+                                              format: int32
+                                              type: integer
+                                          required:
+                                          - podAffinityTerm
+                                          - weight
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      requiredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            labelSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            matchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            mismatchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            namespaceSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            namespaces:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            topologyKey:
+                                              type: string
+                                          required:
+                                          - topologyKey
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    type: object
+                                type: object
+                              antiAffinityTopologyKey:
+                                type: string
+                            type: object
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          enabled:
+                            type: boolean
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          nodeSelector:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          podDisruptionBudget:
+                            properties:
+                              maxUnavailable:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                x-kubernetes-int-or-string: true
+                              minAvailable:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                x-kubernetes-int-or-string: true
+                            type: object
+                          priorityClassName:
+                            type: string
+                          resources:
+                            properties:
+                              claims:
+                                items:
+                                  properties:
+                                    name:
+                                      type: string
+                                    request:
+                                      type: string
+                                  required:
+                                  - name
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - name
+                                x-kubernetes-list-type: map
+                              limits:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                type: object
+                              requests:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                type: object
+                            type: object
+                          runtimeClassName:
+                            type: string
+                          serviceAccountName:
+                            type: string
+                          sidecarPVCs:
+                            items:
+                              properties:
+                                apiVersion:
+                                  type: string
+                                kind:
+                                  type: string
+                                metadata:
+                                  type: object
+                                spec:
+                                  properties:
+                                    accessModes:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    dataSource:
+                                      properties:
+                                        apiGroup:
+                                          type: string
+                                        kind:
+                                          type: string
+                                        name:
+                                          type: string
+                                      required:
+                                      - kind
+                                      - name
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    dataSourceRef:
+                                      properties:
+                                        apiGroup:
+                                          type: string
+                                        kind:
+                                          type: string
+                                        name:
+                                          type: string
+                                        namespace:
+                                          type: string
+                                      required:
+                                      - kind
+                                      - name
+                                      type: object
+                                    resources:
+                                      properties:
+                                        limits:
+                                          additionalProperties:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                            x-kubernetes-int-or-string: true
+                                          type: object
+                                        requests:
+                                          additionalProperties:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                            x-kubernetes-int-or-string: true
+                                          type: object
+                                      type: object
+                                    selector:
+                                      properties:
+                                        matchExpressions:
+                                          items:
+                                            properties:
+                                              key:
+                                                type: string
+                                              operator:
+                                                type: string
+                                              values:
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                            required:
+                                            - key
+                                            - operator
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        matchLabels:
+                                          additionalProperties:
+                                            type: string
+                                          type: object
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    storageClassName:
+                                      type: string
+                                    volumeAttributesClassName:
+                                      type: string
+                                    volumeMode:
+                                      type: string
+                                    volumeName:
+                                      type: string
+                                  type: object
+                                status:
+                                  properties:
+                                    accessModes:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    allocatedResourceStatuses:
+                                      additionalProperties:
+                                        type: string
+                                      type: object
+                                      x-kubernetes-map-type: granular
+                                    allocatedResources:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      type: object
+                                    capacity:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      type: object
+                                    conditions:
+                                      items:
+                                        properties:
+                                          lastProbeTime:
+                                            format: date-time
+                                            type: string
+                                          lastTransitionTime:
+                                            format: date-time
+                                            type: string
+                                          message:
+                                            type: string
+                                          reason:
+                                            type: string
+                                          status:
+                                            type: string
+                                          type:
+                                            type: string
+                                        required:
+                                        - status
+                                        - type
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-map-keys:
+                                      - type
+                                      x-kubernetes-list-type: map
+                                    currentVolumeAttributesClassName:
+                                      type: string
+                                    modifyVolumeStatus:
+                                      properties:
+                                        status:
+                                          type: string
+                                        targetVolumeAttributesClassName:
+                                          type: string
+                                      required:
+                                      - status
+                                      type: object
+                                    phase:
+                                      type: string
+                                  type: object
+                              type: object
+                            type: array
+                          sidecarVolumes:
+                            items:
+                              properties:
+                                awsElasticBlockStore:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    partition:
+                                      format: int32
+                                      type: integer
+                                    readOnly:
+                                      type: boolean
+                                    volumeID:
+                                      type: string
+                                  required:
+                                  - volumeID
+                                  type: object
+                                azureDisk:
+                                  properties:
+                                    cachingMode:
+                                      type: string
+                                    diskName:
+                                      type: string
+                                    diskURI:
+                                      type: string
+                                    fsType:
+                                      default: ext4
+                                      type: string
+                                    kind:
+                                      type: string
+                                    readOnly:
+                                      default: false
+                                      type: boolean
+                                  required:
+                                  - diskName
+                                  - diskURI
+                                  type: object
+                                azureFile:
+                                  properties:
+                                    readOnly:
+                                      type: boolean
+                                    secretName:
+                                      type: string
+                                    shareName:
+                                      type: string
+                                  required:
+                                  - secretName
+                                  - shareName
+                                  type: object
+                                cephfs:
+                                  properties:
+                                    monitors:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    path:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    secretFile:
+                                      type: string
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    user:
+                                      type: string
+                                  required:
+                                  - monitors
+                                  type: object
+                                cinder:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    volumeID:
+                                      type: string
+                                  required:
+                                  - volumeID
+                                  type: object
+                                configMap:
+                                  properties:
+                                    defaultMode:
+                                      format: int32
+                                      type: integer
+                                    items:
+                                      items:
+                                        properties:
+                                          key:
+                                            type: string
+                                          mode:
+                                            format: int32
+                                            type: integer
+                                          path:
+                                            type: string
+                                        required:
+                                        - key
+                                        - path
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    name:
+                                      default: ""
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                csi:
+                                  properties:
+                                    driver:
+                                      type: string
+                                    fsType:
+                                      type: string
+                                    nodePublishSecretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    readOnly:
+                                      type: boolean
+                                    volumeAttributes:
+                                      additionalProperties:
+                                        type: string
+                                      type: object
+                                  required:
+                                  - driver
+                                  type: object
+                                downwardAPI:
+                                  properties:
+                                    defaultMode:
+                                      format: int32
+                                      type: integer
+                                    items:
+                                      items:
+                                        properties:
+                                          fieldRef:
+                                            properties:
+                                              apiVersion:
+                                                type: string
+                                              fieldPath:
+                                                type: string
+                                            required:
+                                            - fieldPath
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          mode:
+                                            format: int32
+                                            type: integer
+                                          path:
+                                            type: string
+                                          resourceFieldRef:
+                                            properties:
+                                              containerName:
+                                                type: string
+                                              divisor:
+                                                anyOf:
+                                                - type: integer
+                                                - type: string
+                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                x-kubernetes-int-or-string: true
+                                              resource:
+                                                type: string
+                                            required:
+                                            - resource
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        required:
+                                        - path
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                emptyDir:
+                                  properties:
+                                    medium:
+                                      type: string
+                                    sizeLimit:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                  type: object
+                                ephemeral:
+                                  properties:
+                                    volumeClaimTemplate:
+                                      properties:
+                                        metadata:
+                                          type: object
+                                        spec:
+                                          properties:
+                                            accessModes:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            dataSource:
+                                              properties:
+                                                apiGroup:
+                                                  type: string
+                                                kind:
+                                                  type: string
+                                                name:
+                                                  type: string
+                                              required:
+                                              - kind
+                                              - name
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            dataSourceRef:
+                                              properties:
+                                                apiGroup:
+                                                  type: string
+                                                kind:
+                                                  type: string
+                                                name:
+                                                  type: string
+                                                namespace:
+                                                  type: string
+                                              required:
+                                              - kind
+                                              - name
+                                              type: object
+                                            resources:
+                                              properties:
+                                                limits:
+                                                  additionalProperties:
+                                                    anyOf:
+                                                    - type: integer
+                                                    - type: string
+                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                    x-kubernetes-int-or-string: true
+                                                  type: object
+                                                requests:
+                                                  additionalProperties:
+                                                    anyOf:
+                                                    - type: integer
+                                                    - type: string
+                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                    x-kubernetes-int-or-string: true
+                                                  type: object
+                                              type: object
+                                            selector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            storageClassName:
+                                              type: string
+                                            volumeAttributesClassName:
+                                              type: string
+                                            volumeMode:
+                                              type: string
+                                            volumeName:
+                                              type: string
+                                          type: object
+                                      required:
+                                      - spec
+                                      type: object
+                                  type: object
+                                fc:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    lun:
+                                      format: int32
+                                      type: integer
+                                    readOnly:
+                                      type: boolean
+                                    targetWWNs:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    wwids:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                flexVolume:
+                                  properties:
+                                    driver:
+                                      type: string
+                                    fsType:
+                                      type: string
+                                    options:
+                                      additionalProperties:
+                                        type: string
+                                      type: object
+                                    readOnly:
+                                      type: boolean
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                  required:
+                                  - driver
+                                  type: object
+                                flocker:
+                                  properties:
+                                    datasetName:
+                                      type: string
+                                    datasetUUID:
+                                      type: string
+                                  type: object
+                                gcePersistentDisk:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    partition:
+                                      format: int32
+                                      type: integer
+                                    pdName:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                  required:
+                                  - pdName
+                                  type: object
+                                gitRepo:
+                                  properties:
+                                    directory:
+                                      type: string
+                                    repository:
+                                      type: string
+                                    revision:
+                                      type: string
+                                  required:
+                                  - repository
+                                  type: object
+                                glusterfs:
+                                  properties:
+                                    endpoints:
+                                      type: string
+                                    path:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                  required:
+                                  - endpoints
+                                  - path
+                                  type: object
+                                hostPath:
+                                  properties:
+                                    path:
+                                      type: string
+                                    type:
+                                      type: string
+                                  required:
+                                  - path
+                                  type: object
+                                image:
+                                  properties:
+                                    pullPolicy:
+                                      type: string
+                                    reference:
+                                      type: string
+                                  type: object
+                                iscsi:
+                                  properties:
+                                    chapAuthDiscovery:
+                                      type: boolean
+                                    chapAuthSession:
+                                      type: boolean
+                                    fsType:
+                                      type: string
+                                    initiatorName:
+                                      type: string
+                                    iqn:
+                                      type: string
+                                    iscsiInterface:
+                                      default: default
+                                      type: string
+                                    lun:
+                                      format: int32
+                                      type: integer
+                                    portals:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    readOnly:
+                                      type: boolean
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    targetPortal:
+                                      type: string
+                                  required:
+                                  - iqn
+                                  - lun
+                                  - targetPortal
+                                  type: object
+                                name:
+                                  type: string
+                                nfs:
+                                  properties:
+                                    path:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    server:
+                                      type: string
+                                  required:
+                                  - path
+                                  - server
+                                  type: object
+                                persistentVolumeClaim:
+                                  properties:
+                                    claimName:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                  required:
+                                  - claimName
+                                  type: object
+                                photonPersistentDisk:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    pdID:
+                                      type: string
+                                  required:
+                                  - pdID
+                                  type: object
+                                portworxVolume:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    volumeID:
+                                      type: string
+                                  required:
+                                  - volumeID
+                                  type: object
+                                projected:
+                                  properties:
+                                    defaultMode:
+                                      format: int32
+                                      type: integer
+                                    sources:
+                                      items:
+                                        properties:
+                                          clusterTrustBundle:
+                                            properties:
+                                              labelSelector:
+                                                properties:
+                                                  matchExpressions:
+                                                    items:
+                                                      properties:
+                                                        key:
+                                                          type: string
+                                                        operator:
+                                                          type: string
+                                                        values:
+                                                          items:
+                                                            type: string
+                                                          type: array
+                                                          x-kubernetes-list-type: atomic
+                                                      required:
+                                                      - key
+                                                      - operator
+                                                      type: object
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                  matchLabels:
+                                                    additionalProperties:
+                                                      type: string
+                                                    type: object
+                                                type: object
+                                                x-kubernetes-map-type: atomic
+                                              name:
+                                                type: string
+                                              optional:
+                                                type: boolean
+                                              path:
+                                                type: string
+                                              signerName:
+                                                type: string
+                                            required:
+                                            - path
+                                            type: object
+                                          configMap:
+                                            properties:
+                                              items:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    mode:
+                                                      format: int32
+                                                      type: integer
+                                                    path:
+                                                      type: string
+                                                  required:
+                                                  - key
+                                                  - path
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              name:
+                                                default: ""
+                                                type: string
+                                              optional:
+                                                type: boolean
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          downwardAPI:
+                                            properties:
+                                              items:
+                                                items:
+                                                  properties:
+                                                    fieldRef:
+                                                      properties:
+                                                        apiVersion:
+                                                          type: string
+                                                        fieldPath:
+                                                          type: string
+                                                      required:
+                                                      - fieldPath
+                                                      type: object
+                                                      x-kubernetes-map-type: atomic
+                                                    mode:
+                                                      format: int32
+                                                      type: integer
+                                                    path:
+                                                      type: string
+                                                    resourceFieldRef:
+                                                      properties:
+                                                        containerName:
+                                                          type: string
+                                                        divisor:
+                                                          anyOf:
+                                                          - type: integer
+                                                          - type: string
+                                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                          x-kubernetes-int-or-string: true
+                                                        resource:
+                                                          type: string
+                                                      required:
+                                                      - resource
+                                                      type: object
+                                                      x-kubernetes-map-type: atomic
+                                                  required:
+                                                  - path
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                            type: object
+                                          secret:
+                                            properties:
+                                              items:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    mode:
+                                                      format: int32
+                                                      type: integer
+                                                    path:
+                                                      type: string
+                                                  required:
+                                                  - key
+                                                  - path
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              name:
+                                                default: ""
+                                                type: string
+                                              optional:
+                                                type: boolean
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          serviceAccountToken:
+                                            properties:
+                                              audience:
+                                                type: string
+                                              expirationSeconds:
+                                                format: int64
+                                                type: integer
+                                              path:
+                                                type: string
+                                            required:
+                                            - path
+                                            type: object
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                quobyte:
+                                  properties:
+                                    group:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    registry:
+                                      type: string
+                                    tenant:
+                                      type: string
+                                    user:
+                                      type: string
+                                    volume:
+                                      type: string
+                                  required:
+                                  - registry
+                                  - volume
+                                  type: object
+                                rbd:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    image:
+                                      type: string
+                                    keyring:
+                                      default: /etc/ceph/keyring
+                                      type: string
+                                    monitors:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    pool:
+                                      default: rbd
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    user:
+                                      default: admin
+                                      type: string
+                                  required:
+                                  - image
+                                  - monitors
+                                  type: object
+                                scaleIO:
+                                  properties:
+                                    fsType:
+                                      default: xfs
+                                      type: string
+                                    gateway:
+                                      type: string
+                                    protectionDomain:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    sslEnabled:
+                                      type: boolean
+                                    storageMode:
+                                      default: ThinProvisioned
+                                      type: string
+                                    storagePool:
+                                      type: string
+                                    system:
+                                      type: string
+                                    volumeName:
+                                      type: string
+                                  required:
+                                  - gateway
+                                  - secretRef
+                                  - system
+                                  type: object
+                                secret:
+                                  properties:
+                                    defaultMode:
+                                      format: int32
+                                      type: integer
+                                    items:
+                                      items:
+                                        properties:
+                                          key:
+                                            type: string
+                                          mode:
+                                            format: int32
+                                            type: integer
+                                          path:
+                                            type: string
+                                        required:
+                                        - key
+                                        - path
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    optional:
+                                      type: boolean
+                                    secretName:
+                                      type: string
+                                  type: object
+                                storageos:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    volumeName:
+                                      type: string
+                                    volumeNamespace:
+                                      type: string
+                                  type: object
+                                vsphereVolume:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    storagePolicyID:
+                                      type: string
+                                    storagePolicyName:
+                                      type: string
+                                    volumePath:
+                                      type: string
+                                  required:
+                                  - volumePath
+                                  type: object
+                              required:
+                              - name
+                              type: object
+                            type: array
+                          sidecars:
+                            items:
+                              properties:
+                                args:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                command:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                env:
+                                  items:
+                                    properties:
+                                      name:
+                                        type: string
+                                      value:
+                                        type: string
+                                      valueFrom:
+                                        properties:
+                                          configMapKeyRef:
+                                            properties:
+                                              key:
+                                                type: string
+                                              name:
+                                                default: ""
+                                                type: string
+                                              optional:
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          fieldRef:
+                                            properties:
+                                              apiVersion:
+                                                type: string
+                                              fieldPath:
+                                                type: string
+                                            required:
+                                            - fieldPath
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          resourceFieldRef:
+                                            properties:
+                                              containerName:
+                                                type: string
+                                              divisor:
+                                                anyOf:
+                                                - type: integer
+                                                - type: string
+                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                x-kubernetes-int-or-string: true
+                                              resource:
+                                                type: string
+                                            required:
+                                            - resource
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secretKeyRef:
+                                            properties:
+                                              key:
+                                                type: string
+                                              name:
+                                                default: ""
+                                                type: string
+                                              optional:
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                    required:
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - name
+                                  x-kubernetes-list-type: map
+                                envFrom:
+                                  items:
+                                    properties:
+                                      configMapRef:
+                                        properties:
+                                          name:
+                                            default: ""
+                                            type: string
+                                          optional:
+                                            type: boolean
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      prefix:
+                                        type: string
+                                      secretRef:
+                                        properties:
+                                          name:
+                                            default: ""
+                                            type: string
+                                          optional:
+                                            type: boolean
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                image:
+                                  type: string
+                                imagePullPolicy:
+                                  type: string
+                                lifecycle:
+                                  properties:
+                                    postStart:
+                                      properties:
+                                        exec:
+                                          properties:
+                                            command:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                        httpGet:
+                                          properties:
+                                            host:
+                                              type: string
+                                            httpHeaders:
+                                              items:
+                                                properties:
+                                                  name:
+                                                    type: string
+                                                  value:
+                                                    type: string
+                                                required:
+                                                - name
+                                                - value
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            path:
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              x-kubernetes-int-or-string: true
+                                            scheme:
+                                              type: string
+                                          required:
+                                          - port
+                                          type: object
+                                        sleep:
+                                          properties:
+                                            seconds:
+                                              format: int64
+                                              type: integer
+                                          required:
+                                          - seconds
+                                          type: object
+                                        tcpSocket:
+                                          properties:
+                                            host:
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              x-kubernetes-int-or-string: true
+                                          required:
+                                          - port
+                                          type: object
+                                      type: object
+                                    preStop:
+                                      properties:
+                                        exec:
+                                          properties:
+                                            command:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                        httpGet:
+                                          properties:
+                                            host:
+                                              type: string
+                                            httpHeaders:
+                                              items:
+                                                properties:
+                                                  name:
+                                                    type: string
+                                                  value:
+                                                    type: string
+                                                required:
+                                                - name
+                                                - value
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            path:
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              x-kubernetes-int-or-string: true
+                                            scheme:
+                                              type: string
+                                          required:
+                                          - port
+                                          type: object
+                                        sleep:
+                                          properties:
+                                            seconds:
+                                              format: int64
+                                              type: integer
+                                          required:
+                                          - seconds
+                                          type: object
+                                        tcpSocket:
+                                          properties:
+                                            host:
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              x-kubernetes-int-or-string: true
+                                          required:
+                                          - port
+                                          type: object
+                                      type: object
+                                  type: object
+                                livenessProbe:
+                                  properties:
+                                    exec:
+                                      properties:
+                                        command:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      properties:
+                                        port:
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      properties:
+                                        host:
+                                          type: string
+                                        httpHeaders:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      properties:
+                                        host:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                name:
+                                  type: string
+                                ports:
+                                  items:
+                                    properties:
+                                      containerPort:
+                                        format: int32
+                                        type: integer
+                                      hostIP:
+                                        type: string
+                                      hostPort:
+                                        format: int32
+                                        type: integer
+                                      name:
+                                        type: string
+                                      protocol:
+                                        default: TCP
+                                        type: string
+                                    required:
+                                    - containerPort
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - containerPort
+                                  - protocol
+                                  x-kubernetes-list-type: map
+                                readinessProbe:
+                                  properties:
+                                    exec:
+                                      properties:
+                                        command:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      properties:
+                                        port:
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      properties:
+                                        host:
+                                          type: string
+                                        httpHeaders:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      properties:
+                                        host:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                resizePolicy:
+                                  items:
+                                    properties:
+                                      resourceName:
+                                        type: string
+                                      restartPolicy:
+                                        type: string
+                                    required:
+                                    - resourceName
+                                    - restartPolicy
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                resources:
+                                  properties:
+                                    claims:
+                                      items:
+                                        properties:
+                                          name:
+                                            type: string
+                                          request:
+                                            type: string
+                                        required:
+                                        - name
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-map-keys:
+                                      - name
+                                      x-kubernetes-list-type: map
+                                    limits:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      type: object
+                                    requests:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      type: object
+                                  type: object
+                                restartPolicy:
+                                  type: string
+                                securityContext:
+                                  properties:
+                                    allowPrivilegeEscalation:
+                                      type: boolean
+                                    appArmorProfile:
+                                      properties:
+                                        localhostProfile:
+                                          type: string
+                                        type:
+                                          type: string
+                                      required:
+                                      - type
+                                      type: object
+                                    capabilities:
+                                      properties:
+                                        add:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        drop:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    privileged:
+                                      type: boolean
+                                    procMount:
+                                      type: string
+                                    readOnlyRootFilesystem:
+                                      type: boolean
+                                    runAsGroup:
+                                      format: int64
+                                      type: integer
+                                    runAsNonRoot:
+                                      type: boolean
+                                    runAsUser:
+                                      format: int64
+                                      type: integer
+                                    seLinuxOptions:
+                                      properties:
+                                        level:
+                                          type: string
+                                        role:
+                                          type: string
+                                        type:
+                                          type: string
+                                        user:
+                                          type: string
+                                      type: object
+                                    seccompProfile:
+                                      properties:
+                                        localhostProfile:
+                                          type: string
+                                        type:
+                                          type: string
+                                      required:
+                                      - type
+                                      type: object
+                                    windowsOptions:
+                                      properties:
+                                        gmsaCredentialSpec:
+                                          type: string
+                                        gmsaCredentialSpecName:
+                                          type: string
+                                        hostProcess:
+                                          type: boolean
+                                        runAsUserName:
+                                          type: string
+                                      type: object
+                                  type: object
+                                startupProbe:
+                                  properties:
+                                    exec:
+                                      properties:
+                                        command:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      properties:
+                                        port:
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      properties:
+                                        host:
+                                          type: string
+                                        httpHeaders:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      properties:
+                                        host:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                stdin:
+                                  type: boolean
+                                stdinOnce:
+                                  type: boolean
+                                terminationMessagePath:
+                                  type: string
+                                terminationMessagePolicy:
+                                  type: string
+                                tty:
+                                  type: boolean
+                                volumeDevices:
+                                  items:
+                                    properties:
+                                      devicePath:
+                                        type: string
+                                      name:
+                                        type: string
+                                    required:
+                                    - devicePath
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - devicePath
+                                  x-kubernetes-list-type: map
+                                volumeMounts:
+                                  items:
+                                    properties:
+                                      mountPath:
+                                        type: string
+                                      mountPropagation:
+                                        type: string
+                                      name:
+                                        type: string
+                                      readOnly:
+                                        type: boolean
+                                      recursiveReadOnly:
+                                        type: string
+                                      subPath:
+                                        type: string
+                                      subPathExpr:
+                                        type: string
+                                    required:
+                                    - mountPath
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - mountPath
+                                  x-kubernetes-list-type: map
+                                workingDir:
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                          size:
+                            format: int32
+                            type: integer
+                          terminationGracePeriodSeconds:
+                            format: int64
+                            type: integer
+                          tolerations:
+                            items:
+                              properties:
+                                effect:
+                                  type: string
+                                key:
+                                  type: string
+                                operator:
+                                  type: string
+                                tolerationSeconds:
+                                  format: int64
+                                  type: integer
+                                value:
+                                  type: string
+                              type: object
+                            type: array
+                          topologySpreadConstraints:
+                            items:
+                              properties:
+                                labelSelector:
+                                  properties:
+                                    matchExpressions:
+                                      items:
+                                        properties:
+                                          key:
+                                            type: string
+                                          operator:
+                                            type: string
+                                          values:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                maxSkew:
+                                  format: int32
+                                  type: integer
+                                minDomains:
+                                  format: int32
+                                  type: integer
+                                nodeAffinityPolicy:
+                                  type: string
+                                nodeTaintsPolicy:
+                                  type: string
+                                topologyKey:
+                                  type: string
+                                whenUnsatisfiable:
+                                  type: string
+                              required:
+                              - maxSkew
+                              - topologyKey
+                              - whenUnsatisfiable
+                              type: object
+                            type: array
+                        required:
+                        - enabled
+                        - size
+                        type: object
+                      clusterRole:
+                        type: string
+                      configuration:
+                        type: string
+                      containerSecurityContext:
+                        properties:
+                          allowPrivilegeEscalation:
+                            type: boolean
+                          appArmorProfile:
+                            properties:
+                              localhostProfile:
+                                type: string
+                              type:
+                                type: string
+                            required:
+                            - type
+                            type: object
+                          capabilities:
+                            properties:
+                              add:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              drop:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            type: object
+                          privileged:
+                            type: boolean
+                          procMount:
+                            type: string
+                          readOnlyRootFilesystem:
+                            type: boolean
+                          runAsGroup:
+                            format: int64
+                            type: integer
+                          runAsNonRoot:
+                            type: boolean
+                          runAsUser:
+                            format: int64
+                            type: integer
+                          seLinuxOptions:
+                            properties:
+                              level:
+                                type: string
+                              role:
+                                type: string
+                              type:
+                                type: string
+                              user:
+                                type: string
+                            type: object
+                          seccompProfile:
+                            properties:
+                              localhostProfile:
+                                type: string
+                              type:
+                                type: string
+                            required:
+                            - type
+                            type: object
+                          windowsOptions:
+                            properties:
+                              gmsaCredentialSpec:
+                                type: string
+                              gmsaCredentialSpecName:
+                                type: string
+                              hostProcess:
+                                type: boolean
+                              runAsUserName:
+                                type: string
+                            type: object
+                        type: object
+                      expose:
+                        properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          enabled:
+                            type: boolean
+                          exposeType:
+                            type: string
+                          externalTrafficPolicy:
+                            type: string
+                          internalTrafficPolicy:
+                            type: string
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          loadBalancerSourceRanges:
+                            items:
+                              type: string
+                            type: array
+                          serviceAnnotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          serviceLabels:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          type:
+                            type: string
+                        required:
+                        - enabled
+                        type: object
+                      externalNodes:
+                        items:
+                          properties:
+                            horizons:
+                              additionalProperties:
+                                type: string
+                              type: object
+                            host:
+                              type: string
+                            port:
+                              type: integer
+                            priority:
+                              type: integer
+                            tags:
+                              additionalProperties:
+                                type: string
+                              type: object
+                            votes:
+                              type: integer
+                          required:
+                          - host
+                          - priority
+                          - votes
+                          type: object
+                        type: array
+                      hostAliases:
+                        items:
+                          properties:
+                            hostnames:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            ip:
+                              type: string
+                          required:
+                          - ip
+                          type: object
+                        type: array
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      livenessProbe:
+                        properties:
+                          exec:
+                            properties:
+                              command:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            type: object
+                          failureThreshold:
+                            format: int32
+                            type: integer
+                          grpc:
+                            properties:
+                              port:
+                                format: int32
+                                type: integer
+                              service:
+                                default: ""
+                                type: string
+                            required:
+                            - port
+                            type: object
+                          httpGet:
+                            properties:
+                              host:
+                                type: string
+                              httpHeaders:
+                                items:
+                                  properties:
+                                    name:
+                                      type: string
+                                    value:
+                                      type: string
+                                  required:
+                                  - name
+                                  - value
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              path:
+                                type: string
+                              port:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                x-kubernetes-int-or-string: true
+                              scheme:
+                                type: string
+                            required:
+                            - port
+                            type: object
+                          initialDelaySeconds:
+                            format: int32
+                            type: integer
+                          periodSeconds:
+                            format: int32
+                            type: integer
+                          startupDelaySeconds:
+                            type: integer
+                          successThreshold:
+                            format: int32
+                            type: integer
+                          tcpSocket:
+                            properties:
+                              host:
+                                type: string
+                              port:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                x-kubernetes-int-or-string: true
+                            required:
+                            - port
+                            type: object
+                          terminationGracePeriodSeconds:
+                            format: int64
+                            type: integer
+                          timeoutSeconds:
+                            format: int32
+                            type: integer
+                        type: object
+                      name:
+                        type: string
+                      nodeSelector:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      nonvoting:
+                        properties:
+                          affinity:
+                            properties:
+                              advanced:
+                                properties:
+                                  nodeAffinity:
+                                    properties:
+                                      preferredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            preference:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchFields:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            weight:
+                                              format: int32
+                                              type: integer
+                                          required:
+                                          - preference
+                                          - weight
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      requiredDuringSchedulingIgnoredDuringExecution:
+                                        properties:
+                                          nodeSelectorTerms:
+                                            items:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchFields:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - nodeSelectorTerms
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  podAffinity:
+                                    properties:
+                                      preferredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            podAffinityTerm:
+                                              properties:
+                                                labelSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                            x-kubernetes-list-type: atomic
+                                                        required:
+                                                        - key
+                                                        - operator
+                                                        type: object
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                  x-kubernetes-map-type: atomic
+                                                matchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                mismatchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                namespaceSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                            x-kubernetes-list-type: atomic
+                                                        required:
+                                                        - key
+                                                        - operator
+                                                        type: object
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                  x-kubernetes-map-type: atomic
+                                                namespaces:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                topologyKey:
+                                                  type: string
+                                              required:
+                                              - topologyKey
+                                              type: object
+                                            weight:
+                                              format: int32
+                                              type: integer
+                                          required:
+                                          - podAffinityTerm
+                                          - weight
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      requiredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            labelSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            matchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            mismatchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            namespaceSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            namespaces:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            topologyKey:
+                                              type: string
+                                          required:
+                                          - topologyKey
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    type: object
+                                  podAntiAffinity:
+                                    properties:
+                                      preferredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            podAffinityTerm:
+                                              properties:
+                                                labelSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                            x-kubernetes-list-type: atomic
+                                                        required:
+                                                        - key
+                                                        - operator
+                                                        type: object
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                  x-kubernetes-map-type: atomic
+                                                matchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                mismatchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                namespaceSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                            x-kubernetes-list-type: atomic
+                                                        required:
+                                                        - key
+                                                        - operator
+                                                        type: object
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                  x-kubernetes-map-type: atomic
+                                                namespaces:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                topologyKey:
+                                                  type: string
+                                              required:
+                                              - topologyKey
+                                              type: object
+                                            weight:
+                                              format: int32
+                                              type: integer
+                                          required:
+                                          - podAffinityTerm
+                                          - weight
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      requiredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            labelSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            matchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            mismatchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            namespaceSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            namespaces:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            topologyKey:
+                                              type: string
+                                          required:
+                                          - topologyKey
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    type: object
+                                type: object
+                              antiAffinityTopologyKey:
+                                type: string
+                            type: object
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          configuration:
+                            type: string
+                          containerSecurityContext:
+                            properties:
+                              allowPrivilegeEscalation:
+                                type: boolean
+                              appArmorProfile:
+                                properties:
+                                  localhostProfile:
+                                    type: string
+                                  type:
+                                    type: string
+                                required:
+                                - type
+                                type: object
+                              capabilities:
+                                properties:
+                                  add:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  drop:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              privileged:
+                                type: boolean
+                              procMount:
+                                type: string
+                              readOnlyRootFilesystem:
+                                type: boolean
+                              runAsGroup:
+                                format: int64
+                                type: integer
+                              runAsNonRoot:
+                                type: boolean
+                              runAsUser:
+                                format: int64
+                                type: integer
+                              seLinuxOptions:
+                                properties:
+                                  level:
+                                    type: string
+                                  role:
+                                    type: string
+                                  type:
+                                    type: string
+                                  user:
+                                    type: string
+                                type: object
+                              seccompProfile:
+                                properties:
+                                  localhostProfile:
+                                    type: string
+                                  type:
+                                    type: string
+                                required:
+                                - type
+                                type: object
+                              windowsOptions:
+                                properties:
+                                  gmsaCredentialSpec:
+                                    type: string
+                                  gmsaCredentialSpecName:
+                                    type: string
+                                  hostProcess:
+                                    type: boolean
+                                  runAsUserName:
+                                    type: string
+                                type: object
+                            type: object
+                          enabled:
+                            type: boolean
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          livenessProbe:
+                            properties:
+                              exec:
+                                properties:
+                                  command:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              failureThreshold:
+                                format: int32
+                                type: integer
+                              grpc:
+                                properties:
+                                  port:
+                                    format: int32
+                                    type: integer
+                                  service:
+                                    default: ""
+                                    type: string
+                                required:
+                                - port
+                                type: object
+                              httpGet:
+                                properties:
+                                  host:
+                                    type: string
+                                  httpHeaders:
+                                    items:
+                                      properties:
+                                        name:
+                                          type: string
+                                        value:
+                                          type: string
+                                      required:
+                                      - name
+                                      - value
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  path:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    x-kubernetes-int-or-string: true
+                                  scheme:
+                                    type: string
+                                required:
+                                - port
+                                type: object
+                              initialDelaySeconds:
+                                format: int32
+                                type: integer
+                              periodSeconds:
+                                format: int32
+                                type: integer
+                              startupDelaySeconds:
+                                type: integer
+                              successThreshold:
+                                format: int32
+                                type: integer
+                              tcpSocket:
+                                properties:
+                                  host:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    x-kubernetes-int-or-string: true
+                                required:
+                                - port
+                                type: object
+                              terminationGracePeriodSeconds:
+                                format: int64
+                                type: integer
+                              timeoutSeconds:
+                                format: int32
+                                type: integer
+                            type: object
+                          nodeSelector:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          podDisruptionBudget:
+                            properties:
+                              maxUnavailable:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                x-kubernetes-int-or-string: true
+                              minAvailable:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                x-kubernetes-int-or-string: true
+                            type: object
+                          podSecurityContext:
+                            properties:
+                              appArmorProfile:
+                                properties:
+                                  localhostProfile:
+                                    type: string
+                                  type:
+                                    type: string
+                                required:
+                                - type
+                                type: object
+                              fsGroup:
+                                format: int64
+                                type: integer
+                              fsGroupChangePolicy:
+                                type: string
+                              runAsGroup:
+                                format: int64
+                                type: integer
+                              runAsNonRoot:
+                                type: boolean
+                              runAsUser:
+                                format: int64
+                                type: integer
+                              seLinuxChangePolicy:
+                                type: string
+                              seLinuxOptions:
+                                properties:
+                                  level:
+                                    type: string
+                                  role:
+                                    type: string
+                                  type:
+                                    type: string
+                                  user:
+                                    type: string
+                                type: object
+                              seccompProfile:
+                                properties:
+                                  localhostProfile:
+                                    type: string
+                                  type:
+                                    type: string
+                                required:
+                                - type
+                                type: object
+                              supplementalGroups:
+                                items:
+                                  format: int64
+                                  type: integer
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              supplementalGroupsPolicy:
+                                type: string
+                              sysctls:
+                                items:
+                                  properties:
+                                    name:
+                                      type: string
+                                    value:
+                                      type: string
+                                  required:
+                                  - name
+                                  - value
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              windowsOptions:
+                                properties:
+                                  gmsaCredentialSpec:
+                                    type: string
+                                  gmsaCredentialSpecName:
+                                    type: string
+                                  hostProcess:
+                                    type: boolean
+                                  runAsUserName:
+                                    type: string
+                                type: object
+                            type: object
+                          priorityClassName:
+                            type: string
+                          readinessProbe:
+                            properties:
+                              exec:
+                                properties:
+                                  command:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              failureThreshold:
+                                format: int32
+                                type: integer
+                              grpc:
+                                properties:
+                                  port:
+                                    format: int32
+                                    type: integer
+                                  service:
+                                    default: ""
+                                    type: string
+                                required:
+                                - port
+                                type: object
+                              httpGet:
+                                properties:
+                                  host:
+                                    type: string
+                                  httpHeaders:
+                                    items:
+                                      properties:
+                                        name:
+                                          type: string
+                                        value:
+                                          type: string
+                                      required:
+                                      - name
+                                      - value
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  path:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    x-kubernetes-int-or-string: true
+                                  scheme:
+                                    type: string
+                                required:
+                                - port
+                                type: object
+                              initialDelaySeconds:
+                                format: int32
+                                type: integer
+                              periodSeconds:
+                                format: int32
+                                type: integer
+                              successThreshold:
+                                format: int32
+                                type: integer
+                              tcpSocket:
+                                properties:
+                                  host:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    x-kubernetes-int-or-string: true
+                                required:
+                                - port
+                                type: object
+                              terminationGracePeriodSeconds:
+                                format: int64
+                                type: integer
+                              timeoutSeconds:
+                                format: int32
+                                type: integer
+                            type: object
+                          resources:
+                            properties:
+                              claims:
+                                items:
+                                  properties:
+                                    name:
+                                      type: string
+                                    request:
+                                      type: string
+                                  required:
+                                  - name
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - name
+                                x-kubernetes-list-type: map
+                              limits:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                type: object
+                              requests:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                type: object
+                            type: object
+                          runtimeClassName:
+                            type: string
+                          serviceAccountName:
+                            type: string
+                          sidecarPVCs:
+                            items:
+                              properties:
+                                apiVersion:
+                                  type: string
+                                kind:
+                                  type: string
+                                metadata:
+                                  type: object
+                                spec:
+                                  properties:
+                                    accessModes:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    dataSource:
+                                      properties:
+                                        apiGroup:
+                                          type: string
+                                        kind:
+                                          type: string
+                                        name:
+                                          type: string
+                                      required:
+                                      - kind
+                                      - name
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    dataSourceRef:
+                                      properties:
+                                        apiGroup:
+                                          type: string
+                                        kind:
+                                          type: string
+                                        name:
+                                          type: string
+                                        namespace:
+                                          type: string
+                                      required:
+                                      - kind
+                                      - name
+                                      type: object
+                                    resources:
+                                      properties:
+                                        limits:
+                                          additionalProperties:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                            x-kubernetes-int-or-string: true
+                                          type: object
+                                        requests:
+                                          additionalProperties:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                            x-kubernetes-int-or-string: true
+                                          type: object
+                                      type: object
+                                    selector:
+                                      properties:
+                                        matchExpressions:
+                                          items:
+                                            properties:
+                                              key:
+                                                type: string
+                                              operator:
+                                                type: string
+                                              values:
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                            required:
+                                            - key
+                                            - operator
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        matchLabels:
+                                          additionalProperties:
+                                            type: string
+                                          type: object
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    storageClassName:
+                                      type: string
+                                    volumeAttributesClassName:
+                                      type: string
+                                    volumeMode:
+                                      type: string
+                                    volumeName:
+                                      type: string
+                                  type: object
+                                status:
+                                  properties:
+                                    accessModes:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    allocatedResourceStatuses:
+                                      additionalProperties:
+                                        type: string
+                                      type: object
+                                      x-kubernetes-map-type: granular
+                                    allocatedResources:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      type: object
+                                    capacity:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      type: object
+                                    conditions:
+                                      items:
+                                        properties:
+                                          lastProbeTime:
+                                            format: date-time
+                                            type: string
+                                          lastTransitionTime:
+                                            format: date-time
+                                            type: string
+                                          message:
+                                            type: string
+                                          reason:
+                                            type: string
+                                          status:
+                                            type: string
+                                          type:
+                                            type: string
+                                        required:
+                                        - status
+                                        - type
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-map-keys:
+                                      - type
+                                      x-kubernetes-list-type: map
+                                    currentVolumeAttributesClassName:
+                                      type: string
+                                    modifyVolumeStatus:
+                                      properties:
+                                        status:
+                                          type: string
+                                        targetVolumeAttributesClassName:
+                                          type: string
+                                      required:
+                                      - status
+                                      type: object
+                                    phase:
+                                      type: string
+                                  type: object
+                              type: object
+                            type: array
+                          sidecarVolumes:
+                            items:
+                              properties:
+                                awsElasticBlockStore:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    partition:
+                                      format: int32
+                                      type: integer
+                                    readOnly:
+                                      type: boolean
+                                    volumeID:
+                                      type: string
+                                  required:
+                                  - volumeID
+                                  type: object
+                                azureDisk:
+                                  properties:
+                                    cachingMode:
+                                      type: string
+                                    diskName:
+                                      type: string
+                                    diskURI:
+                                      type: string
+                                    fsType:
+                                      default: ext4
+                                      type: string
+                                    kind:
+                                      type: string
+                                    readOnly:
+                                      default: false
+                                      type: boolean
+                                  required:
+                                  - diskName
+                                  - diskURI
+                                  type: object
+                                azureFile:
+                                  properties:
+                                    readOnly:
+                                      type: boolean
+                                    secretName:
+                                      type: string
+                                    shareName:
+                                      type: string
+                                  required:
+                                  - secretName
+                                  - shareName
+                                  type: object
+                                cephfs:
+                                  properties:
+                                    monitors:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    path:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    secretFile:
+                                      type: string
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    user:
+                                      type: string
+                                  required:
+                                  - monitors
+                                  type: object
+                                cinder:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    volumeID:
+                                      type: string
+                                  required:
+                                  - volumeID
+                                  type: object
+                                configMap:
+                                  properties:
+                                    defaultMode:
+                                      format: int32
+                                      type: integer
+                                    items:
+                                      items:
+                                        properties:
+                                          key:
+                                            type: string
+                                          mode:
+                                            format: int32
+                                            type: integer
+                                          path:
+                                            type: string
+                                        required:
+                                        - key
+                                        - path
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    name:
+                                      default: ""
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                csi:
+                                  properties:
+                                    driver:
+                                      type: string
+                                    fsType:
+                                      type: string
+                                    nodePublishSecretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    readOnly:
+                                      type: boolean
+                                    volumeAttributes:
+                                      additionalProperties:
+                                        type: string
+                                      type: object
+                                  required:
+                                  - driver
+                                  type: object
+                                downwardAPI:
+                                  properties:
+                                    defaultMode:
+                                      format: int32
+                                      type: integer
+                                    items:
+                                      items:
+                                        properties:
+                                          fieldRef:
+                                            properties:
+                                              apiVersion:
+                                                type: string
+                                              fieldPath:
+                                                type: string
+                                            required:
+                                            - fieldPath
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          mode:
+                                            format: int32
+                                            type: integer
+                                          path:
+                                            type: string
+                                          resourceFieldRef:
+                                            properties:
+                                              containerName:
+                                                type: string
+                                              divisor:
+                                                anyOf:
+                                                - type: integer
+                                                - type: string
+                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                x-kubernetes-int-or-string: true
+                                              resource:
+                                                type: string
+                                            required:
+                                            - resource
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        required:
+                                        - path
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                emptyDir:
+                                  properties:
+                                    medium:
+                                      type: string
+                                    sizeLimit:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                  type: object
+                                ephemeral:
+                                  properties:
+                                    volumeClaimTemplate:
+                                      properties:
+                                        metadata:
+                                          type: object
+                                        spec:
+                                          properties:
+                                            accessModes:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            dataSource:
+                                              properties:
+                                                apiGroup:
+                                                  type: string
+                                                kind:
+                                                  type: string
+                                                name:
+                                                  type: string
+                                              required:
+                                              - kind
+                                              - name
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            dataSourceRef:
+                                              properties:
+                                                apiGroup:
+                                                  type: string
+                                                kind:
+                                                  type: string
+                                                name:
+                                                  type: string
+                                                namespace:
+                                                  type: string
+                                              required:
+                                              - kind
+                                              - name
+                                              type: object
+                                            resources:
+                                              properties:
+                                                limits:
+                                                  additionalProperties:
+                                                    anyOf:
+                                                    - type: integer
+                                                    - type: string
+                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                    x-kubernetes-int-or-string: true
+                                                  type: object
+                                                requests:
+                                                  additionalProperties:
+                                                    anyOf:
+                                                    - type: integer
+                                                    - type: string
+                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                    x-kubernetes-int-or-string: true
+                                                  type: object
+                                              type: object
+                                            selector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            storageClassName:
+                                              type: string
+                                            volumeAttributesClassName:
+                                              type: string
+                                            volumeMode:
+                                              type: string
+                                            volumeName:
+                                              type: string
+                                          type: object
+                                      required:
+                                      - spec
+                                      type: object
+                                  type: object
+                                fc:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    lun:
+                                      format: int32
+                                      type: integer
+                                    readOnly:
+                                      type: boolean
+                                    targetWWNs:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    wwids:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                flexVolume:
+                                  properties:
+                                    driver:
+                                      type: string
+                                    fsType:
+                                      type: string
+                                    options:
+                                      additionalProperties:
+                                        type: string
+                                      type: object
+                                    readOnly:
+                                      type: boolean
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                  required:
+                                  - driver
+                                  type: object
+                                flocker:
+                                  properties:
+                                    datasetName:
+                                      type: string
+                                    datasetUUID:
+                                      type: string
+                                  type: object
+                                gcePersistentDisk:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    partition:
+                                      format: int32
+                                      type: integer
+                                    pdName:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                  required:
+                                  - pdName
+                                  type: object
+                                gitRepo:
+                                  properties:
+                                    directory:
+                                      type: string
+                                    repository:
+                                      type: string
+                                    revision:
+                                      type: string
+                                  required:
+                                  - repository
+                                  type: object
+                                glusterfs:
+                                  properties:
+                                    endpoints:
+                                      type: string
+                                    path:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                  required:
+                                  - endpoints
+                                  - path
+                                  type: object
+                                hostPath:
+                                  properties:
+                                    path:
+                                      type: string
+                                    type:
+                                      type: string
+                                  required:
+                                  - path
+                                  type: object
+                                image:
+                                  properties:
+                                    pullPolicy:
+                                      type: string
+                                    reference:
+                                      type: string
+                                  type: object
+                                iscsi:
+                                  properties:
+                                    chapAuthDiscovery:
+                                      type: boolean
+                                    chapAuthSession:
+                                      type: boolean
+                                    fsType:
+                                      type: string
+                                    initiatorName:
+                                      type: string
+                                    iqn:
+                                      type: string
+                                    iscsiInterface:
+                                      default: default
+                                      type: string
+                                    lun:
+                                      format: int32
+                                      type: integer
+                                    portals:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    readOnly:
+                                      type: boolean
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    targetPortal:
+                                      type: string
+                                  required:
+                                  - iqn
+                                  - lun
+                                  - targetPortal
+                                  type: object
+                                name:
+                                  type: string
+                                nfs:
+                                  properties:
+                                    path:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    server:
+                                      type: string
+                                  required:
+                                  - path
+                                  - server
+                                  type: object
+                                persistentVolumeClaim:
+                                  properties:
+                                    claimName:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                  required:
+                                  - claimName
+                                  type: object
+                                photonPersistentDisk:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    pdID:
+                                      type: string
+                                  required:
+                                  - pdID
+                                  type: object
+                                portworxVolume:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    volumeID:
+                                      type: string
+                                  required:
+                                  - volumeID
+                                  type: object
+                                projected:
+                                  properties:
+                                    defaultMode:
+                                      format: int32
+                                      type: integer
+                                    sources:
+                                      items:
+                                        properties:
+                                          clusterTrustBundle:
+                                            properties:
+                                              labelSelector:
+                                                properties:
+                                                  matchExpressions:
+                                                    items:
+                                                      properties:
+                                                        key:
+                                                          type: string
+                                                        operator:
+                                                          type: string
+                                                        values:
+                                                          items:
+                                                            type: string
+                                                          type: array
+                                                          x-kubernetes-list-type: atomic
+                                                      required:
+                                                      - key
+                                                      - operator
+                                                      type: object
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                  matchLabels:
+                                                    additionalProperties:
+                                                      type: string
+                                                    type: object
+                                                type: object
+                                                x-kubernetes-map-type: atomic
+                                              name:
+                                                type: string
+                                              optional:
+                                                type: boolean
+                                              path:
+                                                type: string
+                                              signerName:
+                                                type: string
+                                            required:
+                                            - path
+                                            type: object
+                                          configMap:
+                                            properties:
+                                              items:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    mode:
+                                                      format: int32
+                                                      type: integer
+                                                    path:
+                                                      type: string
+                                                  required:
+                                                  - key
+                                                  - path
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              name:
+                                                default: ""
+                                                type: string
+                                              optional:
+                                                type: boolean
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          downwardAPI:
+                                            properties:
+                                              items:
+                                                items:
+                                                  properties:
+                                                    fieldRef:
+                                                      properties:
+                                                        apiVersion:
+                                                          type: string
+                                                        fieldPath:
+                                                          type: string
+                                                      required:
+                                                      - fieldPath
+                                                      type: object
+                                                      x-kubernetes-map-type: atomic
+                                                    mode:
+                                                      format: int32
+                                                      type: integer
+                                                    path:
+                                                      type: string
+                                                    resourceFieldRef:
+                                                      properties:
+                                                        containerName:
+                                                          type: string
+                                                        divisor:
+                                                          anyOf:
+                                                          - type: integer
+                                                          - type: string
+                                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                          x-kubernetes-int-or-string: true
+                                                        resource:
+                                                          type: string
+                                                      required:
+                                                      - resource
+                                                      type: object
+                                                      x-kubernetes-map-type: atomic
+                                                  required:
+                                                  - path
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                            type: object
+                                          secret:
+                                            properties:
+                                              items:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    mode:
+                                                      format: int32
+                                                      type: integer
+                                                    path:
+                                                      type: string
+                                                  required:
+                                                  - key
+                                                  - path
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              name:
+                                                default: ""
+                                                type: string
+                                              optional:
+                                                type: boolean
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          serviceAccountToken:
+                                            properties:
+                                              audience:
+                                                type: string
+                                              expirationSeconds:
+                                                format: int64
+                                                type: integer
+                                              path:
+                                                type: string
+                                            required:
+                                            - path
+                                            type: object
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                quobyte:
+                                  properties:
+                                    group:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    registry:
+                                      type: string
+                                    tenant:
+                                      type: string
+                                    user:
+                                      type: string
+                                    volume:
+                                      type: string
+                                  required:
+                                  - registry
+                                  - volume
+                                  type: object
+                                rbd:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    image:
+                                      type: string
+                                    keyring:
+                                      default: /etc/ceph/keyring
+                                      type: string
+                                    monitors:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    pool:
+                                      default: rbd
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    user:
+                                      default: admin
+                                      type: string
+                                  required:
+                                  - image
+                                  - monitors
+                                  type: object
+                                scaleIO:
+                                  properties:
+                                    fsType:
+                                      default: xfs
+                                      type: string
+                                    gateway:
+                                      type: string
+                                    protectionDomain:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    sslEnabled:
+                                      type: boolean
+                                    storageMode:
+                                      default: ThinProvisioned
+                                      type: string
+                                    storagePool:
+                                      type: string
+                                    system:
+                                      type: string
+                                    volumeName:
+                                      type: string
+                                  required:
+                                  - gateway
+                                  - secretRef
+                                  - system
+                                  type: object
+                                secret:
+                                  properties:
+                                    defaultMode:
+                                      format: int32
+                                      type: integer
+                                    items:
+                                      items:
+                                        properties:
+                                          key:
+                                            type: string
+                                          mode:
+                                            format: int32
+                                            type: integer
+                                          path:
+                                            type: string
+                                        required:
+                                        - key
+                                        - path
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    optional:
+                                      type: boolean
+                                    secretName:
+                                      type: string
+                                  type: object
+                                storageos:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    readOnly:
+                                      type: boolean
+                                    secretRef:
+                                      properties:
+                                        name:
+                                          default: ""
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    volumeName:
+                                      type: string
+                                    volumeNamespace:
+                                      type: string
+                                  type: object
+                                vsphereVolume:
+                                  properties:
+                                    fsType:
+                                      type: string
+                                    storagePolicyID:
+                                      type: string
+                                    storagePolicyName:
+                                      type: string
+                                    volumePath:
+                                      type: string
+                                  required:
+                                  - volumePath
+                                  type: object
+                              required:
+                              - name
+                              type: object
+                            type: array
+                          sidecars:
+                            items:
+                              properties:
+                                args:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                command:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                env:
+                                  items:
+                                    properties:
+                                      name:
+                                        type: string
+                                      value:
+                                        type: string
+                                      valueFrom:
+                                        properties:
+                                          configMapKeyRef:
+                                            properties:
+                                              key:
+                                                type: string
+                                              name:
+                                                default: ""
+                                                type: string
+                                              optional:
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          fieldRef:
+                                            properties:
+                                              apiVersion:
+                                                type: string
+                                              fieldPath:
+                                                type: string
+                                            required:
+                                            - fieldPath
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          resourceFieldRef:
+                                            properties:
+                                              containerName:
+                                                type: string
+                                              divisor:
+                                                anyOf:
+                                                - type: integer
+                                                - type: string
+                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                x-kubernetes-int-or-string: true
+                                              resource:
+                                                type: string
+                                            required:
+                                            - resource
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secretKeyRef:
+                                            properties:
+                                              key:
+                                                type: string
+                                              name:
+                                                default: ""
+                                                type: string
+                                              optional:
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                    required:
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - name
+                                  x-kubernetes-list-type: map
+                                envFrom:
+                                  items:
+                                    properties:
+                                      configMapRef:
+                                        properties:
+                                          name:
+                                            default: ""
+                                            type: string
+                                          optional:
+                                            type: boolean
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      prefix:
+                                        type: string
+                                      secretRef:
+                                        properties:
+                                          name:
+                                            default: ""
+                                            type: string
+                                          optional:
+                                            type: boolean
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                image:
+                                  type: string
+                                imagePullPolicy:
+                                  type: string
+                                lifecycle:
+                                  properties:
+                                    postStart:
+                                      properties:
+                                        exec:
+                                          properties:
+                                            command:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                        httpGet:
+                                          properties:
+                                            host:
+                                              type: string
+                                            httpHeaders:
+                                              items:
+                                                properties:
+                                                  name:
+                                                    type: string
+                                                  value:
+                                                    type: string
+                                                required:
+                                                - name
+                                                - value
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            path:
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              x-kubernetes-int-or-string: true
+                                            scheme:
+                                              type: string
+                                          required:
+                                          - port
+                                          type: object
+                                        sleep:
+                                          properties:
+                                            seconds:
+                                              format: int64
+                                              type: integer
+                                          required:
+                                          - seconds
+                                          type: object
+                                        tcpSocket:
+                                          properties:
+                                            host:
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              x-kubernetes-int-or-string: true
+                                          required:
+                                          - port
+                                          type: object
+                                      type: object
+                                    preStop:
+                                      properties:
+                                        exec:
+                                          properties:
+                                            command:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                        httpGet:
+                                          properties:
+                                            host:
+                                              type: string
+                                            httpHeaders:
+                                              items:
+                                                properties:
+                                                  name:
+                                                    type: string
+                                                  value:
+                                                    type: string
+                                                required:
+                                                - name
+                                                - value
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            path:
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              x-kubernetes-int-or-string: true
+                                            scheme:
+                                              type: string
+                                          required:
+                                          - port
+                                          type: object
+                                        sleep:
+                                          properties:
+                                            seconds:
+                                              format: int64
+                                              type: integer
+                                          required:
+                                          - seconds
+                                          type: object
+                                        tcpSocket:
+                                          properties:
+                                            host:
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              x-kubernetes-int-or-string: true
+                                          required:
+                                          - port
+                                          type: object
+                                      type: object
+                                  type: object
+                                livenessProbe:
+                                  properties:
+                                    exec:
+                                      properties:
+                                        command:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      properties:
+                                        port:
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      properties:
+                                        host:
+                                          type: string
+                                        httpHeaders:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      properties:
+                                        host:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                name:
+                                  type: string
+                                ports:
+                                  items:
+                                    properties:
+                                      containerPort:
+                                        format: int32
+                                        type: integer
+                                      hostIP:
+                                        type: string
+                                      hostPort:
+                                        format: int32
+                                        type: integer
+                                      name:
+                                        type: string
+                                      protocol:
+                                        default: TCP
+                                        type: string
+                                    required:
+                                    - containerPort
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - containerPort
+                                  - protocol
+                                  x-kubernetes-list-type: map
+                                readinessProbe:
+                                  properties:
+                                    exec:
+                                      properties:
+                                        command:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      properties:
+                                        port:
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      properties:
+                                        host:
+                                          type: string
+                                        httpHeaders:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      properties:
+                                        host:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                resizePolicy:
+                                  items:
+                                    properties:
+                                      resourceName:
+                                        type: string
+                                      restartPolicy:
+                                        type: string
+                                    required:
+                                    - resourceName
+                                    - restartPolicy
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                resources:
+                                  properties:
+                                    claims:
+                                      items:
+                                        properties:
+                                          name:
+                                            type: string
+                                          request:
+                                            type: string
+                                        required:
+                                        - name
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-map-keys:
+                                      - name
+                                      x-kubernetes-list-type: map
+                                    limits:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      type: object
+                                    requests:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      type: object
+                                  type: object
+                                restartPolicy:
+                                  type: string
+                                securityContext:
+                                  properties:
+                                    allowPrivilegeEscalation:
+                                      type: boolean
+                                    appArmorProfile:
+                                      properties:
+                                        localhostProfile:
+                                          type: string
+                                        type:
+                                          type: string
+                                      required:
+                                      - type
+                                      type: object
+                                    capabilities:
+                                      properties:
+                                        add:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        drop:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    privileged:
+                                      type: boolean
+                                    procMount:
+                                      type: string
+                                    readOnlyRootFilesystem:
+                                      type: boolean
+                                    runAsGroup:
+                                      format: int64
+                                      type: integer
+                                    runAsNonRoot:
+                                      type: boolean
+                                    runAsUser:
+                                      format: int64
+                                      type: integer
+                                    seLinuxOptions:
+                                      properties:
+                                        level:
+                                          type: string
+                                        role:
+                                          type: string
+                                        type:
+                                          type: string
+                                        user:
+                                          type: string
+                                      type: object
+                                    seccompProfile:
+                                      properties:
+                                        localhostProfile:
+                                          type: string
+                                        type:
+                                          type: string
+                                      required:
+                                      - type
+                                      type: object
+                                    windowsOptions:
+                                      properties:
+                                        gmsaCredentialSpec:
+                                          type: string
+                                        gmsaCredentialSpecName:
+                                          type: string
+                                        hostProcess:
+                                          type: boolean
+                                        runAsUserName:
+                                          type: string
+                                      type: object
+                                  type: object
+                                startupProbe:
+                                  properties:
+                                    exec:
+                                      properties:
+                                        command:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      properties:
+                                        port:
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      properties:
+                                        host:
+                                          type: string
+                                        httpHeaders:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      properties:
+                                        host:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                stdin:
+                                  type: boolean
+                                stdinOnce:
+                                  type: boolean
+                                terminationMessagePath:
+                                  type: string
+                                terminationMessagePolicy:
+                                  type: string
+                                tty:
+                                  type: boolean
+                                volumeDevices:
+                                  items:
+                                    properties:
+                                      devicePath:
+                                        type: string
+                                      name:
+                                        type: string
+                                    required:
+                                    - devicePath
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - devicePath
+                                  x-kubernetes-list-type: map
+                                volumeMounts:
+                                  items:
+                                    properties:
+                                      mountPath:
+                                        type: string
+                                      mountPropagation:
+                                        type: string
+                                      name:
+                                        type: string
+                                      readOnly:
+                                        type: boolean
+                                      recursiveReadOnly:
+                                        type: string
+                                      subPath:
+                                        type: string
+                                      subPathExpr:
+                                        type: string
+                                    required:
+                                    - mountPath
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - mountPath
+                                  x-kubernetes-list-type: map
+                                workingDir:
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                          size:
+                            format: int32
+                            type: integer
+                          terminationGracePeriodSeconds:
+                            format: int64
+                            type: integer
+                          tolerations:
+                            items:
+                              properties:
+                                effect:
+                                  type: string
+                                key:
+                                  type: string
+                                operator:
+                                  type: string
+                                tolerationSeconds:
+                                  format: int64
+                                  type: integer
+                                value:
+                                  type: string
+                              type: object
+                            type: array
+                          topologySpreadConstraints:
+                            items:
+                              properties:
+                                labelSelector:
+                                  properties:
+                                    matchExpressions:
+                                      items:
+                                        properties:
+                                          key:
+                                            type: string
+                                          operator:
+                                            type: string
+                                          values:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                maxSkew:
+                                  format: int32
+                                  type: integer
+                                minDomains:
+                                  format: int32
+                                  type: integer
+                                nodeAffinityPolicy:
+                                  type: string
+                                nodeTaintsPolicy:
+                                  type: string
+                                topologyKey:
+                                  type: string
+                                whenUnsatisfiable:
+                                  type: string
+                              required:
+                              - maxSkew
+                              - topologyKey
+                              - whenUnsatisfiable
+                              type: object
+                            type: array
+                          volumeSpec:
+                            properties:
+                              emptyDir:
+                                properties:
+                                  medium:
+                                    type: string
+                                  sizeLimit:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                type: object
+                              hostPath:
+                                properties:
+                                  path:
+                                    type: string
+                                  type:
+                                    type: string
+                                required:
+                                - path
+                                type: object
+                              persistentVolumeClaim:
+                                properties:
+                                  accessModes:
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  annotations:
+                                    additionalProperties:
+                                      type: string
+                                    type: object
+                                  dataSource:
+                                    properties:
+                                      apiGroup:
+                                        type: string
+                                      kind:
+                                        type: string
+                                      name:
+                                        type: string
+                                    required:
+                                    - kind
+                                    - name
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  dataSourceRef:
+                                    properties:
+                                      apiGroup:
+                                        type: string
+                                      kind:
+                                        type: string
+                                      name:
+                                        type: string
+                                      namespace:
+                                        type: string
+                                    required:
+                                    - kind
+                                    - name
+                                    type: object
+                                  labels:
+                                    additionalProperties:
+                                      type: string
+                                    type: object
+                                  resources:
+                                    properties:
+                                      limits:
+                                        additionalProperties:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                          x-kubernetes-int-or-string: true
+                                        type: object
+                                      requests:
+                                        additionalProperties:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                          x-kubernetes-int-or-string: true
+                                        type: object
+                                    type: object
+                                  selector:
+                                    properties:
+                                      matchExpressions:
+                                        items:
+                                          properties:
+                                            key:
+                                              type: string
+                                            operator:
+                                              type: string
+                                            values:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          required:
+                                          - key
+                                          - operator
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      matchLabels:
+                                        additionalProperties:
+                                          type: string
+                                        type: object
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  storageClassName:
+                                    type: string
+                                  volumeAttributesClassName:
+                                    type: string
+                                  volumeMode:
+                                    type: string
+                                  volumeName:
+                                    type: string
+                                type: object
+                            type: object
+                        required:
+                        - enabled
+                        - size
+                        type: object
+                      podDisruptionBudget:
+                        properties:
+                          maxUnavailable:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            x-kubernetes-int-or-string: true
+                          minAvailable:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            x-kubernetes-int-or-string: true
+                        type: object
+                      podSecurityContext:
+                        properties:
+                          appArmorProfile:
+                            properties:
+                              localhostProfile:
+                                type: string
+                              type:
+                                type: string
+                            required:
+                            - type
+                            type: object
+                          fsGroup:
+                            format: int64
+                            type: integer
+                          fsGroupChangePolicy:
+                            type: string
+                          runAsGroup:
+                            format: int64
+                            type: integer
+                          runAsNonRoot:
+                            type: boolean
+                          runAsUser:
+                            format: int64
+                            type: integer
+                          seLinuxChangePolicy:
+                            type: string
+                          seLinuxOptions:
+                            properties:
+                              level:
+                                type: string
+                              role:
+                                type: string
+                              type:
+                                type: string
+                              user:
+                                type: string
+                            type: object
+                          seccompProfile:
+                            properties:
+                              localhostProfile:
+                                type: string
+                              type:
+                                type: string
+                            required:
+                            - type
+                            type: object
+                          supplementalGroups:
+                            items:
+                              format: int64
+                              type: integer
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          supplementalGroupsPolicy:
+                            type: string
+                          sysctls:
+                            items:
+                              properties:
+                                name:
+                                  type: string
+                                value:
+                                  type: string
+                              required:
+                              - name
+                              - value
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          windowsOptions:
+                            properties:
+                              gmsaCredentialSpec:
+                                type: string
+                              gmsaCredentialSpecName:
+                                type: string
+                              hostProcess:
+                                type: boolean
+                              runAsUserName:
+                                type: string
+                            type: object
+                        type: object
+                      primaryPreferTagSelector:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      priorityClassName:
+                        type: string
+                      readinessProbe:
+                        properties:
+                          exec:
+                            properties:
+                              command:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            type: object
+                          failureThreshold:
+                            format: int32
+                            type: integer
+                          grpc:
+                            properties:
+                              port:
+                                format: int32
+                                type: integer
+                              service:
+                                default: ""
+                                type: string
+                            required:
+                            - port
+                            type: object
+                          httpGet:
+                            properties:
+                              host:
+                                type: string
+                              httpHeaders:
+                                items:
+                                  properties:
+                                    name:
+                                      type: string
+                                    value:
+                                      type: string
+                                  required:
+                                  - name
+                                  - value
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              path:
+                                type: string
+                              port:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                x-kubernetes-int-or-string: true
+                              scheme:
+                                type: string
+                            required:
+                            - port
+                            type: object
+                          initialDelaySeconds:
+                            format: int32
+                            type: integer
+                          periodSeconds:
+                            format: int32
+                            type: integer
+                          successThreshold:
+                            format: int32
+                            type: integer
+                          tcpSocket:
+                            properties:
+                              host:
+                                type: string
+                              port:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                x-kubernetes-int-or-string: true
+                            required:
+                            - port
+                            type: object
+                          terminationGracePeriodSeconds:
+                            format: int64
+                            type: integer
+                          timeoutSeconds:
+                            format: int32
+                            type: integer
+                        type: object
+                      replsetOverrides:
+                        additionalProperties:
+                          properties:
+                            horizons:
+                              additionalProperties:
+                                type: string
+                              type: object
+                            host:
+                              type: string
+                            priority:
+                              type: integer
+                            tags:
+                              additionalProperties:
+                                type: string
+                              type: object
+                          type: object
+                        type: object
+                      resources:
+                        properties:
+                          claims:
+                            items:
+                              properties:
+                                name:
+                                  type: string
+                                request:
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
+                          limits:
+                            additionalProperties:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            type: object
+                          requests:
+                            additionalProperties:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            type: object
+                        type: object
+                      runtimeClassName:
+                        type: string
+                      serviceAccountName:
+                        type: string
+                      sidecarPVCs:
+                        items:
+                          properties:
+                            apiVersion:
+                              type: string
+                            kind:
+                              type: string
+                            metadata:
+                              type: object
+                            spec:
+                              properties:
+                                accessModes:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                dataSource:
+                                  properties:
+                                    apiGroup:
+                                      type: string
+                                    kind:
+                                      type: string
+                                    name:
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                dataSourceRef:
+                                  properties:
+                                    apiGroup:
+                                      type: string
+                                    kind:
+                                      type: string
+                                    name:
+                                      type: string
+                                    namespace:
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                resources:
+                                  properties:
+                                    limits:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      type: object
+                                    requests:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      type: object
+                                  type: object
+                                selector:
+                                  properties:
+                                    matchExpressions:
+                                      items:
+                                        properties:
+                                          key:
+                                            type: string
+                                          operator:
+                                            type: string
+                                          values:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                storageClassName:
+                                  type: string
+                                volumeAttributesClassName:
+                                  type: string
+                                volumeMode:
+                                  type: string
+                                volumeName:
+                                  type: string
+                              type: object
+                            status:
+                              properties:
+                                accessModes:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                allocatedResourceStatuses:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                                  x-kubernetes-map-type: granular
+                                allocatedResources:
+                                  additionalProperties:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  type: object
+                                capacity:
+                                  additionalProperties:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  type: object
+                                conditions:
+                                  items:
+                                    properties:
+                                      lastProbeTime:
+                                        format: date-time
+                                        type: string
+                                      lastTransitionTime:
+                                        format: date-time
+                                        type: string
+                                      message:
+                                        type: string
+                                      reason:
+                                        type: string
+                                      status:
+                                        type: string
+                                      type:
+                                        type: string
+                                    required:
+                                    - status
+                                    - type
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - type
+                                  x-kubernetes-list-type: map
+                                currentVolumeAttributesClassName:
+                                  type: string
+                                modifyVolumeStatus:
+                                  properties:
+                                    status:
+                                      type: string
+                                    targetVolumeAttributesClassName:
+                                      type: string
+                                  required:
+                                  - status
+                                  type: object
+                                phase:
+                                  type: string
+                              type: object
+                          type: object
+                        type: array
+                      sidecarVolumes:
+                        items:
+                          properties:
+                            awsElasticBlockStore:
+                              properties:
+                                fsType:
+                                  type: string
+                                partition:
+                                  format: int32
+                                  type: integer
+                                readOnly:
+                                  type: boolean
+                                volumeID:
+                                  type: string
+                              required:
+                              - volumeID
+                              type: object
+                            azureDisk:
+                              properties:
+                                cachingMode:
+                                  type: string
+                                diskName:
+                                  type: string
+                                diskURI:
+                                  type: string
+                                fsType:
+                                  default: ext4
+                                  type: string
+                                kind:
+                                  type: string
+                                readOnly:
+                                  default: false
+                                  type: boolean
+                              required:
+                              - diskName
+                              - diskURI
+                              type: object
+                            azureFile:
+                              properties:
+                                readOnly:
+                                  type: boolean
+                                secretName:
+                                  type: string
+                                shareName:
+                                  type: string
+                              required:
+                              - secretName
+                              - shareName
+                              type: object
+                            cephfs:
+                              properties:
+                                monitors:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                secretFile:
+                                  type: string
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                user:
+                                  type: string
+                              required:
+                              - monitors
+                              type: object
+                            cinder:
+                              properties:
+                                fsType:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                volumeID:
+                                  type: string
+                              required:
+                              - volumeID
+                              type: object
+                            configMap:
+                              properties:
+                                defaultMode:
+                                  format: int32
+                                  type: integer
+                                items:
+                                  items:
+                                    properties:
+                                      key:
+                                        type: string
+                                      mode:
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        type: string
+                                    required:
+                                    - key
+                                    - path
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                name:
+                                  default: ""
+                                  type: string
+                                optional:
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            csi:
+                              properties:
+                                driver:
+                                  type: string
+                                fsType:
+                                  type: string
+                                nodePublishSecretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                readOnly:
+                                  type: boolean
+                                volumeAttributes:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                              required:
+                              - driver
+                              type: object
+                            downwardAPI:
+                              properties:
+                                defaultMode:
+                                  format: int32
+                                  type: integer
+                                items:
+                                  items:
+                                    properties:
+                                      fieldRef:
+                                        properties:
+                                          apiVersion:
+                                            type: string
+                                          fieldPath:
+                                            type: string
+                                        required:
+                                        - fieldPath
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      mode:
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        type: string
+                                      resourceFieldRef:
+                                        properties:
+                                          containerName:
+                                            type: string
+                                          divisor:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                            x-kubernetes-int-or-string: true
+                                          resource:
+                                            type: string
+                                        required:
+                                        - resource
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    required:
+                                    - path
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            emptyDir:
+                              properties:
+                                medium:
+                                  type: string
+                                sizeLimit:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                              type: object
+                            ephemeral:
+                              properties:
+                                volumeClaimTemplate:
+                                  properties:
+                                    metadata:
+                                      type: object
+                                    spec:
+                                      properties:
+                                        accessModes:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        dataSource:
+                                          properties:
+                                            apiGroup:
+                                              type: string
+                                            kind:
+                                              type: string
+                                            name:
+                                              type: string
+                                          required:
+                                          - kind
+                                          - name
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        dataSourceRef:
+                                          properties:
+                                            apiGroup:
+                                              type: string
+                                            kind:
+                                              type: string
+                                            name:
+                                              type: string
+                                            namespace:
+                                              type: string
+                                          required:
+                                          - kind
+                                          - name
+                                          type: object
+                                        resources:
+                                          properties:
+                                            limits:
+                                              additionalProperties:
+                                                anyOf:
+                                                - type: integer
+                                                - type: string
+                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                x-kubernetes-int-or-string: true
+                                              type: object
+                                            requests:
+                                              additionalProperties:
+                                                anyOf:
+                                                - type: integer
+                                                - type: string
+                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                x-kubernetes-int-or-string: true
+                                              type: object
+                                          type: object
+                                        selector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        storageClassName:
+                                          type: string
+                                        volumeAttributesClassName:
+                                          type: string
+                                        volumeMode:
+                                          type: string
+                                        volumeName:
+                                          type: string
+                                      type: object
+                                  required:
+                                  - spec
+                                  type: object
+                              type: object
+                            fc:
+                              properties:
+                                fsType:
+                                  type: string
+                                lun:
+                                  format: int32
+                                  type: integer
+                                readOnly:
+                                  type: boolean
+                                targetWWNs:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                wwids:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            flexVolume:
+                              properties:
+                                driver:
+                                  type: string
+                                fsType:
+                                  type: string
+                                options:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                                readOnly:
+                                  type: boolean
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              required:
+                              - driver
+                              type: object
+                            flocker:
+                              properties:
+                                datasetName:
+                                  type: string
+                                datasetUUID:
+                                  type: string
+                              type: object
+                            gcePersistentDisk:
+                              properties:
+                                fsType:
+                                  type: string
+                                partition:
+                                  format: int32
+                                  type: integer
+                                pdName:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                              required:
+                              - pdName
+                              type: object
+                            gitRepo:
+                              properties:
+                                directory:
+                                  type: string
+                                repository:
+                                  type: string
+                                revision:
+                                  type: string
+                              required:
+                              - repository
+                              type: object
+                            glusterfs:
+                              properties:
+                                endpoints:
+                                  type: string
+                                path:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                              required:
+                              - endpoints
+                              - path
+                              type: object
+                            hostPath:
+                              properties:
+                                path:
+                                  type: string
+                                type:
+                                  type: string
+                              required:
+                              - path
+                              type: object
+                            image:
+                              properties:
+                                pullPolicy:
+                                  type: string
+                                reference:
+                                  type: string
+                              type: object
+                            iscsi:
+                              properties:
+                                chapAuthDiscovery:
+                                  type: boolean
+                                chapAuthSession:
+                                  type: boolean
+                                fsType:
+                                  type: string
+                                initiatorName:
+                                  type: string
+                                iqn:
+                                  type: string
+                                iscsiInterface:
+                                  default: default
+                                  type: string
+                                lun:
+                                  format: int32
+                                  type: integer
+                                portals:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                readOnly:
+                                  type: boolean
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                targetPortal:
+                                  type: string
+                              required:
+                              - iqn
+                              - lun
+                              - targetPortal
+                              type: object
+                            name:
+                              type: string
+                            nfs:
+                              properties:
+                                path:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                server:
+                                  type: string
+                              required:
+                              - path
+                              - server
+                              type: object
+                            persistentVolumeClaim:
+                              properties:
+                                claimName:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                              required:
+                              - claimName
+                              type: object
+                            photonPersistentDisk:
+                              properties:
+                                fsType:
+                                  type: string
+                                pdID:
+                                  type: string
+                              required:
+                              - pdID
+                              type: object
+                            portworxVolume:
+                              properties:
+                                fsType:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                volumeID:
+                                  type: string
+                              required:
+                              - volumeID
+                              type: object
+                            projected:
+                              properties:
+                                defaultMode:
+                                  format: int32
+                                  type: integer
+                                sources:
+                                  items:
+                                    properties:
+                                      clusterTrustBundle:
+                                        properties:
+                                          labelSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          name:
+                                            type: string
+                                          optional:
+                                            type: boolean
+                                          path:
+                                            type: string
+                                          signerName:
+                                            type: string
+                                        required:
+                                        - path
+                                        type: object
+                                      configMap:
+                                        properties:
+                                          items:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                mode:
+                                                  format: int32
+                                                  type: integer
+                                                path:
+                                                  type: string
+                                              required:
+                                              - key
+                                              - path
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          name:
+                                            default: ""
+                                            type: string
+                                          optional:
+                                            type: boolean
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      downwardAPI:
+                                        properties:
+                                          items:
+                                            items:
+                                              properties:
+                                                fieldRef:
+                                                  properties:
+                                                    apiVersion:
+                                                      type: string
+                                                    fieldPath:
+                                                      type: string
+                                                  required:
+                                                  - fieldPath
+                                                  type: object
+                                                  x-kubernetes-map-type: atomic
+                                                mode:
+                                                  format: int32
+                                                  type: integer
+                                                path:
+                                                  type: string
+                                                resourceFieldRef:
+                                                  properties:
+                                                    containerName:
+                                                      type: string
+                                                    divisor:
+                                                      anyOf:
+                                                      - type: integer
+                                                      - type: string
+                                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                      x-kubernetes-int-or-string: true
+                                                    resource:
+                                                      type: string
+                                                  required:
+                                                  - resource
+                                                  type: object
+                                                  x-kubernetes-map-type: atomic
+                                              required:
+                                              - path
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        type: object
+                                      secret:
+                                        properties:
+                                          items:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                mode:
+                                                  format: int32
+                                                  type: integer
+                                                path:
+                                                  type: string
+                                              required:
+                                              - key
+                                              - path
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          name:
+                                            default: ""
+                                            type: string
+                                          optional:
+                                            type: boolean
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      serviceAccountToken:
+                                        properties:
+                                          audience:
+                                            type: string
+                                          expirationSeconds:
+                                            format: int64
+                                            type: integer
+                                          path:
+                                            type: string
+                                        required:
+                                        - path
+                                        type: object
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            quobyte:
+                              properties:
+                                group:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                registry:
+                                  type: string
+                                tenant:
+                                  type: string
+                                user:
+                                  type: string
+                                volume:
+                                  type: string
+                              required:
+                              - registry
+                              - volume
+                              type: object
+                            rbd:
+                              properties:
+                                fsType:
+                                  type: string
+                                image:
+                                  type: string
+                                keyring:
+                                  default: /etc/ceph/keyring
+                                  type: string
+                                monitors:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                pool:
+                                  default: rbd
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                user:
+                                  default: admin
+                                  type: string
+                              required:
+                              - image
+                              - monitors
+                              type: object
+                            scaleIO:
+                              properties:
+                                fsType:
+                                  default: xfs
+                                  type: string
+                                gateway:
+                                  type: string
+                                protectionDomain:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                sslEnabled:
+                                  type: boolean
+                                storageMode:
+                                  default: ThinProvisioned
+                                  type: string
+                                storagePool:
+                                  type: string
+                                system:
+                                  type: string
+                                volumeName:
+                                  type: string
+                              required:
+                              - gateway
+                              - secretRef
+                              - system
+                              type: object
+                            secret:
+                              properties:
+                                defaultMode:
+                                  format: int32
+                                  type: integer
+                                items:
+                                  items:
+                                    properties:
+                                      key:
+                                        type: string
+                                      mode:
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        type: string
+                                    required:
+                                    - key
+                                    - path
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                optional:
+                                  type: boolean
+                                secretName:
+                                  type: string
+                              type: object
+                            storageos:
+                              properties:
+                                fsType:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                volumeName:
+                                  type: string
+                                volumeNamespace:
+                                  type: string
+                              type: object
+                            vsphereVolume:
+                              properties:
+                                fsType:
+                                  type: string
+                                storagePolicyID:
+                                  type: string
+                                storagePolicyName:
+                                  type: string
+                                volumePath:
+                                  type: string
+                              required:
+                              - volumePath
+                              type: object
+                          required:
+                          - name
+                          type: object
+                        type: array
+                      sidecars:
+                        items:
+                          properties:
+                            args:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            command:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            env:
+                              items:
+                                properties:
+                                  name:
+                                    type: string
+                                  value:
+                                    type: string
+                                  valueFrom:
+                                    properties:
+                                      configMapKeyRef:
+                                        properties:
+                                          key:
+                                            type: string
+                                          name:
+                                            default: ""
+                                            type: string
+                                          optional:
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      fieldRef:
+                                        properties:
+                                          apiVersion:
+                                            type: string
+                                          fieldPath:
+                                            type: string
+                                        required:
+                                        - fieldPath
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      resourceFieldRef:
+                                        properties:
+                                          containerName:
+                                            type: string
+                                          divisor:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                            x-kubernetes-int-or-string: true
+                                          resource:
+                                            type: string
+                                        required:
+                                        - resource
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secretKeyRef:
+                                        properties:
+                                          key:
+                                            type: string
+                                          name:
+                                            default: ""
+                                            type: string
+                                          optional:
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                required:
+                                - name
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - name
+                              x-kubernetes-list-type: map
+                            envFrom:
+                              items:
+                                properties:
+                                  configMapRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                      optional:
+                                        type: boolean
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  prefix:
+                                    type: string
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                      optional:
+                                        type: boolean
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            image:
+                              type: string
+                            imagePullPolicy:
+                              type: string
+                            lifecycle:
+                              properties:
+                                postStart:
+                                  properties:
+                                    exec:
+                                      properties:
+                                        command:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    httpGet:
+                                      properties:
+                                        host:
+                                          type: string
+                                        httpHeaders:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    sleep:
+                                      properties:
+                                        seconds:
+                                          format: int64
+                                          type: integer
+                                      required:
+                                      - seconds
+                                      type: object
+                                    tcpSocket:
+                                      properties:
+                                        host:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                  type: object
+                                preStop:
+                                  properties:
+                                    exec:
+                                      properties:
+                                        command:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    httpGet:
+                                      properties:
+                                        host:
+                                          type: string
+                                        httpHeaders:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    sleep:
+                                      properties:
+                                        seconds:
+                                          format: int64
+                                          type: integer
+                                      required:
+                                      - seconds
+                                      type: object
+                                    tcpSocket:
+                                      properties:
+                                        host:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                  type: object
+                              type: object
+                            livenessProbe:
+                              properties:
+                                exec:
+                                  properties:
+                                    command:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                failureThreshold:
+                                  format: int32
+                                  type: integer
+                                grpc:
+                                  properties:
+                                    port:
+                                      format: int32
+                                      type: integer
+                                    service:
+                                      default: ""
+                                      type: string
+                                  required:
+                                  - port
+                                  type: object
+                                httpGet:
+                                  properties:
+                                    host:
+                                      type: string
+                                    httpHeaders:
+                                      items:
+                                        properties:
+                                          name:
+                                            type: string
+                                          value:
+                                            type: string
+                                        required:
+                                        - name
+                                        - value
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    path:
+                                      type: string
+                                    port:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      x-kubernetes-int-or-string: true
+                                    scheme:
+                                      type: string
+                                  required:
+                                  - port
+                                  type: object
+                                initialDelaySeconds:
+                                  format: int32
+                                  type: integer
+                                periodSeconds:
+                                  format: int32
+                                  type: integer
+                                successThreshold:
+                                  format: int32
+                                  type: integer
+                                tcpSocket:
+                                  properties:
+                                    host:
+                                      type: string
+                                    port:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      x-kubernetes-int-or-string: true
+                                  required:
+                                  - port
+                                  type: object
+                                terminationGracePeriodSeconds:
+                                  format: int64
+                                  type: integer
+                                timeoutSeconds:
+                                  format: int32
+                                  type: integer
+                              type: object
+                            name:
+                              type: string
+                            ports:
+                              items:
+                                properties:
+                                  containerPort:
+                                    format: int32
+                                    type: integer
+                                  hostIP:
+                                    type: string
+                                  hostPort:
+                                    format: int32
+                                    type: integer
+                                  name:
+                                    type: string
+                                  protocol:
+                                    default: TCP
+                                    type: string
+                                required:
+                                - containerPort
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - containerPort
+                              - protocol
+                              x-kubernetes-list-type: map
+                            readinessProbe:
+                              properties:
+                                exec:
+                                  properties:
+                                    command:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                failureThreshold:
+                                  format: int32
+                                  type: integer
+                                grpc:
+                                  properties:
+                                    port:
+                                      format: int32
+                                      type: integer
+                                    service:
+                                      default: ""
+                                      type: string
+                                  required:
+                                  - port
+                                  type: object
+                                httpGet:
+                                  properties:
+                                    host:
+                                      type: string
+                                    httpHeaders:
+                                      items:
+                                        properties:
+                                          name:
+                                            type: string
+                                          value:
+                                            type: string
+                                        required:
+                                        - name
+                                        - value
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    path:
+                                      type: string
+                                    port:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      x-kubernetes-int-or-string: true
+                                    scheme:
+                                      type: string
+                                  required:
+                                  - port
+                                  type: object
+                                initialDelaySeconds:
+                                  format: int32
+                                  type: integer
+                                periodSeconds:
+                                  format: int32
+                                  type: integer
+                                successThreshold:
+                                  format: int32
+                                  type: integer
+                                tcpSocket:
+                                  properties:
+                                    host:
+                                      type: string
+                                    port:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      x-kubernetes-int-or-string: true
+                                  required:
+                                  - port
+                                  type: object
+                                terminationGracePeriodSeconds:
+                                  format: int64
+                                  type: integer
+                                timeoutSeconds:
+                                  format: int32
+                                  type: integer
+                              type: object
+                            resizePolicy:
+                              items:
+                                properties:
+                                  resourceName:
+                                    type: string
+                                  restartPolicy:
+                                    type: string
+                                required:
+                                - resourceName
+                                - restartPolicy
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            resources:
+                              properties:
+                                claims:
+                                  items:
+                                    properties:
+                                      name:
+                                        type: string
+                                      request:
+                                        type: string
+                                    required:
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - name
+                                  x-kubernetes-list-type: map
+                                limits:
+                                  additionalProperties:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  type: object
+                                requests:
+                                  additionalProperties:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  type: object
+                              type: object
+                            restartPolicy:
+                              type: string
+                            securityContext:
+                              properties:
+                                allowPrivilegeEscalation:
+                                  type: boolean
+                                appArmorProfile:
+                                  properties:
+                                    localhostProfile:
+                                      type: string
+                                    type:
+                                      type: string
+                                  required:
+                                  - type
+                                  type: object
+                                capabilities:
+                                  properties:
+                                    add:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    drop:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                privileged:
+                                  type: boolean
+                                procMount:
+                                  type: string
+                                readOnlyRootFilesystem:
+                                  type: boolean
+                                runAsGroup:
+                                  format: int64
+                                  type: integer
+                                runAsNonRoot:
+                                  type: boolean
+                                runAsUser:
+                                  format: int64
+                                  type: integer
+                                seLinuxOptions:
+                                  properties:
+                                    level:
+                                      type: string
+                                    role:
+                                      type: string
+                                    type:
+                                      type: string
+                                    user:
+                                      type: string
+                                  type: object
+                                seccompProfile:
+                                  properties:
+                                    localhostProfile:
+                                      type: string
+                                    type:
+                                      type: string
+                                  required:
+                                  - type
+                                  type: object
+                                windowsOptions:
+                                  properties:
+                                    gmsaCredentialSpec:
+                                      type: string
+                                    gmsaCredentialSpecName:
+                                      type: string
+                                    hostProcess:
+                                      type: boolean
+                                    runAsUserName:
+                                      type: string
+                                  type: object
+                              type: object
+                            startupProbe:
+                              properties:
+                                exec:
+                                  properties:
+                                    command:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                failureThreshold:
+                                  format: int32
+                                  type: integer
+                                grpc:
+                                  properties:
+                                    port:
+                                      format: int32
+                                      type: integer
+                                    service:
+                                      default: ""
+                                      type: string
+                                  required:
+                                  - port
+                                  type: object
+                                httpGet:
+                                  properties:
+                                    host:
+                                      type: string
+                                    httpHeaders:
+                                      items:
+                                        properties:
+                                          name:
+                                            type: string
+                                          value:
+                                            type: string
+                                        required:
+                                        - name
+                                        - value
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    path:
+                                      type: string
+                                    port:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      x-kubernetes-int-or-string: true
+                                    scheme:
+                                      type: string
+                                  required:
+                                  - port
+                                  type: object
+                                initialDelaySeconds:
+                                  format: int32
+                                  type: integer
+                                periodSeconds:
+                                  format: int32
+                                  type: integer
+                                successThreshold:
+                                  format: int32
+                                  type: integer
+                                tcpSocket:
+                                  properties:
+                                    host:
+                                      type: string
+                                    port:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      x-kubernetes-int-or-string: true
+                                  required:
+                                  - port
+                                  type: object
+                                terminationGracePeriodSeconds:
+                                  format: int64
+                                  type: integer
+                                timeoutSeconds:
+                                  format: int32
+                                  type: integer
+                              type: object
+                            stdin:
+                              type: boolean
+                            stdinOnce:
+                              type: boolean
+                            terminationMessagePath:
+                              type: string
+                            terminationMessagePolicy:
+                              type: string
+                            tty:
+                              type: boolean
+                            volumeDevices:
+                              items:
+                                properties:
+                                  devicePath:
+                                    type: string
+                                  name:
+                                    type: string
+                                required:
+                                - devicePath
+                                - name
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - devicePath
+                              x-kubernetes-list-type: map
+                            volumeMounts:
+                              items:
+                                properties:
+                                  mountPath:
+                                    type: string
+                                  mountPropagation:
+                                    type: string
+                                  name:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  recursiveReadOnly:
+                                    type: string
+                                  subPath:
+                                    type: string
+                                  subPathExpr:
+                                    type: string
+                                required:
+                                - mountPath
+                                - name
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - mountPath
+                              x-kubernetes-list-type: map
+                            workingDir:
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                      size:
+                        format: int32
+                        type: integer
+                      splitHorizons:
+                        additionalProperties:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        type: object
+                      storage:
+                        properties:
+                          directoryPerDB:
+                            type: boolean
+                          engine:
+                            type: string
+                          inMemory:
+                            properties:
+                              engineConfig:
+                                properties:
+                                  inMemorySizeRatio:
+                                    type: number
+                                type: object
+                            type: object
+                          mmapv1:
+                            properties:
+                              nsSize:
+                                type: integer
+                              smallfiles:
+                                type: boolean
+                            type: object
+                          syncPeriodSecs:
+                            type: integer
+                          wiredTiger:
+                            properties:
+                              collectionConfig:
+                                properties:
+                                  blockCompressor:
+                                    type: string
+                                type: object
+                              engineConfig:
+                                properties:
+                                  cacheSizeRatio:
+                                    type: number
+                                  directoryForIndexes:
+                                    type: boolean
+                                  journalCompressor:
+                                    type: string
+                                type: object
+                              indexConfig:
+                                properties:
+                                  prefixCompression:
+                                    type: boolean
+                                type: object
+                            type: object
+                        type: object
+                      terminationGracePeriodSeconds:
+                        format: int64
+                        type: integer
+                      tolerations:
+                        items:
+                          properties:
+                            effect:
+                              type: string
+                            key:
+                              type: string
+                            operator:
+                              type: string
+                            tolerationSeconds:
+                              format: int64
+                              type: integer
+                            value:
+                              type: string
+                          type: object
+                        type: array
+                      topologySpreadConstraints:
+                        items:
+                          properties:
+                            labelSelector:
+                              properties:
+                                matchExpressions:
+                                  items:
+                                    properties:
+                                      key:
+                                        type: string
+                                      operator:
+                                        type: string
+                                      values:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            maxSkew:
+                              format: int32
+                              type: integer
+                            minDomains:
+                              format: int32
+                              type: integer
+                            nodeAffinityPolicy:
+                              type: string
+                            nodeTaintsPolicy:
+                              type: string
+                            topologyKey:
+                              type: string
+                            whenUnsatisfiable:
+                              type: string
+                          required:
+                          - maxSkew
+                          - topologyKey
+                          - whenUnsatisfiable
+                          type: object
+                        type: array
+                      volumeSpec:
+                        properties:
+                          emptyDir:
+                            properties:
+                              medium:
+                                type: string
+                              sizeLimit:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                x-kubernetes-int-or-string: true
+                            type: object
+                          hostPath:
+                            properties:
+                              path:
+                                type: string
+                              type:
+                                type: string
+                            required:
+                            - path
+                            type: object
+                          persistentVolumeClaim:
+                            properties:
+                              accessModes:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              annotations:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              dataSource:
+                                properties:
+                                  apiGroup:
+                                    type: string
+                                  kind:
+                                    type: string
+                                  name:
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              dataSourceRef:
+                                properties:
+                                  apiGroup:
+                                    type: string
+                                  kind:
+                                    type: string
+                                  name:
+                                    type: string
+                                  namespace:
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                              labels:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              resources:
+                                properties:
+                                  limits:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    type: object
+                                  requests:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    type: object
+                                type: object
+                              selector:
+                                properties:
+                                  matchExpressions:
+                                    items:
+                                      properties:
+                                        key:
+                                          type: string
+                                        operator:
+                                          type: string
+                                        values:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      required:
+                                      - key
+                                      - operator
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  matchLabels:
+                                    additionalProperties:
+                                      type: string
+                                    type: object
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              storageClassName:
+                                type: string
+                              volumeAttributesClassName:
+                                type: string
+                              volumeMode:
+                                type: string
+                              volumeName:
+                                type: string
+                            type: object
+                        type: object
+                    required:
+                    - size
+                    type: object
+                  enabled:
+                    type: boolean
+                  mongos:
+                    properties:
+                      affinity:
+                        properties:
+                          advanced:
+                            properties:
+                              nodeAffinity:
+                                properties:
+                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        preference:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchFields:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        weight:
+                                          format: int32
+                                          type: integer
+                                      required:
+                                      - preference
+                                      - weight
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                    properties:
+                                      nodeSelectorTerms:
+                                        items:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchFields:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - nodeSelectorTerms
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              podAffinity:
+                                properties:
+                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        podAffinityTerm:
+                                          properties:
+                                            labelSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            matchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            mismatchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            namespaceSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            namespaces:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            topologyKey:
+                                              type: string
+                                          required:
+                                          - topologyKey
+                                          type: object
+                                        weight:
+                                          format: int32
+                                          type: integer
+                                      required:
+                                      - podAffinityTerm
+                                      - weight
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        labelSelector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        matchLabelKeys:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        mismatchLabelKeys:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        namespaceSelector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        namespaces:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        topologyKey:
+                                          type: string
+                                      required:
+                                      - topologyKey
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              podAntiAffinity:
+                                properties:
+                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        podAffinityTerm:
+                                          properties:
+                                            labelSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            matchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            mismatchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            namespaceSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            namespaces:
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            topologyKey:
+                                              type: string
+                                          required:
+                                          - topologyKey
+                                          type: object
+                                        weight:
+                                          format: int32
+                                          type: integer
+                                      required:
+                                      - podAffinityTerm
+                                      - weight
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        labelSelector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        matchLabelKeys:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        mismatchLabelKeys:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        namespaceSelector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        namespaces:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        topologyKey:
+                                          type: string
+                                      required:
+                                      - topologyKey
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                            type: object
+                          antiAffinityTopologyKey:
+                            type: string
+                        type: object
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      configuration:
+                        type: string
+                      containerSecurityContext:
+                        properties:
+                          allowPrivilegeEscalation:
+                            type: boolean
+                          appArmorProfile:
+                            properties:
+                              localhostProfile:
+                                type: string
+                              type:
+                                type: string
+                            required:
+                            - type
+                            type: object
+                          capabilities:
+                            properties:
+                              add:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              drop:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            type: object
+                          privileged:
+                            type: boolean
+                          procMount:
+                            type: string
+                          readOnlyRootFilesystem:
+                            type: boolean
+                          runAsGroup:
+                            format: int64
+                            type: integer
+                          runAsNonRoot:
+                            type: boolean
+                          runAsUser:
+                            format: int64
+                            type: integer
+                          seLinuxOptions:
+                            properties:
+                              level:
+                                type: string
+                              role:
+                                type: string
+                              type:
+                                type: string
+                              user:
+                                type: string
+                            type: object
+                          seccompProfile:
+                            properties:
+                              localhostProfile:
+                                type: string
+                              type:
+                                type: string
+                            required:
+                            - type
+                            type: object
+                          windowsOptions:
+                            properties:
+                              gmsaCredentialSpec:
+                                type: string
+                              gmsaCredentialSpecName:
+                                type: string
+                              hostProcess:
+                                type: boolean
+                              runAsUserName:
+                                type: string
+                            type: object
+                        type: object
+                      expose:
+                        properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          exposeType:
+                            type: string
+                          externalTrafficPolicy:
+                            type: string
+                          internalTrafficPolicy:
+                            type: string
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          loadBalancerSourceRanges:
+                            items:
+                              type: string
+                            type: array
+                          nodePort:
+                            format: int32
+                            type: integer
+                          serviceAnnotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          serviceLabels:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          servicePerPod:
+                            type: boolean
+                          type:
+                            type: string
+                        type: object
+                      hostAliases:
+                        items:
+                          properties:
+                            hostnames:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            ip:
+                              type: string
+                          required:
+                          - ip
+                          type: object
+                        type: array
+                      hostPort:
+                        format: int32
+                        type: integer
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      livenessProbe:
+                        properties:
+                          exec:
+                            properties:
+                              command:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            type: object
+                          failureThreshold:
+                            format: int32
+                            type: integer
+                          grpc:
+                            properties:
+                              port:
+                                format: int32
+                                type: integer
+                              service:
+                                default: ""
+                                type: string
+                            required:
+                            - port
+                            type: object
+                          httpGet:
+                            properties:
+                              host:
+                                type: string
+                              httpHeaders:
+                                items:
+                                  properties:
+                                    name:
+                                      type: string
+                                    value:
+                                      type: string
+                                  required:
+                                  - name
+                                  - value
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              path:
+                                type: string
+                              port:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                x-kubernetes-int-or-string: true
+                              scheme:
+                                type: string
+                            required:
+                            - port
+                            type: object
+                          initialDelaySeconds:
+                            format: int32
+                            type: integer
+                          periodSeconds:
+                            format: int32
+                            type: integer
+                          startupDelaySeconds:
+                            type: integer
+                          successThreshold:
+                            format: int32
+                            type: integer
+                          tcpSocket:
+                            properties:
+                              host:
+                                type: string
+                              port:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                x-kubernetes-int-or-string: true
+                            required:
+                            - port
+                            type: object
+                          terminationGracePeriodSeconds:
+                            format: int64
+                            type: integer
+                          timeoutSeconds:
+                            format: int32
+                            type: integer
+                        type: object
+                      nodeSelector:
+                        additionalProperties:
+                          type: string
+                        type: object
+                      podDisruptionBudget:
+                        properties:
+                          maxUnavailable:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            x-kubernetes-int-or-string: true
+                          minAvailable:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            x-kubernetes-int-or-string: true
+                        type: object
+                      podSecurityContext:
+                        properties:
+                          appArmorProfile:
+                            properties:
+                              localhostProfile:
+                                type: string
+                              type:
+                                type: string
+                            required:
+                            - type
+                            type: object
+                          fsGroup:
+                            format: int64
+                            type: integer
+                          fsGroupChangePolicy:
+                            type: string
+                          runAsGroup:
+                            format: int64
+                            type: integer
+                          runAsNonRoot:
+                            type: boolean
+                          runAsUser:
+                            format: int64
+                            type: integer
+                          seLinuxChangePolicy:
+                            type: string
+                          seLinuxOptions:
+                            properties:
+                              level:
+                                type: string
+                              role:
+                                type: string
+                              type:
+                                type: string
+                              user:
+                                type: string
+                            type: object
+                          seccompProfile:
+                            properties:
+                              localhostProfile:
+                                type: string
+                              type:
+                                type: string
+                            required:
+                            - type
+                            type: object
+                          supplementalGroups:
+                            items:
+                              format: int64
+                              type: integer
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          supplementalGroupsPolicy:
+                            type: string
+                          sysctls:
+                            items:
+                              properties:
+                                name:
+                                  type: string
+                                value:
+                                  type: string
+                              required:
+                              - name
+                              - value
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          windowsOptions:
+                            properties:
+                              gmsaCredentialSpec:
+                                type: string
+                              gmsaCredentialSpecName:
+                                type: string
+                              hostProcess:
+                                type: boolean
+                              runAsUserName:
+                                type: string
+                            type: object
+                        type: object
+                      port:
+                        format: int32
+                        type: integer
+                      priorityClassName:
+                        type: string
+                      readinessProbe:
+                        properties:
+                          exec:
+                            properties:
+                              command:
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            type: object
+                          failureThreshold:
+                            format: int32
+                            type: integer
+                          grpc:
+                            properties:
+                              port:
+                                format: int32
+                                type: integer
+                              service:
+                                default: ""
+                                type: string
+                            required:
+                            - port
+                            type: object
+                          httpGet:
+                            properties:
+                              host:
+                                type: string
+                              httpHeaders:
+                                items:
+                                  properties:
+                                    name:
+                                      type: string
+                                    value:
+                                      type: string
+                                  required:
+                                  - name
+                                  - value
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              path:
+                                type: string
+                              port:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                x-kubernetes-int-or-string: true
+                              scheme:
+                                type: string
+                            required:
+                            - port
+                            type: object
+                          initialDelaySeconds:
+                            format: int32
+                            type: integer
+                          periodSeconds:
+                            format: int32
+                            type: integer
+                          successThreshold:
+                            format: int32
+                            type: integer
+                          tcpSocket:
+                            properties:
+                              host:
+                                type: string
+                              port:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                x-kubernetes-int-or-string: true
+                            required:
+                            - port
+                            type: object
+                          terminationGracePeriodSeconds:
+                            format: int64
+                            type: integer
+                          timeoutSeconds:
+                            format: int32
+                            type: integer
+                        type: object
+                      resources:
+                        properties:
+                          claims:
+                            items:
+                              properties:
+                                name:
+                                  type: string
+                                request:
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
+                          limits:
+                            additionalProperties:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            type: object
+                          requests:
+                            additionalProperties:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            type: object
+                        type: object
+                      runtimeClassName:
+                        type: string
+                      serviceAccountName:
+                        type: string
+                      setParameter:
+                        properties:
+                          cursorTimeoutMillis:
+                            type: integer
+                        type: object
+                      sidecarPVCs:
+                        items:
+                          properties:
+                            apiVersion:
+                              type: string
+                            kind:
+                              type: string
+                            metadata:
+                              type: object
+                            spec:
+                              properties:
+                                accessModes:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                dataSource:
+                                  properties:
+                                    apiGroup:
+                                      type: string
+                                    kind:
+                                      type: string
+                                    name:
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                dataSourceRef:
+                                  properties:
+                                    apiGroup:
+                                      type: string
+                                    kind:
+                                      type: string
+                                    name:
+                                      type: string
+                                    namespace:
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                resources:
+                                  properties:
+                                    limits:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      type: object
+                                    requests:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      type: object
+                                  type: object
+                                selector:
+                                  properties:
+                                    matchExpressions:
+                                      items:
+                                        properties:
+                                          key:
+                                            type: string
+                                          operator:
+                                            type: string
+                                          values:
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                storageClassName:
+                                  type: string
+                                volumeAttributesClassName:
+                                  type: string
+                                volumeMode:
+                                  type: string
+                                volumeName:
+                                  type: string
+                              type: object
+                            status:
+                              properties:
+                                accessModes:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                allocatedResourceStatuses:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                                  x-kubernetes-map-type: granular
+                                allocatedResources:
+                                  additionalProperties:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  type: object
+                                capacity:
+                                  additionalProperties:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  type: object
+                                conditions:
+                                  items:
+                                    properties:
+                                      lastProbeTime:
+                                        format: date-time
+                                        type: string
+                                      lastTransitionTime:
+                                        format: date-time
+                                        type: string
+                                      message:
+                                        type: string
+                                      reason:
+                                        type: string
+                                      status:
+                                        type: string
+                                      type:
+                                        type: string
+                                    required:
+                                    - status
+                                    - type
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - type
+                                  x-kubernetes-list-type: map
+                                currentVolumeAttributesClassName:
+                                  type: string
+                                modifyVolumeStatus:
+                                  properties:
+                                    status:
+                                      type: string
+                                    targetVolumeAttributesClassName:
+                                      type: string
+                                  required:
+                                  - status
+                                  type: object
+                                phase:
+                                  type: string
+                              type: object
+                          type: object
+                        type: array
+                      sidecarVolumes:
+                        items:
+                          properties:
+                            awsElasticBlockStore:
+                              properties:
+                                fsType:
+                                  type: string
+                                partition:
+                                  format: int32
+                                  type: integer
+                                readOnly:
+                                  type: boolean
+                                volumeID:
+                                  type: string
+                              required:
+                              - volumeID
+                              type: object
+                            azureDisk:
+                              properties:
+                                cachingMode:
+                                  type: string
+                                diskName:
+                                  type: string
+                                diskURI:
+                                  type: string
+                                fsType:
+                                  default: ext4
+                                  type: string
+                                kind:
+                                  type: string
+                                readOnly:
+                                  default: false
+                                  type: boolean
+                              required:
+                              - diskName
+                              - diskURI
+                              type: object
+                            azureFile:
+                              properties:
+                                readOnly:
+                                  type: boolean
+                                secretName:
+                                  type: string
+                                shareName:
+                                  type: string
+                              required:
+                              - secretName
+                              - shareName
+                              type: object
+                            cephfs:
+                              properties:
+                                monitors:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                secretFile:
+                                  type: string
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                user:
+                                  type: string
+                              required:
+                              - monitors
+                              type: object
+                            cinder:
+                              properties:
+                                fsType:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                volumeID:
+                                  type: string
+                              required:
+                              - volumeID
+                              type: object
+                            configMap:
+                              properties:
+                                defaultMode:
+                                  format: int32
+                                  type: integer
+                                items:
+                                  items:
+                                    properties:
+                                      key:
+                                        type: string
+                                      mode:
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        type: string
+                                    required:
+                                    - key
+                                    - path
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                name:
+                                  default: ""
+                                  type: string
+                                optional:
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            csi:
+                              properties:
+                                driver:
+                                  type: string
+                                fsType:
+                                  type: string
+                                nodePublishSecretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                readOnly:
+                                  type: boolean
+                                volumeAttributes:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                              required:
+                              - driver
+                              type: object
+                            downwardAPI:
+                              properties:
+                                defaultMode:
+                                  format: int32
+                                  type: integer
+                                items:
+                                  items:
+                                    properties:
+                                      fieldRef:
+                                        properties:
+                                          apiVersion:
+                                            type: string
+                                          fieldPath:
+                                            type: string
+                                        required:
+                                        - fieldPath
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      mode:
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        type: string
+                                      resourceFieldRef:
+                                        properties:
+                                          containerName:
+                                            type: string
+                                          divisor:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                            x-kubernetes-int-or-string: true
+                                          resource:
+                                            type: string
+                                        required:
+                                        - resource
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    required:
+                                    - path
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            emptyDir:
+                              properties:
+                                medium:
+                                  type: string
+                                sizeLimit:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                              type: object
+                            ephemeral:
+                              properties:
+                                volumeClaimTemplate:
+                                  properties:
+                                    metadata:
+                                      type: object
+                                    spec:
+                                      properties:
+                                        accessModes:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        dataSource:
+                                          properties:
+                                            apiGroup:
+                                              type: string
+                                            kind:
+                                              type: string
+                                            name:
+                                              type: string
+                                          required:
+                                          - kind
+                                          - name
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        dataSourceRef:
+                                          properties:
+                                            apiGroup:
+                                              type: string
+                                            kind:
+                                              type: string
+                                            name:
+                                              type: string
+                                            namespace:
+                                              type: string
+                                          required:
+                                          - kind
+                                          - name
+                                          type: object
+                                        resources:
+                                          properties:
+                                            limits:
+                                              additionalProperties:
+                                                anyOf:
+                                                - type: integer
+                                                - type: string
+                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                x-kubernetes-int-or-string: true
+                                              type: object
+                                            requests:
+                                              additionalProperties:
+                                                anyOf:
+                                                - type: integer
+                                                - type: string
+                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                x-kubernetes-int-or-string: true
+                                              type: object
+                                          type: object
+                                        selector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        storageClassName:
+                                          type: string
+                                        volumeAttributesClassName:
+                                          type: string
+                                        volumeMode:
+                                          type: string
+                                        volumeName:
+                                          type: string
+                                      type: object
+                                  required:
+                                  - spec
+                                  type: object
+                              type: object
+                            fc:
+                              properties:
+                                fsType:
+                                  type: string
+                                lun:
+                                  format: int32
+                                  type: integer
+                                readOnly:
+                                  type: boolean
+                                targetWWNs:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                wwids:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            flexVolume:
+                              properties:
+                                driver:
+                                  type: string
+                                fsType:
+                                  type: string
+                                options:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                                readOnly:
+                                  type: boolean
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              required:
+                              - driver
+                              type: object
+                            flocker:
+                              properties:
+                                datasetName:
+                                  type: string
+                                datasetUUID:
+                                  type: string
+                              type: object
+                            gcePersistentDisk:
+                              properties:
+                                fsType:
+                                  type: string
+                                partition:
+                                  format: int32
+                                  type: integer
+                                pdName:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                              required:
+                              - pdName
+                              type: object
+                            gitRepo:
+                              properties:
+                                directory:
+                                  type: string
+                                repository:
+                                  type: string
+                                revision:
+                                  type: string
+                              required:
+                              - repository
+                              type: object
+                            glusterfs:
+                              properties:
+                                endpoints:
+                                  type: string
+                                path:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                              required:
+                              - endpoints
+                              - path
+                              type: object
+                            hostPath:
+                              properties:
+                                path:
+                                  type: string
+                                type:
+                                  type: string
+                              required:
+                              - path
+                              type: object
+                            image:
+                              properties:
+                                pullPolicy:
+                                  type: string
+                                reference:
+                                  type: string
+                              type: object
+                            iscsi:
+                              properties:
+                                chapAuthDiscovery:
+                                  type: boolean
+                                chapAuthSession:
+                                  type: boolean
+                                fsType:
+                                  type: string
+                                initiatorName:
+                                  type: string
+                                iqn:
+                                  type: string
+                                iscsiInterface:
+                                  default: default
+                                  type: string
+                                lun:
+                                  format: int32
+                                  type: integer
+                                portals:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                readOnly:
+                                  type: boolean
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                targetPortal:
+                                  type: string
+                              required:
+                              - iqn
+                              - lun
+                              - targetPortal
+                              type: object
+                            name:
+                              type: string
+                            nfs:
+                              properties:
+                                path:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                server:
+                                  type: string
+                              required:
+                              - path
+                              - server
+                              type: object
+                            persistentVolumeClaim:
+                              properties:
+                                claimName:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                              required:
+                              - claimName
+                              type: object
+                            photonPersistentDisk:
+                              properties:
+                                fsType:
+                                  type: string
+                                pdID:
+                                  type: string
+                              required:
+                              - pdID
+                              type: object
+                            portworxVolume:
+                              properties:
+                                fsType:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                volumeID:
+                                  type: string
+                              required:
+                              - volumeID
+                              type: object
+                            projected:
+                              properties:
+                                defaultMode:
+                                  format: int32
+                                  type: integer
+                                sources:
+                                  items:
+                                    properties:
+                                      clusterTrustBundle:
+                                        properties:
+                                          labelSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                      x-kubernetes-list-type: atomic
+                                                  required:
+                                                  - key
+                                                  - operator
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          name:
+                                            type: string
+                                          optional:
+                                            type: boolean
+                                          path:
+                                            type: string
+                                          signerName:
+                                            type: string
+                                        required:
+                                        - path
+                                        type: object
+                                      configMap:
+                                        properties:
+                                          items:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                mode:
+                                                  format: int32
+                                                  type: integer
+                                                path:
+                                                  type: string
+                                              required:
+                                              - key
+                                              - path
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          name:
+                                            default: ""
+                                            type: string
+                                          optional:
+                                            type: boolean
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      downwardAPI:
+                                        properties:
+                                          items:
+                                            items:
+                                              properties:
+                                                fieldRef:
+                                                  properties:
+                                                    apiVersion:
+                                                      type: string
+                                                    fieldPath:
+                                                      type: string
+                                                  required:
+                                                  - fieldPath
+                                                  type: object
+                                                  x-kubernetes-map-type: atomic
+                                                mode:
+                                                  format: int32
+                                                  type: integer
+                                                path:
+                                                  type: string
+                                                resourceFieldRef:
+                                                  properties:
+                                                    containerName:
+                                                      type: string
+                                                    divisor:
+                                                      anyOf:
+                                                      - type: integer
+                                                      - type: string
+                                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                      x-kubernetes-int-or-string: true
+                                                    resource:
+                                                      type: string
+                                                  required:
+                                                  - resource
+                                                  type: object
+                                                  x-kubernetes-map-type: atomic
+                                              required:
+                                              - path
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        type: object
+                                      secret:
+                                        properties:
+                                          items:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                mode:
+                                                  format: int32
+                                                  type: integer
+                                                path:
+                                                  type: string
+                                              required:
+                                              - key
+                                              - path
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          name:
+                                            default: ""
+                                            type: string
+                                          optional:
+                                            type: boolean
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      serviceAccountToken:
+                                        properties:
+                                          audience:
+                                            type: string
+                                          expirationSeconds:
+                                            format: int64
+                                            type: integer
+                                          path:
+                                            type: string
+                                        required:
+                                        - path
+                                        type: object
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            quobyte:
+                              properties:
+                                group:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                registry:
+                                  type: string
+                                tenant:
+                                  type: string
+                                user:
+                                  type: string
+                                volume:
+                                  type: string
+                              required:
+                              - registry
+                              - volume
+                              type: object
+                            rbd:
+                              properties:
+                                fsType:
+                                  type: string
+                                image:
+                                  type: string
+                                keyring:
+                                  default: /etc/ceph/keyring
+                                  type: string
+                                monitors:
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                pool:
+                                  default: rbd
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                user:
+                                  default: admin
+                                  type: string
+                              required:
+                              - image
+                              - monitors
+                              type: object
+                            scaleIO:
+                              properties:
+                                fsType:
+                                  default: xfs
+                                  type: string
+                                gateway:
+                                  type: string
+                                protectionDomain:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                sslEnabled:
+                                  type: boolean
+                                storageMode:
+                                  default: ThinProvisioned
+                                  type: string
+                                storagePool:
+                                  type: string
+                                system:
+                                  type: string
+                                volumeName:
+                                  type: string
+                              required:
+                              - gateway
+                              - secretRef
+                              - system
+                              type: object
+                            secret:
+                              properties:
+                                defaultMode:
+                                  format: int32
+                                  type: integer
+                                items:
+                                  items:
+                                    properties:
+                                      key:
+                                        type: string
+                                      mode:
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        type: string
+                                    required:
+                                    - key
+                                    - path
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                optional:
+                                  type: boolean
+                                secretName:
+                                  type: string
+                              type: object
+                            storageos:
+                              properties:
+                                fsType:
+                                  type: string
+                                readOnly:
+                                  type: boolean
+                                secretRef:
+                                  properties:
+                                    name:
+                                      default: ""
+                                      type: string
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                volumeName:
+                                  type: string
+                                volumeNamespace:
+                                  type: string
+                              type: object
+                            vsphereVolume:
+                              properties:
+                                fsType:
+                                  type: string
+                                storagePolicyID:
+                                  type: string
+                                storagePolicyName:
+                                  type: string
+                                volumePath:
+                                  type: string
+                              required:
+                              - volumePath
+                              type: object
+                          required:
+                          - name
+                          type: object
+                        type: array
+                      sidecars:
+                        items:
+                          properties:
+                            args:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            command:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            env:
+                              items:
+                                properties:
+                                  name:
+                                    type: string
+                                  value:
+                                    type: string
+                                  valueFrom:
+                                    properties:
+                                      configMapKeyRef:
+                                        properties:
+                                          key:
+                                            type: string
+                                          name:
+                                            default: ""
+                                            type: string
+                                          optional:
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      fieldRef:
+                                        properties:
+                                          apiVersion:
+                                            type: string
+                                          fieldPath:
+                                            type: string
+                                        required:
+                                        - fieldPath
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      resourceFieldRef:
+                                        properties:
+                                          containerName:
+                                            type: string
+                                          divisor:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                            x-kubernetes-int-or-string: true
+                                          resource:
+                                            type: string
+                                        required:
+                                        - resource
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secretKeyRef:
+                                        properties:
+                                          key:
+                                            type: string
+                                          name:
+                                            default: ""
+                                            type: string
+                                          optional:
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                required:
+                                - name
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - name
+                              x-kubernetes-list-type: map
+                            envFrom:
+                              items:
+                                properties:
+                                  configMapRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                      optional:
+                                        type: boolean
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  prefix:
+                                    type: string
+                                  secretRef:
+                                    properties:
+                                      name:
+                                        default: ""
+                                        type: string
+                                      optional:
+                                        type: boolean
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            image:
+                              type: string
+                            imagePullPolicy:
+                              type: string
+                            lifecycle:
+                              properties:
+                                postStart:
+                                  properties:
+                                    exec:
+                                      properties:
+                                        command:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    httpGet:
+                                      properties:
+                                        host:
+                                          type: string
+                                        httpHeaders:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    sleep:
+                                      properties:
+                                        seconds:
+                                          format: int64
+                                          type: integer
+                                      required:
+                                      - seconds
+                                      type: object
+                                    tcpSocket:
+                                      properties:
+                                        host:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                  type: object
+                                preStop:
+                                  properties:
+                                    exec:
+                                      properties:
+                                        command:
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    httpGet:
+                                      properties:
+                                        host:
+                                          type: string
+                                        httpHeaders:
+                                          items:
+                                            properties:
+                                              name:
+                                                type: string
+                                              value:
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    sleep:
+                                      properties:
+                                        seconds:
+                                          format: int64
+                                          type: integer
+                                      required:
+                                      - seconds
+                                      type: object
+                                    tcpSocket:
+                                      properties:
+                                        host:
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                  type: object
+                              type: object
+                            livenessProbe:
+                              properties:
+                                exec:
+                                  properties:
+                                    command:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                failureThreshold:
+                                  format: int32
+                                  type: integer
+                                grpc:
+                                  properties:
+                                    port:
+                                      format: int32
+                                      type: integer
+                                    service:
+                                      default: ""
+                                      type: string
+                                  required:
+                                  - port
+                                  type: object
+                                httpGet:
+                                  properties:
+                                    host:
+                                      type: string
+                                    httpHeaders:
+                                      items:
+                                        properties:
+                                          name:
+                                            type: string
+                                          value:
+                                            type: string
+                                        required:
+                                        - name
+                                        - value
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    path:
+                                      type: string
+                                    port:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      x-kubernetes-int-or-string: true
+                                    scheme:
+                                      type: string
+                                  required:
+                                  - port
+                                  type: object
+                                initialDelaySeconds:
+                                  format: int32
+                                  type: integer
+                                periodSeconds:
+                                  format: int32
+                                  type: integer
+                                successThreshold:
+                                  format: int32
+                                  type: integer
+                                tcpSocket:
+                                  properties:
+                                    host:
+                                      type: string
+                                    port:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      x-kubernetes-int-or-string: true
+                                  required:
+                                  - port
+                                  type: object
+                                terminationGracePeriodSeconds:
+                                  format: int64
+                                  type: integer
+                                timeoutSeconds:
+                                  format: int32
+                                  type: integer
+                              type: object
+                            name:
+                              type: string
+                            ports:
+                              items:
+                                properties:
+                                  containerPort:
+                                    format: int32
+                                    type: integer
+                                  hostIP:
+                                    type: string
+                                  hostPort:
+                                    format: int32
+                                    type: integer
+                                  name:
+                                    type: string
+                                  protocol:
+                                    default: TCP
+                                    type: string
+                                required:
+                                - containerPort
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - containerPort
+                              - protocol
+                              x-kubernetes-list-type: map
+                            readinessProbe:
+                              properties:
+                                exec:
+                                  properties:
+                                    command:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                failureThreshold:
+                                  format: int32
+                                  type: integer
+                                grpc:
+                                  properties:
+                                    port:
+                                      format: int32
+                                      type: integer
+                                    service:
+                                      default: ""
+                                      type: string
+                                  required:
+                                  - port
+                                  type: object
+                                httpGet:
+                                  properties:
+                                    host:
+                                      type: string
+                                    httpHeaders:
+                                      items:
+                                        properties:
+                                          name:
+                                            type: string
+                                          value:
+                                            type: string
+                                        required:
+                                        - name
+                                        - value
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    path:
+                                      type: string
+                                    port:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      x-kubernetes-int-or-string: true
+                                    scheme:
+                                      type: string
+                                  required:
+                                  - port
+                                  type: object
+                                initialDelaySeconds:
+                                  format: int32
+                                  type: integer
+                                periodSeconds:
+                                  format: int32
+                                  type: integer
+                                successThreshold:
+                                  format: int32
+                                  type: integer
+                                tcpSocket:
+                                  properties:
+                                    host:
+                                      type: string
+                                    port:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      x-kubernetes-int-or-string: true
+                                  required:
+                                  - port
+                                  type: object
+                                terminationGracePeriodSeconds:
+                                  format: int64
+                                  type: integer
+                                timeoutSeconds:
+                                  format: int32
+                                  type: integer
+                              type: object
+                            resizePolicy:
+                              items:
+                                properties:
+                                  resourceName:
+                                    type: string
+                                  restartPolicy:
+                                    type: string
+                                required:
+                                - resourceName
+                                - restartPolicy
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            resources:
+                              properties:
+                                claims:
+                                  items:
+                                    properties:
+                                      name:
+                                        type: string
+                                      request:
+                                        type: string
+                                    required:
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - name
+                                  x-kubernetes-list-type: map
+                                limits:
+                                  additionalProperties:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  type: object
+                                requests:
+                                  additionalProperties:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  type: object
+                              type: object
+                            restartPolicy:
+                              type: string
+                            securityContext:
+                              properties:
+                                allowPrivilegeEscalation:
+                                  type: boolean
+                                appArmorProfile:
+                                  properties:
+                                    localhostProfile:
+                                      type: string
+                                    type:
+                                      type: string
+                                  required:
+                                  - type
+                                  type: object
+                                capabilities:
+                                  properties:
+                                    add:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    drop:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                privileged:
+                                  type: boolean
+                                procMount:
+                                  type: string
+                                readOnlyRootFilesystem:
+                                  type: boolean
+                                runAsGroup:
+                                  format: int64
+                                  type: integer
+                                runAsNonRoot:
+                                  type: boolean
+                                runAsUser:
+                                  format: int64
+                                  type: integer
+                                seLinuxOptions:
+                                  properties:
+                                    level:
+                                      type: string
+                                    role:
+                                      type: string
+                                    type:
+                                      type: string
+                                    user:
+                                      type: string
+                                  type: object
+                                seccompProfile:
+                                  properties:
+                                    localhostProfile:
+                                      type: string
+                                    type:
+                                      type: string
+                                  required:
+                                  - type
+                                  type: object
+                                windowsOptions:
+                                  properties:
+                                    gmsaCredentialSpec:
+                                      type: string
+                                    gmsaCredentialSpecName:
+                                      type: string
+                                    hostProcess:
+                                      type: boolean
+                                    runAsUserName:
+                                      type: string
+                                  type: object
+                              type: object
+                            startupProbe:
+                              properties:
+                                exec:
+                                  properties:
+                                    command:
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                failureThreshold:
+                                  format: int32
+                                  type: integer
+                                grpc:
+                                  properties:
+                                    port:
+                                      format: int32
+                                      type: integer
+                                    service:
+                                      default: ""
+                                      type: string
+                                  required:
+                                  - port
+                                  type: object
+                                httpGet:
+                                  properties:
+                                    host:
+                                      type: string
+                                    httpHeaders:
+                                      items:
+                                        properties:
+                                          name:
+                                            type: string
+                                          value:
+                                            type: string
+                                        required:
+                                        - name
+                                        - value
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    path:
+                                      type: string
+                                    port:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      x-kubernetes-int-or-string: true
+                                    scheme:
+                                      type: string
+                                  required:
+                                  - port
+                                  type: object
+                                initialDelaySeconds:
+                                  format: int32
+                                  type: integer
+                                periodSeconds:
+                                  format: int32
+                                  type: integer
+                                successThreshold:
+                                  format: int32
+                                  type: integer
+                                tcpSocket:
+                                  properties:
+                                    host:
+                                      type: string
+                                    port:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      x-kubernetes-int-or-string: true
+                                  required:
+                                  - port
+                                  type: object
+                                terminationGracePeriodSeconds:
+                                  format: int64
+                                  type: integer
+                                timeoutSeconds:
+                                  format: int32
+                                  type: integer
+                              type: object
+                            stdin:
+                              type: boolean
+                            stdinOnce:
+                              type: boolean
+                            terminationMessagePath:
+                              type: string
+                            terminationMessagePolicy:
+                              type: string
+                            tty:
+                              type: boolean
+                            volumeDevices:
+                              items:
+                                properties:
+                                  devicePath:
+                                    type: string
+                                  name:
+                                    type: string
+                                required:
+                                - devicePath
+                                - name
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - devicePath
+                              x-kubernetes-list-type: map
+                            volumeMounts:
+                              items:
+                                properties:
+                                  mountPath:
+                                    type: string
+                                  mountPropagation:
+                                    type: string
+                                  name:
+                                    type: string
+                                  readOnly:
+                                    type: boolean
+                                  recursiveReadOnly:
+                                    type: string
+                                  subPath:
+                                    type: string
+                                  subPathExpr:
+                                    type: string
+                                required:
+                                - mountPath
+                                - name
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - mountPath
+                              x-kubernetes-list-type: map
+                            workingDir:
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                      size:
+                        format: int32
+                        type: integer
+                      terminationGracePeriodSeconds:
+                        format: int64
+                        type: integer
+                      tolerations:
+                        items:
+                          properties:
+                            effect:
+                              type: string
+                            key:
+                              type: string
+                            operator:
+                              type: string
+                            tolerationSeconds:
+                              format: int64
+                              type: integer
+                            value:
+                              type: string
+                          type: object
+                        type: array
+                      topologySpreadConstraints:
+                        items:
+                          properties:
+                            labelSelector:
+                              properties:
+                                matchExpressions:
+                                  items:
+                                    properties:
+                                      key:
+                                        type: string
+                                      operator:
+                                        type: string
+                                      values:
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            maxSkew:
+                              format: int32
+                              type: integer
+                            minDomains:
+                              format: int32
+                              type: integer
+                            nodeAffinityPolicy:
+                              type: string
+                            nodeTaintsPolicy:
+                              type: string
+                            topologyKey:
+                              type: string
+                            whenUnsatisfiable:
+                              type: string
+                          required:
+                          - maxSkew
+                          - topologyKey
+                          - whenUnsatisfiable
+                          type: object
+                        type: array
+                    type: object
+                required:
+                - enabled
+                type: object
+              tls:
+                properties:
+                  allowInvalidCertificates:
+                    type: boolean
+                  certValidityDuration:
+                    type: string
+                  issuerConf:
+                    properties:
+                      group:
+                        type: string
+                      kind:
+                        type: string
+                      name:
+                        type: string
+                    required:
+                    - name
+                    type: object
+                  mode:
+                    type: string
+                type: object
+              unmanaged:
+                type: boolean
+              unsafeFlags:
+                properties:
+                  backupIfUnhealthy:
+                    type: boolean
+                  mongosSize:
+                    type: boolean
+                  replsetSize:
+                    type: boolean
+                  terminationGracePeriod:
+                    type: boolean
+                  tls:
+                    type: boolean
+                type: object
+              updateStrategy:
+                type: string
+              upgradeOptions:
+                properties:
+                  apply:
+                    type: string
+                  schedule:
+                    type: string
+                  setFCV:
+                    type: boolean
+                  versionServiceEndpoint:
+                    type: string
+                type: object
+              users:
+                items:
+                  properties:
+                    db:
+                      type: string
+                    name:
+                      type: string
+                    passwordSecretRef:
+                      properties:
+                        key:
+                          type: string
+                        name:
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    roles:
+                      items:
+                        properties:
+                          db:
+                            type: string
+                          name:
+                            type: string
+                        required:
+                        - db
+                        - name
+                        type: object
+                      type: array
+                  required:
+                  - name
+                  - roles
+                  type: object
+                type: array
+            required:
+            - image
+            type: object
+          status:
+            properties:
+              backup:
+                type: string
+              backupVersion:
+                type: string
+              conditions:
+                items:
+                  properties:
+                    lastTransitionTime:
+                      format: date-time
+                      type: string
+                    message:
+                      type: string
+                    reason:
+                      type: string
+                    status:
+                      type: string
+                    type:
+                      type: string
+                  required:
+                  - status
+                  - type
+                  type: object
+                type: array
+              host:
+                type: string
+              message:
+                type: string
+              mongoImage:
+                type: string
+              mongoVersion:
+                type: string
+              mongos:
+                properties:
+                  message:
+                    type: string
+                  ready:
+                    type: integer
+                  size:
+                    type: integer
+                  status:
+                    type: string
+                required:
+                - ready
+                - size
+                type: object
+              observedGeneration:
+                format: int64
+                type: integer
+              pmmStatus:
+                type: string
+              pmmVersion:
+                type: string
+              ready:
+                format: int32
+                type: integer
+              replsets:
+                additionalProperties:
+                  properties:
+                    added_as_shard:
+                      type: boolean
+                    clusterRole:
+                      type: string
+                    initialized:
+                      type: boolean
+                    members:
+                      additionalProperties:
+                        properties:
+                          name:
+                            type: string
+                          state:
+                            type: integer
+                          stateStr:
+                            type: string
+                        type: object
+                      type: object
+                    message:
+                      type: string
+                    ready:
+                      format: int32
+                      type: integer
+                    size:
+                      format: int32
+                      type: integer
+                    status:
+                      type: string
+                  required:
+                  - ready
+                  - size
+                  type: object
+                type: object
+              size:
+                format: int32
+                type: integer
+              state:
+                type: string
+            required:
+            - ready
+            - size
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
\ No newline at end of file
diff --git a/charts/percona/psmdb-operator/1.19.0/templates/NOTES.txt b/charts/percona/psmdb-operator/1.19.0/templates/NOTES.txt
new file mode 100644
index 000000000..f72a33c0d
--- /dev/null
+++ b/charts/percona/psmdb-operator/1.19.0/templates/NOTES.txt
@@ -0,0 +1,15 @@
+1. Percona Operator for MongoDB is deployed.
+  See if the operator Pod is running:
+
+    kubectl get pods -l app.kubernetes.io/name=psmdb-operator --namespace {{ .Release.Namespace }}
+
+  Check the operator logs if the Pod is not starting:
+
+    export POD=$(kubectl get pods -l app.kubernetes.io/name=psmdb-operator --namespace {{ .Release.Namespace }} --output name)
+    kubectl logs $POD --namespace={{ .Release.Namespace }}
+
+2. Deploy the database cluster from psmdb-db chart:
+
+    helm install my-db percona/psmdb-db --namespace={{ .Release.Namespace }}
+
+Read more in our documentation: https://docs.percona.com/percona-operator-for-mongodb/
diff --git a/charts/percona/psmdb-operator/1.19.0/templates/_helpers.tpl b/charts/percona/psmdb-operator/1.19.0/templates/_helpers.tpl
new file mode 100644
index 000000000..1bf81ed17
--- /dev/null
+++ b/charts/percona/psmdb-operator/1.19.0/templates/_helpers.tpl
@@ -0,0 +1,45 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "psmdb-operator.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "psmdb-operator.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "psmdb-operator.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "psmdb-operator.labels" -}}
+app.kubernetes.io/name: {{ include "psmdb-operator.name" . }}
+helm.sh/chart: {{ include "psmdb-operator.chart" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
diff --git a/charts/percona/psmdb-operator/1.19.0/templates/deployment.yaml b/charts/percona/psmdb-operator/1.19.0/templates/deployment.yaml
new file mode 100644
index 000000000..41f26c264
--- /dev/null
+++ b/charts/percona/psmdb-operator/1.19.0/templates/deployment.yaml
@@ -0,0 +1,108 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "psmdb-operator.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "psmdb-operator.labels" . | nindent 4 }}
+    {{- with .Values.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "psmdb-operator.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        app.kubernetes.io/name: {{ include "psmdb-operator.name" . }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        {{- with .Values.podLabels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      serviceAccountName: {{ include "psmdb-operator.fullname" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+    {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+          - containerPort: 8080
+            protocol: TCP
+            name: metrics
+          - containerPort: 8081
+            protocol: TCP
+            name: health
+          command:
+          - percona-server-mongodb-operator
+          {{- if .Values.securityContext.readOnlyRootFilesystem }}
+          volumeMounts:
+            - name: tmpdir
+              mountPath: /tmp
+          {{- end }}
+          env:
+            - name: LOG_STRUCTURED
+              value: "{{ .Values.logStructured }}"
+            - name: LOG_LEVEL
+              value: "{{ .Values.logLevel }}"
+            - name: WATCH_NAMESPACE
+              {{- if .Values.watchAllNamespaces }}
+              value: ""
+              {{- else }}
+              value: "{{ default .Release.Namespace .Values.watchNamespace }}"
+              {{- end }}
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: OPERATOR_NAME
+              value: {{ default "percona-server-mongodb-operator" .Values.operatorName }}
+            - name: RESYNC_PERIOD
+              value: "{{ .Values.env.resyncPeriod }}"
+            - name: DISABLE_TELEMETRY
+              value: "{{ .Values.disableTelemetry }}"
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: health
+          readinessProbe:
+            httpGet:
+              path: /healthz
+              port: health
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- if .Values.securityContext.readOnlyRootFilesystem }}
+      volumes:
+        - name: tmpdir
+          emptyDir: {}
+    {{- end }}
diff --git a/charts/percona/psmdb-operator/1.19.0/templates/namespace.yaml b/charts/percona/psmdb-operator/1.19.0/templates/namespace.yaml
new file mode 100644
index 000000000..cfc96d4d9
--- /dev/null
+++ b/charts/percona/psmdb-operator/1.19.0/templates/namespace.yaml
@@ -0,0 +1,11 @@
+{{ if and .Values.watchNamespace .Values.createNamespace }}
+{{ range ( split "," .Values.watchNamespace ) }}
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ trim . }}
+  annotations:
+    helm.sh/resource-policy: keep
+---
+{{ end }}
+{{ end }}
diff --git a/charts/percona/psmdb-operator/1.19.0/templates/role-binding.yaml b/charts/percona/psmdb-operator/1.19.0/templates/role-binding.yaml
new file mode 100644
index 000000000..a815869d4
--- /dev/null
+++ b/charts/percona/psmdb-operator/1.19.0/templates/role-binding.yaml
@@ -0,0 +1,41 @@
+{{- if .Values.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "psmdb-operator.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+---
+{{- end }}
+{{- if .Values.rbac.create }}
+{{- if or .Values.watchNamespace .Values.watchAllNamespaces }}
+kind: ClusterRoleBinding
+{{- else }}
+kind: RoleBinding
+{{- end }}
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: service-account-{{ include "psmdb-operator.fullname" . }}
+{{- if not (or .Values.watchNamespace .Values.watchAllNamespaces) }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
+  labels:
+{{ include "psmdb-operator.labels" . | indent 4 }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "psmdb-operator.fullname" . }}
+  {{- if or .Values.watchNamespace .Values.watchAllNamespaces }}
+  namespace: {{ .Release.Namespace }}
+  {{- end }}
+roleRef:
+  {{- if or .Values.watchNamespace .Values.watchAllNamespaces }}
+  kind: ClusterRole
+  {{- else }}
+  kind: Role
+  {{- end }}
+  name: {{ include "psmdb-operator.fullname" . }}
+  apiGroup: rbac.authorization.k8s.io
+{{- end }}
diff --git a/charts/percona/psmdb-operator/1.19.0/templates/role.yaml b/charts/percona/psmdb-operator/1.19.0/templates/role.yaml
new file mode 100644
index 000000000..4d65e6a7a
--- /dev/null
+++ b/charts/percona/psmdb-operator/1.19.0/templates/role.yaml
@@ -0,0 +1,167 @@
+{{- if .Values.rbac.create }}
+{{- if or .Values.watchNamespace .Values.watchAllNamespaces }}
+kind: ClusterRole
+{{- else }}
+kind: Role
+{{- end }}
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ include "psmdb-operator.fullname" . }}
+{{- if not (or .Values.watchNamespace .Values.watchAllNamespaces) }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
+  labels:
+{{ include "psmdb-operator.labels" . | indent 4 }}
+rules:
+  - apiGroups:
+    - psmdb.percona.com
+    resources:
+    - perconaservermongodbs
+    - perconaservermongodbs/status
+    - perconaservermongodbs/finalizers
+    - perconaservermongodbbackups
+    - perconaservermongodbbackups/status
+    - perconaservermongodbbackups/finalizers
+    - perconaservermongodbrestores
+    - perconaservermongodbrestores/status
+    - perconaservermongodbrestores/finalizers
+    verbs:
+    - get
+    - list
+    - watch
+    - create
+    - update
+    - patch
+    - delete
+{{- if or .Values.watchNamespace .Values.watchAllNamespaces }}
+  - apiGroups:
+    - admissionregistration.k8s.io
+    resources:
+    - validatingwebhookconfigurations
+    verbs:
+    - get
+    - list
+    - watch
+    - create
+    - update
+    - patch
+    - delete
+  - apiGroups:
+    - ""
+    resources:
+    - nodes
+    verbs:
+    - get
+    - list
+    - watch
+{{- end }}
+  - apiGroups:
+    - ""
+    resources:
+    - pods
+    - pods/exec
+    - services
+    - persistentvolumeclaims
+    - secrets
+    - configmaps
+    verbs:
+    - get
+    - list
+    - watch
+    - create
+    - update
+    - patch
+    - delete
+  - apiGroups:
+    - apps
+    resources:
+    - deployments
+    - replicasets
+    - statefulsets
+    verbs:
+    - get
+    - list
+    - watch
+    - create
+    - update
+    - patch
+    - delete
+  - apiGroups:
+    - batch
+    resources:
+    - cronjobs
+    verbs:
+    - get
+    - list
+    - watch
+    - create
+    - update
+    - patch
+    - delete
+  - apiGroups:
+    - policy
+    resources:
+    - poddisruptionbudgets
+    verbs:
+    - get
+    - list
+    - watch
+    - create
+    - update
+    - patch
+    - delete
+  - apiGroups:
+    - coordination.k8s.io
+    resources:
+    - leases
+    verbs:
+    - get
+    - list
+    - watch
+    - create
+    - update
+    - patch
+    - delete
+  - apiGroups:
+    - events.k8s.io
+    - ""
+    resources:
+    - events
+    verbs:
+    - get
+    - list
+    - watch
+    - create
+    - patch
+  - apiGroups:
+    - certmanager.k8s.io
+    - cert-manager.io
+    resources:
+    - issuers
+    - certificates
+    - certificaterequests
+    verbs:
+    - get
+    - list
+    - watch
+    - create
+    - update
+    - patch
+    - delete
+    - deletecollection
+  - apiGroups:
+    - net.gke.io
+    - multicluster.x-k8s.io
+    resources:
+    - serviceexports
+    - serviceimports
+    verbs:
+    - get
+    - list
+    - watch
+    - create
+    - update
+    - patch
+    - delete
+    - deletecollection
+{{- end }}
diff --git a/charts/percona/psmdb-operator/1.19.0/values.yaml b/charts/percona/psmdb-operator/1.19.0/values.yaml
new file mode 100644
index 000000000..71d6cb635
--- /dev/null
+++ b/charts/percona/psmdb-operator/1.19.0/values.yaml
@@ -0,0 +1,99 @@
+# Default values for psmdb-operator.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: percona/percona-server-mongodb-operator
+  tag: 1.19.0
+  pullPolicy: IfNotPresent
+
+# disableTelemetry: according to
+# https://docs.percona.com/percona-operator-for-mongodb/telemetry.html
+# this is how you can disable telemetry collection
+# default is false which means telemetry will be collected
+disableTelemetry: false
+
+# set if you want to specify a namespace to watch
+# defaults to `.Release.namespace` if left blank
+# multiple namespaces can be specified and separated by comma
+# watchNamespace:
+# set if you want that watched namespaces are created by helm
+# createNamespace: false
+
+# set if operator should be deployed in cluster wide mode. defaults to false
+watchAllNamespaces: false
+
+# rbac: settings for deployer RBAC creation
+rbac:
+  # rbac.create: if false RBAC resources should be in place
+  create: true
+
+# serviceAccount: settings for Service Accounts used by the deployer
+serviceAccount:
+  # serviceAccount.create: Whether to create the Service Accounts or not
+  create: true
+  # annotations to add to the service account
+  annotations: {}
+
+# annotations to add to the operator deployment
+annotations: {}
+
+# labels to add to the operator deployment
+labels: {}
+
+# annotations to add to the operator pod
+podAnnotations: {}
+  # prometheus.io/scrape: "true"
+  # prometheus.io/port: "8080"
+
+# labels to the operator pod
+podLabels: {}
+  
+podSecurityContext: {}
+  # runAsNonRoot: true
+  # runAsUser: 2
+  # runAsGroup: 2
+  # fsGroup: 2
+  # fsGroupChangePolicy: "OnRootMismatch"
+
+securityContext: {}
+  # allowPrivilegeEscalation: false
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # seccompProfile:
+  #   type: RuntimeDefault
+
+# set if you want to use a different operator name
+# defaults to `percona-server-mongodb-operator`
+# operatorName:
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+env:
+  resyncPeriod: 5s
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+logStructured: false
+logLevel: "INFO"
diff --git a/charts/speedscale/speedscale-operator/2.3.134/.helmignore b/charts/speedscale/speedscale-operator/2.3.134/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/speedscale/speedscale-operator/2.3.134/Chart.yaml b/charts/speedscale/speedscale-operator/2.3.134/Chart.yaml
new file mode 100644
index 000000000..efd5260f6
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/Chart.yaml
@@ -0,0 +1,27 @@
+annotations:
+  catalog.cattle.io/certified: partner
+  catalog.cattle.io/display-name: Speedscale Operator
+  catalog.cattle.io/kube-version: '>= 1.17.0-0'
+  catalog.cattle.io/release-name: speedscale-operator
+apiVersion: v1
+appVersion: 2.3.134
+description: Stress test your APIs with real world scenarios.  Collect and replay
+  traffic without scripting.
+home: https://speedscale.com
+icon: file://assets/icons/speedscale-operator.png
+keywords:
+- speedscale
+- test
+- testing
+- regression
+- reliability
+- load
+- replay
+- network
+- traffic
+kubeVersion: '>= 1.17.0-0'
+maintainers:
+- email: support@speedscale.com
+  name: Speedscale Support
+name: speedscale-operator
+version: 2.3.134
diff --git a/charts/speedscale/speedscale-operator/2.3.134/LICENSE b/charts/speedscale/speedscale-operator/2.3.134/LICENSE
new file mode 100644
index 000000000..b78723d62
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2021 Speedscale
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/charts/speedscale/speedscale-operator/2.3.134/README.md b/charts/speedscale/speedscale-operator/2.3.134/README.md
new file mode 100644
index 000000000..6ca25eed9
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/README.md
@@ -0,0 +1,111 @@
+![GitHub Tag](https://img.shields.io/github/v/tag/speedscale/operator-helm)
+
+
+# Speedscale Operator
+
+The [Speedscale](https://www.speedscale.com) Operator is a [Kubernetes operator](https://kubernetes.io/docs/concepts/extend-kubernetes/operator/)
+that watches for deployments to be applied to the cluster and takes action based on annotations. The operator
+can inject a proxy to capture traffic into or out of applications, or setup an isolation test environment around
+a deployment for testing. The operator itself is a deployment that will be always present on the cluster once
+the helm chart is installed.
+
+## Prerequisites
+
+- Kubernetes 1.20+
+- Helm 3+
+- Appropriate [network and firewall configuration](https://docs.speedscale.com/reference/networking) for Speedscale cloud and webhook traffic
+
+## Get Repo Info
+
+```bash
+helm repo add speedscale https://speedscale.github.io/operator-helm/
+helm repo update
+```
+
+_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._
+
+## Install Chart
+
+An API key is required. Sign up for a [free Speedscale trial](https://speedscale.com/free-trial/) if you do not have one.
+
+```bash
+helm install speedscale-operator speedscale/speedscale-operator \
+	-n speedscale \
+	--create-namespace \
+	--set apiKey=<YOUR-SPEEDSCALE-API-KEY> \
+	--set clusterName=<YOUR-CLUSTER-NAME>
+```
+
+_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._
+
+### Pre-install job failure
+
+We use pre-install job to check provided API key and provision some of the required resources.
+
+If the job failed during the installation, you'll see the following error during install:
+
+```
+Error: INSTALLATION FAILED: failed pre-install: job failed: BackoffLimitExceeded
+```
+
+You can inspect the logs using this command:
+
+```bash
+kubectl -n speedscale logs job/speedscale-operator-pre-install
+```
+
+After fixing the error, uninstall the helm release, delete the failed job
+and try installing again:
+
+```bash
+helm -n speedscale uninstall speedscale-operator
+kubectl -n speedscale delete job speedscale-operator-pre-install
+```
+
+## Uninstall Chart
+
+```bash
+helm -n speedscale uninstall speedscale-operator
+```
+
+This removes all the Kubernetes components associated with the chart and deletes the release.
+
+_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._
+
+CRDs created by this chart are not removed by default and should be manually cleaned up:
+
+```bash
+kubectl delete crd trafficreplays.speedscale.com
+```
+
+## Upgrading Chart
+
+```bash
+helm repo update
+helm -n speedscale upgrade speedscale-operator speedscale/speedscale-operator
+```
+
+Resources capturing traffic will need to be rolled to pick up the latest
+Speedscale sidecar. Use the rollout restart command for each namespace and
+resource type:
+
+```bash
+kubectl -n <namespace> rollout restart deployment
+```
+
+With Helm v3, CRDs created by this chart are not updated by default
+and should be manually updated.
+Consult also the [Helm Documentation on CRDs](https://helm.sh/docs/chart_best_practices/custom_resource_definitions).
+
+_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._
+
+### Upgrading an existing Release to a new version
+
+A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an
+incompatible breaking change needing manual actions.
+
+
+## Help
+
+Speedscale docs information available at [docs.speedscale.com](https://docs.speedscale.com) or join us
+on the [Speedscale community Slack](https://join.slack.com/t/speedscalecommunity/shared_invite/zt-x5rcrzn4-XHG1QqcHNXIM~4yozRrz8A)!
diff --git a/charts/speedscale/speedscale-operator/2.3.134/app-readme.md b/charts/speedscale/speedscale-operator/2.3.134/app-readme.md
new file mode 100644
index 000000000..6ca25eed9
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/app-readme.md
@@ -0,0 +1,111 @@
+![GitHub Tag](https://img.shields.io/github/v/tag/speedscale/operator-helm)
+
+
+# Speedscale Operator
+
+The [Speedscale](https://www.speedscale.com) Operator is a [Kubernetes operator](https://kubernetes.io/docs/concepts/extend-kubernetes/operator/)
+that watches for deployments to be applied to the cluster and takes action based on annotations. The operator
+can inject a proxy to capture traffic into or out of applications, or setup an isolation test environment around
+a deployment for testing. The operator itself is a deployment that will be always present on the cluster once
+the helm chart is installed.
+
+## Prerequisites
+
+- Kubernetes 1.20+
+- Helm 3+
+- Appropriate [network and firewall configuration](https://docs.speedscale.com/reference/networking) for Speedscale cloud and webhook traffic
+
+## Get Repo Info
+
+```bash
+helm repo add speedscale https://speedscale.github.io/operator-helm/
+helm repo update
+```
+
+_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._
+
+## Install Chart
+
+An API key is required. Sign up for a [free Speedscale trial](https://speedscale.com/free-trial/) if you do not have one.
+
+```bash
+helm install speedscale-operator speedscale/speedscale-operator \
+	-n speedscale \
+	--create-namespace \
+	--set apiKey=<YOUR-SPEEDSCALE-API-KEY> \
+	--set clusterName=<YOUR-CLUSTER-NAME>
+```
+
+_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._
+
+### Pre-install job failure
+
+We use pre-install job to check provided API key and provision some of the required resources.
+
+If the job failed during the installation, you'll see the following error during install:
+
+```
+Error: INSTALLATION FAILED: failed pre-install: job failed: BackoffLimitExceeded
+```
+
+You can inspect the logs using this command:
+
+```bash
+kubectl -n speedscale logs job/speedscale-operator-pre-install
+```
+
+After fixing the error, uninstall the helm release, delete the failed job
+and try installing again:
+
+```bash
+helm -n speedscale uninstall speedscale-operator
+kubectl -n speedscale delete job speedscale-operator-pre-install
+```
+
+## Uninstall Chart
+
+```bash
+helm -n speedscale uninstall speedscale-operator
+```
+
+This removes all the Kubernetes components associated with the chart and deletes the release.
+
+_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._
+
+CRDs created by this chart are not removed by default and should be manually cleaned up:
+
+```bash
+kubectl delete crd trafficreplays.speedscale.com
+```
+
+## Upgrading Chart
+
+```bash
+helm repo update
+helm -n speedscale upgrade speedscale-operator speedscale/speedscale-operator
+```
+
+Resources capturing traffic will need to be rolled to pick up the latest
+Speedscale sidecar. Use the rollout restart command for each namespace and
+resource type:
+
+```bash
+kubectl -n <namespace> rollout restart deployment
+```
+
+With Helm v3, CRDs created by this chart are not updated by default
+and should be manually updated.
+Consult also the [Helm Documentation on CRDs](https://helm.sh/docs/chart_best_practices/custom_resource_definitions).
+
+_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._
+
+### Upgrading an existing Release to a new version
+
+A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an
+incompatible breaking change needing manual actions.
+
+
+## Help
+
+Speedscale docs information available at [docs.speedscale.com](https://docs.speedscale.com) or join us
+on the [Speedscale community Slack](https://join.slack.com/t/speedscalecommunity/shared_invite/zt-x5rcrzn4-XHG1QqcHNXIM~4yozRrz8A)!
diff --git a/charts/speedscale/speedscale-operator/2.3.134/questions.yaml b/charts/speedscale/speedscale-operator/2.3.134/questions.yaml
new file mode 100644
index 000000000..29aee3895
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/questions.yaml
@@ -0,0 +1,9 @@
+questions:
+- variable: apiKey
+  default: "fffffffffffffffffffffffffffffffffffffffffffff"
+  description: "An API key is required to connect to the Speedscale cloud."
+  required: true
+  type: string
+  label: API Key
+  group: Authentication
+
diff --git a/charts/speedscale/speedscale-operator/2.3.134/templates/NOTES.txt b/charts/speedscale/speedscale-operator/2.3.134/templates/NOTES.txt
new file mode 100644
index 000000000..cabb59b17
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/templates/NOTES.txt
@@ -0,0 +1,12 @@
+Thank you for installing the Speedscale Operator!
+
+Next you'll need to add the Speedscale Proxy Sidecar to your deployments.
+See https://docs.speedscale.com/setup/sidecar/install/
+
+If upgrading use the rollout restart command for each namespace and resource
+type to ensure Speedscale sidecars are updated:
+
+  kubectl -n <namespace> rollout restart deployment
+
+Once your deployment is running the sidecar your service will show up on
+https://app.speedscale.com/.
diff --git a/charts/speedscale/speedscale-operator/2.3.134/templates/admission.yaml b/charts/speedscale/speedscale-operator/2.3.134/templates/admission.yaml
new file mode 100644
index 000000000..301748a61
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/templates/admission.yaml
@@ -0,0 +1,209 @@
+{{- $cacrt := "" -}}
+{{- $crt := "" -}}
+{{- $key := "" -}}
+{{- $s := (lookup "v1" "Secret" .Release.Namespace "speedscale-webhook-certs") -}}
+{{- if $s -}}
+{{- $cacrt = index $s.data "ca.crt" | default (index $s.data "tls.crt") | b64dec -}}
+{{- $crt = index $s.data "tls.crt" | b64dec -}}
+{{- $key = index $s.data "tls.key" | b64dec -}}
+{{ else }}
+{{- $altNames := list ( printf "speedscale-operator.%s" .Release.Namespace ) ( printf "speedscale-operator.%s.svc" .Release.Namespace ) -}}
+{{- $ca := genCA "speedscale-operator" 3650 -}}
+{{- $cert := genSignedCert "speedscale-operator" nil $altNames 3650 $ca -}}
+{{- $cacrt = $ca.Cert -}}
+{{- $crt = $cert.Cert -}}
+{{- $key = $cert.Key -}}
+{{- end -}}
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  creationTimestamp: null
+  name: speedscale-operator
+  annotations:
+    argocd.argoproj.io/hook: PreSync
+    {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 4}}
+    {{- end }}
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    caBundle: {{ $cacrt | b64enc }}
+    service:
+      name: speedscale-operator
+      namespace: {{ .Release.Namespace }}
+      path: /mutate
+  failurePolicy: Ignore
+  name: sidecar.speedscale.com
+  namespaceSelector:
+    matchExpressions:
+      - key: kubernetes.io/metadata.name
+        operator: "NotIn"
+        values:
+          - kube-system
+          - kube-node-lease
+    {{- if .Values.namespaceSelector }}
+      - key: kubernetes.io/metadata.name
+        operator: "In"
+        values:
+          {{- range .Values.namespaceSelector }}
+          - {{ . | quote }}
+          {{- end }}
+    {{- end }}
+  reinvocationPolicy: IfNeeded
+  rules:
+  - apiGroups:
+    - apps
+    - batch
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    - DELETE
+    resources:
+    - deployments
+    - statefulsets
+    - daemonsets
+    - jobs
+    - replicasets
+  - apiGroups:
+    - ""
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    - DELETE
+    resources:
+    - pods
+  - apiGroups:
+    - argoproj.io
+    apiVersions:
+    - "*"
+    operations:
+    - CREATE
+    - UPDATE
+    - DELETE
+    resources:
+    - rollouts
+  sideEffects: None
+  timeoutSeconds: 10
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  creationTimestamp: null
+  name: speedscale-operator-replay
+  annotations:
+    argocd.argoproj.io/hook: PreSync
+    {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 4}}
+    {{- end }}
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    caBundle: {{ $cacrt | b64enc }}
+    service:
+      name: speedscale-operator
+      namespace: {{ .Release.Namespace }}
+      path: /mutate-speedscale-com-v1-trafficreplay
+  failurePolicy: Fail
+  name: replay.speedscale.com
+  namespaceSelector:
+    matchExpressions:
+      - key: kubernetes.io/metadata.name
+        operator: "NotIn"
+        values:
+          - kube-system
+          - kube-node-lease
+    {{- if .Values.namespaceSelector }}
+      - key: kubernetes.io/metadata.name
+        operator: "In"
+        values:
+          {{- range .Values.namespaceSelector }}
+          - {{ . | quote }}
+          {{- end }}
+    {{- end }}
+  rules:
+  - apiGroups:
+    - speedscale.com
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - trafficreplays
+  sideEffects: None
+  timeoutSeconds: 10
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  creationTimestamp: null
+  name: speedscale-operator-replay
+  annotations:
+    argocd.argoproj.io/hook: PreSync
+    {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 4}}
+    {{- end }}
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    caBundle: {{ $cacrt | b64enc }}
+    service:
+      name: speedscale-operator
+      namespace: {{ .Release.Namespace }}
+      path: /validate-speedscale-com-v1-trafficreplay
+  failurePolicy: Fail
+  name: replay.speedscale.com
+  namespaceSelector:
+    matchExpressions:
+      - key: kubernetes.io/metadata.name
+        operator: "NotIn"
+        values:
+          - kube-system
+          - kube-node-lease
+    {{- if .Values.namespaceSelector }}
+      - key: kubernetes.io/metadata.name
+        operator: "In"
+        values:
+          {{- range .Values.namespaceSelector }}
+          - {{ . | quote }}
+          {{- end }}
+    {{- end }}
+  rules:
+  - apiGroups:
+    - speedscale.com
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    - DELETE
+    resources:
+    - trafficreplays
+  sideEffects: None
+  timeoutSeconds: 10
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  annotations:
+    helm.sh/hook: pre-install
+    helm.sh/hook-delete-policy: before-hook-creation
+    {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 4}}
+    {{- end }}
+  creationTimestamp: null
+  name: speedscale-webhook-certs
+  namespace: {{ .Release.Namespace }}
+type: kubernetes.io/tls
+data:
+  ca.crt: {{ $cacrt | b64enc }}
+  tls.crt: {{ $crt | b64enc }}
+  tls.key: {{ $key | b64enc }}
diff --git a/charts/speedscale/speedscale-operator/2.3.134/templates/configmap.yaml b/charts/speedscale/speedscale-operator/2.3.134/templates/configmap.yaml
new file mode 100644
index 000000000..eb963d3c0
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/templates/configmap.yaml
@@ -0,0 +1,43 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: speedscale-operator
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    argocd.argoproj.io/hook: PreSync
+    {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 4}}
+    {{- end }}
+data:
+  CLUSTER_NAME: {{ .Values.clusterName }}
+  IMAGE_PULL_POLICY: {{ .Values.image.pullPolicy }}
+  IMAGE_PULL_SECRETS: ""
+  IMAGE_REGISTRY: {{ .Values.image.registry }}
+  IMAGE_TAG: {{ .Values.image.tag }}
+  INSTANCE_ID: '{{- $cm := (lookup "v1" "ConfigMap" .Release.Namespace "speedscale-operator") -}}{{ if $cm }}{{ $cm.data.INSTANCE_ID }}{{ else }}{{ ( printf "%s-%s" .Values.clusterName uuidv4 ) }}{{ end }}'
+  LOG_LEVEL: {{ .Values.logLevel }}
+  SPEEDSCALE_DLP_CONFIG: {{ .Values.dlp.config }}
+  SPEEDSCALE_FILTER_RULE: {{ .Values.filterRule }}
+  TELEMETRY_INTERVAL: 60s
+  WITH_DLP: {{ .Values.dlp.enabled | quote }}
+  WITH_INSPECTOR: {{ .Values.dashboardAccess | quote }}
+  API_KEY_SECRET_NAME: {{ .Values.apiKeySecret | quote }}
+  DEPLOY_DEMO: {{ .Values.deployDemo | quote }}
+  GLOBAL_ANNOTATIONS: {{ .Values.globalAnnotations | toJson | quote }}
+  GLOBAL_LABELS: {{ .Values.globalLabels | toJson | quote }}
+  {{- if .Values.http_proxy }}
+  HTTP_PROXY: {{ .Values.http_proxy }}
+  {{- end }}
+  {{- if .Values.https_proxy }}
+  HTTPS_PROXY: {{ .Values.https_proxy }}
+  {{- end }}
+  {{- if .Values.no_proxy }}
+  NO_PROXY: {{ .Values.no_proxy }}
+  {{- end }}
+  PRIVILEGED_SIDECARS: {{ .Values.privilegedSidecars | quote }}
+  DISABLE_SMARTDNS: {{ .Values.disableSidecarSmartReverseDNS | quote }}
+  SIDECAR_CONFIG: {{ .Values.sidecar | toJson | quote }}
+  FORWARDER_CONFIG: {{ .Values.forwarder | toJson | quote }}
+  TEST_PREP_TIMEOUT: {{ .Values.operator.test_prep_timeout }}
+  CONTROL_PLANE_TIMEOUT: {{ .Values.operator.control_plane_timeout }}
diff --git a/charts/speedscale/speedscale-operator/2.3.134/templates/crds/agenttasks.yaml b/charts/speedscale/speedscale-operator/2.3.134/templates/crds/agenttasks.yaml
new file mode 100644
index 000000000..4d56f8950
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/templates/crds/agenttasks.yaml
@@ -0,0 +1,161 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.15.0
+  creationTimestamp: null
+  name: agenttasks.speedscale.com
+spec:
+  group: speedscale.com
+  names:
+    kind: AgentTask
+    listKind: AgentTaskList
+    plural: agenttasks
+    shortNames:
+    - sat
+    singular: agenttask
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.active
+      name: Active
+      type: boolean
+    - jsonPath: .spec.mode
+      name: Mode
+      type: string
+    - jsonPath: .status.conditions[-1:].message
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1
+    schema:
+      openAPIV3Schema:
+        description: AgentTask is the Schema for the agenttasks API.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec is the desired state of the AgentTask.
+            type: object
+          status:
+            default:
+              observedGeneration: -1
+            description: Status is the current state of the AgentTask.
+            properties:
+              active:
+                description: Active indicates whether this agent task is currently
+                  underway or not.
+                type: boolean
+              conditions:
+                items:
+                  description: "Condition contains details for one aspect of the current
+                    state of this API Resource.\n---\nThis struct is intended for
+                    direct use as an array at the field path .status.conditions.  For
+                    example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the
+                    observations of a foo's current state.\n\t    // Known .status.conditions.type
+                    are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    //
+                    +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t
+                    \   // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\"
+                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
+                    \   // other fields\n\t}"
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: |-
+                        type of condition in CamelCase or in foo.example.com/CamelCase.
+                        ---
+                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
+                        useful (see .node.status.conditions), the ability to deconflict is important.
+                        The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              observedGeneration:
+                description: ObservedGeneration is the last observed generation.
+                format: int64
+                type: integer
+              reconcileFailures:
+                description: |-
+                  ReconcileFailures is the number of times the agent task controller
+                  experienced an error during the reconciliation process.  The agent
+                  task will be deleted if too many errors occur.
+                format: int64
+                type: integer
+              reportID:
+                description: The ID of the agent report associated with this agent
+                  task.
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: null
+  storedVersions: null
diff --git a/charts/speedscale/speedscale-operator/2.3.134/templates/crds/trafficreplays.yaml b/charts/speedscale/speedscale-operator/2.3.134/templates/crds/trafficreplays.yaml
new file mode 100644
index 000000000..5a1158306
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/templates/crds/trafficreplays.yaml
@@ -0,0 +1,522 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.15.0
+  creationTimestamp: null
+  name: trafficreplays.speedscale.com
+spec:
+  group: speedscale.com
+  names:
+    kind: TrafficReplay
+    listKind: TrafficReplayList
+    plural: trafficreplays
+    shortNames:
+    - replay
+    singular: trafficreplay
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.active
+      name: Active
+      type: boolean
+    - jsonPath: .spec.mode
+      name: Mode
+      type: string
+    - jsonPath: .status.conditions[-1:].message
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1
+    schema:
+      openAPIV3Schema:
+        description: TrafficReplay is the Schema for the trafficreplays API.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec defines the desired state of TrafficReplay.
+            properties:
+              buildTag:
+                description: |-
+                  BuildTag links a unique tag, build hash, etc. to the generated
+                  traffic replay report. That way you can connect the report results to the
+                  version of the code that was tested.
+                type: string
+              cleanup:
+                description: |-
+                  Cleanup is the name of cleanup mode used for this TrafficReplay.  Set to
+                  "none" to leave resources in the state they were during the replay.  The
+                  default mode "inventory" will revert the environment to the state it was
+                  before the replay.
+                enum:
+                - inventory
+                - all
+                - none
+                type: string
+              collectLogs:
+                description: 'DEPRECATED: use TestReport.ActualConfig.Cluster.CollectLogs'
+                type: boolean
+              configChecksum:
+                description: |-
+                  ConfigChecksum, managed my the operator, is the SHA1 checksum of the
+                  configuration.
+                type: string
+              customURL:
+                description: |-
+                  CustomURL specifies a custom URL to send *ALL* traffic to.  Use
+                  Workload.CustomURI to send traffic to a specific URL for only that
+                  workload.
+                type: string
+              generatorLowData:
+                description: |-
+                  GeneratorLowData forces the generator into a high
+                  efficiency/low data output mode. This is ideal for high volume
+                  performance tests. Defaults to false.
+                  DEPRECATED
+                type: boolean
+              mode:
+                description: Mode is the name of replay mode used for this TrafficReplay.
+                enum:
+                - full-replay
+                - responder-only
+                - generator-only
+                type: string
+              needsReport:
+                description: 'DEPRECATED: replays always create reports'
+                type: boolean
+              proxyMode:
+                description: |-
+                  ProxyMode defines proxy operational mode used with injected sidecar.
+                  DEPRECATED
+                type: string
+              responderLowData:
+                description: |-
+                  ResponderLowData forces the responder into a high
+                  efficiency/low data output mode. This is ideal for high volume
+                  performance tests. Defaults to false.
+                  DEPRECATED
+                type: boolean
+              secretRefs:
+                description: |-
+                  SecretRefs hold the references to the secrets which contain
+                  various secrets like (e.g. short-lived JWTs to be used by the generator
+                  for authorization with HTTP calls).
+                items:
+                  description: |-
+                    LocalObjectReference contains enough information to locate the referenced
+                    Kubernetes resource object.
+                  properties:
+                    name:
+                      description: Name of the referent.
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+              sidecar:
+                description: |-
+                  Sidecar defines sidecar specific configuration.
+                  DEPRECATED: use Workloads
+                properties:
+                  inject:
+                    description: 'DEPRECATED: do not use'
+                    type: boolean
+                  patch:
+                    description: Patch is .yaml file patch for the Workload
+                    format: byte
+                    type: string
+                  tls:
+                    properties:
+                      in:
+                        description: In provides configuration for sidecar inbound
+                          TLS.
+                        properties:
+                          private:
+                            description: Private is the filename of the TLS inbound
+                              private key.
+                            type: string
+                          public:
+                            description: Public is the filename of the TLS inbound
+                              public key.
+                            type: string
+                          secret:
+                            description: Secret is a secret with the TLS keys to use
+                              for inbound traffic.
+                            type: string
+                        type: object
+                      mutual:
+                        description: Mutual provides configuration for sidecar mutual
+                          TLS.
+                        properties:
+                          private:
+                            description: Private is the filename of the mutual TLS
+                              private key.
+                            type: string
+                          public:
+                            description: Public is the filename of the mutual TLS
+                              public key.
+                            type: string
+                          secret:
+                            description: Secret is a secret with the mutual TLS keys.
+                            type: string
+                        type: object
+                      out:
+                        description: |-
+                          Out enables or disables TLS out on the
+                          sidecar during replay.
+                        type: boolean
+                    type: object
+                type: object
+              snapshotID:
+                description: |-
+                  SnapshotID is the id of the traffic snapshot for this
+                  TrafficReplay.
+                type: string
+              testConfigID:
+                description: |-
+                  TestConfigID is the id of the replay configuration to be used
+                  by the generator and responder for the TrafficReplay.
+                type: string
+              timeout:
+                description: |-
+                  Timeout is the time to wait for replay test to finish. Defaults
+                  to value of the `TIMEOUT` setting of the operator.
+                type: string
+              ttlAfterReady:
+                description: |-
+                  TTLAfterReady provides a TTL (time to live) mechanism to limit
+                  the lifetime of TrafficReplay object that have finished the execution and
+                  reached its final state (either complete or failed).
+                type: string
+              workloadRef:
+                description: |-
+                  WorkloadRef is the reference to the target workload (SUT) for
+                  TrafficReplay. The operations will be performed in the namespace of the
+                  target object.
+                  DEPRECATED: use Workloads
+                properties:
+                  apiVersion:
+                    description: API version of the referenced object.
+                    type: string
+                  kind:
+                    description: Kind of the referenced object.  Defaults to "Deployment".
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referenced object.  Required when defining for a test unless a
+                      custom URI is provided.  Always required when defining mocks.
+                    type: string
+                  namespace:
+                    description: Namespace of the referenced object. Defaults to the
+                      TrafficReplay namespace.
+                    type: string
+                required:
+                - name
+                type: object
+              workloads:
+                description: |-
+                  Workloads define target workloads (SUT) for a TrafficReplay. Many
+                  workloads may be provided, or none.  Workloads may be modified and
+                  restarted during replay to configure communication with a responder.
+                items:
+                  description: |-
+                    Workload represents a Kubernetes workload to be targeted during replay and
+                    associated settings.
+                  properties:
+                    customURI:
+                      description: |-
+                        CustomURI will be target of the traffic instead of directly targeting
+                        workload.  This is required if a Ref is not specified.
+                      type: string
+                    inTrafficKey:
+                      description: 'DEPRECATED: use Tests'
+                      type: string
+                    inTrafficKeys:
+                      description: 'DEPRECATED: use Tests'
+                      items:
+                        type: string
+                      type: array
+                    mocks:
+                      description: |-
+                        Mocks are strings used to identify slices of outbound snapshot traffic to
+                        mock for this workload and maps directly to a snapshot's `OutTraffic`
+                        field.  Snapshot egress traffic can be split across multiple slices where
+                        each slice contains part of the traffic.  A workload may specify multiple
+                        keys and multiple workloads may specify the same key.
+
+
+                        Only the traffic slices defined here will be mocked.  A workload with no
+                        keys defined will not mock any traffic.  Pass '*' to mock all traffic.
+
+
+                        Mock strings may only match part of the snapshot's `OutTraffic` key if the
+                        string matches exactly one key. For example, the test string
+                        `foo.example.com` would match the `OutTraffic` key of
+                        my-service:foo.example.com:8080, as long as no other keys would match
+                        `foo.example.com`.  Multiple mocks must be specified for multiple keys
+                        unless using '*'.
+                      items:
+                        type: string
+                      type: array
+                    outTrafficKeys:
+                      description: 'DEPRECATED: use Mocks'
+                      items:
+                        type: string
+                      type: array
+                    ref:
+                      description: |-
+                        Ref is a reference to a cluster workload, like a service, deployment or
+                        statefulset.  This is required unless a CustomURI is specified.
+                      properties:
+                        apiVersion:
+                          description: API version of the referenced object.
+                          type: string
+                        kind:
+                          description: Kind of the referenced object.  Defaults to
+                            "Deployment".
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referenced object.  Required when defining for a test unless a
+                            custom URI is provided.  Always required when defining mocks.
+                          type: string
+                        namespace:
+                          description: Namespace of the referenced object. Defaults
+                            to the TrafficReplay namespace.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    routing:
+                      description: Routing configures how workloads route egress traffic
+                        to responders
+                      enum:
+                      - hostalias
+                      - nat
+                      type: string
+                    sidecar:
+                      description: |-
+                        TODO: this is not implemented, come back and replace deprecated Sidecar with workload specific settings
+                        Sidecar defines sidecar specific configuration.
+                      properties:
+                        inject:
+                          description: 'DEPRECATED: do not use'
+                          type: boolean
+                        patch:
+                          description: Patch is .yaml file patch for the Workload
+                          format: byte
+                          type: string
+                        tls:
+                          properties:
+                            in:
+                              description: In provides configuration for sidecar inbound
+                                TLS.
+                              properties:
+                                private:
+                                  description: Private is the filename of the TLS
+                                    inbound private key.
+                                  type: string
+                                public:
+                                  description: Public is the filename of the TLS inbound
+                                    public key.
+                                  type: string
+                                secret:
+                                  description: Secret is a secret with the TLS keys
+                                    to use for inbound traffic.
+                                  type: string
+                              type: object
+                            mutual:
+                              description: Mutual provides configuration for sidecar
+                                mutual TLS.
+                              properties:
+                                private:
+                                  description: Private is the filename of the mutual
+                                    TLS private key.
+                                  type: string
+                                public:
+                                  description: Public is the filename of the mutual
+                                    TLS public key.
+                                  type: string
+                                secret:
+                                  description: Secret is a secret with the mutual
+                                    TLS keys.
+                                  type: string
+                              type: object
+                            out:
+                              description: |-
+                                Out enables or disables TLS out on the
+                                sidecar during replay.
+                              type: boolean
+                          type: object
+                      type: object
+                    tests:
+                      description: |-
+                        Tests are strings used to identify slices of inbound snapshot traffic this
+                        workload is targeting and maps directly to a snapshot's `InTraffic` field.
+                        Snapshot ingress traffic can be split across multiple slices where each
+                        slice contains part of the traffic.  A key must only be specified once
+                        across all workloads, but a workload may specify multiple keys.  Pass '*'
+                        to match all keys.
+
+
+                        Test strings may only match part of the snapshot's `InTraffic` key if the
+                        string matches exactly one key. For example, the test string
+                        `foo.example.com` would match the `InTraffic` key of
+                        my-service:foo.example.com:8080, as long as no other keys would match
+                        `foo.example.com`
+
+
+                        This field is optional in the spec to provide support for single-workload
+                        and legacy replays, but must be specified for multi-workload replays in
+                        order to provide deterministic replay configuration.
+                      items:
+                        type: string
+                      type: array
+                  type: object
+                type: array
+            required:
+            - snapshotID
+            - testConfigID
+            type: object
+          status:
+            default:
+              observedGeneration: -1
+            description: Status defines the observed state of TrafficReplay.
+            properties:
+              active:
+                description: Active indicates whether this traffic replay is currently
+                  underway or not.
+                type: boolean
+              conditions:
+                items:
+                  description: "Condition contains details for one aspect of the current
+                    state of this API Resource.\n---\nThis struct is intended for
+                    direct use as an array at the field path .status.conditions.  For
+                    example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the
+                    observations of a foo's current state.\n\t    // Known .status.conditions.type
+                    are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    //
+                    +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t
+                    \   // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\"
+                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
+                    \   // other fields\n\t}"
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: |-
+                        type of condition in CamelCase or in foo.example.com/CamelCase.
+                        ---
+                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
+                        useful (see .node.status.conditions), the ability to deconflict is important.
+                        The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              finishedTime:
+                description: Information when the traffic replay has finished.
+                format: date-time
+                type: string
+              initializedTime:
+                description: Information when the test environment was successfully
+                  prepared.
+                format: date-time
+                type: string
+              lastHeartbeatTime:
+                description: 'DEPRECATED: will not be set'
+                format: date-time
+                type: string
+              observedGeneration:
+                description: ObservedGeneration is the last observed generation.
+                format: int64
+                type: integer
+              reconcileFailures:
+                description: |-
+                  ReconcileFailures is the number of times the traffic replay controller
+                  experienced an error during the reconciliation process.  The traffic
+                  replay will be deleted if too many errors occur.
+                format: int64
+                type: integer
+              reportID:
+                description: The ID of the traffic replay report created.
+                type: string
+              reportURL:
+                description: The URL to the traffic replay report.
+                type: string
+              startedTime:
+                description: Information when the traffic replay has started.
+                format: date-time
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: null
+  storedVersions: null
diff --git a/charts/speedscale/speedscale-operator/2.3.134/templates/deployments.yaml b/charts/speedscale/speedscale-operator/2.3.134/templates/deployments.yaml
new file mode 100644
index 000000000..e5f329257
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/templates/deployments.yaml
@@ -0,0 +1,132 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    operator.speedscale.com/ignore: "true"
+    {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 4}}
+    {{- end }}
+  labels:
+    app: speedscale-operator
+    controlplane.speedscale.com/component: operator
+    {{- if .Values.globalLabels }}
+{{ toYaml .Values.globalLabels | indent 4}}
+    {{- end }}
+  name: speedscale-operator
+  namespace: {{ .Release.Namespace }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: speedscale-operator
+      controlplane.speedscale.com/component: operator
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      annotations:
+        {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 8}}
+        {{- end }}
+      labels:
+        app: speedscale-operator
+        controlplane.speedscale.com/component: operator
+        {{- if .Values.globalLabels }}
+{{ toYaml .Values.globalLabels | indent 8}}
+        {{- end }}
+    spec:
+      containers:
+      - command:
+        - /operator
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        envFrom:
+        - configMapRef:
+            name: speedscale-operator
+        # https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#container-v1-core
+        # When a key exists in multiple sources, the value associated with the last source will take precedence.
+        # Values defined by an Env with a duplicate key will take precedence.
+        - configMapRef:
+            name: speedscale-operator-override
+            optional: true
+        - secretRef:
+            name: '{{ ne .Values.apiKeySecret "" | ternary .Values.apiKeySecret "speedscale-apikey" }}'
+            optional: false
+        image: '{{ .Values.image.registry }}/operator:{{ .Values.image.tag }}'
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        livenessProbe:
+          failureThreshold: 5
+          httpGet:
+            path: /healthz
+            port: health-check
+            scheme: HTTP
+          initialDelaySeconds: 30
+          periodSeconds: 30
+          successThreshold: 1
+          timeoutSeconds: 5
+        name: operator
+        ports:
+        - containerPort: 443
+          name: webhook-server
+        - containerPort: 8081
+          name: health-check
+        readinessProbe:
+          failureThreshold: 10
+          httpGet:
+            path: /readyz
+            port: health-check
+            scheme: HTTP
+          initialDelaySeconds: 5
+          periodSeconds: 5
+          successThreshold: 1
+          timeoutSeconds: 5
+        resources: {{- toYaml .Values.operator.resources | nindent 10 }}
+        securityContext:
+          allowPrivilegeEscalation: false
+          privileged: false
+          readOnlyRootFilesystem: true
+          runAsNonRoot: false
+          # Run as root to bind 443 https://github.com/kubernetes/kubernetes/issues/56374
+          runAsUser: 0
+        volumeMounts:
+        - mountPath: /tmp
+          name: tmp
+        - mountPath: /tmp/k8s-webhook-server/serving-certs
+          name: webhook-certs
+          readOnly: true
+        - mountPath: /etc/ssl/speedscale
+          name: speedscale-tls-out
+          readOnly: true
+      hostNetwork: {{ .Values.hostNetwork }}
+      securityContext:
+        runAsNonRoot: true
+      serviceAccountName: speedscale-operator
+      terminationGracePeriodSeconds: 10
+      volumes:
+      - emptyDir: {}
+        name: tmp
+      - name: webhook-certs
+        secret:
+          secretName: speedscale-webhook-certs
+      - name: speedscale-tls-out
+        secret:
+          secretName: speedscale-certs
+      {{- if .Values.affinity }}
+      affinity: {{ toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations: {{ toYaml .Values.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
diff --git a/charts/speedscale/speedscale-operator/2.3.134/templates/hooks.yaml b/charts/speedscale/speedscale-operator/2.3.134/templates/hooks.yaml
new file mode 100644
index 000000000..b6b080f3e
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/templates/hooks.yaml
@@ -0,0 +1,79 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  annotations:
+    helm.sh/hook: pre-install
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+    helm.sh/hook-weight: "4"
+    {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 4}}
+    {{- end }}
+  creationTimestamp: null
+  name: speedscale-operator-pre-install
+  namespace: {{ .Release.Namespace }}
+  labels:
+  {{- if .Values.globalLabels }}
+{{ toYaml .Values.globalLabels | indent 4}}
+    {{- end }}
+spec:
+  backoffLimit: 0
+  ttlSecondsAfterFinished: 30
+  template:
+    metadata:
+      annotations:
+        {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 8}}
+        {{- end }}
+      creationTimestamp: null
+      labels:
+        {{- if .Values.globalLabels }}
+{{ toYaml .Values.globalLabels | indent 8}}
+        {{- end }}
+    spec:
+      containers:
+      - args:
+        - |-
+          # ensure valid settings before the chart reports a successfull install
+          {{- if .Values.http_proxy }}
+          HTTP_PROXY={{ .Values.http_proxy | quote }} \
+          {{- end }}
+          {{- if .Values.https_proxy }}
+          HTTPS_PROXY={{ .Values.https_proxy | quote }} \
+          {{- end }}
+          {{- if .Values.no_proxy }}
+          NO_PROXY={{ .Values.no_proxy | quote }} \
+          {{- end }}
+          speedctl init --overwrite --no-rcfile-update \
+          --api-key $SPEEDSCALE_API_KEY \
+          --app-url $SPEEDSCALE_APP_URL
+
+          # in case we're in istio
+          curl -X POST http://127.0.0.1:15000/quitquitquit || true
+        command:
+        - sh
+        - -c
+        envFrom:
+        - secretRef:
+            name: '{{ ne .Values.apiKeySecret "" | ternary .Values.apiKeySecret "speedscale-apikey" }}'
+            optional: false
+        image: '{{ .Values.image.registry }}/speedscale-cli:{{ .Values.image.tag }}'
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        name: speedscale-cli
+        resources:
+          limits:
+            memory: "128M"
+            cpu: "1"
+          requests:
+            memory: "64M"
+            cpu: "100m"
+      restartPolicy: Never
+      {{- if .Values.affinity }}
+      affinity: {{ toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations: {{ toYaml .Values.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
diff --git a/charts/speedscale/speedscale-operator/2.3.134/templates/rbac.yaml b/charts/speedscale/speedscale-operator/2.3.134/templates/rbac.yaml
new file mode 100644
index 000000000..fc2a88683
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/templates/rbac.yaml
@@ -0,0 +1,246 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  creationTimestamp: null
+  name: speedscale-operator
+  {{- if .Values.globalAnnotations }}
+  annotations: {{ toYaml .Values.globalAnnotations | nindent 4 }}
+  {{- end }}
+rules:
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  - statefulsets
+  - daemonsets
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - apps
+  resources:
+  - replicasets
+  verbs:
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - batch
+  resources:
+  - jobs
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - admissionregistration.k8s.io
+  resources:
+  - mutatingwebhookconfigurations
+  - validatingwebhookconfigurations
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - clusterrolebindings
+  - clusterroles
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - secrets
+  - pods
+  - services
+  - serviceaccounts
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - pods/log
+  verbs:
+  - get
+  - list
+- apiGroups:
+    - ""
+  resources:
+    - events
+  verbs:
+    - get
+    - list
+    - watch
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - metrics.k8s.io
+  resources:
+  - pods
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - rolebindings
+  - roles
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - networking.istio.io
+  resources:
+  - envoyfilters
+  - sidecars
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - security.istio.io
+  resources:
+  - peerauthentications
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - speedscale.com
+  resources:
+  - trafficreplays
+  - agenttasks
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - speedscale.com
+  resources:
+  - trafficreplays/status
+  - agenttasks/status
+  verbs:
+  - get
+  - update
+  - patch
+- apiGroups:
+  - argoproj.io
+  resources:
+  - rollouts
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: speedscale-operator
+  {{- if .Values.globalAnnotations }}
+  annotations: {{ toYaml .Values.globalAnnotations | nindent 4 }}
+  {{- end }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: speedscale-operator
+subjects:
+- kind: ServiceAccount
+  name: speedscale-operator
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: v1
+automountServiceAccountToken: true
+kind: ServiceAccount
+metadata:
+  creationTimestamp: null
+  labels:
+    app: speedscale-operator
+    controlplane.speedscale.com/component: operator
+  name: speedscale-operator
+  namespace: {{ .Release.Namespace }}
+  {{- if .Values.globalAnnotations }}
+  annotations: {{ toYaml .Values.globalAnnotations | nindent 4 }}
+  {{- end }}
diff --git a/charts/speedscale/speedscale-operator/2.3.134/templates/secrets.yaml b/charts/speedscale/speedscale-operator/2.3.134/templates/secrets.yaml
new file mode 100644
index 000000000..1fb6999e4
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/templates/secrets.yaml
@@ -0,0 +1,18 @@
+---
+{{ if .Values.apiKey }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: speedscale-apikey
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    helm.sh/hook: pre-install
+    helm.sh/hook-weight: "3"
+    {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 4}}
+    {{- end }}
+type: Opaque
+data:
+  SPEEDSCALE_API_KEY: {{ .Values.apiKey | b64enc }}
+  SPEEDSCALE_APP_URL: {{ .Values.appUrl | b64enc }}
+{{ end }}
diff --git a/charts/speedscale/speedscale-operator/2.3.134/templates/services.yaml b/charts/speedscale/speedscale-operator/2.3.134/templates/services.yaml
new file mode 100644
index 000000000..f9da2c25c
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/templates/services.yaml
@@ -0,0 +1,22 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  labels:
+    app: speedscale-operator
+    controlplane.speedscale.com/component: operator
+  name: speedscale-operator
+  namespace: {{ .Release.Namespace }}
+  {{- if .Values.globalAnnotations }}
+  annotations: {{ toYaml .Values.globalAnnotations | nindent 4 }}
+  {{- end }}
+spec:
+  ports:
+  - port: 443
+    protocol: TCP
+  selector:
+    app: speedscale-operator
+    controlplane.speedscale.com/component: operator
+status:
+  loadBalancer: {}
diff --git a/charts/speedscale/speedscale-operator/2.3.134/templates/tls.yaml b/charts/speedscale/speedscale-operator/2.3.134/templates/tls.yaml
new file mode 100644
index 000000000..4e293999e
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/templates/tls.yaml
@@ -0,0 +1,189 @@
+{{- $crt := "" -}}
+{{- $key := "" -}}
+{{- $s := (lookup "v1" "Secret" .Release.Namespace "speedscale-certs") -}}
+{{- if $s -}}
+{{- $crt = index $s.data "tls.crt" | b64dec -}}
+{{- $key = index $s.data "tls.key" | b64dec -}}
+{{ else }}
+{{- $cert := genCA "Speedscale" 3650 -}}
+{{- $crt = $cert.Cert -}}
+{{- $key = $cert.Key -}}
+{{- end -}}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  annotations:
+    helm.sh/hook: pre-install
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+    helm.sh/hook-weight: "5"
+    {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 4}}
+    {{- end }}
+  creationTimestamp: null
+  name: speedscale-operator-create-jks
+  namespace: {{ .Release.Namespace }}
+  labels:
+  {{- if .Values.globalLabels }}
+{{ toYaml .Values.globalLabels | indent 4}}
+    {{- end }}
+spec:
+  backoffLimit: 0
+  ttlSecondsAfterFinished: 30
+  template:
+    metadata:
+      annotations:
+        {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 8}}
+        {{- end }}
+      creationTimestamp: null
+      labels:
+        {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 8}}
+        {{- end }}
+    spec:
+      containers:
+      - args:
+        - |-
+            keytool -keystore /usr/lib/jvm/jre/lib/security/cacerts  -importcert -noprompt -trustcacerts  -storepass changeit  -alias speedscale -file /etc/ssl/speedscale/tls.crt
+            kubectl -n ${POD_NAMESPACE} delete secret speedscale-jks || true
+            kubectl -n ${POD_NAMESPACE} create secret generic speedscale-jks --from-file=cacerts.jks=/usr/lib/jvm/jre/lib/security/cacerts
+
+            # in case we're in istio
+            curl -X POST http://127.0.0.1:15000/quitquitquit || true
+        command:
+        - sh
+        - -c
+        volumeMounts:
+        - mountPath: /etc/ssl/speedscale
+          name: speedscale-tls-out
+          readOnly: true
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        envFrom:
+        - secretRef:
+            name: '{{ ne .Values.apiKeySecret "" | ternary .Values.apiKeySecret "speedscale-apikey" }}'
+            optional: false
+        image: '{{ .Values.image.registry }}/amazoncorretto'
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        name: create-jks
+        resources:
+          limits:
+            memory: "256M"
+            cpu: "1"
+          requests:
+            memory: "128M"
+            cpu: "200m"
+      restartPolicy: Never
+      serviceAccountName: speedscale-operator-provisioning
+      volumes:
+      - name: speedscale-tls-out
+        secret:
+          secretName: speedscale-certs
+      {{- if .Values.affinity }}
+      affinity: {{ toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations: {{ toYaml .Values.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+---
+apiVersion: v1
+automountServiceAccountToken: true
+kind: ServiceAccount
+metadata:
+  annotations:
+    helm.sh/hook: pre-install
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+    helm.sh/hook-weight: "1"
+    {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 4}}
+    {{- end }}
+  creationTimestamp: null
+  labels:
+    app: speedscale-operator
+    controlplane.speedscale.com/component: operator
+  name: speedscale-operator-provisioning
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  annotations:
+    helm.sh/hook: pre-install
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+    helm.sh/hook-weight: "2"
+  creationTimestamp: null
+  name: speedscale-operator-provisioning
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - admissionregistration.k8s.io
+  resources:
+  - mutatingwebhookconfigurations
+  - validatingwebhookconfigurations
+  verbs:
+  - create
+  - delete
+  - deletecollection
+  - get
+  - list
+  - patch
+  - update
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  annotations:
+    helm.sh/hook: pre-install
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+    helm.sh/hook-weight: "3"
+    {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 4}}
+    {{- end }}
+  creationTimestamp: null
+  name: speedscale-operator-provisioning
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: speedscale-operator-provisioning
+subjects:
+- kind: ServiceAccount
+  name: speedscale-operator-provisioning
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  annotations:
+    helm.sh/hook: pre-install
+    helm.sh/hook-delete-policy: before-hook-creation
+    {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 4}}
+    {{- end }}
+  creationTimestamp: null
+  name: speedscale-certs
+  namespace: {{ .Release.Namespace }}
+type: kubernetes.io/tls
+data:
+  tls.crt: {{ $crt | b64enc }}
+  tls.key: {{ $key | b64enc }}
diff --git a/charts/speedscale/speedscale-operator/2.3.134/values.yaml b/charts/speedscale/speedscale-operator/2.3.134/values.yaml
new file mode 100644
index 000000000..aac127f19
--- /dev/null
+++ b/charts/speedscale/speedscale-operator/2.3.134/values.yaml
@@ -0,0 +1,138 @@
+# An API key is required to connect to the Speedscale cloud.
+# If you need a key email support@speedscale.com.
+apiKey: ""
+
+# A secret name can be referenced instead of the api key itself.
+# The secret must be of the format:
+#
+# type: Opaque
+# data:
+#   SPEEDSCALE_API_KEY: <key>
+#   SPEEDSCALE_APP_URL: <appUrl>
+apiKeySecret: ""
+
+# Speedscale domain to use.
+appUrl: "app.speedscale.com"
+
+# The name of your cluster.
+clusterName: "my-cluster"
+
+# Speedscale components image settings.
+image:
+  registry: gcr.io/speedscale
+  tag: v2.3.134
+  pullPolicy: Always
+
+# Log level for Speedscale components.
+logLevel: "info"
+
+# Namespaces to be watched by Speedscale Operator as a list of names.
+namespaceSelector: []
+
+# Instructs operator to deploy resources necessary to interact with your cluster from the Speedscale dashboard.
+dashboardAccess: true
+
+# Filter Rule to apply to the Speedscale Forwarder
+filterRule: "standard"
+
+# Data Loss Prevention settings.
+dlp:
+  # Instructs operator to enable data loss prevention features
+  enabled: false
+
+  # Configuration for data loss prevention
+  config: "standard"
+
+# If the operator pod/webhooks need to be on the host network.
+# This is only needed if the control plane cannot connect directly to a pod
+# for eg. if Calico is used as EKS's default networking
+# https://docs.tigera.io/calico/3.25/getting-started/kubernetes/managed-public-cloud/eks#install-eks-with-calico-networking
+hostNetwork: false
+
+# A set of annotations to be applied to all Speedscale related deployments,
+# services, jobs, pods, etc.
+#
+# Example:
+# annotation.first: value
+# annotation.second: value
+globalAnnotations: {}
+
+# A set of labels to be applied to all Speedscale related deployments,
+# services, jobs, pods, etc.
+#
+# Example:
+# label1: value
+# label2: value
+globalLabels: {}
+
+# A full affinity object as detailed: https://kubernetes.io/docs/tasks/configure-pod-container/assign-pods-nodes-using-node-affinity
+affinity: {}
+
+# The list of tolerations as detailed: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
+tolerations: []
+
+# A nodeselector object as detailed: https://kubernetes.io/docs/tasks/configure-pod-container/assign-pods-nodes/
+nodeSelector: {}
+
+# Deploy a demo app at startup. Set this to an empty string to not deploy.
+# Valid values: ["java", ""]
+deployDemo: "java"
+
+# Proxy connection settings if required by your network. These translate to standard proxy environment
+# variables HTTP_PROXY, HTTPS_PROXY, and NO_PROXY
+http_proxy: ""
+https_proxy: ""
+no_proxy: ""
+
+# control if sidecar init containers should run with privileged set
+privilegedSidecars: false
+
+# control if the sidecar should enable/disable use of the smart dns lookup feature (requires NET_ADMIN)
+disableSidecarSmartReverseDNS: false
+
+# Operator settings. These limits are recommended unless you have a cluster
+# with a very large number of workloads (for eg. 10k+ deployments, replicasets, etc.).
+operator:
+  resources:
+    limits:
+      cpu: 500m
+      memory: 512Mi
+    requests:
+      cpu: 100m
+      memory: 128Mi
+  # how long to wait for the SUT to become ready
+  test_prep_timeout: 10m
+  # timeout for deploying & upgrading control plane components
+  control_plane_timeout: 5m
+
+
+# Default sidecar settings. Example:
+# sidecar:
+#   resources:
+#     limits:
+#       cpu: 500m
+#       memory: 512Mi
+#       ephemeral-storage: 100Mi
+#     requests:
+#       cpu: 10m
+#       memory: 32Mi
+#       ephemeral-storage: 100Mi
+#   ignore_src_hosts: example.com, example.org
+#   ignore_src_ips: 8.8.8.8, 1.1.1.1
+#   ignore_dst_hosts: example.com, example.org
+#   ignore_dst_ips: 8.8.8.8, 1.1.1.1
+#   insert_init_first: false
+#   tls_out: false
+#   reinitialize_iptables: false
+sidecar: {}
+
+# Forwarder settings
+# forwarder:
+#   resources:
+#     limits:
+#       cpu: 500m
+#       memory: 500M
+#     requests:
+#       cpu: 300m
+#       memory: 250M
+forwarder: {}
diff --git a/index.yaml b/index.yaml
index 47e58ce7a..ad1cb09b7 100644
--- a/index.yaml
+++ b/index.yaml
@@ -315,6 +315,42 @@ entries:
       metadataVersion: 7.90.7
       observabilityVersion: 1.31.11
     apiVersion: v2
+    appVersion: 7.98.14
+    created: "2025-01-22T00:01:52.069485288Z"
+    dependencies:
+    - condition: postgresql.enabled
+      name: postgresql
+      repository: https://charts.jfrog.io/
+      version: 10.3.18
+    description: Universal Repository Manager supporting all major packaging formats,
+      build tools and CI servers.
+    digest: 5671b47a7ac1557245b88f68cab9cae0ddca1baf31e99999b286e40cd00b6033
+    home: https://www.jfrog.com/artifactory/
+    icon: file://assets/icons/artifactory-ha.png
+    keywords:
+    - artifactory
+    - jfrog
+    - devops
+    kubeVersion: '>= 1.19.0-0'
+    maintainers:
+    - email: installers@jfrog.com
+      name: Chart Maintainers at JFrog
+    name: artifactory-ha
+    sources:
+    - https://github.com/jfrog/charts
+    type: application
+    urls:
+    - assets/jfrog/artifactory-ha-107.98.14.tgz
+    version: 107.98.14
+  - annotations:
+      artifactoryServiceVersion: 7.98.13
+      catalog.cattle.io/certified: partner
+      catalog.cattle.io/display-name: JFrog Artifactory HA
+      catalog.cattle.io/kube-version: '>= 1.19.0-0'
+      catalog.cattle.io/release-name: artifactory-ha
+      metadataVersion: 7.90.7
+      observabilityVersion: 1.31.11
+    apiVersion: v2
     appVersion: 7.98.13
     created: "2025-01-07T00:01:57.125699363Z"
     dependencies:
@@ -324,7 +360,7 @@ entries:
       version: 10.3.18
     description: Universal Repository Manager supporting all major packaging formats,
       build tools and CI servers.
-    digest: f0b872c910ac5cc4869b9889ad1562f476e030f12fe00c84601d882f51097f03
+    digest: bba9219def34eedcea5c79a897fd3f28d6168fa855df3a42d6094854e17746b7
     home: https://www.jfrog.com/artifactory/
     icon: file://assets/icons/artifactory-ha.png
     keywords:
@@ -2027,6 +2063,40 @@ entries:
     - assets/jfrog/artifactory-ha-107.55.14.tgz
     version: 107.55.14
   artifactory-jcr:
+  - annotations:
+      catalog.cattle.io/certified: partner
+      catalog.cattle.io/display-name: JFrog Container Registry
+      catalog.cattle.io/kube-version: '>= 1.19.0-0'
+      catalog.cattle.io/release-name: artifactory-jcr
+    apiVersion: v2
+    appVersion: 7.98.14
+    created: "2025-01-22T00:01:52.600319433Z"
+    dependencies:
+    - name: artifactory
+      repository: file://charts/artifactory
+      version: 107.98.14
+    description: JFrog Container Registry
+    digest: 7b5255a4e2b0d2ac194ecefec017a3294c0322a72e5cde08ce5675a583395007
+    home: https://jfrog.com/container-registry/
+    icon: file://assets/icons/artifactory-jcr.png
+    keywords:
+    - artifactory
+    - jfrog
+    - container
+    - registry
+    - devops
+    - jfrog-container-registry
+    kubeVersion: '>= 1.19.0-0'
+    maintainers:
+    - email: helm@jfrog.com
+      name: Chart Maintainers at JFrog
+    name: artifactory-jcr
+    sources:
+    - https://github.com/jfrog/charts
+    type: application
+    urls:
+    - assets/jfrog/artifactory-jcr-107.98.14.tgz
+    version: 107.98.14
   - annotations:
       catalog.cattle.io/certified: partner
       catalog.cattle.io/display-name: JFrog Container Registry
@@ -4928,6 +4998,38 @@ entries:
     - assets/cerbos/cerbos-0.37.0.tgz
     version: 0.37.0
   cf-runtime:
+  - annotations:
+      artifacthub.io/changes: |
+        - kind: fixed
+          description: "reverted engine version back to 1.176.3"
+      artifacthub.io/containsSecurityUpdates: "false"
+      catalog.cattle.io/certified: partner
+      catalog.cattle.io/display-name: Codefresh
+      catalog.cattle.io/kube-version: '>=1.18-0'
+      catalog.cattle.io/release-name: ""
+    apiVersion: v2
+    created: "2025-01-22T00:01:50.795849501Z"
+    dependencies:
+    - name: cf-common
+      repository: oci://quay.io/codefresh/charts
+      version: 0.21.0
+    description: A Helm chart for Codefresh Runner
+    digest: 6f2e6a8ef605c552cefcec1aa3f65f8115306296397793ea314a8055db023b22
+    home: https://codefresh.io/
+    icon: file://assets/icons/cf-runtime.png
+    keywords:
+    - codefresh
+    - runner
+    kubeVersion: '>=1.18-0'
+    maintainers:
+    - name: codefresh
+      url: https://codefresh-io.github.io/
+    name: cf-runtime
+    sources:
+    - https://github.com/codefresh-io/venona
+    urls:
+    - assets/codefresh/cf-runtime-7.4.2.tgz
+    version: 7.4.2
   - annotations:
       artifacthub.io/changes: |
         - kind: fixed
@@ -12512,6 +12614,35 @@ entries:
     - assets/dynatrace/dynatrace-operator-0.12.0.tgz
     version: 0.12.0
   external-secrets:
+  - annotations:
+      catalog.cattle.io/certified: partner
+      catalog.cattle.io/display-name: External Secrets Operator
+      catalog.cattle.io/kube-version: '>= 1.19.0-0'
+      catalog.cattle.io/release-name: external-secrets
+    apiVersion: v2
+    appVersion: v0.13.0
+    created: "2025-01-22T00:01:51.103176422Z"
+    dependencies:
+    - condition: bitwarden-sdk-server.enabled
+      name: bitwarden-sdk-server
+      repository: oci://ghcr.io/external-secrets/charts
+      version: v0.3.1
+    description: External secret management for Kubernetes
+    digest: 107a348dec50b14bdb3fa80b6e1616e96f203f6b1594d7c2dbddbde577d42f5f
+    home: https://github.com/external-secrets/external-secrets
+    icon: file://assets/icons/external-secrets.png
+    keywords:
+    - kubernetes-external-secrets
+    - secrets
+    kubeVersion: '>= 1.19.0-0'
+    maintainers:
+    - email: kellinmcavoy@gmail.com
+      name: mcavoyk
+    name: external-secrets
+    type: application
+    urls:
+    - assets/external-secrets/external-secrets-0.13.0.tgz
+    version: 0.13.0
   - annotations:
       catalog.cattle.io/certified: partner
       catalog.cattle.io/display-name: External Secrets Operator
@@ -22224,6 +22355,36 @@ entries:
     - assets/avesha/kubeslice-worker-1.1.1.tgz
     version: 1.1.1
   kuma:
+  - annotations:
+      catalog.cattle.io/certified: partner
+      catalog.cattle.io/display-name: Kuma
+      catalog.cattle.io/namespace: kuma-system
+      catalog.cattle.io/release-name: kuma
+    apiVersion: v2
+    appVersion: 2.9.3
+    created: "2025-01-22T00:01:53.811318613Z"
+    description: A Helm chart for the Kuma Control Plane
+    digest: 5df25d594a63aaf7dc68c71d30e21398db3db34a0c5709000e2869b7a497db61
+    home: https://github.com/kumahq/kuma
+    icon: file://assets/icons/kuma.svg
+    keywords:
+    - service mesh
+    - control plane
+    maintainers:
+    - email: jakub.dyszkiewicz@konghq.com
+      name: Jakub Dyszkiewicz
+      url: https://github.com/jakubdyszkiewicz
+    - email: charly.molter@konghq.com
+      name: Charly Molter
+      url: https://github.com/lahabana
+    - email: michael.beaumont@konghq.com
+      name: Mike Beaumont
+      url: https://github.com/michaelbeaumont
+    name: kuma
+    type: application
+    urls:
+    - assets/kuma/kuma-2.9.3.tgz
+    version: 2.9.3
   - annotations:
       catalog.cattle.io/certified: partner
       catalog.cattle.io/display-name: Kuma
@@ -29346,6 +29507,95 @@ entries:
     - assets/f5/nginx-ingress-1.0.2.tgz
     version: 1.0.2
   nri-bundle:
+  - annotations:
+      catalog.cattle.io/certified: partner
+      catalog.cattle.io/display-name: New Relic
+      catalog.cattle.io/release-name: nri-bundle
+    apiVersion: v2
+    created: "2025-01-22T00:01:54.124959609Z"
+    dependencies:
+    - condition: infrastructure.enabled,newrelic-infrastructure.enabled
+      name: newrelic-infrastructure
+      repository: https://newrelic.github.io/nri-kubernetes
+      version: 3.38.0
+    - condition: prometheus.enabled,nri-prometheus.enabled
+      name: nri-prometheus
+      repository: https://newrelic.github.io/nri-prometheus
+      version: 2.1.19
+    - condition: newrelic-prometheus-agent.enabled
+      name: newrelic-prometheus-agent
+      repository: https://newrelic.github.io/newrelic-prometheus-configurator
+      version: 1.16.0
+    - condition: webhook.enabled,nri-metadata-injection.enabled
+      name: nri-metadata-injection
+      repository: https://newrelic.github.io/k8s-metadata-injection
+      version: 4.23.0
+    - condition: metrics-adapter.enabled,newrelic-k8s-metrics-adapter.enabled
+      name: newrelic-k8s-metrics-adapter
+      repository: https://newrelic.github.io/newrelic-k8s-metrics-adapter
+      version: 1.13.5
+    - condition: ksm.enabled,kube-state-metrics.enabled
+      name: kube-state-metrics
+      repository: https://prometheus-community.github.io/helm-charts
+      version: 5.26.0
+    - condition: kubeEvents.enabled,nri-kube-events.enabled
+      name: nri-kube-events
+      repository: https://newrelic.github.io/nri-kube-events
+      version: 3.11.6
+    - condition: logging.enabled,newrelic-logging.enabled
+      name: newrelic-logging
+      repository: https://newrelic.github.io/helm-charts
+      version: 1.23.5
+    - condition: newrelic-pixie.enabled
+      name: newrelic-pixie
+      repository: https://newrelic.github.io/helm-charts
+      version: 2.1.6
+    - condition: k8s-agents-operator.enabled
+      name: k8s-agents-operator
+      repository: https://newrelic.github.io/k8s-agents-operator
+      version: 0.19.0
+    - alias: pixie-chart
+      condition: pixie-chart.enabled
+      name: pixie-operator-chart
+      repository: https://pixie-operator-charts.storage.googleapis.com
+      version: 0.1.7
+    - condition: newrelic-infra-operator.enabled
+      name: newrelic-infra-operator
+      repository: https://newrelic.github.io/newrelic-infra-operator
+      version: 2.13.5
+    description: Groups together the individual charts for the New Relic Kubernetes
+      solution for a more comfortable deployment.
+    digest: f203da66092cad832eb23170e30aef830cc9a7365906e60760a933eb005b6d54
+    home: https://github.com/newrelic/helm-charts
+    icon: file://assets/icons/nri-bundle.svg
+    keywords:
+    - infrastructure
+    - newrelic
+    - monitoring
+    maintainers:
+    - name: juanjjaramillo
+      url: https://github.com/juanjjaramillo
+    - name: csongnr
+      url: https://github.com/csongnr
+    - name: dbudziwojskiNR
+      url: https://github.com/dbudziwojskiNR
+    name: nri-bundle
+    sources:
+    - https://github.com/newrelic/nri-bundle/
+    - https://github.com/newrelic/nri-bundle/tree/master/charts/nri-bundle
+    - https://github.com/newrelic/nri-kubernetes/tree/master/charts/newrelic-infrastructure
+    - https://github.com/newrelic/nri-prometheus/tree/master/charts/nri-prometheus
+    - https://github.com/newrelic/newrelic-prometheus-configurator/tree/master/charts/newrelic-prometheus-agent
+    - https://github.com/newrelic/k8s-metadata-injection/tree/master/charts/nri-metadata-injection
+    - https://github.com/newrelic/newrelic-k8s-metrics-adapter/tree/master/charts/newrelic-k8s-metrics-adapter
+    - https://github.com/newrelic/nri-kube-events/tree/master/charts/nri-kube-events
+    - https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging
+    - https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie
+    - https://github.com/newrelic/newrelic-infra-operator/tree/master/charts/newrelic-infra-operator
+    - https://github.com/newrelic/k8s-agents-operator/tree/master/charts/k8s-agents-operator
+    urls:
+    - assets/new-relic/nri-bundle-5.0.107.tgz
+    version: 5.0.107
   - annotations:
       catalog.cattle.io/certified: partner
       catalog.cattle.io/display-name: New Relic
@@ -34922,6 +35172,29 @@ entries:
     - assets/portworx/portworx-5.1.1.tgz
     version: 5.1.1
   psmdb-db:
+  - annotations:
+      catalog.cattle.io/certified: partner
+      catalog.cattle.io/display-name: Percona Server for MongoDB
+      catalog.cattle.io/kube-version: '>=1.21-0'
+      catalog.cattle.io/release-name: psmdb-db
+    apiVersion: v2
+    appVersion: 1.19.0
+    created: "2025-01-22T00:01:55.008381467Z"
+    description: A Helm chart for installing Percona Server MongoDB Cluster Databases
+      using the PSMDB Operator.
+    digest: a18e668341698d97460c04ac1f7079354d76b115a6c3f2e455988f04a5a31a99
+    home: https://www.percona.com/doc/kubernetes-operator-for-psmongodb/index.html
+    icon: file://assets/icons/psmdb-db.png
+    kubeVersion: '>=1.21-0'
+    maintainers:
+    - email: natalia.marukovich@percona.com
+      name: nmarukovich
+    - email: julio.pasinatto@percona.com
+      name: jvpasinatto
+    name: psmdb-db
+    urls:
+    - assets/percona/psmdb-db-1.19.0.tgz
+    version: 1.19.0
   - annotations:
       catalog.cattle.io/certified: partner
       catalog.cattle.io/display-name: Percona Server for MongoDB
@@ -35192,6 +35465,30 @@ entries:
     - assets/percona/psmdb-db-1.14.4.tgz
     version: 1.14.4
   psmdb-operator:
+  - annotations:
+      catalog.cattle.io/certified: partner
+      catalog.cattle.io/display-name: Percona Operator for MongoDB
+      catalog.cattle.io/kube-version: '>=1.21-0'
+      catalog.cattle.io/release-name: psmdb-operator
+    apiVersion: v2
+    appVersion: 1.19.0
+    created: "2025-01-22T00:01:55.03700904Z"
+    description: A Helm chart for deploying the Percona Operator for MongoDB
+    digest: 3b16973559c8bcff2cd705d1d7fc495ed29e29d689c41360da126d123d4581ef
+    home: https://docs.percona.com/percona-operator-for-mongodb/
+    icon: file://assets/icons/psmdb-operator.png
+    kubeVersion: '>=1.21-0'
+    maintainers:
+    - email: natalia.marukovich@percona.com
+      name: nmarukovich
+    - email: sergey.pronin@percona.com
+      name: spron-in
+    - email: julio.pasinatto@percona.com
+      name: jvpasinatto
+    name: psmdb-operator
+    urls:
+    - assets/percona/psmdb-operator-1.19.0.tgz
+    version: 1.19.0
   - annotations:
       catalog.cattle.io/certified: partner
       catalog.cattle.io/display-name: Percona Operator for MongoDB
@@ -40149,6 +40446,37 @@ entries:
     - assets/redpanda/redpanda-4.0.33.tgz
     version: 4.0.33
   speedscale-operator:
+  - annotations:
+      catalog.cattle.io/certified: partner
+      catalog.cattle.io/display-name: Speedscale Operator
+      catalog.cattle.io/kube-version: '>= 1.17.0-0'
+      catalog.cattle.io/release-name: speedscale-operator
+    apiVersion: v1
+    appVersion: 2.3.134
+    created: "2025-01-22T00:01:55.676327426Z"
+    description: Stress test your APIs with real world scenarios.  Collect and replay
+      traffic without scripting.
+    digest: 186dff9a6a89602ff3431507b2591866559397c7a5a5d200d51030459750eac5
+    home: https://speedscale.com
+    icon: file://assets/icons/speedscale-operator.png
+    keywords:
+    - speedscale
+    - test
+    - testing
+    - regression
+    - reliability
+    - load
+    - replay
+    - network
+    - traffic
+    kubeVersion: '>= 1.17.0-0'
+    maintainers:
+    - email: support@speedscale.com
+      name: Speedscale Support
+    name: speedscale-operator
+    urls:
+    - assets/speedscale/speedscale-operator-2.3.134.tgz
+    version: 2.3.134
   - annotations:
       catalog.cattle.io/certified: partner
       catalog.cattle.io/display-name: Speedscale Operator
@@ -47815,4 +48143,4 @@ entries:
     urls:
     - assets/netfoundry/ziti-host-1.5.1.tgz
     version: 1.5.1
-generated: "2025-01-21T00:01:39.715831435Z"
+generated: "2025-01-22T00:01:50.08010105Z"