kill the canary

SCT-Engineering · Apr 1, 2025 · 74b1694 · 74b1694
1 parent c5d4e86
commit 74b1694
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 19 deletions.
diff --git a/main.tf b/main.tf
@@ -53,11 +53,6 @@ resource "helm_release" "loki" {
       provisioner_image_tag        = module.images.images[local.provisioner_key].tag
       gateway_image_repository     = module.images.images[local.gateway_key].dest_repository
       gateway_image_tag            = module.images.images[local.gateway_key].tag
-<<<<<<< HEAD
-=======
-      canary_image_repository      = module.images.images[local.canary_key].dest_repository
-      canary_image_tag             = module.images.images[local.canary_key].tag
->>>>>>> 98921ea (refactor chart values)
       sidecar_image_repository     = split(":", module.images.images[local.sidecar_key].dest_full_path)[0]
       sidecar_image_tag            = module.images.images[local.sidecar_key].tag
       memcached_image_repository   = split(":", module.images.images[local.memcached_key].dest_full_path)[0]

diff --git a/values/loki.yml.tpl b/values/loki.yml.tpl
@@ -197,16 +197,6 @@ read:
 
 lokiCanary:
   enabled: false
-  image:
-    repository: ${canary_image_repository}
-    tag: ${canary_image_tag}
-  resources:
-    requests:
-      cpu: 1m
-      memory: 1Mi
-    limits:
-      cpu: 100m
-      memory: 128Mi
 
 memcached:
   chunk_cache:
@@ -309,10 +299,6 @@ write:
       memory: 256Mi
 
 
-memberlist:
-  service:
-    publishNotReadyAddresses: false
-
 serviceAccount:
   annotations:
     eks.amazonaws.com/role-arn: ${iam_role_arn}