From 7cc339f44de0704df83fe3439f38b7adfc3302a4 Mon Sep 17 00:00:00 2001 From: Trayan Azarov Date: Wed, 27 Sep 2023 22:47:25 +0300 Subject: [PATCH] feat: Remove kubeVersion restrictions from Chart to make it accessible to cloud providers with custom version (#20) --- .github/workflows/build-images.yml | 4 +-- .github/workflows/integration-test.yml | 6 ++--- charts/chromadb-chart/Chart.yaml | 5 ++-- charts/chromadb-chart/config/log_config.yaml | 27 +++++++++++++------- charts/chromadb-chart/values.yaml | 2 +- image/Dockerfile | 2 +- 6 files changed, 27 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index d3c2705..e8a9a6d 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -7,13 +7,13 @@ on: env: REGISTRY: ghcr.io IMAGE_NAME: "ghcr.io/amikos-tech/chromadb-chart/chroma" - LATEST_VERSION: "0.4.9" + LATEST_VERSION: "0.4.13" jobs: build-images: strategy: matrix: - chroma-version: [ 0.4.3, 0.4.4, 0.4.5, 0.4.6, 0.4.7, 0.4.8, 0.4.9 ] + chroma-version: [ 0.4.3, 0.4.4, 0.4.5, 0.4.6, 0.4.7, 0.4.8, 0.4.9, 0.4.10, 0.4.11, 0.4.12, 0.4.13 ] runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 45904a6..b8ba5cb 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -14,12 +14,12 @@ on: env: REGISTRY: ghcr.io IMAGE_NAME: "ghcr.io/amikos-tech/chromadb-chart/chroma" - LATEST_VERSION: "0.4.9" + LATEST_VERSION: "0.4.13" jobs: build-images: strategy: matrix: - chroma-version: [ 0.4.3, 0.4.4, 0.4.5, 0.4.6, 0.4.7, 0.4.8, 0.4.9 ] + chroma-version: [ 0.4.3, 0.4.4, 0.4.5, 0.4.6, 0.4.7, 0.4.8, 0.4.9, 0.4.10, 0.4.11, 0.4.12, 0.4.13 ] runs-on: ubuntu-latest steps: - name: Checkout @@ -69,7 +69,7 @@ jobs: strategy: matrix: kubernetes-version: [1.23.0, 1.24.0, 1.27.3, v1.28.0-rc.0 ] - chroma-version: [ 0.4.3, 0.4.4, 0.4.5, 0.4.6, 0.4.7, 0.4.8, 0.4.9 ] + chroma-version: [ 0.4.3, 0.4.4, 0.4.5, 0.4.6, 0.4.7, 0.4.8, 0.4.9, 0.4.10, 0.4.11, 0.4.12, 0.4.13 ] runs-on: ubuntu-latest steps: - name: Checkout diff --git a/charts/chromadb-chart/Chart.yaml b/charts/chromadb-chart/Chart.yaml index e4c8aa0..ccc90a0 100644 --- a/charts/chromadb-chart/Chart.yaml +++ b/charts/chromadb-chart/Chart.yaml @@ -4,7 +4,6 @@ maintainers: - name: Amikos Tech email: opensource@amikos.tech url: https://amikos.tech -kubeVersion: ">= 1.23.0 <= 1.28.x || >= 1.28.0-rc.0 <= 1.28.x-rc.x" home: "https://github.com/amikos-tech/chromadb-chart" sources: - "https://github.com/amikos-tech/chromadb-chart" @@ -17,6 +16,6 @@ keywords: - ai/ml type: application -version: 0.1.15 +version: 0.1.16 # chromadb version -appVersion: "0.4.9" +appVersion: "0.4.13" diff --git a/charts/chromadb-chart/config/log_config.yaml b/charts/chromadb-chart/config/log_config.yaml index 32dd25c..134d665 100644 --- a/charts/chromadb-chart/config/log_config.yaml +++ b/charts/chromadb-chart/config/log_config.yaml @@ -2,23 +2,32 @@ version: 1 disable_existing_loggers: False formatters: default: - format: '%(asctime)s %(levelname)-8s %(name)-15s %(message)s' - datefmt: '%Y-%m-%d %H:%M:%S' + "()": uvicorn.logging.DefaultFormatter + format: '%(levelprefix)s [%(asctime)s] %(message)s' + use_colors: null + datefmt: '%d-%m-%Y %H:%M:%S' + access: + "()": uvicorn.logging.AccessFormatter + format: '%(levelprefix)s [%(asctime)s] %(client_addr)s - "%(request_line)s" %(status_code)s' + datefmt: '%d-%m-%Y %H:%M:%S' handlers: + default: + formatter: default + class: logging.StreamHandler + stream: ext://sys.stderr + access: + formatter: access + class: logging.StreamHandler + stream: ext://sys.stdout console: class: logging.StreamHandler stream: ext://sys.stdout formatter: default - file: - class: logging.handlers.RotatingFileHandler - filename: chroma.log - formatter: default loggers: root: level: WARN - # handlers: [console, file] we remove file handler as this is not needed in k8s and in cloud-native setups in general - handlers: [ console ] + handlers: [console] chromadb: level: DEBUG uvicorn: - level: INFO + level: INFO \ No newline at end of file diff --git a/charts/chromadb-chart/values.yaml b/charts/chromadb-chart/values.yaml index 19a1dac..43bf844 100644 --- a/charts/chromadb-chart/values.yaml +++ b/charts/chromadb-chart/values.yaml @@ -93,7 +93,7 @@ startupProbe: initialDelaySeconds: 10 chromadb: - apiVersion: "0.4.9" + apiVersion: "0.4.13" allowReset: false isPersistent: true persistDirectory: /index_data diff --git a/image/Dockerfile b/image/Dockerfile index c99b21e..6bab944 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,4 +1,4 @@ -ARG CHROMA_VERSION=0.4.9 +ARG CHROMA_VERSION=0.4.13 FROM ghcr.io/chroma-core/chroma:${CHROMA_VERSION} as base COPY ./image/docker_entrypoint.sh /docker_entrypoint.sh