From 9cc25e4e46f735e8a1da2fb2265bb44d5a27feab Mon Sep 17 00:00:00 2001 From: bikash119 Date: Wed, 18 Sep 2024 08:44:03 +0530 Subject: [PATCH 1/8] Included default username/password to environment variable to create owner user. --- examples/deployments/k8s/argilla-server-deployment.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/deployments/k8s/argilla-server-deployment.yaml b/examples/deployments/k8s/argilla-server-deployment.yaml index 65fe6d32d9..adfe5c7baf 100644 --- a/examples/deployments/k8s/argilla-server-deployment.yaml +++ b/examples/deployments/k8s/argilla-server-deployment.yaml @@ -29,6 +29,10 @@ spec: value: "http://elasticsearch:9200" - name: ARGILLA_AUTH_SECRET_KEY value: "CHANGE_ME" + - name: USERNAME + value: "argilla" + - name: PASSWORD + value: "12345678" ports: - containerPort: 6900 resources: From e57344e509cefe490845bc5bf77c6842ce08e3f5 Mon Sep 17 00:00:00 2001 From: bikash119 Date: Wed, 18 Sep 2024 09:07:28 +0530 Subject: [PATCH 2/8] Added the details of the fix for issue https://github.com/argilla-io/argilla/issues/5434 --- argilla/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/argilla/CHANGELOG.md b/argilla/CHANGELOG.md index 58b80c8b9a..581a10cdd6 100644 --- a/argilla/CHANGELOG.md +++ b/argilla/CHANGELOG.md @@ -18,6 +18,10 @@ These are the section headers that we use: ## [2.1.0](https://github.com/argilla-io/argilla/compare/v2.0.1...v2.1.0) +### Fixed + +- Fixed the deployment yaml used to create a new Argilla server in K8s. Added `USERNAME` and `PASSWORD` to the environment variables of pod template. ([#5434](https://github.com/argilla-io/argilla/issues/5434)) + ### Added - Added new `ImageField` supporting URLs and Data URLs. ([#5279](https://github.com/argilla-io/argilla/pull/5279)) From 5b7cadbad821b02b685204eb48a43ecb80349339 Mon Sep 17 00:00:00 2001 From: bikash119 Date: Wed, 18 Sep 2024 17:35:40 +0530 Subject: [PATCH 3/8] Moved entry to Unreleased section --- argilla/CHANGELOG.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/argilla/CHANGELOG.md b/argilla/CHANGELOG.md index 581a10cdd6..edd6303862 100644 --- a/argilla/CHANGELOG.md +++ b/argilla/CHANGELOG.md @@ -15,13 +15,12 @@ These are the section headers that we use: --> ## [Unreleased]() - -## [2.1.0](https://github.com/argilla-io/argilla/compare/v2.0.1...v2.1.0) - ### Fixed - Fixed the deployment yaml used to create a new Argilla server in K8s. Added `USERNAME` and `PASSWORD` to the environment variables of pod template. ([#5434](https://github.com/argilla-io/argilla/issues/5434)) +## [2.1.0](https://github.com/argilla-io/argilla/compare/v2.0.1...v2.1.0) + ### Added - Added new `ImageField` supporting URLs and Data URLs. ([#5279](https://github.com/argilla-io/argilla/pull/5279)) From 8aa6b8fc455856ea2f5c3bb1a442b791af02ac3d Mon Sep 17 00:00:00 2001 From: bikash119 Date: Mon, 23 Sep 2024 20:07:19 +0530 Subject: [PATCH 4/8] Added USERNAME and PASSWORD to Authentication section of Server configuration --- argilla/docs/reference/argilla-server/configuration.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/argilla/docs/reference/argilla-server/configuration.md b/argilla/docs/reference/argilla-server/configuration.md index 0fbf229b1f..a5042444d6 100644 --- a/argilla/docs/reference/argilla-server/configuration.md +++ b/argilla/docs/reference/argilla-server/configuration.md @@ -51,6 +51,10 @@ You can set the following environment variables to further configure your server #### Authentication - `ARGILLA_AUTH_SECRET_KEY`: The secret key used to sign the API token data. You can use `openssl rand -hex 32` to generate a 32 character string to use with this environment variable. By default a random value is generated, so if you are using more than one server worker (or more than one Argilla server) you will need to set the same value for all of them. +- `USERNAME`: If provided, the owner username (Default: `""`). +- `PASSWORD`: If provided, the owner password. +If `USERNAME` and `PASSWORD` are provided, the owner user will be created with these credentials on the server startup (Default: `""`). + #### Database From 8f4468962d0d242c94b1f96c01c683e9b68760b1 Mon Sep 17 00:00:00 2001 From: bikash119 Date: Tue, 24 Sep 2024 13:38:13 +0530 Subject: [PATCH 5/8] Update argilla/docs/reference/argilla-server/configuration.md Co-authored-by: David Berenstein --- argilla/docs/reference/argilla-server/configuration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/argilla/docs/reference/argilla-server/configuration.md b/argilla/docs/reference/argilla-server/configuration.md index 5eefd7ae10..8f7c50c0ab 100644 --- a/argilla/docs/reference/argilla-server/configuration.md +++ b/argilla/docs/reference/argilla-server/configuration.md @@ -51,9 +51,9 @@ You can set the following environment variables to further configure your server #### Authentication - `ARGILLA_AUTH_SECRET_KEY`: The secret key used to sign the API token data. You can use `openssl rand -hex 32` to generate a 32 character string to use with this environment variable. By default a random value is generated, so if you are using more than one server worker (or more than one Argilla server) you will need to set the same value for all of them. -- `USERNAME`: If provided, the owner username (Default: `""`). +- `USERNAME`: If provided, the owner username (Default: `None`). - `PASSWORD`: If provided, the owner password. -If `USERNAME` and `PASSWORD` are provided, the owner user will be created with these credentials on the server startup (Default: `""`). +If `USERNAME` and `PASSWORD` are provided, the owner user will be created with these credentials on the server startup (Default: `None`). #### Database From 811fb3df1f58ff90a06ec0d243f2e91eec9204db Mon Sep 17 00:00:00 2001 From: bikash119 Date: Tue, 24 Sep 2024 13:48:16 +0530 Subject: [PATCH 6/8] Update argilla-server-deployment.yaml Commented the USERNAME and PASSWORD field. This will enforce users to set USERNAME and PASSWORD for Owner explicitly. Thank you @david for the review comments. --- examples/deployments/k8s/argilla-server-deployment.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/deployments/k8s/argilla-server-deployment.yaml b/examples/deployments/k8s/argilla-server-deployment.yaml index adfe5c7baf..eca01486ee 100644 --- a/examples/deployments/k8s/argilla-server-deployment.yaml +++ b/examples/deployments/k8s/argilla-server-deployment.yaml @@ -29,10 +29,11 @@ spec: value: "http://elasticsearch:9200" - name: ARGILLA_AUTH_SECRET_KEY value: "CHANGE_ME" - - name: USERNAME - value: "argilla" - - name: PASSWORD - value: "12345678" + ## Uncomment these lines to create owner user + # - name: USERNAME + # value: "argilla" + # - name: PASSWORD + # value: "12345678" ports: - containerPort: 6900 resources: From 87c2afaf059e891790de41804ba3dfc08408cdc9 Mon Sep 17 00:00:00 2001 From: David Berenstein Date: Tue, 24 Sep 2024 10:49:36 +0200 Subject: [PATCH 7/8] Update configuration.md --- argilla/docs/reference/argilla-server/configuration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/argilla/docs/reference/argilla-server/configuration.md b/argilla/docs/reference/argilla-server/configuration.md index 8f7c50c0ab..af61bbde3b 100644 --- a/argilla/docs/reference/argilla-server/configuration.md +++ b/argilla/docs/reference/argilla-server/configuration.md @@ -52,9 +52,9 @@ You can set the following environment variables to further configure your server - `ARGILLA_AUTH_SECRET_KEY`: The secret key used to sign the API token data. You can use `openssl rand -hex 32` to generate a 32 character string to use with this environment variable. By default a random value is generated, so if you are using more than one server worker (or more than one Argilla server) you will need to set the same value for all of them. - `USERNAME`: If provided, the owner username (Default: `None`). -- `PASSWORD`: If provided, the owner password. -If `USERNAME` and `PASSWORD` are provided, the owner user will be created with these credentials on the server startup (Default: `None`). +- `PASSWORD`: If provided, the owner password (Default: `None`). +If `USERNAME` and `PASSWORD` are provided, the owner user will be created with these credentials on the server startup. #### Database From 12e98f0036a898a1c681a539f116acc0b31c33f6 Mon Sep 17 00:00:00 2001 From: David Berenstein Date: Tue, 24 Sep 2024 10:55:40 +0200 Subject: [PATCH 8/8] Update argilla-server-deployment.yaml --- examples/deployments/k8s/argilla-server-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/deployments/k8s/argilla-server-deployment.yaml b/examples/deployments/k8s/argilla-server-deployment.yaml index eca01486ee..23df543ad3 100644 --- a/examples/deployments/k8s/argilla-server-deployment.yaml +++ b/examples/deployments/k8s/argilla-server-deployment.yaml @@ -29,7 +29,7 @@ spec: value: "http://elasticsearch:9200" - name: ARGILLA_AUTH_SECRET_KEY value: "CHANGE_ME" - ## Uncomment these lines to create owner user + # Uncomment these lines to create owner user # - name: USERNAME # value: "argilla" # - name: PASSWORD