Merge pull request #265 from gouthamve/move-to-main

Move trunk branch to main

Author: gouthamve

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master / unreleased
 
+* [CHANGE] Updated the trunk branch from `master` to `main`. You need to run the following in your local fork: #265
+  ```
+  git branch -m master main
+  git fetch origin
+  git branch -u origin/main main
+  ```
 * [ENHANCEMENT] Add `EtcdAllocatingTooMuchMemory` alert for monitoring etcd memory usage. #261
 
 ## 1.7.0 / 2021-02-24

Makefile

@@ -38,7 +38,7 @@ 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 && \
+	jb install github.com/grafana/cortex-jsonnet/cortex@main && \
 	rm -fr ./vendor/cortex && \
 	cp -r ../cortex ./vendor/ && \
 	cp vendor/cortex/cortex-manifests.jsonnet.example environments/default/main.jsonnet && \

README.md

@@ -25,7 +25,7 @@ To generate the YAMLs for deploying Cortex:
       (import "github.com/jsonnet-libs/k8s-alpha/1.18/main.libsonnet")
       + (import "github.com/jsonnet-libs/k8s-alpha/1.18/extensions/kausal-shim.libsonnet")
       EOF
-    $ jb install github.com/grafana/cortex-jsonnet/cortex
+    $ jb install github.com/grafana/cortex-jsonnet/cortex@main
     ```
 
 1. Use the example monitoring.jsonnet.example: