From 335c6b0675bce2beb6d044664d4ac9bae1aaf0fe Mon Sep 17 00:00:00 2001 From: Benjamin Date: Tue, 14 Jan 2020 20:45:55 +0800 Subject: [PATCH 1/3] Fix error 'Field does not exist: jaeger_mixin' in tk show Signed-off-by: Benjamin --- production/ksonnet/loki/loki.libsonnet | 1 + 1 file changed, 1 insertion(+) diff --git a/production/ksonnet/loki/loki.libsonnet b/production/ksonnet/loki/loki.libsonnet index ccf71f44e8932..7c87564aca64e 100644 --- a/production/ksonnet/loki/loki.libsonnet +++ b/production/ksonnet/loki/loki.libsonnet @@ -1,4 +1,5 @@ (import 'ksonnet-util/kausal.libsonnet') + +(import 'ksonnet-util/jaeger.libsonnet') + (import 'images.libsonnet') + (import 'common.libsonnet') + (import 'config.libsonnet') + From 6b39237f70b9e98df3cb1e77c075203a3baeab63 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Wed, 15 Jan 2020 15:16:51 +0800 Subject: [PATCH 2/3] update apigroup and apiversion of promtail daemonset for k8s v1.16+ Signed-off-by: Benjamin --- production/ksonnet/promtail/promtail.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/ksonnet/promtail/promtail.libsonnet b/production/ksonnet/promtail/promtail.libsonnet index c02988ad5e7c4..93bd505c0bf73 100644 --- a/production/ksonnet/promtail/promtail.libsonnet +++ b/production/ksonnet/promtail/promtail.libsonnet @@ -58,7 +58,7 @@ k + config + scrape_config { container.mixin.securityContext.withPrivileged(true) + container.mixin.securityContext.withRunAsUser(0), - local daemonSet = $.extensions.v1beta1.daemonSet, + local daemonSet = $.apps.v1.daemonSet, promtail_daemonset: daemonSet.new($._config.promtail_pod_name, [$.promtail_container]) + From 95b47454019399723503db607919c992a35a7bc6 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Wed, 15 Jan 2020 18:45:17 +0800 Subject: [PATCH 3/3] upgrade deployment apiVersion from v1beta1 to v1 for k8s 1.16+ Signed-off-by: Benjamin --- production/ksonnet/loki/config.libsonnet | 2 +- production/ksonnet/loki/distributor.libsonnet | 2 +- production/ksonnet/loki/gateway.libsonnet | 2 +- production/ksonnet/loki/ingester.libsonnet | 2 +- production/ksonnet/loki/querier.libsonnet | 2 +- production/ksonnet/loki/query-frontend.libsonnet | 2 +- production/ksonnet/loki/table-manager.libsonnet | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/production/ksonnet/loki/config.libsonnet b/production/ksonnet/loki/config.libsonnet index 290bf4dd8c81f..1496a62144797 100644 --- a/production/ksonnet/loki/config.libsonnet +++ b/production/ksonnet/loki/config.libsonnet @@ -273,7 +273,7 @@ 'config.yaml': $.util.manifestYaml($._config.loki), }), - local deployment = $.apps.v1beta1.deployment, + local deployment = $.apps.v1.deployment, config_hash_mixin:: deployment.mixin.spec.template.metadata.withAnnotationsMixin({ diff --git a/production/ksonnet/loki/distributor.libsonnet b/production/ksonnet/loki/distributor.libsonnet index 3f51d639bd37c..083522b32e829 100644 --- a/production/ksonnet/loki/distributor.libsonnet +++ b/production/ksonnet/loki/distributor.libsonnet @@ -18,7 +18,7 @@ $.util.resourcesRequests('500m', '100Mi') + $.util.resourcesLimits('1', '200Mi'), - local deployment = $.apps.v1beta1.deployment, + local deployment = $.apps.v1.deployment, distributor_deployment: deployment.new('distributor', 3, [$.distributor_container]) + diff --git a/production/ksonnet/loki/gateway.libsonnet b/production/ksonnet/loki/gateway.libsonnet index 547816dbb7a7f..c4fe39b629ddf 100644 --- a/production/ksonnet/loki/gateway.libsonnet +++ b/production/ksonnet/loki/gateway.libsonnet @@ -73,7 +73,7 @@ container.withPorts($.core.v1.containerPort.new('http', 80)) + $.util.resourcesRequests('50m', '100Mi'), - local deployment = $.apps.v1beta1.deployment, + local deployment = $.apps.v1.deployment, gateway_deployment: deployment.new('gateway', 3, [ diff --git a/production/ksonnet/loki/ingester.libsonnet b/production/ksonnet/loki/ingester.libsonnet index 2267209bbdff9..ab92f3ceeed06 100644 --- a/production/ksonnet/loki/ingester.libsonnet +++ b/production/ksonnet/loki/ingester.libsonnet @@ -17,7 +17,7 @@ $.util.resourcesRequests('1', '5Gi') + $.util.resourcesLimits('2', '10Gi'), - local deployment = $.apps.v1beta1.deployment, + local deployment = $.apps.v1.deployment, ingester_deployment: deployment.new('ingester', 3, [$.ingester_container]) + diff --git a/production/ksonnet/loki/querier.libsonnet b/production/ksonnet/loki/querier.libsonnet index 470613023400d..206b73643878d 100644 --- a/production/ksonnet/loki/querier.libsonnet +++ b/production/ksonnet/loki/querier.libsonnet @@ -15,7 +15,7 @@ container.mixin.readinessProbe.withInitialDelaySeconds(15) + container.mixin.readinessProbe.withTimeoutSeconds(1), - local deployment = $.apps.v1beta1.deployment, + local deployment = $.apps.v1.deployment, querier_deployment: deployment.new('querier', 3, [$.querier_container]) + diff --git a/production/ksonnet/loki/query-frontend.libsonnet b/production/ksonnet/loki/query-frontend.libsonnet index bf73b40a33c36..4c7ae734c98dd 100644 --- a/production/ksonnet/loki/query-frontend.libsonnet +++ b/production/ksonnet/loki/query-frontend.libsonnet @@ -15,7 +15,7 @@ $.util.resourcesLimits(null, '1200Mi') + $.jaeger_mixin, - local deployment = $.apps.v1beta1.deployment, + local deployment = $.apps.v1.deployment, query_frontend_deployment: deployment.new('query-frontend', 2, [$.query_frontend_container]) + diff --git a/production/ksonnet/loki/table-manager.libsonnet b/production/ksonnet/loki/table-manager.libsonnet index 2f2b3e9627a7a..979678b7b4dcb 100644 --- a/production/ksonnet/loki/table-manager.libsonnet +++ b/production/ksonnet/loki/table-manager.libsonnet @@ -13,7 +13,7 @@ $.util.resourcesRequests('100m', '100Mi') + $.util.resourcesLimits('200m', '200Mi'), - local deployment = $.apps.v1beta1.deployment, + local deployment = $.apps.v1.deployment, table_manager_deployment: deployment.new('table-manager', 1, [$.table_manager_container]) +