diff --git a/charts/BasicDeployment/ReadMe.txt b/charts/BasicDeployment/ReadMe.txt
deleted file mode 100644
index 806d9a8..0000000
--- a/charts/BasicDeployment/ReadMe.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-=========
-Overview
-=========
-This is a HELM chart project to do a simple single node HDP deployment.
-By default, uses PostgreSQL as account database - the required user accounts will be setup automatically during the project install.
-
-Optionally, we can use any other database as account database, but the required configurations need to be updated correctly.
-Refer to the hdp-server-deploy/ReadMe.txt for more details.
-
-==============
-Installing HDP
-==============
-
-By running the following two commands HDP should be setup successfully.
-
-Steps:
-1) Create the secrets used for this project setup
-
-    kubectl create -f <root>\hdp-server-deploy\secrets\hdp-secrets.yaml
-
-    kubectl create -f <root>\hdp-server-deploy\secrets\postgres-secrets.yaml
-2) Setup HDP
-    helm install hdp-server-deploy hdp-server-deploy
-
-==============
-Accessing HDP
-==============
-Access Hybrid Data Pipeline (HDP) using https://<EXTERNAL-IP>:8443>/hdpui or http://<EXTERNAL-IP>:8080>/hdpui
-
-To know the EXTERNAL-IP for the hdp-service, run the following command   
-kubectl get svc
-
-There are two users created by default named d2cadmin and d2cuser.
-The passwords are created as part of hdpsecrets with the keys hdpAdminPwd and hdpUserPwd.
-
diff --git a/charts/BasicDeployment/hdp-server-deploy/.helmignore b/charts/BasicDeployment/hdp-server-deploy/.helmignore
deleted file mode 100644
index 0e8a0eb..0000000
--- a/charts/BasicDeployment/hdp-server-deploy/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/BasicDeployment/hdp-server-deploy/Chart.yaml b/charts/BasicDeployment/hdp-server-deploy/Chart.yaml
deleted file mode 100644
index d4781de..0000000
--- a/charts/BasicDeployment/hdp-server-deploy/Chart.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-apiVersion: v2
-name: hdp-server-deploy
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.4
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "4.6.1"
-dependencies:
-  - name: postgresql
-    version: "^13.2.30"
-    repository: https://charts.bitnami.com/bitnami
-    condition: postgres.enabled
\ No newline at end of file
diff --git a/charts/BasicDeployment/hdp-server-deploy/ReadMe.txt b/charts/BasicDeployment/hdp-server-deploy/ReadMe.txt
deleted file mode 100644
index a7310bc..0000000
--- a/charts/BasicDeployment/hdp-server-deploy/ReadMe.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-=========================
-Building the HELM Project
-=========================
-This project uses PostgreSQL as HDP's account database by default, thus have a dependency on PostgreSQL Helm Chart project.
-
-To build the project, use the command
->> helm dependency build hdp-server-deploy
-
-===================
-Configurable Values
-===================
-By default, this project installs PostgreSQL, runs a SQL Script to setup the user and admin accounts needed for HDP in a fresh install.
-When the volumes are mounted, and a prior database exists, PostgreSQL will skip running the init SQL script.
-
-In case of a need to use any other supported database like Oralce or SQLServer, configure .values.postgres.enabled to false.
-This will skip creating the init sql script as a config map and the installation of PostgreSQL database.
-In addition, config/hdpdeploy.properties need to be updated to the right account database details for a successful HDP installation.
-
-==============
-Installing HDP
-==============
-
-By running the following two commands HDP should be setup successfully.
-
-Steps:
-1) Create the secrets used for this project setup
-
-    kubectl create -f <root>\hdp-server-deploy\secrets\hdp-secrets.yaml
-
-    kubectl create -f <root>\hdp-server-deploy\secrets\postgres-secrets.yaml
-2) Setup HDP
-    helm install hdp-server-deploy hdp-server-deploy
-
-You can refer to the hdp-secrets.yaml for the HDP Admin and User passwords. The passwords are base64 encoded in the file.
\ No newline at end of file
diff --git a/charts/BasicDeployment/hdp-server-deploy/charts/postgresql-13.4.4.tgz b/charts/BasicDeployment/hdp-server-deploy/charts/postgresql-13.4.4.tgz
deleted file mode 100644
index ef982e1..0000000
Binary files a/charts/BasicDeployment/hdp-server-deploy/charts/postgresql-13.4.4.tgz and /dev/null differ
diff --git a/charts/BasicDeployment/hdp-server-deploy/config/hdpdeploy.properties b/charts/BasicDeployment/hdp-server-deploy/config/hdpdeploy.properties
deleted file mode 100644
index 5a79d14..0000000
--- a/charts/BasicDeployment/hdp-server-deploy/config/hdpdeploy.properties
+++ /dev/null
@@ -1,189 +0,0 @@
-; This properties file is used to configure a Docker deployment of Hybrid Data
-; Pipeline (HDP). Specify values for each property to suit your environment. A
-; number of values can be set using environment variables. Environment variables
-; must be specified in the Docker run command used to deploy the service. For
-; example:
-; docker run -dt -p 8080:8080 -p 8443:8443 -e "ACCEPT_EULA=true"
-;      -v /opt/hdpshare:/hdpshare --hostname hdp1 --name hdp1
-;      --network hdp-net %HDP_DOCKER_IMAGE%
-;      -e HDP_USER_PASSWORD=MyHDPUserPassword
-;      -e HDP_ADMIN_PASSWORD=MyHDPAdminPassword
-; The names of supported environment variables match the names of the properties
-; in this file. For more information about using environment variables, refer to
-; "Using environment variables for server and system database credentials":
-; https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-installation-46/page/Using-environment-variables-for-server-and-system-database-credentials.html
-
-; HDP server hostname
-; -------------------
-; The fully qualified hostname of the HDP server. In a Docker deployment, the
-; hostname is the name of the Docker container host. If a hostname is not
-; supplied, the Docker image will attempt to detect it.
-HDP_SERVER=
-
-; HDP SSL certificate
-; -------------------
-; The name of the SSL certificate file used by the HDP server to establish SSL
-; connections with ODBC and JDBC client applications. The certificate file must
-; be placed in the shared volume. (NOTE: The default location of the shared
-; volume for each demo is C:\hdpshare.) The value provided depends on whether
-; you are deploying HDP as a cluster or as a standalone node.
-; For cluster deployments, the specified file must be the root certificate used
-; to sign the certificate for the load balancer server. PEM, DER, and Base64
-; encodings are supported.
-; For standalone deployments, you have two options.
-; (1) Leave blank to use the self-signed certificate included with the
-; deployment.
-; (2) Specify the SSL certificate in PEM file format. The PEM file must consist
-; of a private key, a public key certificate issued by a certificate authority
-; (CA), and additional certificates that make up the trust chain.
-; For more information about creating a PEM file, refer to "The PEM file":
-; https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-installation-46/page/The-PEM-file.html.
-HDP_SERVER_CERT_FILE=
-
-; System database properties
-; ==========================
-; An external system database is required for this Docker deployment of HDP.
-; For supported databases and requirements, refer to "External system
-; databases":
-; https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-installation-46/page/External-system-databases.html.
-; The following properties are used to configure the external database. Several
-; properties are specific to the database vendor.
-
-; Required. The hostname of the system database.
-; NOTE: If you are locally deploying the system database as a Docker container,
-; the hostname does not resolve correctly if set to 'localhost'. Instead, you
-; must use use the Docker-specific lookup name 'host.docker.internal'.
-HDP_DATABASE_HOSTNAME={{.Values.hdp.deploy.properties.HDP_DATABASE_HOSTNAME}}
-
-; Required. The port of the system database.
-HDP_DATABASE_PORT={{.Values.hdp.deploy.properties.HDP_DATABASE_PORT}}
-
-; Required for PostgreSQL and MySQL databases. The name of the system database.
-HDP_DATABASE_NAME={{.Values.hdp.deploy.properties.HDP_DATABASE_NAME}}
-
-; Required. The name of the system database vendor.
-; Valid values include: oracle | mssqlserver | postgresql | mysqlcommunity
-HDP_DATABASE_VENDOR={{.Values.hdp.deploy.properties.HDP_DATABASE_VENDOR}}
-
-; Required if you are using a MySQL Community Edition system database.  The
-; MySQL Connector/J jar file must be placed in the hdpshare volume, and the name
-; of the jar file must be specified with this property.
-HDP_MYSQL_DRIVER=
-
-; Required if you are using an Oracle system database with the Oracle System
-; Identifier (SID). Specify the SID for this property. Otherwise, leave this
-; property blank.
-HDP_ORACLE_SID=
-
-; Required if you are using an Oracle system database with the service name. For
-; this property, provide the database service name that specifies the database
-; that is used for the connection. The service name is a string that is the
-; global database name. The global database name typically comprises the
-; database name and domain name. Otherwise, leave this property blank.
-HDP_ORACLE_SERVICE_NAME=
-
-; Required if you are using a SQL Server system database. Provide the name of
-; the SQL Server database schema.
-HDP_SQLSERVER_SCHEMA=
-
-; Additional connection parameters may be included in the database connection
-; URL. For supported parameters, refer to the data store topic associated with
-; your system database in the HDP user's guide:
-; https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-46/page/Supported-data-stores.html
-; Parameters should be provided as a list of key-value pairs. For a MySQL
-; Community database, the key-value pairs should be separated by an ampersand.
-; For other databases, the key-value pairs should be separated by a semicolon.
-HDP_DATABASE_ADVANCED_OPTIONS=
-
-; Required but may be set as an environment variable. The name of the database
-; user without administrator privileges. Required privileges depend on the type
-; of database you are using. For details on required privileges, refer to
-; "External system databases":
-; https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-installation-46/page/External-system-databases.html.
-HDP_DATABASE_USER={{ include "hdp-server-deploy.secretValue" (list "default" "hdp-secrets" "hdpDbUser") | trim }}
-
-; Required but may be set as an environment variable. The password of the
-; database user without administrator privileges.
-HDP_DATABASE_USER_PASSWORD={{ include "hdp-server-deploy.secretValue" (list "default" "hdp-secrets" "hdpDbUserPwd") | trim }}
-
-; Required but may be set as an environment variable. The name of the database
-; user with administrator privileges. Required privileges depend on the type of
-; database you are using. For details on required privileges, refer to "External
-; system databases":
-; https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-installation-46/page/External-system-databases.html.
-HDP_DATABASE_ADMIN={{ include "hdp-server-deploy.secretValue" (list "default" "hdp-secrets" "hdpDbAdmin") | trim }}
-
-; Required but may be set as an environment variable. The password of the
-; database user with administrator privileges.
-HDP_DATABASE_ADMIN_PASSWORD={{ include "hdp-server-deploy.secretValue" (list "default" "hdp-secrets" "hdpDbAdminPwd") | trim }}
-
-; On-Premises Connector
-; ---------------------
-; Specify 'yes' if you plan to deploy the On-Premises Connector.
-; Specify 'no' if you are not deploying the On-Premises Connector.
-; If 'yes' is specified, the HDP server uses the On-Premises Access Port (40501)
-; and the Notification Server Port (11443) to communicate with the On-Premises
-; Connector. These ports must be made available across the firewall. The default
-; value is 'yes'.
-HDP_ENABLE_ONPREMISE_CONNECTOR=no
-
-; HDP Logon credentials
-; =====================
-; HDP provides the default d2cadmin and d2cuser accounts. You must specify
-; passwords for each of these accounts with the following properties.
-
-; Required but may be set as an environment variable. The password for the
-; default administrator account.
-HDP_ADMIN_PASSWORD={{ include "hdp-server-deploy.secretValue" (list "default" "hdp-secrets" "hdpAdminPwd") | trim }}
-
-; Required but may be set as an environment variable. The password for the
-; default user account.
-HDP_USER_PASSWORD={{ include "hdp-server-deploy.secretValue" (list "default" "hdp-secrets" "hdpUserPwd") | trim }}
-
-; Load balancer
-; -------------
-; Required. Indicates whether or not a load balancer is being used.
-; Valid values: none | tunnel | websocket
-; * 'none' should be specified for standalone deployments.
-; * 'tunnel' should be specified for load balancer routing using tunneling.
-;   Tunneling is generally used for network load balancing.
-; * 'websocket' should be specified for load balancer routing using the
-;    WebSocket protocol. The WebSocket protocol is generally used for load
-;    balancing when using a hosted service such as AWS or Azure.
-HDP_LOAD_BALANCER_TYPE=none
-
-; Load balancer name
-; ------------------
-; Required if a load balancer is being used. The hostname or IP address of the
-; machine where the load balancer is running.
-HDP_LOAD_BALANCER_HOST_NAME=
-
-; License key
-; -----------
-; Leave blank to deploy an evaluation version of the product.
-; Provide a valid license key to deploy a licensed version of the product.
-HDP_LICENSE_KEY=
-
-; FIPS configuration
-; ------------------
-; Specify 'yes' to configure the server to be FIPS compliant.
-; Specify 'no' if the server will not use FIPS.
-; The default value is 'no'.
-; For more information on FIPS requirements, refer to "FIPS (Federal Information
-; Processing Standard)":
-; https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-46/page/FIPS-Federal-Information-Processing-Standard.html
-HDP_ENABLE_FIPS=
-
-; JVM heap size
-; =============
-; JVM heap size properties may be specified if you need to limit the memory
-; allocated to HDP nodes. Specifying heap size may be particularly useful when
-; running multiple Docker nodes on a single host machine.
-
-; The initial JVM heap size in megabytes. The default is 4096 megabytes.
-HDP_HEAP_INITIAL=
-
-; The maximum JVM heap size in megabytes. This value cannot be less than the
-; initial JVM heap size. The default value is the value specified for the
-; HDP_HEAP_INITIAL property.
-HDP_HEAP_MAX=
\ No newline at end of file
diff --git a/charts/BasicDeployment/hdp-server-deploy/secrets/hdp-secrets.yaml b/charts/BasicDeployment/hdp-server-deploy/secrets/hdp-secrets.yaml
deleted file mode 100644
index 0730d6d..0000000
--- a/charts/BasicDeployment/hdp-server-deploy/secrets/hdp-secrets.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: hdp-secrets
-data:
-  hdpDbUser: cGd1c2Vy
-  hdpDbUserPwd: dXNlcjEyMzQ=
-  hdpDbAdmin: cGdhZG1pbg==
-  hdpDbAdminPwd: YWRtaW4xMjM0
-  hdpAdminPwd: ZDJjYWRtaW4=
-  hdpUserPwd: ZDJjdXNlcg==
diff --git a/charts/BasicDeployment/hdp-server-deploy/secrets/postgres-secrets.yaml b/charts/BasicDeployment/hdp-server-deploy/secrets/postgres-secrets.yaml
deleted file mode 100644
index 8c563c9..0000000
--- a/charts/BasicDeployment/hdp-server-deploy/secrets/postgres-secrets.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: postgres-secrets
-data:
-  postgres.db.name: cG9zdGdyZXM=
-  postgres.db.username: cG9zdGdyZXM=
-  postgres.db.password: ZG9ja2Vy
-  postgres.hdp.pgadmin.user: cGdhZG1pbg==
-  postgres.hdp.pgadmin.pwd: YWRtaW4xMjM0
-  postgres.hdp.pguser.user: cGd1c2Vy
-  postgres.hdp.pguser.pwd: dXNlcjEyMzQ=
\ No newline at end of file
diff --git a/charts/BasicDeployment/hdp-server-deploy/templates/NOTES.txt b/charts/BasicDeployment/hdp-server-deploy/templates/NOTES.txt
deleted file mode 100644
index 431fe80..0000000
--- a/charts/BasicDeployment/hdp-server-deploy/templates/NOTES.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Access Hybrid Data Pipeline (HDP) using https://<EXTERNAL-IP>:8443>/hdpui or http://<EXTERNAL-IP>:8080>/hdpui
-
-To know the EXTERNAL-IP for the hdp-service, run the following command   
-kubectl get svc
-
-There are two users created by default named d2cadmin and d2cuser.
-The passwords are created as part of hdpsecrets with the keys hdpAdminPwd and hdpUserPwd. 
\ No newline at end of file
diff --git a/charts/BasicDeployment/hdp-server-deploy/templates/_helpers.tpl b/charts/BasicDeployment/hdp-server-deploy/templates/_helpers.tpl
deleted file mode 100644
index e3dd127..0000000
--- a/charts/BasicDeployment/hdp-server-deploy/templates/_helpers.tpl
+++ /dev/null
@@ -1,78 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "hdp-server-deploy.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 "hdp-server-deploy.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 "hdp-server-deploy.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "hdp-server-deploy.labels" -}}
-helm.sh/chart: {{ include "hdp-server-deploy.chart" . }}
-{{ include "hdp-server-deploy.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "hdp-server-deploy.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "hdp-server-deploy.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "hdp-server-deploy.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "hdp-server-deploy.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{/*
-Helper function to retrieve a value from a Kubernetes Secret
-Arguments in Order - namespace, secretname, secretkey
-Usage: {{ include "hdp-server-deploy.secretValue" (list "default" "hdp-secrets" "userpwd") | trim | b64dec}}
-*/}}
-{{- define "hdp-server-deploy.secretValue" -}}
-{{- $namespace := index . 0 }}
-{{- $secretName := index . 1 }}
-{{- $key := index . 2 }}
-{{- $existingSecret := (lookup "v1" "Secret" $namespace $secretName) }}
-{{- if $existingSecret.data }}
-{{- $userPassword := index $existingSecret.data $key}}
-{{ $userPassword  | b64dec}}
-{{- end -}}
-{{- end }}
diff --git a/charts/BasicDeployment/hdp-server-deploy/templates/hdp-common-pvc.yaml b/charts/BasicDeployment/hdp-server-deploy/templates/hdp-common-pvc.yaml
deleted file mode 100644
index b047e76..0000000
--- a/charts/BasicDeployment/hdp-server-deploy/templates/hdp-common-pvc.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: hdp-common-pvc
-  annotations:
-    "helm.sh/resource-policy": keep
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: {{.Values.hdp.resources.storage.size}}
-  storageClassName: azurefile-csi
\ No newline at end of file
diff --git a/charts/BasicDeployment/hdp-server-deploy/templates/hdpService.yaml b/charts/BasicDeployment/hdp-server-deploy/templates/hdpService.yaml
deleted file mode 100644
index cbb266a..0000000
--- a/charts/BasicDeployment/hdp-server-deploy/templates/hdpService.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: hdp-service
-  namespace: default
-spec:
-  type: LoadBalancer
-  selector:
-    hdp: test
-  ports:
-  - name: http
-    port: {{.Values.hdp.ports.http.containerPort}}
-    targetPort: {{.Values.hdp.ports.http.containerPort}}
-    nodePort: {{.Values.hdp.ports.http.nodePort}}
-  - name: https
-    port: {{.Values.hdp.ports.https.containerPort}}
-    targetPort: {{.Values.hdp.ports.https.containerPort}}
-    nodePort: {{.Values.hdp.ports.https.nodePort}}
-  sessionAffinity: ClientIP
-  sessionAffinityConfig:
-    clientIP:
-      timeoutSeconds: 86400
\ No newline at end of file
diff --git a/charts/BasicDeployment/hdp-server-deploy/templates/hdpStatefulset.yaml b/charts/BasicDeployment/hdp-server-deploy/templates/hdpStatefulset.yaml
deleted file mode 100644
index 5921a6a..0000000
--- a/charts/BasicDeployment/hdp-server-deploy/templates/hdpStatefulset.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: hdp
-  namespace: default
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      hdp: test
-  template:
-    metadata:
-      labels:
-        hdp: test
-    spec:
-      initContainers:
-      - name: init-hdpdeployprops
-        image: {{.Values.hdp.image.repository}}
-        command: ["/bin/sh", "-c", "mkdir -p /hdpshare && cp /hdpdeployprops/hdpdeploy.properties /hdpshare/ && echo \'Config Map mounted and hdpdeploy.properties copied to /hdpshare!\'"]
-        volumeMounts:
-        - name: hdpdeployprops
-          mountPath: /hdpdeployprops
-        - name: common-storage
-          mountPath: /hdpshare
-      containers:
-        - name: kube-hdp
-          image: {{.Values.hdp.image.repository}}          
-          ports:
-            - name: http
-              containerPort: {{.Values.hdp.ports.http.containerPort}}
-            - name: https
-              containerPort: {{.Values.hdp.ports.https.containerPort}}
-          env:
-            - name: ACCEPT_EULA
-              value: "true"
-          volumeMounts:
-          - name: hdpdeployprops
-            mountPath: /hdpdeployprops
-          - name: common-storage
-            mountPath: {{ .Values.hdp.deploy.mountPath }}
-      volumes:
-        - name: common-storage
-          persistentVolumeClaim:
-            claimName: hdp-common-pvc
-        - name: hdpdeployprops
-          configMap:
-            name: hdpdeploy-configmap
\ No newline at end of file
diff --git a/charts/BasicDeployment/hdp-server-deploy/templates/hdpdeploy-configmap.yaml b/charts/BasicDeployment/hdp-server-deploy/templates/hdpdeploy-configmap.yaml
deleted file mode 100644
index 3ae6620..0000000
--- a/charts/BasicDeployment/hdp-server-deploy/templates/hdpdeploy-configmap.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: hdpdeploy-configmap
-data:
-  hdpdeploy.properties: |-
-{{ tpl (.Files.Get "config/hdpdeploy.properties") . | indent 4 }}
\ No newline at end of file
diff --git a/charts/BasicDeployment/hdp-server-deploy/templates/postgres-init-sql.yaml b/charts/BasicDeployment/hdp-server-deploy/templates/postgres-init-sql.yaml
deleted file mode 100644
index bcfbdeb..0000000
--- a/charts/BasicDeployment/hdp-server-deploy/templates/postgres-init-sql.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Creates the initial script to setup the PostgresSQL Database for HDP as an external Account Database
-# Expects the secrets to be created prior to setup the ConfigMap
-{{- if (.Values.postgres.enabled) }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: postgres-initsql
-data:
-  init.sh: |-
-    set -e
-    export PGPASSWORD='{{ include "hdp-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.db.password") | trim }}'
-    psql -v ON_ERROR_STOP=1 --username {{.Values.postgres.init.postgres_user}} --dbname {{.Values.postgres.init.dbname}} <<-EOSQL
-      create database {{.Values.postgres.hdp.dbname}};
-      create user {{ include "hdp-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pgadmin.user") | trim }} with PASSWORD '{{ include "hdp-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pgadmin.pwd") | trim }}';
-      create user {{ include "hdp-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pguser.user") | trim }} with PASSWORD '{{ include "hdp-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pguser.pwd") | trim }}';
-    EOSQL
-    psql -v ON_ERROR_STOP=1 --username {{.Values.postgres.init.postgres_user}} --dbname {{.Values.postgres.hdp.dbname}} <<-EOSQL
-      create schema {{.Values.postgres.hdp.schemaname}} authorization {{ include "hdp-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pgadmin.user") | trim }};
-      create extension citext with schema {{.Values.postgres.hdp.schemaname}};
-      grant usage on schema {{.Values.postgres.hdp.schemaname}} to {{ include "hdp-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pguser.user") | trim }};
-      alter user {{ include "hdp-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pgadmin.user") | trim }} SET search_path TO {{.Values.postgres.hdp.schemaname}};
-      alter user {{ include "hdp-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pguser.user") | trim }} SET search_path TO {{.Values.postgres.hdp.schemaname}};
-    EOSQL
-{{- end }}
\ No newline at end of file
diff --git a/charts/BasicDeployment/hdp-server-deploy/values.yaml b/charts/BasicDeployment/hdp-server-deploy/values.yaml
deleted file mode 100644
index ad62f2b..0000000
--- a/charts/BasicDeployment/hdp-server-deploy/values.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-hdp:
-  image:
-    repository: dcihdp.azurecr.io/hdp-docker-4.6.1:2057
-  ports:
-    http:
-      containerPort: 8080
-      nodePort: 30080
-    https:
-      containerPort: 8443
-      nodePort: 30443  
-  deploy:
-    properties:
-      HDP_DATABASE_HOSTNAME: hdp-server-deploy-postgresql.default.svc.cluster.local
-      HDP_DATABASE_PORT: 5432
-      HDP_DATABASE_NAME: hdp
-      HDP_DATABASE_VENDOR: postgresql
-    mountPath: /hdpshare
-  resources:
-    storage:
-      size: 1Gi
-postgres:
-  enabled: true
-  init:
-    postgres_user: postgres
-    dbname: postgres
-  hdp:
-    schemaname: hdp
-    dbname: hdp
-postgresql:
-  global:
-    postgresql:
-      auth:
-        existingSecret: "postgres-secrets"
-        secretKeys:
-          adminPasswordKey: "postgres.db.password"
-  primary:
-    initdb:
-      scriptsConfigMap: "postgres-initsql"
-    persistence:
-      size: 2Gi
\ No newline at end of file
diff --git a/charts/LBDeployment/.project b/charts/LBDeployment/.project
new file mode 100644
index 0000000..b968f82
--- /dev/null
+++ b/charts/LBDeployment/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>LBDeployment</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/charts/LBDeployment/haproxy-deploy/.helmignore b/charts/LBDeployment/haproxy-deploy/.helmignore
deleted file mode 100644
index 0e8a0eb..0000000
--- a/charts/LBDeployment/haproxy-deploy/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/LBDeployment/haproxy-deploy/Chart.yaml b/charts/LBDeployment/haproxy-deploy/Chart.yaml
deleted file mode 100644
index 750eefd..0000000
--- a/charts/LBDeployment/haproxy-deploy/Chart.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-apiVersion: v2
-name: haproxy-deploy
-description: A Helm chart for Kubernetes that deploys haproxy
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.2
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.11.0"
-dependencies:
-  - name: kubernetes-ingress
-    version: "^1.38.2"
-    repository: https://haproxytech.github.io/helm-charts/
diff --git a/charts/LBDeployment/haproxy-deploy/ReadMe.txt b/charts/LBDeployment/haproxy-deploy/ReadMe.txt
deleted file mode 100644
index ba6400f..0000000
--- a/charts/LBDeployment/haproxy-deploy/ReadMe.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-========
-Overview
-========
-
-This HELM project wraps Haproxy Ingress Controller helm chart as a dependency, when installed - this will setup a HAProxy Ingress Controller with two pods and a service.
-
-To build this project, run -
-    helm dep up hdp-lb-server-deploy
-
-This will download the chart to /charts directory.
-
-The .values.yaml has the basic configuration needed for the HAProxy Ingress Controller HELM project setup.  Based on the need, values can be finetuned further.
-
-Refer to this wiki page for more details - https://progresssoftware.atlassian.net/wiki/spaces/DataDirectRandD/pages/541753550/Deploying+HDP+Server+on+Azure+Kubernetes+Service+AKS
-
-================
-Steps to Install
-================
-
-helm install haproxy-deploy haproxy-deploy --namespace haproxy-controller -create-namespace -f values.yaml
-
-This would install necessary resources, to get the external IP for the HAProxy Controller Service,
-run the command kubectl get svc and check the External - IP column.
-
-'A' record should be mapped to this IP address for the valid dns hostname in a valid dns zone.
-
-As an example, this is the default dns zone offerred by Azure AKS accessible over public internet.
-To access HDP would be something like - http://hdp.2565fbe255034c49a07b.eastus.aksapp.io/
-
-================
-Useful Commands
-================
-
-helm install haproxy-deploy haproxy-deploy --namespace haproxy-controller --create-namespace -f values.yaml
-
-helm list --namespace haproxy-controller
-
-kubectl get svc --namespace haproxy-controller
-
-kubectl get pods --namespace haproxy-controller
-
-helm uninstall haproxy-deploy --namespace haproxy-controller
-
diff --git a/charts/LBDeployment/haproxy-deploy/templates/NOTES.txt b/charts/LBDeployment/haproxy-deploy/templates/NOTES.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/charts/LBDeployment/haproxy-deploy/templates/_helpers.tpl b/charts/LBDeployment/haproxy-deploy/templates/_helpers.tpl
deleted file mode 100644
index b248920..0000000
--- a/charts/LBDeployment/haproxy-deploy/templates/_helpers.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "haproxy-deploy.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 "haproxy-deploy.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 "haproxy-deploy.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "haproxy-deploy.labels" -}}
-helm.sh/chart: {{ include "haproxy-deploy.chart" . }}
-{{ include "haproxy-deploy.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "haproxy-deploy.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "haproxy-deploy.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "haproxy-deploy.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "haproxy-deploy.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/charts/LBDeployment/haproxy-deploy/values.yaml b/charts/LBDeployment/haproxy-deploy/values.yaml
deleted file mode 100644
index d4d83dc..0000000
--- a/charts/LBDeployment/haproxy-deploy/values.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-kubernetes-ingress:
-  controller:
-    ingressClass: "haproxy"
-    service:
-      type: "LoadBalancer"
-      externalTrafficPolicy: Local
-    annotations:
-      service.beta.kubernetes.io/azure-load-balancer-health-probe-request-path: "/healthz"
\ No newline at end of file
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/.helmignore b/charts/LBDeployment/hdp-lb-server-deploy/.helmignore
deleted file mode 100644
index 0e8a0eb..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/LBDeployment/hdp-lb-server-deploy/Chart.yaml b/charts/LBDeployment/hdp-lb-server-deploy/Chart.yaml
deleted file mode 100644
index 542a183..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/Chart.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-apiVersion: v2
-name: hdp-lb-server-deploy
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "4.6.1"
-dependencies:
-  - name: postgresql
-    version: "^13.2.30"
-    repository: https://charts.bitnami.com/bitnami
-    condition: postgres.enabled
\ No newline at end of file
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/ReadMe.txt b/charts/LBDeployment/hdp-lb-server-deploy/ReadMe.txt
deleted file mode 100644
index 026146c..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/ReadMe.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-========
-Overview
-========
-
-This HELM project wraps PostgreSQL helm chart as a dependency, when installed - this will setup a PostgreSQL database.
-
-To build this project, run -
-    helm dep up hdp-lb-server-deploy
-
-This will download the chart to /charts
-
-The .values.yaml has the defaults for the HAProxy HELM project setup.  Based on the need, values can be finetuned.
-
-Note: This project does not configure the Ingress Controller to run over SSL yet.
-
-================
-Steps to Install
-================
-
-helm install hdp-lb-server-deploy hdp-lb-server-deploy --namespace hdp-deployment -create-namespace -f values.yaml
-
-This would install necessary resources.
-
-================
-Useful Commands
-================
-
-helm install hdp-lb-server-deploy hdp-lb-server-deploy --namespace hdp-deployment --create-namespace -f values.yaml
-
-helm list --namespace hdp-deployment
-
-kubectl get svc --namespace hdp-deployment
-
-kubectl get pods --namespace hdp-deployment
-
-kubectl logs hdp-0 --namespace hdp-deployment
-
-kubectl exec -it hdp-0 --namespace hdp-deployment -- bash
-
-helm uninstall hdp-lb-server-deploy --namespace hdp-deployment
-
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/config/hdpdeploy.properties b/charts/LBDeployment/hdp-lb-server-deploy/config/hdpdeploy.properties
deleted file mode 100644
index 5b039ee..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/config/hdpdeploy.properties
+++ /dev/null
@@ -1,189 +0,0 @@
-; This properties file is used to configure a Docker deployment of Hybrid Data
-; Pipeline (HDP). Specify values for each property to suit your environment. A
-; number of values can be set using environment variables. Environment variables
-; must be specified in the Docker run command used to deploy the service. For
-; example:
-; docker run -dt -p 8080:8080 -p 8443:8443 -e "ACCEPT_EULA=true"
-;      -v /opt/hdpshare:/hdpshare --hostname hdp1 --name hdp1
-;      --network hdp-net %HDP_DOCKER_IMAGE%
-;      -e HDP_USER_PASSWORD=MyHDPUserPassword
-;      -e HDP_ADMIN_PASSWORD=MyHDPAdminPassword
-; The names of supported environment variables match the names of the properties
-; in this file. For more information about using environment variables, refer to
-; "Using environment variables for server and system database credentials":
-; https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-installation-46/page/Using-environment-variables-for-server-and-system-database-credentials.html
-
-; HDP server hostname
-; -------------------
-; The fully qualified hostname of the HDP server. In a Docker deployment, the
-; hostname is the name of the Docker container host. If a hostname is not
-; supplied, the Docker image will attempt to detect it.
-HDP_SERVER=hdp-server-app-headless
-
-; HDP SSL certificate
-; -------------------
-; The name of the SSL certificate file used by the HDP server to establish SSL
-; connections with ODBC and JDBC client applications. The certificate file must
-; be placed in the shared volume. (NOTE: The default location of the shared
-; volume for each demo is C:\hdpshare.) The value provided depends on whether
-; you are deploying HDP as a cluster or as a standalone node.
-; For cluster deployments, the specified file must be the root certificate used
-; to sign the certificate for the load balancer server. PEM, DER, and Base64
-; encodings are supported.
-; For standalone deployments, you have two options.
-; (1) Leave blank to use the self-signed certificate included with the
-; deployment.
-; (2) Specify the SSL certificate in PEM file format. The PEM file must consist
-; of a private key, a public key certificate issued by a certificate authority
-; (CA), and additional certificates that make up the trust chain.
-; For more information about creating a PEM file, refer to "The PEM file":
-; https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-installation-46/page/The-PEM-file.html.
-HDP_SERVER_CERT_FILE=
-
-; System database properties
-; ==========================
-; An external system database is required for this Docker deployment of HDP.
-; For supported databases and requirements, refer to "External system
-; databases":
-; https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-installation-46/page/External-system-databases.html.
-; The following properties are used to configure the external database. Several
-; properties are specific to the database vendor.
-
-; Required. The hostname of the system database.
-; NOTE: If you are locally deploying the system database as a Docker container,
-; the hostname does not resolve correctly if set to 'localhost'. Instead, you
-; must use use the Docker-specific lookup name 'host.docker.internal'.
-HDP_DATABASE_HOSTNAME={{.Values.hdp.deploy.properties.HDP_DATABASE_HOSTNAME}}
-
-; Required. The port of the system database.
-HDP_DATABASE_PORT={{.Values.hdp.deploy.properties.HDP_DATABASE_PORT}}
-
-; Required for PostgreSQL and MySQL databases. The name of the system database.
-HDP_DATABASE_NAME={{.Values.hdp.deploy.properties.HDP_DATABASE_NAME}}
-
-; Required. The name of the system database vendor.
-; Valid values include: oracle | mssqlserver | postgresql | mysqlcommunity
-HDP_DATABASE_VENDOR={{.Values.hdp.deploy.properties.HDP_DATABASE_VENDOR}}
-
-; Required if you are using a MySQL Community Edition system database.  The
-; MySQL Connector/J jar file must be placed in the hdpshare volume, and the name
-; of the jar file must be specified with this property.
-HDP_MYSQL_DRIVER=
-
-; Required if you are using an Oracle system database with the Oracle System
-; Identifier (SID). Specify the SID for this property. Otherwise, leave this
-; property blank.
-HDP_ORACLE_SID=
-
-; Required if you are using an Oracle system database with the service name. For
-; this property, provide the database service name that specifies the database
-; that is used for the connection. The service name is a string that is the
-; global database name. The global database name typically comprises the
-; database name and domain name. Otherwise, leave this property blank.
-HDP_ORACLE_SERVICE_NAME=
-
-; Required if you are using a SQL Server system database. Provide the name of
-; the SQL Server database schema.
-HDP_SQLSERVER_SCHEMA=
-
-; Additional connection parameters may be included in the database connection
-; URL. For supported parameters, refer to the data store topic associated with
-; your system database in the HDP user's guide:
-; https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-46/page/Supported-data-stores.html
-; Parameters should be provided as a list of key-value pairs. For a MySQL
-; Community database, the key-value pairs should be separated by an ampersand.
-; For other databases, the key-value pairs should be separated by a semicolon.
-HDP_DATABASE_ADVANCED_OPTIONS=
-
-; Required but may be set as an environment variable. The name of the database
-; user without administrator privileges. Required privileges depend on the type
-; of database you are using. For details on required privileges, refer to
-; "External system databases":
-; https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-installation-46/page/External-system-databases.html.
-HDP_DATABASE_USER={{ include "hdp-lb-server-deploy.secretValue" (list "default" "hdp-secrets" "hdpDbUser") | trim }}
-
-; Required but may be set as an environment variable. The password of the
-; database user without administrator privileges.
-HDP_DATABASE_USER_PASSWORD={{ include "hdp-lb-server-deploy.secretValue" (list "default" "hdp-secrets" "hdpDbUserPwd") | trim }}
-
-; Required but may be set as an environment variable. The name of the database
-; user with administrator privileges. Required privileges depend on the type of
-; database you are using. For details on required privileges, refer to "External
-; system databases":
-; https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-installation-46/page/External-system-databases.html.
-HDP_DATABASE_ADMIN={{ include "hdp-lb-server-deploy.secretValue" (list "default" "hdp-secrets" "hdpDbAdmin") | trim }}
-
-; Required but may be set as an environment variable. The password of the
-; database user with administrator privileges.
-HDP_DATABASE_ADMIN_PASSWORD={{ include "hdp-lb-server-deploy.secretValue" (list "default" "hdp-secrets" "hdpDbAdminPwd") | trim }}
-
-; On-Premises Connector
-; ---------------------
-; Specify 'yes' if you plan to deploy the On-Premises Connector.
-; Specify 'no' if you are not deploying the On-Premises Connector.
-; If 'yes' is specified, the HDP server uses the On-Premises Access Port (40501)
-; and the Notification Server Port (11443) to communicate with the On-Premises
-; Connector. These ports must be made available across the firewall. The default
-; value is 'yes'.
-HDP_ENABLE_ONPREMISE_CONNECTOR=yes
-
-; HDP Logon credentials
-; =====================
-; HDP provides the default d2cadmin and d2cuser accounts. You must specify
-; passwords for each of these accounts with the following properties.
-
-; Required but may be set as an environment variable. The password for the
-; default administrator account.
-HDP_ADMIN_PASSWORD={{ include "hdp-lb-server-deploy.secretValue" (list "default" "hdp-secrets" "hdpAdminPwd") | trim }}
-
-; Required but may be set as an environment variable. The password for the
-; default user account.
-HDP_USER_PASSWORD={{ include "hdp-lb-server-deploy.secretValue" (list "default" "hdp-secrets" "hdpUserPwd") | trim }}
-
-; Load balancer
-; -------------
-; Required. Indicates whether or not a load balancer is being used.
-; Valid values: none | tunnel | websocket
-; * 'none' should be specified for standalone deployments.
-; * 'tunnel' should be specified for load balancer routing using tunneling.
-;   Tunneling is generally used for network load balancing.
-; * 'websocket' should be specified for load balancer routing using the
-;    WebSocket protocol. The WebSocket protocol is generally used for load
-;    balancing when using a hosted service such as AWS or Azure.
-HDP_LOAD_BALANCER_TYPE=cloud
-
-; Load balancer name
-; ------------------
-; Required if a load balancer is being used. The hostname or IP address of the
-; machine where the load balancer is running.
-HDP_LOAD_BALANCER_HOST_NAME=hdplb.hdpaks.com
-
-; License key
-; -----------
-; Leave blank to deploy an evaluation version of the product.
-; Provide a valid license key to deploy a licensed version of the product.
-HDP_LICENSE_KEY=
-
-; FIPS configuration
-; ------------------
-; Specify 'yes' to configure the server to be FIPS compliant.
-; Specify 'no' if the server will not use FIPS.
-; The default value is 'no'.
-; For more information on FIPS requirements, refer to "FIPS (Federal Information
-; Processing Standard)":
-; https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-46/page/FIPS-Federal-Information-Processing-Standard.html
-HDP_ENABLE_FIPS=
-
-; JVM heap size
-; =============
-; JVM heap size properties may be specified if you need to limit the memory
-; allocated to HDP nodes. Specifying heap size may be particularly useful when
-; running multiple Docker nodes on a single host machine.
-
-; The initial JVM heap size in megabytes. The default is 4096 megabytes.
-HDP_HEAP_INITIAL=
-
-; The maximum JVM heap size in megabytes. This value cannot be less than the
-; initial JVM heap size. The default value is the value specified for the
-; HDP_HEAP_INITIAL property.
-HDP_HEAP_MAX=
\ No newline at end of file
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/secrets/hdp-secrets.yaml b/charts/LBDeployment/hdp-lb-server-deploy/secrets/hdp-secrets.yaml
deleted file mode 100644
index 0730d6d..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/secrets/hdp-secrets.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: hdp-secrets
-data:
-  hdpDbUser: cGd1c2Vy
-  hdpDbUserPwd: dXNlcjEyMzQ=
-  hdpDbAdmin: cGdhZG1pbg==
-  hdpDbAdminPwd: YWRtaW4xMjM0
-  hdpAdminPwd: ZDJjYWRtaW4=
-  hdpUserPwd: ZDJjdXNlcg==
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/secrets/postgres-secrets.yaml b/charts/LBDeployment/hdp-lb-server-deploy/secrets/postgres-secrets.yaml
deleted file mode 100644
index 8c563c9..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/secrets/postgres-secrets.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: postgres-secrets
-data:
-  postgres.db.name: cG9zdGdyZXM=
-  postgres.db.username: cG9zdGdyZXM=
-  postgres.db.password: ZG9ja2Vy
-  postgres.hdp.pgadmin.user: cGdhZG1pbg==
-  postgres.hdp.pgadmin.pwd: YWRtaW4xMjM0
-  postgres.hdp.pguser.user: cGd1c2Vy
-  postgres.hdp.pguser.pwd: dXNlcjEyMzQ=
\ No newline at end of file
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/templates/NOTES.txt b/charts/LBDeployment/hdp-lb-server-deploy/templates/NOTES.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/templates/_helpers.tpl b/charts/LBDeployment/hdp-lb-server-deploy/templates/_helpers.tpl
deleted file mode 100644
index b4328a8..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/templates/_helpers.tpl
+++ /dev/null
@@ -1,78 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "hdp-lb-server-deploy.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 "hdp-lb-server-deploy.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 "hdp-lb-server-deploy.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "hdp-lb-server-deploy.labels" -}}
-helm.sh/chart: {{ include "hdp-lb-server-deploy.chart" . }}
-{{ include "hdp-lb-server-deploy.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "hdp-lb-server-deploy.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "hdp-lb-server-deploy.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "hdp-lb-server-deploy.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "hdp-lb-server-deploy.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{/*
-Helper function to retrieve a value from a Kubernetes Secret
-Arguments in Order - namespace, secretname, secretkey
-Usage: {{ include "hdp-lb-server-deploy.secretValue" (list "default" "hdp-secrets" "userpwd") | trim | b64dec}}
-*/}}
-{{- define "hdp-lb-server-deploy.secretValue" -}}
-{{- $namespace := index . 0 }}
-{{- $secretName := index . 1 }}
-{{- $key := index . 2 }}
-{{- $existingSecret := (lookup "v1" "Secret" $namespace $secretName) }}
-{{- if $existingSecret.data }}
-{{- $userPassword := index $existingSecret.data $key}}
-{{ $userPassword  | b64dec}}
-{{- end -}}
-{{- end }}
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/templates/haproxy-ingress.yaml b/charts/LBDeployment/hdp-lb-server-deploy/templates/haproxy-ingress.yaml
deleted file mode 100644
index ea5c7b1..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/templates/haproxy-ingress.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  annotations:
-    haproxy.org/affinity: "true"
-    haproxy.org/cookie-persistence: HDP-SESSION
-    haproxy.org/forwarded-for: "true"
-    haproxy.org/load-balance: roundrobin
-    haproxy.org/timeout-check: 5m
-    haproxy.org/timeout-server: 5m
-    ingress.class: haproxy
-    #kubernetes.io/ingress.class: addon-http-application-routing
-  name: hdp-ingress
-  namespace: default
-spec:
-  ingressClassName: haproxy
-  rules:
-  - host: hdp.2565fbe255034c49a07b.eastus.aksapp.io
-    http:
-      paths:
-      - backend:
-          service:
-            name: hdp-server-app-headless
-            port:
-              number: 8080
-        path: /
-        pathType: Prefix      
-      - backend:
-          service:
-            name: hdp-notification-headless
-            port:
-              number: 11280
-        path: /connect/X_DataDirect_Notification_Server
-        pathType: Prefix
-      - backend:
-          service:
-            name: hdp-opa-headless
-            port:
-              number: 40501
-        path: /connect/opa_hdp-server-app-headless_40501
-        pathType: Prefix
-  #tls:
-  #- hosts:
-   # - xxxxxxxx
-   # secretName: hdp-tls-secret
\ No newline at end of file
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/templates/hdp-common-pvc.yaml b/charts/LBDeployment/hdp-lb-server-deploy/templates/hdp-common-pvc.yaml
deleted file mode 100644
index b047e76..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/templates/hdp-common-pvc.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: hdp-common-pvc
-  annotations:
-    "helm.sh/resource-policy": keep
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: {{.Values.hdp.resources.storage.size}}
-  storageClassName: azurefile-csi
\ No newline at end of file
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/templates/hdp-notification-service.yaml b/charts/LBDeployment/hdp-lb-server-deploy/templates/hdp-notification-service.yaml
deleted file mode 100644
index ac39fdc..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/templates/hdp-notification-service.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    haproxy.org/check: "true"
-    haproxy.org/check-http: HEAD /
-    haproxy.org/check-interval: 5m
-    haproxy.org/route-acl: path_end -i /connect/X_DataDirect_Notification_Server
-  name: hdp-notification-headless
-  namespace: default
-spec:
-  ports:
-  - name: hdp-notification-headless
-    port: 11280
-    protocol: TCP
-    targetPort: 11280
-  selector:
-    app: hdp-server-app
-  sessionAffinity: None
-  type: ClusterIP
\ No newline at end of file
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/templates/hdp-opc-service.yaml b/charts/LBDeployment/hdp-lb-server-deploy/templates/hdp-opc-service.yaml
deleted file mode 100644
index a821ca2..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/templates/hdp-opc-service.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    haproxy.org/check: "true"
-    haproxy.org/check-http: HEAD /
-    haproxy.org/check-interval: 5m
-    haproxy.org/route-acl: path_end -i /connect/opa_hdp-server-app-headless_40501
-  name: hdp-opa-headless
-  namespace: default
-spec:
-  ports:
-  - name: hdp-opa
-    port: 40501
-    protocol: TCP
-    targetPort: 40501
-  selector:
-    app: hdp-server-app
-  type: ClusterIP
\ No newline at end of file
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/templates/hdp-server-app-service.yaml b/charts/LBDeployment/hdp-lb-server-deploy/templates/hdp-server-app-service.yaml
deleted file mode 100644
index 975227a..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/templates/hdp-server-app-service.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    haproxy.org/check: "true"
-    haproxy.org/check-http: HEAD /api/healthcheck
-    haproxy.org/check-interval: 5m
-  name: hdp-server-app-headless
-  namespace: default
-spec:
-  #type: LoadBalancer
-  type: ClusterIP
-  ports:
-  - name: http
-    port: 8080
-    targetPort: 8080   
-  selector:
-    app: hdp-server-app
-  sessionAffinity: ClientIP
-  sessionAffinityConfig:
-    clientIP:
-      timeoutSeconds: 86400
\ No newline at end of file
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/templates/hdpStatefulset.yaml b/charts/LBDeployment/hdp-lb-server-deploy/templates/hdpStatefulset.yaml
deleted file mode 100644
index ec14d02..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/templates/hdpStatefulset.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: hdp
-  namespace: default
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: hdp-server-app
-  template:
-    metadata:
-      labels:
-        app: hdp-server-app
-    spec:
-      initContainers:
-      - name: init-hdpdeployprops
-        image: {{.Values.hdp.image.repository}}
-        command: ["/bin/sh", "-c", "mkdir -p /hdpshare && cp /hdpdeployprops/hdpdeploy.properties /hdpshare/ && echo \'Config Map mounted and hdpdeploy.properties copied to /hdpshare!\'"]
-        volumeMounts:
-        - name: hdpdeployprops
-          mountPath: /hdpdeployprops
-        - name: common-storage
-          mountPath: /hdpshare
-      containers:
-        - name: kube-hdp
-          image: {{.Values.hdp.image.repository}}          
-          ports:
-            - name: http
-              containerPort: {{.Values.hdp.ports.http.containerPort}}
-            - name: https
-              containerPort: {{.Values.hdp.ports.https.containerPort}}
-          env:
-            - name: ACCEPT_EULA
-              value: "true"
-          volumeMounts:
-          - name: hdpdeployprops
-            mountPath: /hdpdeployprops
-          - name: common-storage
-            mountPath: {{ .Values.hdp.deploy.mountPath }}
-      volumes:
-        - name: common-storage
-          persistentVolumeClaim:
-            claimName: hdp-common-pvc
-        - name: hdpdeployprops
-          configMap:
-            name: hdpdeploy-configmap
\ No newline at end of file
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/templates/hdpdeploy-configmap.yaml b/charts/LBDeployment/hdp-lb-server-deploy/templates/hdpdeploy-configmap.yaml
deleted file mode 100644
index 3ae6620..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/templates/hdpdeploy-configmap.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: hdpdeploy-configmap
-data:
-  hdpdeploy.properties: |-
-{{ tpl (.Files.Get "config/hdpdeploy.properties") . | indent 4 }}
\ No newline at end of file
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/templates/postgres-init-sql.yaml b/charts/LBDeployment/hdp-lb-server-deploy/templates/postgres-init-sql.yaml
deleted file mode 100644
index a9acb0a..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/templates/postgres-init-sql.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-{{- if (.Values.postgres.enabled) }}
-# Creates the initial script to setup the PostgresSQL Database for HDP as an external Account Database
-# Expects the secrets to be created prior to setup the ConfigMap
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: postgres-initsql
-data:
-  init.sh: |-
-    set -e
-    export PGPASSWORD='{{ include "hdp-lb-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.db.password") | trim }}'
-    psql -v ON_ERROR_STOP=1 --username {{.Values.postgres.init.postgres_user}} --dbname {{.Values.postgres.init.dbname}} <<-EOSQL
-      create database {{.Values.postgres.hdp.dbname}};
-      create user {{ include "hdp-lb-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pgadmin.user") | trim }} with PASSWORD '{{ include "hdp-lb-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pgadmin.pwd") | trim }}';
-      create user {{ include "hdp-lb-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pguser.user") | trim }} with PASSWORD '{{ include "hdp-lb-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pguser.pwd") | trim }}';
-    EOSQL
-    psql -v ON_ERROR_STOP=1 --username {{.Values.postgres.init.postgres_user}} --dbname {{.Values.postgres.hdp.dbname}} <<-EOSQL
-      create schema {{.Values.postgres.hdp.schemaname}} authorization {{ include "hdp-lb-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pgadmin.user") | trim }};
-      create extension citext with schema {{.Values.postgres.hdp.schemaname}};
-      grant usage on schema {{.Values.postgres.hdp.schemaname}} to {{ include "hdp-lb-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pguser.user") | trim }};
-      alter user {{ include "hdp-lb-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pgadmin.user") | trim }} SET search_path TO {{.Values.postgres.hdp.schemaname}};
-      alter user {{ include "hdp-lb-server-deploy.secretValue" (list "default" "postgres-secrets" "postgres.hdp.pguser.user") | trim }} SET search_path TO {{.Values.postgres.hdp.schemaname}};
-    EOSQL
-{{- end }}
\ No newline at end of file
diff --git a/charts/LBDeployment/hdp-lb-server-deploy/values.yaml b/charts/LBDeployment/hdp-lb-server-deploy/values.yaml
deleted file mode 100644
index 180c745..0000000
--- a/charts/LBDeployment/hdp-lb-server-deploy/values.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-hdp:
-  image:
-    repository: dcihdp.azurecr.io/hdp-docker-4.6.1:2057
-  ports:
-    http:
-      containerPort: 8080
-      nodePort: 30080
-    https:
-      containerPort: 8443
-      nodePort: 30443  
-  deploy:
-    properties:
-      HDP_DATABASE_HOSTNAME: hdp-lb-server-deploy-postgresql.default.svc.cluster.local
-      HDP_DATABASE_PORT: 5432
-      HDP_DATABASE_NAME: hdp
-      HDP_DATABASE_VENDOR: postgresql
-    mountPath: /hdpshare
-  resources:
-    storage:
-      size: 1Gi
-postgres:
-  enabled: true
-  init:
-    postgres_user: postgres
-    dbname: postgres
-  hdp:
-    schemaname: hdp
-    dbname: hdp
-postgresql:
-  global:
-    postgresql:
-      auth:
-        existingSecret: "postgres-secrets"
-        secretKeys:
-          adminPasswordKey: "postgres.db.password"
-  primary:
-    initdb:
-      scriptsConfigMap: "postgres-initsql"
-    persistence:
-      size: 1Gi
\ No newline at end of file