Skip to content

Commit

Permalink
update nexus
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrii Korolov committed Jan 23, 2025
1 parent 92f247b commit 39bcf20
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ nexus:
pathType: Prefix
configMapData:
DOMAIN: nexus.${BASE_DOMAIN}
UI_URL: 'https://ui.${BASE_DOMAIN}'
UI_BASE_URL: 'https://ui.${BASE_DOMAIN}'
STORAGE_S3_BUCKET: dynamiqai-prod
synapse:
Expand Down
2 changes: 1 addition & 1 deletion charts/dynamiq/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ 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.77
version: 0.1.78

# 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
Expand Down
28 changes: 14 additions & 14 deletions charts/dynamiq/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,17 @@
"default": "prod",
"enum": ["prod", "dev"]
},
"SYNAPSE_URL": {
"SYNAPSE_BASE_URL": {
"type": "string",
"description": "URL for Synapse.",
"default": "http://synapse.synapse.svc.cluster.local:80"
},
"CATALYST_URL": {
"CATALYST_BASE_URL": {
"type": "string",
"description": "URL for Catalyst.",
"default": "http://catalyst.catalyst.svc.cluster.local:80"
},
"APP_NAMESPACE": {
"APPS_NAMESPACE": {
"type": "string",
"description": "Namespace for the app.",
"default": "apps"
Expand Down Expand Up @@ -195,12 +195,12 @@
"description": "Service account for image builder.",
"default": "image-builder"
},
"INFERENCE_NAMESPACE": {
"INFERENCES_NAMESPACE": {
"type": "string",
"description": "Namespace for inference.",
"default": "inference"
},
"INFERENCE_SERVICE_ACCOUNT": {
"INFERENCES_SERVICE_ACCOUNT": {
"type": "string",
"description": "Service account for inference.",
"default": "inference"
Expand All @@ -210,17 +210,17 @@
"description": "Docker image for inference.",
"default": "ghcr.io/predibase/lorax:387e17e"
},
"SERVICE_IMAGE_REPOSITORY": {
"SERVICES_IMAGE_REPOSITORY": {
"type": "string",
"description": "Image repository for services.",
"default": "128336707324.dkr.ecr.us-east-1.amazonaws.com/service"
},
"SERVICE_NAMESPACE": {
"SERVICES_NAMESPACE": {
"type": "string",
"description": "Namespace for services.",
"default": "services"
},
"SERVICE_SERVICE_ACCOUNT": {
"SERVICES_SERVICE_ACCOUNT": {
"type": "string",
"description": "Service account for services.",
"default": "services"
Expand All @@ -232,13 +232,13 @@
}
},
"required": [
"ENV", "SYNAPSE_URL", "CATALYST_URL", "APP_NAMESPACE",
"ENV", "SYNAPSE_BASE_URL", "CATALYST_BASE_URL", "APPS_NAMESPACE",
"AUTH_ACCESS_TOKEN_TTL", "AUTH_REFRESH_TOKEN_TTL", "AUTH_VERIFICATION_TOKEN_TTL",
"BILLING_ENABLED", "FINE_TUNING_DOCKER_IMAGE", "FINE_TUNING_IMAGE_PULL_SECRET",
"FINE_TUNING_NAMESPACE", "FINE_TUNING_SERVICE_ACCOUNT", "IMAGE_BUILDER_DOCKER_IMAGE",
"IMAGE_BUILDER_NAMESPACE", "IMAGE_BUILDER_SERVICE_ACCOUNT", "INFERENCE_NAMESPACE",
"INFERENCE_SERVICE_ACCOUNT", "INFERENCE_DOCKER_IMAGE", "SERVICE_IMAGE_REPOSITORY",
"SERVICE_NAMESPACE", "SERVICE_SERVICE_ACCOUNT", "STORAGE_SERVICE"
"IMAGE_BUILDER_NAMESPACE", "IMAGE_BUILDER_SERVICE_ACCOUNT", "INFERENCES_NAMESPACE",
"INFERENCES_SERVICE_ACCOUNT", "INFERENCE_DOCKER_IMAGE", "SERVICES_IMAGE_REPOSITORY",
"SERVICES_NAMESPACE", "SERVICES_SERVICE_ACCOUNT", "STORAGE_SERVICE"
]
}
},
Expand All @@ -256,7 +256,7 @@
"enum": ["prod", "dev"],
"default": "prod"
},
"APPS_URL": {
"APPS_BASE_URL": {
"type": "string",
"description": "URL for apps.",
"default": "http://router.fission.svc.cluster.local:80"
Expand All @@ -272,7 +272,7 @@
"enum": ["ibm_cos", "s3"]
}
},
"required": ["ENV", "APPS_URL", "INFERENCES_NAMESPACE", "STORAGE_SERVICE"]
"required": ["ENV", "APPS_BASE_URL", "INFERENCES_NAMESPACE", "STORAGE_SERVICE"]
}
},
"required": ["configMapData"]
Expand Down
18 changes: 9 additions & 9 deletions charts/dynamiq/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ nexus:
className: public-iks-k8s-nginx
configMapData:
ENV: prod
SYNAPSE_URL: 'http://synapse.synapse.svc.cluster.local:80'
CATALYST_URL: 'http://catalyst.catalyst.svc.cluster.local:80'
APP_NAMESPACE: apps
SYNAPSE_BASE_URL: 'http://synapse.synapse.svc.cluster.local:80'
CATALYST_BASE_URL: 'http://catalyst.catalyst.svc.cluster.local:80'
APPS_NAMESPACE: apps
AUTH_ACCESS_TOKEN_TTL: 1h
AUTH_REFRESH_TOKEN_TTL: 240h
AUTH_VERIFICATION_TOKEN_TTL: 12h
Expand All @@ -45,12 +45,12 @@ nexus:
IMAGE_BUILDER_DOCKER_IMAGE: 'gcr.io/kaniko-project/executor:v1.23.1'
IMAGE_BUILDER_NAMESPACE: image-builder
IMAGE_BUILDER_SERVICE_ACCOUNT: image-builder
INFERENCE_NAMESPACE: inferences
INFERENCE_SERVICE_ACCOUNT: inference
INFERENCES_NAMESPACE: inferences
INFERENCES_SERVICE_ACCOUNT: inference
INFERENCE_DOCKER_IMAGE: 'ghcr.io/predibase/lorax:387e17e'
SERVICE_IMAGE_REPOSITORY: 128336707324.dkr.ecr.us-east-1.amazonaws.com/service
SERVICE_NAMESPACE: services
SERVICE_SERVICE_ACCOUNT: service
SERVICES_IMAGE_REPOSITORY: 128336707324.dkr.ecr.us-east-1.amazonaws.com/service
SERVICES_NAMESPACE: services
SERVICES_SERVICE_ACCOUNT: service
STORAGE_SERVICE: 'ibm_cos'
STORAGE_IBM_COS_BUCKET: 'dynamiqai'

Expand All @@ -61,7 +61,7 @@ synapse:
className: public-iks-k8s-nginx
configMapData:
ENV: prod
APPS_URL: 'http://router.fission.svc.cluster.local:80'
APPS_BASE_URL: 'http://router.fission.svc.cluster.local:80'
INFERENCES_NAMESPACE: inferences
STORAGE_SERVICE: 'ibm_cos'
STORAGE_IBM_COS_BUCKET: 'dynamiqai'
Expand Down
4 changes: 2 additions & 2 deletions charts/nexus/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ 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.44
version: 0.1.45

# 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: "0.27.0"
appVersion: "0.28.0"
2 changes: 1 addition & 1 deletion charts/nexus/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
app: nexus-service
data:
UI_URL: "https://ui.{{ .Values.dynamiq.domain }}"
UI_BASE_URL: "https://ui.{{ .Values.dynamiq.domain }}"
DOMAIN: "{{ .Values.dynamiq.domain }}"
{{- range $key, $value := .Values.configMapData }}
{{ $key | quote }}: {{ $value | quote }}
Expand Down
16 changes: 8 additions & 8 deletions charts/nexus/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ affinity: {}

configMapData:
ENV: prod
SYNAPSE_URL: 'http://synapse.synapse.svc.cluster.local:80'
CATALYST_URL: 'http://catalyst.catalyst.svc.cluster.local:80'
APP_NAMESPACE: apps
SYNAPSE_BASE_URL: 'http://synapse.synapse.svc.cluster.local:80'
CATALYST_BASE_URL: 'http://catalyst.catalyst.svc.cluster.local:80'
APPS_NAMESPACE: apps
AUTH_ACCESS_TOKEN_TTL: 1h
AUTH_REFRESH_TOKEN_TTL: 240h
AUTH_VERIFICATION_TOKEN_TTL: 12h
Expand All @@ -136,12 +136,12 @@ configMapData:
IMAGE_BUILDER_DOCKER_IMAGE: 'gcr.io/kaniko-project/executor:v1.23.1'
IMAGE_BUILDER_NAMESPACE: image-builder
IMAGE_BUILDER_SERVICE_ACCOUNT: image-builder
INFERENCE_NAMESPACE: inferences
INFERENCE_SERVICE_ACCOUNT: inference
INFERENCES_NAMESPACE: inferences
INFERENCES_SERVICE_ACCOUNT: inference
INFERENCE_DOCKER_IMAGE: 'ghcr.io/predibase/lorax:387e17e'
SERVICE_IMAGE_REPOSITORY: 128336707324.dkr.ecr.us-east-1.amazonaws.com/service
SERVICE_NAMESPACE: services
SERVICE_SERVICE_ACCOUNT: service
SERVICES_IMAGE_REPOSITORY: 128336707324.dkr.ecr.us-east-1.amazonaws.com/service
SERVICES_NAMESPACE: services
SERVICES_SERVICE_ACCOUNT: service
STORAGE_SERVICE: 'ibm_cos'
STORAGE_IBM_COS_BUCKET: 'dynamiqai'

Expand Down
4 changes: 2 additions & 2 deletions charts/synapse/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ 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.30
version: 0.1.31

# 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: "0.27.0"
appVersion: "0.28.0"
2 changes: 1 addition & 1 deletion charts/synapse/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ affinity: {}

configMapData:
ENV: prod
APPS_URL: 'http://router.fission.svc.cluster.local:80'
APPS_BASE_URL: 'http://router.fission.svc.cluster.local:80'
INFERENCES_NAMESPACE: inferences
STORAGE_SERVICE: 'ibm_cos'
STORAGE_IBM_COS_BUCKET: 'dynamiqai'
Expand Down
4 changes: 2 additions & 2 deletions charts/ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ 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.22
version: 0.1.23

# 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: "0.27.0"
appVersion: "0.28.0"

0 comments on commit 39bcf20

Please sign in to comment.