Skip to content

Commit

Permalink
[pre-commit.ci] Apply automatic pre-commit fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
pre-commit-ci[bot] committed Dec 27, 2024
1 parent e813e81 commit e7809ec
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 21 deletions.
2 changes: 1 addition & 1 deletion conda-store-server/install/conda-store/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ spec:
operator: In
values:
- mynode
```
```
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
data:
conda_store_config.py: |
{{ .Values.apiServer.condaStoreConfig | nindent 4 }}
{{ .Values.apiServer.condaStoreConfig | nindent 4 }}
kind: ConfigMap
metadata:
name: "{{ template "condaStore.fullname" . }}-api-server"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ spec:
name: http
selector:
app: "{{ template "condaStore.fullname" . }}-api-server"

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
data:
conda_store_config.py: |
{{ .Values.uiServer.condaStoreConfig | nindent 4 }}
{{ .Values.uiServer.condaStoreConfig | nindent 4 }}
kind: ConfigMap
metadata:
name: "{{ template "condaStore.fullname" . }}-ui-server"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ spec:
name: http
selector:
app: "{{ template "condaStore.fullname" . }}-ui-server"

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
data:
conda_store_config.py: |
{{ .Values.worker.condaStoreConfig | nindent 4 }}
{{ .Values.worker.condaStoreConfig | nindent 4 }}
kind: ConfigMap
metadata:
name: "{{ template "condaStore.fullname" . }}-worker"
Expand Down
14 changes: 7 additions & 7 deletions conda-store-server/install/conda-store/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ apiServer:
pullPolicy: IfNotPresent
tag: 2024.6.1

# Config for the conda-store-server. For all available options, see the
# Config for the conda-store-server. For all available options, see the
# docs at https://conda.store/conda-store/references/configuration-options
# The following env vars are injected into the container if required:
# * POSTGRES_USERNAME
Expand Down Expand Up @@ -87,7 +87,7 @@ uiServer:
pullPolicy: IfNotPresent
tag: 2024.6.1

# Config for the conda-store-server. For all available options, see the
# Config for the conda-store-server. For all available options, see the
# docs at https://conda.store/conda-store/references/configuration-options
# Provided is a good starting point for the config
condaStoreConfig: |
Expand Down Expand Up @@ -132,15 +132,15 @@ uiServer:
worker:
# Number of workers that are to be in the worker deployment
replicas: 2

# Image for the worker container
image:
repository: quansight/conda-store-server
pullPolicy: IfNotPresent
tag: 2024.6.1
# Volume attached to the worker volumes that contains conda environments
# and packages. This will bind to the worker with a PVC. To bind your

# Volume attached to the worker volumes that contains conda environments
# and packages. This will bind to the worker with a PVC. To bind your
# PV to the PVC ensure to set the claim ref on your volume. For example
# ```
# spec:
Expand All @@ -155,7 +155,7 @@ worker:
# Size of the environmentsVolume
environmentsVolumeSize: 2Gi

# Config for the conda-store-server. For all available options, see the
# Config for the conda-store-server. For all available options, see the
# docs at https://conda.store/conda-store/references/configuration-options
# The following env vars are injected into the container if required:
# * POSTGRES_USERNAME
Expand Down
14 changes: 7 additions & 7 deletions examples/helm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ $ kubectl get secret -n conda-store

## Generate vaules.local.yaml

Use gomplate to generate the values.local.yaml file.
Use gomplate to generate the values.local.yaml file.

If you don't already have gomplate installed, follow [these install instructions](https://docs.gomplate.ca/installing/)

Expand All @@ -45,7 +45,7 @@ $ cd tmpl
$ gomplate -d api-server-config.py -d ui-server-config.py -d worker-config.py -d defaults.yaml -f values.local.yaml.tmpl -o ../values.local.yaml
```

## Helm install
## Helm install

```
$ helm install conda-store ../../conda-store-server/install/conda-store/ --values values.local.yaml
Expand All @@ -54,10 +54,10 @@ $ helm install conda-store ../../conda-store-server/install/conda-store/ --valu
Expose the required ports
```
# conda-store UI
$ kubectl port-forward -n conda-store service/conda-store-ui-server 8080:8080
$ kubectl port-forward -n conda-store service/conda-store-ui-server 8080:8080
# conda-store api
$ kubectl port-forward -n conda-store service/conda-store-api-server 8081:8080
$ kubectl port-forward -n conda-store service/conda-store-api-server 8081:8080
# minio
$ kubectl port-forward -n conda-store service/minio 9000:9000
Expand Down Expand Up @@ -95,10 +95,10 @@ $ curl http://localhost:8080

Connect to the database pod with psql
```
$ kub exec --stdin --tty postgres-68cd794f77-z7qzk -n conda-store -- psql -U admin conda-store
$ kub exec --stdin --tty postgres-68cd794f77-z7qzk -n conda-store -- psql -U admin conda-store
```

Connect to the worker pod with a shell
```
$ kub exec --stdin --tty conda-store-worker-9cc75dd7d-87nz8 -n conda-store -- /bin/bash
```
$ kub exec --stdin --tty conda-store-worker-9cc75dd7d-87nz8 -n conda-store -- /bin/bash
```
2 changes: 1 addition & 1 deletion examples/helm/tmpl/values.local.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ apiServer:
tag: {{ (datasource "defaults").image.tag }}
condaStoreConfig: |
{{ include "api-server-config" | indent 4 }}

uiServer:
nodePort: 30500
port: 8080
Expand Down

0 comments on commit e7809ec

Please sign in to comment.