diff --git a/.dockerignore b/.dockerignore index b55be287d5..c5c79b0d3a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -54,4 +54,7 @@ tests/coverage settings.json -GoSDK/tester/ \ No newline at end of file +GoSDK/tester/ + +Llama/Models/* + diff --git a/HelmChart/Public/oneuptime/README.md b/HelmChart/Public/oneuptime/README.md index 729d6134b6..8231c87375 100644 --- a/HelmChart/Public/oneuptime/README.md +++ b/HelmChart/Public/oneuptime/README.md @@ -60,6 +60,7 @@ The following table lists the configurable parameters of the OneUptime chart and | `global.storageClass` | Storage class to be used for all persistent volumes | `nil` | 🚨 | | `host` | Hostname for the ingress | `localhost` | 🚨 | | `httpProtocol` | If the server is hosted with SSL/TLS cert then change this value to https | `http` | 🚨 | +| `global.clusterDomain` | Kubernetes Cluster Domain | `cluster.local` | | | `image.registry` | Docker image registry | `docker.io` | | | `image.repository` | Docker image repository | `oneuptime` | | | `image.tag` | Docker image tag | `release` | diff --git a/HelmChart/Public/oneuptime/templates/_helpers.tpl b/HelmChart/Public/oneuptime/templates/_helpers.tpl index 14acccafbe..2677ff0ff7 100644 --- a/HelmChart/Public/oneuptime/templates/_helpers.tpl +++ b/HelmChart/Public/oneuptime/templates/_helpers.tpl @@ -24,37 +24,37 @@ - name: ANALYTICS_HOST value: {{ $.Values.analytics.host }} - name: SERVER_ACCOUNTS_HOSTNAME - value: {{ $.Release.Name }}-accounts.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-accounts.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_DASHBOARD_API_HOSTNAME - value: {{ $.Release.Name }}-dashboard-api.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-dashboard-api.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_WORKFLOW_HOSTNAME - value: {{ $.Release.Name }}-workflow.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-workflow.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_LINK_SHORTENER_HOSTNAME - value: {{ $.Release.Name }}-link-shortener.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-link-shortener.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_INGESTOR_HOSTNAME - value: {{ $.Release.Name }}-ingestor.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-ingestor.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_TEST_SERVER_HOSTNAME - value: {{ $.Release.Name }}-test-server.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-test-server.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_FILE_HOSTNAME - value: {{ $.Release.Name }}-file.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-file.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_HOME_HOSTNAME - value: {{ $.Release.Name }}-home.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-home.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_IDENTITY_HOSTNAME - value: {{ $.Release.Name }}-identity.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-identity.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_NOTIFICATION_HOSTNAME - value: {{ $.Release.Name }}-notification.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-notification.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: OTEL_COLLECTOR_HOSTNAME - value: {{ $.Release.Name }}-otel-collector.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-otel-collector.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_WORKERS_HOSTNAME - value: {{ $.Release.Name }}-workers.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-workers.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_STATUS_PAGE_HOSTNAME - value: {{ $.Release.Name }}-status-page.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-status-page.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_DASHBOARD_HOSTNAME - value: {{ $.Release.Name }}-dashboard.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-dashboard.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_ADMIN_DASHBOARD_HOSTNAME - value: {{ $.Release.Name }}-admin-dashboard.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-admin-dashboard.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: SERVER_API_REFERENCE_HOSTNAME - value: {{ $.Release.Name }}-api-reference.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-api-reference.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: DASHBOARD_API_PORT value: {{ $.Values.port.dashboardApi | squote }} @@ -128,14 +128,14 @@ name: {{ printf "%s-%s" $.Release.Name "clickhouse" }} key: admin-password - name: CLICKHOUSE_HOST - value: {{ $.Release.Name }}-clickhouse.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-clickhouse.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: CLICKHOUSE_PORT value: {{ printf "8123" | squote}} - name: CLICKHOUSE_DATABASE value: {{ printf "oneuptime" | squote}} - name: REDIS_HOST - value: {{ $.Release.Name }}-redis-master.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-redis-master.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: REDIS_PORT value: {{ printf "6379" | squote}} - name: REDIS_PASSWORD @@ -149,7 +149,7 @@ value: default - name: DATABASE_HOST - value: {{ $.Release.Name }}-postgresql.{{ $.Release.Namespace }}.svc.cluster.local + value: {{ $.Release.Name }}-postgresql.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }} - name: DATABASE_PORT value: {{ printf "5432" | squote}} - name: DATABASE_USERNAME diff --git a/HelmChart/Public/oneuptime/templates/probe.yaml b/HelmChart/Public/oneuptime/templates/probe.yaml index a399d0da69..df17f53d00 100644 --- a/HelmChart/Public/oneuptime/templates/probe.yaml +++ b/HelmChart/Public/oneuptime/templates/probe.yaml @@ -29,7 +29,7 @@ spec: - name: PORT value: {{ $.Values.port.probe | squote }} - name: INGESTOR_URL - value: http://{{ $.Release.Name }}-ingestor.{{ $.Release.Namespace }}.svc.cluster.local:{{ $.Values.port.ingestor }} + value: http://{{ $.Release.Name }}-ingestor.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}:{{ $.Values.port.ingestor }} - name: PROBE_NAME value: {{ $val.name }} - name: PROBE_DESCRIPTION diff --git a/HelmChart/Public/oneuptime/values.yaml b/HelmChart/Public/oneuptime/values.yaml index dc47107ca9..f90635d752 100644 --- a/HelmChart/Public/oneuptime/values.yaml +++ b/HelmChart/Public/oneuptime/values.yaml @@ -1,5 +1,6 @@ global: storageClass: + clusterDomain: &global-cluster-domain cluster.local # Please change this to the domain name / IP where OneUtpime server is hosted on. @@ -26,6 +27,7 @@ ingress: loadBalancerIP: postgresql: + clusterDomain: *global-cluster-domain auth: username: oneuptime database: oneuptimedb @@ -38,6 +40,7 @@ postgresql: size: 25Gi clickhouse: + clusterDomain: *global-cluster-domain shards: 1 replicaCount: 1 zookeeper: @@ -51,6 +54,7 @@ clickhouse: CREATE DATABASE oneuptime; redis: + clusterDomain: *global-cluster-domain architecture: standalone auth: enabled: true diff --git a/Llama/Readme.md b/Llama/Readme.md index 3b8b14b1e9..8315926bfb 100644 --- a/Llama/Readme.md +++ b/Llama/Readme.md @@ -8,13 +8,13 @@ - Docker build ``` -docker build -t llama . -f ./Llama/Dockerfile +docker build -t llama . -f ./Llama/Dockerfile ``` ## Run ``` -docker run -it llama +docker run -it -v ./Llama/Models:/app/Models llama ```