Skip to content

Commit 7148080

Browse files
committed
feat: flatten out dynamo cloud helm chart
1 parent 9418237 commit 7148080

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

deploy/cloud/helm/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ cd ..
157157
# Install/upgrade the helm chart for the CRDs
158158
if [ "$INSTALL_CRDS" = true ]; then
159159
echo "Installing/upgrading helm chart for the CRDs..."
160-
$HELM_CMD upgrade --install dynamo-crds crds/ --namespace default
160+
$HELM_CMD upgrade --install dynamo-crds crds/ --namespace default --wait --atomic
161161
fi
162162

163163
# Install/upgrade the helm chart

deploy/cloud/helm/platform/Chart.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,3 @@ dependencies:
4646
version: 16.0.2
4747
repository: "https://charts.bitnami.com/bitnami"
4848
condition: minio.enabled
49-

deploy/cloud/helm/platform/components/api-store/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ spec:
8484
- name: DYN_OBJECT_STORE_ID
8585
valueFrom:
8686
secretKeyRef:
87-
name: '{{ .Values.minio.host | default (printf "%s-minio" .Release.Name) }}'
87+
name: '{{ .Values.minio.passwordSecret | default (printf "%s-minio" .Release.Name) }}'
8888
key: root-user
8989
- name: DYN_OBJECT_STORE_KEY
9090
valueFrom:

deploy/cloud/helm/platform/components/api-store/values.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,14 @@ istio:
9494
postgresql:
9595
host: ""
9696
port: 5432
97-
user: "admin"
97+
# allow to override the secret name containing the postgres password
9898
passwordSecret: ""
9999
database: "dynamo"
100100

101101
minio:
102102
host: ""
103103
port: 9000
104-
accessKey: "minioadmin"
105-
secretKey: "minioadmin"
104+
# allow to override the secret name containing the minio username and password
106105
passwordSecret: ""
107106

108107
resources: {}

deploy/cloud/helm/platform/components/operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ version: 0.1.7
3232
# incremented each time you make changes to the application. Versions are not expected to
3333
# follow Semantic Versioning. They should reflect the version the application is using.
3434
# It is recommended to use it with quotes.
35-
appVersion: "0.1.0"
35+
appVersion: "0.1.0"

deploy/cloud/helm/platform/components/operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,4 @@ metricsService:
118118
type: ClusterIP
119119

120120
natsAddr: ""
121-
etcdAddr: ""
121+
etcdAddr: ""

deploy/cloud/helm/platform/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ postgresql:
149149
password: "password"
150150
database: "dynamo"
151151
primary:
152-
persistence:
153-
enabled: false
152+
persistence:
153+
enabled: false
154154

155155
etcd:
156156
enabled: false

docs/guides/dynamo_deploy/dynamo_cloud.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ kubectl create namespace $NAMESPACE
148148
kubectl config set-context --current --namespace=$NAMESPACE
149149
```
150150

151-
3. Deploy the helm charts using the deploy script:
151+
3. Deploy the Helm charts (install CRDs first, then platform) using the deployment script:
152152

153153
```bash
154154
./deploy.sh --crds
@@ -160,6 +160,8 @@ if you wish to be guided through the deployment process, you can run the deploy
160160
./deploy.sh --crds --interactive
161161
```
162162

163+
omitting `--crds` will skip the CRDs installation/upgrade. This is useful when installing on a shared cluster as CRDs are cluster-scoped resources.
164+
163165
4. **Expose Dynamo Cloud Externally**
164166

165167
``` {note}

0 commit comments

Comments
 (0)