Merge commit '160ab890eab79de17f4c81fd4e86ea83d09ce39a' into atm/protobuf-usage

Signed-off-by: Alex Meijer <ameijer@kubecost.com>

# Conflicts:
#	core/pkg/model/pb/messages.pb.go
#	generate.sh
#	protos/customcost/messages.proto

generate.sh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/usr/bin/env sh
 #
 
 protoc --go_out=./core --go_opt=module=github.com/opencost/opencost/core \