Skip to content

Commit 6c230d7

Browse files
Merge pull request #6 from sourcefuse/feature/signoz-update
signoz fix
2 parents 6747a40 + 04ca85b commit 6c230d7

16 files changed

Lines changed: 178 additions & 170 deletions

File tree

.github/workflows/snyk.yaml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.terraform.lock.hcl

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 7 additions & 6 deletions
Large diffs are not rendered by default.

examples/signoz/.terraform.lock.hcl

Lines changed: 49 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/signoz/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | = 2.24.0 |
1212
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 2.0 |
1313
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.6.0 |
14+
| <a name="requirement_time"></a> [time](#requirement\_time) | ~> 0.9 |
1415
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | ~> 4.0.6 |
1516

1617
## Providers
1718

1819
| Name | Version |
1920
|------|---------|
20-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.94.1 |
21+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.100.0 |
2122

2223
## Modules
2324

@@ -32,7 +33,6 @@
3233
|------|------|
3334
| [aws_acm_certificate.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/acm_certificate) | data source |
3435
| [aws_eks_cluster.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_cluster) | data source |
35-
| [aws_eks_cluster_auth.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_cluster_auth) | data source |
3636
| [aws_ssm_parameter.domain](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ssm_parameter) | data source |
3737

3838
## Inputs

examples/signoz/locals.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ locals {
1919
name = "signoz"
2020
storage_class = "gp3"
2121
cluster_name = data.aws_eks_cluster.this.name
22+
chart_version = "0.118.0"
2223

2324
k8s_namespace = {
2425
name = "signoz"
2526
create = true
2627
}
2728

28-
2929
clickhouse = {
3030
user = "admin"
3131
cpu_limit = "2000m"
@@ -41,6 +41,7 @@ locals {
4141
memory_limit = "1000Mi"
4242
cpu_request = "100m"
4343
memory_request = "200Mi"
44+
storage = "1Gi"
4445
ingress_enabled = true
4546
aws_certificate_arn = data.aws_acm_certificate.this.arn
4647
root_domain = local.domain

examples/signoz/main.tf

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,36 @@ terraform {
2929
source = "hashicorp/random"
3030
version = "~> 3.6.0"
3131
}
32+
time = {
33+
source = "hashicorp/time"
34+
version = "~> 0.9"
35+
}
3236
}
3337
}
3438

3539
data "aws_eks_cluster" "this" {
3640
name = "arc-poc-cluster"
3741
}
3842

39-
data "aws_eks_cluster_auth" "this" {
40-
name = data.aws_eks_cluster.this.name
41-
}
42-
4343
provider "kubernetes" {
4444
host = data.aws_eks_cluster.this.endpoint
4545
cluster_ca_certificate = base64decode(data.aws_eks_cluster.this.certificate_authority[0].data)
46-
token = data.aws_eks_cluster_auth.this.token
46+
exec {
47+
api_version = "client.authentication.k8s.io/v1beta1"
48+
command = "aws"
49+
args = ["eks", "get-token", "--cluster-name", data.aws_eks_cluster.this.name]
50+
}
4751
}
4852

4953
provider "helm" {
5054
kubernetes {
5155
host = data.aws_eks_cluster.this.endpoint
5256
cluster_ca_certificate = base64decode(data.aws_eks_cluster.this.certificate_authority[0].data)
53-
token = data.aws_eks_cluster_auth.this.token
57+
exec {
58+
api_version = "client.authentication.k8s.io/v1beta1"
59+
command = "aws"
60+
args = ["eks", "get-token", "--cluster-name", data.aws_eks_cluster.this.name]
61+
}
5462
}
5563
}
5664

@@ -65,7 +73,6 @@ module "signoz" {
6573
environment = var.environment
6674
namespace = var.namespace
6775

68-
6976
search_engine = "signoz-clickhouse"
7077
signoz_config = local.signoz_config
7178
}

modules/signoz/.terraform.lock.hcl

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)