We need these overrides for GKE, or at least some of them

solsson · solsson · commit 9190a0045664 · 2022-01-20T17:07:52.000+01:00
diff --git a/kubernetes-mixin-update.sh b/kubernetes-mixin-update.sh
@@ -5,10 +5,13 @@ set -e
 # expecting an existing clone of https://github.com/Yolean/kubernetes-mixin-managed
 MIXIN_CLONE=../kubernetes-mixin-managed
 
+grep kubelet $MIXIN_CLONE/mixin.libsonnet || mv $MIXIN_CLONE/mixin.libsonnet $MIXIN_CLONE/upstream-mixin.libsonnet
+cp kubernetes-mixin/mixin.libsonnet $MIXIN_CLONE/
+
 (
   cd $MIXIN_CLONE;
   pwd; git remote -v; git branch; git rev-parse HEAD;
-  curl https://gist.github.com/solsson/449f3ceba74859df5b6ead8f16b11dfa/raw/c9f2e5609a52376731da997e81ff185ed9b71869/build-kubernetes-mixin.sh | bash -;
+  curl -L https://gist.githubusercontent.com/solsson/449f3ceba74859df5b6ead8f16b11dfa/raw/2c976dde5557df6697ce241ef13e165e922ee81f/build-kubernetes-mixin.sh | DEBUG=$DEBUG bash -;
 )
 
 jsontoyaml=~/go/bin/gojsontoyaml
diff --git a/kubernetes-mixin/mixin.libsonnet b/kubernetes-mixin/mixin.libsonnet
@@ -1,4 +1,4 @@
-local kubernetes = import "kubernetes-mixin/mixin.libsonnet";
+local kubernetes = import "upstream-mixin.libsonnet";
 
 // TODO when we want to exclude/ignore stuff this could help: https://github.com/nabadger/monitoring-mixins
 

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,13 @@ set -e`
`5`	`5`	`# expecting an existing clone of https://github.com/Yolean/kubernetes-mixin-managed`
`6`	`6`	`MIXIN_CLONE=../kubernetes-mixin-managed`
`7`	`7`
	`8`	`+grep kubelet $MIXIN_CLONE/mixin.libsonnet \|\| mv $MIXIN_CLONE/mixin.libsonnet $MIXIN_CLONE/upstream-mixin.libsonnet`
	`9`	`+cp kubernetes-mixin/mixin.libsonnet $MIXIN_CLONE/`
	`10`	`+`
`8`	`11`	`(`
`9`	`12`	`cd $MIXIN_CLONE;`
`10`	`13`	`pwd; git remote -v; git branch; git rev-parse HEAD;`
`11`		`- curl https://gist.github.com/solsson/449f3ceba74859df5b6ead8f16b11dfa/raw/c9f2e5609a52376731da997e81ff185ed9b71869/build-kubernetes-mixin.sh \| bash -;`
	`14`	`+ curl -L https://gist.githubusercontent.com/solsson/449f3ceba74859df5b6ead8f16b11dfa/raw/2c976dde5557df6697ce241ef13e165e922ee81f/build-kubernetes-mixin.sh \| DEBUG=$DEBUG bash -;`
`12`	`15`	`)`
`13`	`16`
`14`	`17`	`jsontoyaml=~/go/bin/gojsontoyaml`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-local kubernetes = import "kubernetes-mixin/mixin.libsonnet";`
	`1`	`+local kubernetes = import "upstream-mixin.libsonnet";`
`2`	`2`
`3`	`3`	`// TODO when we want to exclude/ignore stuff this could help: https://github.com/nabadger/monitoring-mixins`
`4`	`4`