Merge branch 'main' into improve-default-tenant-sizes

Author: friedrichg

README.md

@@ -25,7 +25,7 @@ To generate the YAMLs for deploying Cortex:
 
     ```console
     $ mkdir <name> && cd <name>
-    $ tk init --k8s=1.26 # this includes github.com/jsonnet-libs/k8s-libsonnet/1.26@main
+    $ tk init --k8s=1.30 # this includes github.com/jsonnet-libs/k8s-libsonnet/1.30@main
     $ jb install github.com/cortexproject/cortex-jsonnet/cortex@main
     ```
 

scripts/test-readme.sh

@@ -3,7 +3,7 @@ set -xe
 rm -rf $1
 mkdir -p $1
 cd $1
-tk init --k8s=1.26
+tk init --k8s=1.30
 jb install github.com/cortexproject/cortex-jsonnet/cortex@main
 rm -fr ./vendor/cortex
 cp -r ../../cortex ./vendor/