From 2c96d68f306880b81f2797f767ce4da72da2cd77 Mon Sep 17 00:00:00 2001 From: Andrew Xie Date: Wed, 21 Jan 2026 14:51:15 -0500 Subject: [PATCH 1/2] Fix helm on eks --- kubernetes/README.md | 15 +++++++++++++-- kubernetes/helm/templates/ice-rest-catalog.yaml | 7 ++++++- kubernetes/helm/templates/swarm.yaml | 11 +++++++++++ kubernetes/helm/templates/vector.yaml | 2 ++ kubernetes/helm/values-minikube.yaml | 1 + kubernetes/helm/values.yaml | 7 ++++--- 6 files changed, 37 insertions(+), 6 deletions(-) diff --git a/kubernetes/README.md b/kubernetes/README.md index 580d7a9..ec57a68 100644 --- a/kubernetes/README.md +++ b/kubernetes/README.md @@ -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 @@ -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 diff --git a/kubernetes/helm/templates/ice-rest-catalog.yaml b/kubernetes/helm/templates/ice-rest-catalog.yaml index 20b4dd3..691e738 100644 --- a/kubernetes/helm/templates/ice-rest-catalog.yaml +++ b/kubernetes/helm/templates/ice-rest-catalog.yaml @@ -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 @@ -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: diff --git a/kubernetes/helm/templates/swarm.yaml b/kubernetes/helm/templates/swarm.yaml index 8c46374..aef4254 100644 --- a/kubernetes/helm/templates/swarm.yaml +++ b/kubernetes/helm/templates/swarm.yaml @@ -16,6 +16,17 @@ 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/enable_filesystem_cache_log: 1 + default/filesystem_cache_name: "s3_parquet_cache" + cache_enabled/enable_filesystem_cache: 1 + #cache_enabled/enable_filesystem_cache_log: 1 + cache_enabled/filesystem_cache_name: "s3_parquet_cache" files: config.d/remote_servers.xml: | diff --git a/kubernetes/helm/templates/vector.yaml b/kubernetes/helm/templates/vector.yaml index 35fe180..0cda978 100644 --- a/kubernetes/helm/templates/vector.yaml +++ b/kubernetes/helm/templates/vector.yaml @@ -16,6 +16,8 @@ spec: nodes: - host: keeper-keeper port: 2181 + users: + root/password: topsecret files: config.d/remote_servers.xml: | diff --git a/kubernetes/helm/values-minikube.yaml b/kubernetes/helm/values-minikube.yaml index f70b21d..0b50955 100644 --- a/kubernetes/helm/values-minikube.yaml +++ b/kubernetes/helm/values-minikube.yaml @@ -60,6 +60,7 @@ swarm: # Ice Rest Catalog settings iceRestCatalog: catalogBucket: warehouse + serviceAccountName: s3: endpoint: "http://minio:9000" accessKeyID: minio diff --git a/kubernetes/helm/values.yaml b/kubernetes/helm/values.yaml index f7f28ab..a915a43 100644 --- a/kubernetes/helm/values.yaml +++ b/kubernetes/helm/values.yaml @@ -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 From 690d9c7804b0679d357cebada1f146dc4b8ce556 Mon Sep 17 00:00:00 2001 From: Andrew Xie Date: Fri, 23 Jan 2026 14:21:28 -0500 Subject: [PATCH 2/2] Remove commented out lines --- kubernetes/helm/templates/swarm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/kubernetes/helm/templates/swarm.yaml b/kubernetes/helm/templates/swarm.yaml index aef4254..5abce75 100644 --- a/kubernetes/helm/templates/swarm.yaml +++ b/kubernetes/helm/templates/swarm.yaml @@ -22,10 +22,8 @@ spec: cache_enabled/profile: default profiles: default/enable_filesystem_cache: 0 - #default/enable_filesystem_cache_log: 1 default/filesystem_cache_name: "s3_parquet_cache" cache_enabled/enable_filesystem_cache: 1 - #cache_enabled/enable_filesystem_cache_log: 1 cache_enabled/filesystem_cache_name: "s3_parquet_cache" files: config.d/remote_servers.xml: |