Remove chunks (#6)

* Remove chunks from jsonnet deployment
* Adjust examples
* Adjust changelog
* Fix test-readme
* Include tanka v0.21.0 updating build-image

Author: friedrichg

.github/workflows/lint.yaml

@@ -6,7 +6,7 @@ on:
 jobs:
   lint:
     runs-on: ubuntu-18.04
-    container: grafana/cortex-jsonnet-build-image:3527936
+    container: quay.io/cortexproject/cortex-jsonnet-build-image:c924d52
     steps:
       - uses: actions/checkout@v2
         name: Checkout
@@ -20,7 +20,7 @@ jobs:
         run: make lint-playbooks
   build:
     runs-on: ubuntu-18.04
-    container: grafana/cortex-jsonnet-build-image:3527936
+    container: quay.io/cortexproject/cortex-jsonnet-build-image:c924d52
     steps:
       - uses: actions/checkout@v2
         name: Checkout
@@ -31,7 +31,7 @@ jobs:
         run: make build-mixin
   readme:
     runs-on: ubuntu-18.04
-    container: grafana/cortex-jsonnet-build-image:3527936
+    container: quay.io/cortexproject/cortex-jsonnet-build-image:c924d52
     steps:
       - uses: actions/checkout@v2
         name: Checkout

CHANGELOG.md

@@ -3,7 +3,9 @@
 ## master / unreleased
 
 * [CHANGE] Updated readme to use this repo with tanka
+* [CHANGE] Removed chunks support
 * [CHANGE] Use integrated cortex overrides exporter
+* [ENHANCEMENT] Added main.jsonnet examples for azure, gcs and s3
 * [ENHANCEMENT] How to rename buckets in AWS and Azure for `not healthy index found` playbook. #5
 * [BUGFIX] Updated blocks_storage_s3_endpoint in config.libsonnet to include the correct aws region
 

Makefile

@@ -32,10 +32,10 @@ fmt:
 		xargs -n 1 -- $(JSONNET_FMT) -i
 
 build-image:
-	docker build -t grafana/cortex-jsonnet-build-image:$(shell git rev-parse --short HEAD) build-image
+	docker build -t quay.io/cortexproject/cortex-jsonnet-build-image:$(shell git rev-parse --short HEAD) build-image
 
 publish-build-image:
-	docker push grafana/cortex-jsonnet-build-image:$(shell git rev-parse --short HEAD)
+	docker push quay.io/cortexproject/cortex-jsonnet-build-image:$(shell git rev-parse --short HEAD)
 
 build-mixin:
 	@cd cortex-mixin && \
@@ -44,16 +44,16 @@ build-mixin:
 	mixtool generate all --output-alerts out/alerts.yaml --output-rules out/rules.yaml --directory out/dashboards mixin.libsonnet && \
 	zip -q -r cortex-mixin.zip out
 
-test-readme:
-	rm -rf test-readme && \
-	mkdir test-readme && cd test-readme && \
-	tk init --k8s=false && \
-	jb install github.com/jsonnet-libs/k8s-alpha/1.18 && \
-	printf '(import "github.com/jsonnet-libs/k8s-alpha/1.18/main.libsonnet")\n+(import "github.com/jsonnet-libs/k8s-alpha/1.18/extensions/kausal-shim.libsonnet")' > lib/k.libsonnet && \
-	jb install github.com/grafana/cortex-jsonnet/cortex@main && \
+test-readme: test-readme/azure test-readme/gcs test-readme/s3
+
+test-readme/%:
+	rm -rf $@ && \
+	mkdir -p $@ && cd $@ && \
+	tk init --k8s=1.21 && \
+	jb install github.com/cortexproject/cortex-jsonnet/cortex@main && \
 	rm -fr ./vendor/cortex && \
-	cp -r ../cortex ./vendor/ && \
-	cp vendor/cortex/cortex-manifests.jsonnet.example environments/default/main.jsonnet && \
+	cp -r ../../cortex ./vendor/ && \
+	cp vendor/cortex/$(notdir $@)/main.jsonnet.example environments/default/main.jsonnet && \
 	PAGER=cat tk show environments/default
 
 clean-white-noise:

README.md

@@ -29,10 +29,18 @@ To generate the YAMLs for deploying Cortex:
     $ jb install github.com/cortexproject/cortex-jsonnet/cortex@main
     ```
 
-1. Use the example cortex-manifests.jsonnet.example:
+1. Use any of the examples to get a main.jsonnet and adjust as needed
 
     ```console
-    $ cp vendor/cortex/cortex-manifests.jsonnet.example environments/default/main.jsonnet
+    $ cp vendor/cortex/azure/main.jsonnet.example environments/default/main.jsonnet
+    ```
+
+    ```console
+    $ cp vendor/cortex/gcs/main.jsonnet.example environments/default/main.jsonnet
+    ```
+
+    ```console
+    $ cp vendor/cortex/s3/main.jsonnet.example environments/default/main.jsonnet
     ```
 
 1. Check what is in the example:

build-image/Dockerfile

@@ -18,8 +18,8 @@ RUN chmod +x /usr/bin/jb
 
 # Build tanka
 FROM alpine:3.13 AS tk-builder
-ARG TANKA_VERSION=0.11.1
-ARG TANKA_CHECKSUM="3b253ca7d7bf01189604c10a8f7cead20a553ddc04c813f0f836d80338cfad71  /usr/bin/tk"
+ARG TANKA_VERSION=0.21.0
+ARG TANKA_CHECKSUM="cd60a005f84fd99763f26d07d4cb626e7585a62800aae97234d8187129eed1ec  /usr/bin/tk"
 RUN apk add --no-cache curl
 RUN curl -fSL -o "/usr/bin/tk" "https://github.com/grafana/tanka/releases/download/v${TANKA_VERSION}/tk-linux-amd64"
 RUN echo "${TANKA_CHECKSUM}" | sha256sum -c || (printf "wanted: %s\n   got: %s\n" "${TANKA_CHECKSUM}" "$(sha256sum /usr/bin/tk)"; exit 1)

cortex/azure/main.jsonnet.example

@@ -0,0 +1,28 @@
+local cortex = import 'cortex/cortex.libsonnet';
+
+cortex {
+  _config+:: {
+    namespace: 'default',
+
+    blocks_storage_backend: 'azure',
+    blocks_storage_bucket_name: 'example-bucket',
+    blocks_storage_azure_account_key: 'replace-with-valid-key',
+    blocks_storage_azure_account_name: 'example-account',
+    
+    // Cortex Ruler config. 
+    ruler_enabled: true,
+    ruler_client_type: 'azure',
+    ruler_storage_bucket_name: 'ruler-example-bucket',
+    ruler_storage_azure_account_name: 'example-account',
+    ruler_storage_azure_account_key: 'replace-with-valid-key',
+
+    // Cortex Alertmanager config
+    alertmanager_enabled: true,
+    alertmanager_client_type: 'azure',
+    alertmanager_azure_container_name: 'alertmanager-example-bucket',
+    alertmanager_azure_account_key: 'replace-with-valid-key',
+    alertmanager_azure_account_name: 'example-account',
+    external_url: 'https://cortex.example.com', //Alertmanager UI
+    cluster: 'cluster',
+  },
+}

cortex/compactor.libsonnet

@@ -0,0 +1,72 @@
+{
+  local container = $.core.v1.container,
+  local pvc = $.core.v1.persistentVolumeClaim,
+  local statefulSet = $.apps.v1.statefulSet,
+  local volumeMount = $.core.v1.volumeMount,
+
+  // The compactor runs a statefulset with a single replica, because
+  // it does not support horizontal scalability yet.
+  local compactor_data_pvc =
+    pvc.new() +
+    pvc.mixin.spec.resources.withRequests({ storage: $._config.cortex_compactor_data_disk_size }) +
+    pvc.mixin.spec.withAccessModes(['ReadWriteOnce']) +
+    pvc.mixin.spec.withStorageClassName($._config.cortex_compactor_data_disk_class) +
+    pvc.mixin.metadata.withName('compactor-data'),
+
+  compactor_args::
+    $._config.grpcConfig +
+    $._config.blocksStorageConfig +
+    $._config.compactorLimitsConfig +
+    {
+      target: 'compactor',
+
+      // Compactor config.
+      'compactor.block-ranges': '2h,12h,24h',
+      'compactor.data-dir': '/data',
+      'compactor.compaction-interval': '30m',
+      'compactor.compaction-concurrency': $._config.cortex_compactor_max_concurrency,
+      'compactor.cleanup-interval': $._config.cortex_compactor_cleanup_interval,
+
+      // Enable sharding.
+      'compactor.sharding-enabled': true,
+      'compactor.ring.store': 'consul',
+      'compactor.ring.consul.hostname': 'consul.%s.svc.cluster.local:8500' % $._config.namespace,
+      'compactor.ring.prefix': '',
+
+      // Limits config.
+      'runtime-config.file': '/etc/cortex/overrides.yaml',
+    },
+
+  compactor_ports:: $.util.defaultPorts,
+
+  compactor_container::
+    container.new('compactor', $._images.compactor) +
+    container.withPorts($.compactor_ports) +
+    container.withArgsMixin($.util.mapToFlags($.compactor_args)) +
+    container.withVolumeMountsMixin([volumeMount.new('compactor-data', '/data')]) +
+    // Do not limit compactor CPU and request enough cores to honor configured max concurrency.
+    $.util.resourcesRequests($._config.cortex_compactor_max_concurrency, '6Gi') +
+    $.util.resourcesLimits(null, '6Gi') +
+    $.util.readinessProbe +
+    $.jaeger_mixin,
+
+  newCompactorStatefulSet(name, container)::
+    statefulSet.new(name, 1, [container], compactor_data_pvc) +
+    statefulSet.mixin.spec.withServiceName(name) +
+    statefulSet.mixin.metadata.withNamespace($._config.namespace) +
+    statefulSet.mixin.metadata.withLabels({ name: name }) +
+    statefulSet.mixin.spec.template.metadata.withLabels({ name: name }) +
+    statefulSet.mixin.spec.selector.withMatchLabels({ name: name }) +
+    statefulSet.mixin.spec.template.spec.securityContext.withRunAsUser(0) +
+    statefulSet.mixin.spec.updateStrategy.withType('RollingUpdate') +
+    statefulSet.mixin.spec.template.spec.withTerminationGracePeriodSeconds(900) +
+    // Parallelly scale up/down compactor instances instead of starting them
+    // one by one. This does NOT affect rolling updates: they will continue to be
+    // rolled out one by one (the next pod will be rolled out once the previous is
+    // ready).
+    statefulSet.mixin.spec.withPodManagementPolicy('Parallel') +
+    $.util.configVolumeMount($._config.overrides_configmap, '/etc/cortex'),
+
+  compactor_statefulset:
+    $.newCompactorStatefulSet('compactor', $.compactor_container),
+}