merge new ui with ortelius

Signed-off-by: Steve Taylor <[email protected]>
DeployHubProject · Sep 10, 2024 · dacd807 · dacd807
1 parent d7acec3
commit dacd807
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/charts/deployhub/Chart.yaml b/charts/deployhub/Chart.yaml
@@ -11,13 +11,13 @@ type: application
 version: 10.0.333
 appVersion: 10.0.0
 dependencies:
-- name: dh-ms-general
+- name: ms-general
   version: 11.0.398
   repository: https://deployhubproject.github.io/charts/
-- name: dh-ms-nginx
+- name: ms-nginx
   version: 11.0.398
   repository: https://deployhubproject.github.io/charts/
-- name: dh-ms-ui
+- name: ms-ui
   version: 11.0.398
   repository: https://deployhubproject.github.io/charts/
 - name: ms-compitem-crud

diff --git a/charts/deployhub/README.md b/charts/deployhub/README.md
@@ -63,7 +63,7 @@ This chart deploys all of the required secrets, services, and deployments on a [
     DEPLOYHUB_VERSION=10.0.1088
     helm repo add deployhub https://deployhubproject.github.io/DeployHub-Pro/
     helm repo update
-    helm upgrade --install my-release deployhub/deployhub --set dh-ms-general.dbpass=my_db_password --set global.postgresql.enabled=true  --set global.nginxController.enabled=true  --version "${DEPLOYHUB_VERSION}" --namespace deployhub --create-namespace
+    helm upgrade --install my-release deployhub/deployhub --set ms-general.dbpass=my_db_password --set global.postgresql.enabled=true  --set global.nginxController.enabled=true  --version "${DEPLOYHUB_VERSION}" --namespace deployhub --create-namespace
     ```
 
     > Note: This will install DeployHub persisting the Postgres data on the host system in /tmp/postgres
@@ -74,7 +74,7 @@ This chart deploys all of the required secrets, services, and deployments on a [
     DEPLOYHUB_VERSION=10.0.1088
     helm repo add deployhub https://deployhubproject.github.io/DeployHub-Pro/
     helm repo update
-    helm upgrade --install my-release deployhub/deployhub --set dh-ms-general.dbpass=my_db_password --set dh-ms-general.dbuser=postgres --set dh-ms-general.dbhost=postgres.hosted.com --set-string dh-ms-general.dbport=5432 --set global.nginxController.enabled=true  --version "${DEPLOYHUB_VERSION}" --namespace deployhub --create-namespace
+    helm upgrade --install my-release deployhub/deployhub --set ms-general.dbpass=my_db_password --set ms-general.dbuser=postgres --set ms-general.dbhost=postgres.hosted.com --set-string ms-general.dbport=5432 --set global.nginxController.enabled=true  --version "${DEPLOYHUB_VERSION}" --namespace deployhub --create-namespace
     ```
 
 5. Access DeployHub UI
@@ -101,7 +101,7 @@ This chart deploys all of the required secrets, services, and deployments on a [
     DEPLOYHUB_VERSION=10.0.1088
     helm repo add deployhub https://deployhubproject.github.io/DeployHub-Pro/
     helm repo update
-    helm upgrade --install my-release deployhub/deployhub --set dh-ms-general.dbpass=my_db_password --set global.postgresql.enabled=true --set dh-ms-nginx.ingress.nodePort=30000 --version "${DEPLOYHUB_VERSION}" --namespace deployhub --create-namespace
+    helm upgrade --install my-release deployhub/deployhub --set ms-general.dbpass=my_db_password --set global.postgresql.enabled=true --set ms-nginx.ingress.nodePort=30000 --version "${DEPLOYHUB_VERSION}" --namespace deployhub --create-namespace
     ```
 
     > Note: This will install DeployHub persisting the Postgres data on the host system in /tmp/postgres
@@ -112,7 +112,7 @@ This chart deploys all of the required secrets, services, and deployments on a [
     DEPLOYHUB_VERSION=10.0.1088
     helm repo add deployhub https://deployhubproject.github.io/DeployHub-Pro/
     helm repo update
-    helm upgrade --install my-release deployhub/deployhub --set dh-ms-general.dbpass=my_db_password --set dh-ms-general.dbuser=postgres --set dh-ms-general.dbhost=postgres.hosted.com --set-string dh-ms-general.dbport=5432 --set dh-ms-nginx.ingress.nodePort=30000  --version "${DEPLOYHUB_VERSION}" --namespace deployhub --create-namespace
+    helm upgrade --install my-release deployhub/deployhub --set ms-general.dbpass=my_db_password --set ms-general.dbuser=postgres --set ms-general.dbhost=postgres.hosted.com --set-string ms-general.dbport=5432 --set ms-nginx.ingress.nodePort=30000  --version "${DEPLOYHUB_VERSION}" --namespace deployhub --create-namespace
     ```
 
 4. Access DeployHub UI
@@ -165,7 +165,7 @@ This chart deploys all of the required secrets, services, and deployments on a [
     DEPLOYHUB_DNSNAME=deployhub.example.com
     helm repo add deployhub https://deployhubproject.github.io/DeployHub-Pro/
     helm repo update
-    helm upgrade --install my-release deployhub/deployhub --set dh-ms-general.dbpass=my_db_password --set dh-ms-general.dbuser=postgres --set dh-ms-general.dbhost=postgres.hosted.com --set-string dh-ms-general.dbport=5432 --set dh-ms-nginx.ingress.type=glb --set dh-ms-nginx.ingress.dnsname=${DEPLOYHUB_DNSNAME} --version "${DEPLOYHUB_VERSION}" --namespace deployhub --create-namespace
+    helm upgrade --install my-release deployhub/deployhub --set ms-general.dbpass=my_db_password --set ms-general.dbuser=postgres --set ms-general.dbhost=postgres.hosted.com --set-string ms-general.dbport=5432 --set ms-nginx.ingress.type=glb --set ms-nginx.ingress.dnsname=${DEPLOYHUB_DNSNAME} --version "${DEPLOYHUB_VERSION}" --namespace deployhub --create-namespace
     ```
 
 6. Access DeployHub UI
@@ -237,7 +237,7 @@ This chart deploys all of the required secrets, services, and deployments on a [
     DEPLOYHUB_DNSNAME=deployhub.example.com
     helm repo add deployhub https://deployhubproject.github.io/DeployHub-Pro/
     helm repo update
-    helm upgrade --install my-release deployhub/deployhub --set dh-ms-general.dbpass=my_db_password --set dh-ms-general.dbuser=postgres --set dh-ms-general.dbhost=postgres.hosted.com --set-string dh-ms-general.dbport=5432 --set dh-ms-nginx.ingress.type=alb --set dh-ms-nginx.ingress.dnsname=${DEPLOYHUB_DNSNAME} --set-string 'dh-ms-nginx.ingress.alb_subnets=subnet-08c2def0d12544e2fd4\,subnet-0ff7730f35433930b32' --set-string 'dh-ms-nginx.ingress.alb_certificate_arn=arn\:aws\:acm\:us-east-1\:850343264173\:certificate\/8c2cb138-0172-477c-afb7-1d444eba2ec5' --version "${DEPLOYHUB_VERSION}" --namespace deployhub --create-namespace
+    helm upgrade --install my-release deployhub/deployhub --set ms-general.dbpass=my_db_password --set ms-general.dbuser=postgres --set ms-general.dbhost=postgres.hosted.com --set-string ms-general.dbport=5432 --set ms-nginx.ingress.type=alb --set ms-nginx.ingress.dnsname=${DEPLOYHUB_DNSNAME} --set-string 'ms-nginx.ingress.alb_subnets=subnet-08c2def0d12544e2fd4\,subnet-0ff7730f35433930b32' --set-string 'ms-nginx.ingress.alb_certificate_arn=arn\:aws\:acm\:us-east-1\:850343264173\:certificate\/8c2cb138-0172-477c-afb7-1d444eba2ec5' --version "${DEPLOYHUB_VERSION}" --namespace deployhub --create-namespace
     ```
 
 6. Access DeployHub UI
@@ -252,17 +252,17 @@ This chart deploys all of the required secrets, services, and deployments on a [
 
 | Name                | Description                 | Value       |
 |---------------------|-----------------------------|-------------|
-| `dh-ms-general.dbuser` | Postgres Database User Name | `postgres`  |
-| `dh-ms-general.dbpass` | Postgres Database Password  | `postgres`  |
-| `dh-ms-general.dbname` | Postgres Database Name      | `postgres`  |
-| `dh-ms-general.dbhost` | Postgres Database Host Name | `localhost` |
-| `dh-ms-general.dbport` | Postgres Database Port      | `5432`      |
-| `dh-ms-nginx.ingress.type` | default nginx ingress,  AWS Load Balancer or Google Load Balancer | `ssloff, alb, glb, k3s` | `ssloff`  |
-| `dh-ms-nginx.ingress.nodePort` | set the nodePort to access the service | >= 30000 | default is random port number  |
-| `dh-ms-nginx.ingress.alb_subnets`    | String of comma delimited subnets for the ALB - required when  `dh-ms-nginx.ingress.type=alb`  |   |
-| `dh-ms-nginx.ingress.alb_certificate_arn`    | ARN for the certificate from AWS Certificate Manager - required when  `dh-ms-nginx.ingress.type=alb` |  |
-| `dh-ms-nginx.ingress.dnsname`   | DNS Name that matches the certificate from AWS Certificate Manager - required when  `dh-ms-nginx.ingress.type=alb` or `dh-ms-nginx.ingress.type=glb` |  |
-| `dh-ms-nginx.ingress.scheme`    | ALB scheme - required when  `dh-ms-nginx.ingress.type=alb` |  `internal` or `internet-facing`  | `internal`|
+| `ms-general.dbuser` | Postgres Database User Name | `postgres`  |
+| `ms-general.dbpass` | Postgres Database Password  | `postgres`  |
+| `ms-general.dbname` | Postgres Database Name      | `postgres`  |
+| `ms-general.dbhost` | Postgres Database Host Name | `localhost` |
+| `ms-general.dbport` | Postgres Database Port      | `5432`      |
+| `ms-nginx.ingress.type` | default nginx ingress,  AWS Load Balancer or Google Load Balancer | `ssloff, alb, glb, k3s` | `ssloff`  |
+| `ms-nginx.ingress.nodePort` | set the nodePort to access the service | >= 30000 | default is random port number  |
+| `ms-nginx.ingress.alb_subnets`    | String of comma delimited subnets for the ALB - required when  `ms-nginx.ingress.type=alb`  |   |
+| `ms-nginx.ingress.alb_certificate_arn`    | ARN for the certificate from AWS Certificate Manager - required when  `ms-nginx.ingress.type=alb` |  |
+| `ms-nginx.ingress.dnsname`   | DNS Name that matches the certificate from AWS Certificate Manager - required when  `ms-nginx.ingress.type=alb` or `ms-nginx.ingress.type=glb` |  |
+| `ms-nginx.ingress.scheme`    | ALB scheme - required when  `ms-nginx.ingress.type=alb` |  `internal` or `internet-facing`  | `internal`|
 
 > 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.
 
@@ -276,7 +276,7 @@ helm install my-release -f values.yaml deployhub/deployhub
 
 > Note: default userid/pass is admin/admin
 
-* Use a port forward with kubectl to the dh-ms-nginx microservice service
+* Use a port forward with kubectl to the ms-nginx microservice service
 * `kubectl port-forward TYPE/NAME [options] LOCAL_PORT:REMOTE_PORT`
 * kubectl port-forward help
 
@@ -287,13 +287,13 @@ helm install my-release -f values.yaml deployhub/deployhub
 * 8080 represents the local port on your machine `http://localhost:8080`
 
     ```console
-    kubectl port-forward svc/dh-ms-nginx 8080:80 -n deployhub
+    kubectl port-forward svc/ms-nginx 8080:80 -n deployhub
     ```
 
 - 8443 represents the local port on your machine `http://localhost:8443`
 
     ```console
-    kubectl port-forward svc/dh-ms-nginx 8443:443 -n deployhub
+    kubectl port-forward svc/ms-nginx 8443:443 -n deployhub
     ```
 
 ## Uninstalling the Chart

diff --git a/charts/deployhub/values.yaml b/charts/deployhub/values.yaml
@@ -1,6 +1,6 @@
 ---
 # Ingress and SSL Definition
-dh-ms-nginx:
+ms-nginx:
   ingress:
     type: ssloff # sslcert, alb, volumemnt, ssloff
     alb_certificate_arn:

diff --git a/main.js b/main.js
@@ -66,7 +66,7 @@ async function getChartEntries () {
           dep.name = latest.name
           dep.version = latest.version
 
-          if (key === 'dh-ms-ui' || key === 'dh-ms-nginx' || key === 'dh-ms-general') {
+          if (key === 'ms-ui' || key === 'ms-nginx' || key === 'ms-general') {
             key = 'charts'
             dep.repository = 'https://deployhubproject.github.io/' + key + '/'
           } else { dep.repository = 'https://ortelius.github.io/' + key + '/' }