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 21, 2025
1 parent 808b3bc commit d530e11
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 20 deletions.
8 changes: 4 additions & 4 deletions charts/dynamiq/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ 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.76
version: 0.1.77

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

dependencies:
- name: nexus
version: 0.1.43
version: 0.1.44
repository: https://dynamiq-ai.github.io/charts
- name: synapse
version: 0.1.29
version: 0.1.30
repository: https://dynamiq-ai.github.io/charts
- name: ui
version: 0.1.22
Expand Down
25 changes: 15 additions & 10 deletions charts/dynamiq/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ It is recommended to create a new IBM Cloud Object Storage service instance befo
```bash
ibmcloud plugin install infrastructure-service
ibmcloud plugin install kubernetes-service
ibmcloud plugin install cos
```

#### Login to IBM Cloud
```bash
ibmcloud login -r us-south [-g <resource_group>] [--sso]
ibmcloud resource group-create dynamiq
ibmcloud target -g dynamiq

```

#### Create VPC and Subnet
Expand All @@ -41,16 +41,16 @@ ibmcloud is subnet-create <subnet-name> <vpc-name> --zone <zone-name> --ipv4-add
```

```bash
ibmcloud is vpc-create dynamiq
ibmcloud is public-gateway-create dynamiq-gateway dynamiq us-south-1
ibmcloud is subnet-create public dynamiq --zone us-south-1 --ipv4-address-count 256 --pgw dynamiq-gateway
ibmcloud is vpc-create dynamiq --resource-group-name dynamiq
ibmcloud is public-gateway-create dynamiq-gateway dynamiq us-south-1 --resource-group-name dynamiq
ibmcloud is subnet-create public dynamiq --zone us-south-1 --ipv4-address-count 256 --pgw dynamiq-gateway --resource-group-name dynamiq
```

#### Create Kubernetes Cluster
```bash
VPC_ID=$(ibmcloud is vpcs --json | jq -r '.[] | select(.name == "dynamiq") | .id')
VPC_SUBNET_ID=$(ibmcloud is subnets --json | jq -r '.[] | select(.name == "public") | .id')
ibmcloud ks cluster create vpc-gen2 --name dynamiq-cluster --zone us-south-1 --version 1.31 --flavor bx2.2x8 --workers 2 --vpc-id $VPC_ID --subnet-id $VPC_SUBNET_ID
ibmcloud ks cluster create vpc-gen2 --name dynamiq-cluster --zone us-south-1 --version 1.31 --flavor bx2.2x8 --workers 2 --vpc-id $VPC_ID --subnet-id $VPC_SUBNET_ID --disable-outbound-traffic-protection
```

List clusters and update kubectl config
Expand Down Expand Up @@ -93,8 +93,11 @@ DATABASE_NAME=$(ibmcloud resource service-key ${DB_INSTANCE_NAME}-credentials --

```bash
export COS_INSTANCE_NAME=cos-dynamiq
ibmcloud resource service-instance-create ${COS_INSTANCE_NAME} cloud-object-storage standard global
ibmcloud resource service-key-create dynamiq-app Writer --instance-name ${COS_INSTANCE_NAME} --parameters '{"HMAC":true}'
ibmcloud resource service-instance-create ${COS_INSTANCE_NAME} cloud-object-storage standard global -g dynamiq
ibmcloud resource service-key-create ${COS_INSTANCE_NAME}-credentials Writer --instance-name ${COS_INSTANCE_NAME} --parameters '{"HMAC":true}'
STORAGE_IBM_COS_API_KEY=$(ibmcloud resource service-key ${COS_INSTANCE_NAME}-credentials --output=json | jq -r '.[] | select ( .name == "'${COS_INSTANCE_NAME}-credentials'") | .credentials.apikey')
STORAGE_IBM_COS_RESOURCE_INSTANCE_ID=$(ibmcloud resource service-instance ${COS_INSTANCE_NAME} --output=json | jq -r '.[] | select (.name == "'${COS_INSTANCE_NAME}'") | .id')
ibmcloud cos bucket-create --bucket dynamiqai --region us-south --ibm-service-instance-id=$STORAGE_IBM_COS_RESOURCE_INSTANCE_ID
```

## Installing the software
Expand Down Expand Up @@ -128,8 +131,8 @@ HUGGING_FACE_TOKEN="<hugging face token>"
1. Configure the values as illustrated in the following <sample_secret_file>.yaml file:
```bash
kubectl create namespace dynamiq
```bash
kubectl create namespace dynamiq
cat <<EOF | envsubst | kubectl apply -f -
apiVersion: v1
kind: Secret
Expand All @@ -145,6 +148,8 @@ stringData:
DATABASE_SCHEMA: 'public'
DATABASE_USERNAME: '${DATABASE_USERNAME}'
DATABASE_PASSWORD: '${DATABASE_PASSWORD}'
STORAGE_IBM_COS_API_KEY: '${STORAGE_IBM_COS_API_KEY}'
STORAGE_IBM_COS_RESOURCE_INSTANCE_ID: '${STORAGE_IBM_COS_RESOURCE_INSTANCE_ID}'
SMTP_HOST: '${SMTP_HOST}'
SMTP_PORT: '${SMTP_PORT}'
SMTP_USERNAME: '${SMTP_USERNAME}'
Expand All @@ -155,7 +160,7 @@ stringData:
AUTH_VERIFICATION_TOKEN_KEY: '${AUTH_VERIFICATION_TOKEN_KEY}'
HUGGING_FACE_TOKEN: '${HUGGING_FACE_TOKEN}'
EOF
```
```

2. Pass the name of the Secret as a value to the `nexus.appSecret` parameter.
`
Expand Down
4 changes: 2 additions & 2 deletions charts/dynamiq/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
"STORAGE_SERVICE": {
"type": "string",
"description": "Storage service.",
"enum": ["ibmcloud", "s3"]
"enum": ["ibm_cos", "s3"]
}
},
"required": [
Expand Down Expand Up @@ -269,7 +269,7 @@
"STORAGE_SERVICE": {
"type": "string",
"description": "Storage service.",
"enum": ["ibmcloud", "s3"]
"enum": ["ibm_cos", "s3"]
}
},
"required": ["ENV", "APPS_URL", "INFERENCES_NAMESPACE", "STORAGE_SERVICE"]
Expand Down
8 changes: 4 additions & 4 deletions charts/dynamiq/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ nexus:
SERVICE_IMAGE_REPOSITORY: 128336707324.dkr.ecr.us-east-1.amazonaws.com/service
SERVICE_NAMESPACE: services
SERVICE_SERVICE_ACCOUNT: service
STORAGE_SERVICE: 'ibmcloud'
STORAGE_S3_BUCKET: 'dynamiqai'
STORAGE_SERVICE: 'ibm_cos'
STORAGE_IBM_COS_BUCKET: 'dynamiqai'

synapse:
appSecret: "nexus-secret"
Expand All @@ -63,8 +63,8 @@ synapse:
ENV: prod
APPS_URL: 'http://router.fission.svc.cluster.local:80'
INFERENCES_NAMESPACE: inferences
STORAGE_SERVICE: s3
STORAGE_S3_BUCKET:
STORAGE_SERVICE: 'ibm_cos'
STORAGE_IBM_COS_BUCKET: 'dynamiqai'


ui:
Expand Down

0 comments on commit d530e11

Please sign in to comment.