Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions kubernetes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,21 @@ kubectl apply -f vector.yaml

The helm script is in the helm directory. It's under development.

In the `helm` directory, run the following to install the helm chart:
##### EKS

In the `helm` directory, run the following to install the helm chart on EKS.
Replace `bucket-name` with your S3 bucket name.

```shell
helm install antalya-test ./
helm install antalya-test ./ --set iceRestCatalog.catalogBucket=bucket-name
```

This requires a service account named `ice-rest-catalog` set up from the instructions [here](ice/README.md).
To use a different service account name, add `--set iceRestCatalog.serviceAccountName=new-account-name` to
the end of the `helm install` command above.

##### Minikube

On Minikube, run:

```shell
Expand All @@ -85,6 +94,8 @@ helm install antalya-test ./ -f values-minikube.yaml

This will deploy MinIO for local object storage.

##### Uninstalling

To uninstall, run:

```shell
Expand Down
7 changes: 6 additions & 1 deletion kubernetes/helm/templates/ice-rest-catalog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ stringData:
uri: etcd:http://ice-rest-catalog-etcd:2379
warehouse: s3://{{ .Values.iceRestCatalog.catalogBucket }}
s3:
{{ if .Values.minio.enabled }}
endpoint: {{ .Values.iceRestCatalog.s3.endpoint }}
pathStyleAccess: true
accessKeyID: {{ .Values.iceRestCatalog.s3.accessKeyID }}
secretAccessKey: {{ .Values.iceRestCatalog.s3.secretAccessKey }}
{{ end }}
pathStyleAccess: true
region: {{ .Values.iceRestCatalog.s3.region }}
bearerTokens:
- value: foo
Expand Down Expand Up @@ -50,6 +52,9 @@ spec:
prometheus.io/scrape: "true"
prometheus.io/port: "5001"
spec:
{{ if .Values.iceRestCatalog.serviceAccountName }}
serviceAccountName: {{ .Values.iceRestCatalog.serviceAccountName }}
{{ end }}
volumes:
- name: etc
secret:
Expand Down
9 changes: 9 additions & 0 deletions kubernetes/helm/templates/swarm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ spec:
nodes:
- host: keeper-keeper
port: 2181
users:
cache_enabled/networks/ip: "::/0"
cache_enabled/password: topsecret
cache_enabled/profile: default
profiles:
default/enable_filesystem_cache: 0
default/filesystem_cache_name: "s3_parquet_cache"
cache_enabled/enable_filesystem_cache: 1
cache_enabled/filesystem_cache_name: "s3_parquet_cache"
files:
config.d/remote_servers.xml: |
<clickhouse>
Expand Down
2 changes: 2 additions & 0 deletions kubernetes/helm/templates/vector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ spec:
nodes:
- host: keeper-keeper
port: 2181
users:
root/password: topsecret
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can wait for a later PR but we should use secrets rather than expose passwords. See https://altinity.com/blog/clickhouse-confidential-using-kubernetes-secrets-with-the-altinity-operator#using-secrets-to-protect-clickhouse-user-passwords for more information.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will look into using secrets. But this section was added so the test_vector_sever_version auth header here works. If the test is changed to not use the auth header, this root password is not needed. Not sure if that's an issue with the test or if we do need a root password specified, because I don't see this password in the docker compose setup.

files:
config.d/remote_servers.xml: |
<clickhouse>
Expand Down
1 change: 1 addition & 0 deletions kubernetes/helm/values-minikube.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ swarm:
# Ice Rest Catalog settings
iceRestCatalog:
catalogBucket: warehouse
serviceAccountName:
s3:
endpoint: "http://minio:9000"
accessKeyID: minio
Expand Down
7 changes: 4 additions & 3 deletions kubernetes/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,13 @@ swarm:

# Ice Rest Catalog settings
iceRestCatalog:
catalogBucket: bucket1
catalogBucket: bucket-name
serviceAccountName: ice-rest-catalog
s3:
endpoint: ""
endpoint: http://s3.us-west-2.amazonaws.com
region: us-west-2
accessKeyID: ""
secretAccessKey: ""
region: us-east-1
storage:
class: "" # Defaults to global.storageClass if empty

Expand Down