Skip to content

Commit 5e3c662

Browse files
authored
Add helm chart initial release (#38)
Also change default port number to more recallable 8000. Embed DO Spaces as default credentials in the Parseable binary, so Parseable no longer expects a local MinIO server as default object storage
1 parent 18f8a5a commit 5e3c662

File tree

7 files changed

+18
-10
lines changed

7 files changed

+18
-10
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ COPY --from=compiler /parseable/target/release/parseable /bin/parseable
6161

6262
USER parseable:parseable
6363

64-
EXPOSE 5678/tcp
64+
EXPOSE 8000/tcp
6565

6666
CMD ["/bin/parseable"]

helm-releases/parseable-0.0.1.tgz

1.78 KB
Binary file not shown.

helm/parseable/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
value: {{ tpl $value $ | quote }}
3838
{{- end }}
3939
ports:
40-
- containerPort: 5678
40+
- containerPort: 8000
4141
resources:
4242
{{- toYaml .Values.parseable.resources | nindent 12 }}
4343
volumeMounts:

helm/parseable/templates/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spec:
77
type: {{ $.Values.parseable.service.type }}
88
ports:
99
- port: {{ $.Values.parseable.service.port }}
10-
targetPort: 5678
10+
targetPort: 8000
1111
protocol: TCP
1212
selector:
1313
{{- include "parseable.selectorLabels" . | nindent 4 }}

helm/parseable/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ parseable:
55
pullPolicy: IfNotPresent
66
tag: ""
77
env:
8-
P_ADDR: "0.0.0.0:5678"
8+
P_ADDR: "0.0.0.0:8000"
99
P_TLS_CERT_PATH: ""
1010
P_LOCAL_STORAGE: "data"
1111
P_STORAGE_UPLOAD_INTERVAL: "60"

server/src/option.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ pub struct Opt {
156156
pub tls_key_path: Option<PathBuf>,
157157

158158
/// The address on which the http server will listen.
159-
#[structopt(long, env = "P_ADDR", default_value = "127.0.0.1:5678")]
159+
#[structopt(long, env = "P_ADDR", default_value = "0.0.0.0:8000")]
160160
pub address: String,
161161

162162
/// The local storage path is used as temporary landing point

server/src/s3.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,15 @@ use crate::option::{StorageOpt, CONFIG};
2424
use crate::query::Query;
2525
use crate::storage::{LogStream, ObjectStorage, ObjectStorageError};
2626

27-
const DEFAULT_S3_URL: &str = "http://127.0.0.1:9000";
27+
// Default object storage currently is DO Spaces bucket
28+
// Any user who starts the Parseable server with default configuration
29+
// will point to this bucket and will see any data present on this bucket
30+
const DEFAULT_S3_URL: &str = "https://sgp1.digitaloceanspaces.com";
31+
const DEFAULT_S3_REGION: &str = "sgp1";
32+
const DEFAULT_S3_BUCKET: &str = "parseable";
33+
const DEFAULT_S3_ACCESS_KEY: &str = "DO00KWGMX3M4ABBBFPCZ";
34+
const DEFAULT_S3_SECRET_KEY: &str = "5CqfjVsIPBjZxTOz51Bxod3Cd0FWkMLC3/vTwRavaaQ";
35+
2836
const S3_URL_ENV_VAR: &str = "P_S3_URL";
2937

3038
lazy_static::lazy_static! {
@@ -40,19 +48,19 @@ pub struct S3Config {
4048
pub s3_endpoint_url: String,
4149

4250
/// The access key for AWS S3 or compatible object storage platform
43-
#[structopt(long, env = "P_S3_ACCESS_KEY", default_value = "minioadmin")]
51+
#[structopt(long, env = "P_S3_ACCESS_KEY", default_value = DEFAULT_S3_ACCESS_KEY)]
4452
pub s3_access_key_id: String,
4553

4654
/// The secret key for AWS S3 or compatible object storage platform
47-
#[structopt(long, env = "P_S3_SECRET_KEY", default_value = "minioadmin")]
55+
#[structopt(long, env = "P_S3_SECRET_KEY", default_value = DEFAULT_S3_SECRET_KEY)]
4856
pub s3_secret_key: String,
4957

5058
/// The region for AWS S3 or compatible object storage platform
51-
#[structopt(long, env = "P_S3_REGION", default_value = "us-east-1")]
59+
#[structopt(long, env = "P_S3_REGION", default_value = DEFAULT_S3_REGION)]
5260
pub s3_default_region: String,
5361

5462
/// The AWS S3 or compatible object storage bucket to be used for storage
55-
#[structopt(long, env = "P_S3_BUCKET", default_value = "logstorage")]
63+
#[structopt(long, env = "P_S3_BUCKET", default_value = DEFAULT_S3_BUCKET)]
5664
pub s3_bucket_name: String,
5765
}
5866

0 commit comments

Comments
 (0)