From a0ff45f3de16abfcd984637d5aff76d4266563e9 Mon Sep 17 00:00:00 2001 From: Vishnu Narayanan Date: Mon, 16 Aug 2021 23:45:04 +0530 Subject: [PATCH] chore: refactor installation_env variable naming (#28) * chore: refactor installation_env variable naming * chore: remove unused env var --- charts/chatwoot/Chart.yaml | 2 +- charts/chatwoot/README.md | 9 ++++----- charts/chatwoot/templates/_env_rails.tpl | 10 +++++----- charts/chatwoot/values.yaml | 3 +-- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/charts/chatwoot/Chart.yaml b/charts/chatwoot/Chart.yaml index b6a2943..c3e2f9d 100644 --- a/charts/chatwoot/Chart.yaml +++ b/charts/chatwoot/Chart.yaml @@ -31,7 +31,7 @@ sources: - http://www.chatwoot.com # This is the chart version. -version: 0.5.5 +version: 0.5.6 # This is the application version. appVersion: "v1.18.2" diff --git a/charts/chatwoot/README.md b/charts/chatwoot/README.md index e3970ec..f6841ae 100644 --- a/charts/chatwoot/README.md +++ b/charts/chatwoot/README.md @@ -59,7 +59,7 @@ The command removes all the Kubernetes components associated with the chart and | ----------------------------------- | ------------------------------------------------------------------- | ---------------------------------------------------------- | | `env.ACTIVE_STORAGE_SERVICE` | Storage service. `local` for disk. `amazon` for s3. | `"local"` | | `env.ASSET_CDN_HOST` | Set if CDN is used for asset delivery. | `""` | -| `env.CHATWOOT_INSTALLATION_ENV` | Sets chatwoot installation method. | `"helm"` | +| `env.INSTALLATION_ENV` | Sets chatwoot installation method. | `"helm"` | | `env.ENABLE_ACCOUNT_SIGNUP` | `true` : default option, allows sign ups, `false` : disables all the end points related to sign ups, `api_only`: disables the UI for signup but you can create sign ups via the account apis. | `"false"` | | `env.FORCE_SSL` | Force all access to the app over SSL, default is set to false. | `"false"` | | `env.FRONTEND_URL` | Replace with the URL you are planning to use for your app. | `"http://0.0.0.0:3000/"` | @@ -91,8 +91,8 @@ The command removes all the Kubernetes components associated with the chart and ### Postgres variables -| Name | Type | Default Value | -| ----------------------------------- | ------------------------------------------------------------------- | ---------------------------------------------------------- | +| Name | Type | Default Value | +| ----------------------------------- | ----------------------------------------------------------------------------- | ------------------------------------------------ | | `postgresql.enabled` | Set to `false` if using external postgres and modify the below variables. | `true` | | `env.POSTGRES_DB` | Chatwoot database name | `"chatwoot_production"` | | `env.POSTGRES_HOST` | Database url. Edit if using external postgres. | `"chatwoot-chatwoot-postgresql"` | @@ -123,10 +123,9 @@ The command removes all the Kubernetes components associated with the chart and | ----------------------------------- | -------------------------------------------------------------------- | ---------------------------------------------------------- | | `env.S3_BUCKET_NAME` | S3 bucket name | `""` | | `env.AWS_ACCESS_KEY_ID` | Amazon access key ID | `""` | -| `env.AWS_ENDPOINT_URL` | https://www.chatwoot.com/docs/configuring-s3-bucket-as-cloud-storage | `""` | | `env.AWS_REGION` | Amazon region | `""` | | `env.AWS_SECRET_ACCESS_KEY` | Amazon secret key ID | `""` | -| `env.FB_APP_ID` | For facebook channel. https://www.chatwoot.com/docs/facebook-setup | `""` | +| `env.FB_APP_ID` | For facebook channel https://www.chatwoot.com/docs/facebook-setup | `""` | | `env.FB_APP_SECRET` | For facebook channel | `""` | | `env.FB_VERIFY_TOKEN` | For facebook channel | `""` | | `env.SLACK_CLIENT_ID` | For slack integration | `""` | diff --git a/charts/chatwoot/templates/_env_rails.tpl b/charts/chatwoot/templates/_env_rails.tpl index dbd1edd..7b06869 100644 --- a/charts/chatwoot/templates/_env_rails.tpl +++ b/charts/chatwoot/templates/_env_rails.tpl @@ -57,6 +57,11 @@ configMapKeyRef: key: FRONTEND_URL name: env + - name: INSTALLATION_ENV + valueFrom: + configMapKeyRef: + key: INSTALLATION_ENV + name: env - name: IOS_APP_ID valueFrom: configMapKeyRef: @@ -249,10 +254,5 @@ configMapKeyRef: key: USE_INBOX_AVATAR_FOR_BOT name: env - - name: CHATWOOT_INSTALLATION_ENV - valueFrom: - configMapKeyRef: - key: CHATWOOT_INSTALLATION_ENV - name: env {{- end }} diff --git a/charts/chatwoot/values.yaml b/charts/chatwoot/values.yaml index 9a148f1..6ecda08 100644 --- a/charts/chatwoot/values.yaml +++ b/charts/chatwoot/values.yaml @@ -150,13 +150,13 @@ env: AWS_ACCESS_KEY_ID: "" AWS_REGION: "" AWS_SECRET_ACCESS_KEY: "" - AWS_ENDPOINT_URL: "" ENABLE_ACCOUNT_SIGNUP: "false" FB_APP_ID: "" FB_APP_SECRET: "" FB_VERIFY_TOKEN: "" FORCE_SSL: "false" FRONTEND_URL: "http://0.0.0.0:3000/" + INSTALLATION_ENV: "helm" IOS_APP_ID: 6C953F3RX2.com.chatwoot.app LOG_LEVEL: info LOG_SIZE: "500" @@ -196,4 +196,3 @@ env: TWITTER_CONSUMER_SECRET: "" TWITTER_ENVIRONMENT: "" USE_INBOX_AVATAR_FOR_BOT: "true" - CHATWOOT_INSTALLATION_ENV: "helm"