Fix protobuf generation

martin-aders · Dec 20, 2019 · 28ada18 · 28ada18
1 parent 2f4dddb
commit 28ada18
Show file tree

Hide file tree

Showing 2 changed files with 782 additions and 3 deletions.
diff --git a/hack/update-protobuf.sh b/hack/update-protobuf.sh
@@ -17,13 +17,13 @@ fi
 rm -rf go-to-protobuf
 rm -rf protoc-gen-gogo
 
-GOFLAGS="" go build -o _output/bin/go-to-protobuf github.com/openshift/api/vendor/k8s.io/code-generator/cmd/go-to-protobuf
-GOFLAGS="" go build -o _output/bin/protoc-gen-gogo github.com/openshift/api/vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
+GOFLAGS="" go build -o _output/bin/go-to-protobuf ./vendor/k8s.io/code-generator/cmd/go-to-protobuf
+GOFLAGS="" go build -o _output/bin/protoc-gen-gogo ./vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
 
 PATH="$PATH:_output/bin" go-to-protobuf \
   --output-base="${GOPATH}/src" \
   --apimachinery-packages='-k8s.io/apimachinery/pkg/util/intstr,-k8s.io/apimachinery/pkg/api/resource,-k8s.io/apimachinery/pkg/runtime/schema,-k8s.io/apimachinery/pkg/runtime,-k8s.io/apimachinery/pkg/apis/meta/v1,-k8s.io/apimachinery/pkg/apis/meta/v1beta1,-k8s.io/api/core/v1,-k8s.io/api/rbac/v1' \
   --go-header-file=${SCRIPT_ROOT}/hack/empty.txt \
-  --proto-import=${SCRIPT_ROOT}/vendor/github.com/gogo/protobuf/protobuf \
+  --proto-import=${SCRIPT_ROOT}/third_party/protobuf \
   --proto-import=${SCRIPT_ROOT}/vendor \
   --packages="${API_PACKAGES}"