diff --git a/copy_images.tf b/copy_images.tf index 887672c..7e8b0e4 100644 --- a/copy_images.tf +++ b/copy_images.tf @@ -1,6 +1,5 @@ locals { loki_key = format("%v#%v", "grafana/loki", var.loki_tag) - canary_key = format("%v#%v", "grafana/loki-canary", var.canary_tag) provisioner_key = format("%v#%v", "grafana/enterprise-logs-provisioner", var.enterprise_logs_provisioner_tag) gateway_key = format("%v#%v", "grafana/nginx-unprivileged", var.gateway_tag) sidecar_key = format("%v#%v", "kiwigrid/k8s-sidecar", var.sidecar_tag) diff --git a/main.tf b/main.tf index 228df46..a1af8f2 100644 --- a/main.tf +++ b/main.tf @@ -49,8 +49,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 - canary_image_repository = module.images.images[local.canary_key].dest_repository - canary_image_tag = module.images.images[local.canary_key].tag 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 index 7bedb9f..f4b854d 100644 --- a/values/loki.yml.tpl +++ b/values/loki.yml.tpl @@ -94,16 +94,6 @@ gateway: 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: @@ -172,10 +162,6 @@ sidecar: memory: 256Mi -memberlist: - service: - publishNotReadyAddresses: false - serviceAccount: annotations: eks.amazonaws.com/role-arn: ${iam_role_arn}