Merge pull request operator-framework#381 from ecordell/replace-skips-listbundles

feat(api): add skips/replaces to listbundles api

Author: openshift-merge-robot

Makefile

@@ -44,8 +44,10 @@ vendor:
 
 .PHONY: codegen
 codegen:
-	protoc -I pkg/api/ --go_out=plugins=grpc:pkg/api pkg/api/*.proto
-	protoc -I pkg/api/grpc_health_v1 --go_out=plugins=grpc:pkg/api/grpc_health_v1 pkg/api/grpc_health_v1/*.proto
+	protoc -I pkg/api/ --go_out=pkg/api pkg/api/*.proto
+	protoc -I pkg/api/ --go-grpc_out=pkg/api pkg/api/*.proto
+	protoc -I pkg/api/grpc_health_v1 --go_out=pkg/api/grpc_health_v1 pkg/api/grpc_health_v1/*.proto
+	protoc -I pkg/api/grpc_health_v1 --go-grpc_out=pkg/api/grpc_health_v1 pkg/api/grpc_health_v1/*.proto
 
 .PHONY: container-codegen
 container-codegen:

codegen.Dockerfile

@@ -1,13 +1,13 @@
-FROM golang:1.11-alpine
+FROM golang:1.13-alpine
 
 RUN apk update && \
     apk add make git protobuf
 
-ENV MODULE github.com/golang/protobuf
+ENV MODULE google.golang.org
 ENV SRC ${GOPATH}/src/${MODULE}
 COPY vendor/${MODULE} ${SRC}
-RUN echo $(ls ${SRC})  
-RUN go install ${SRC}/proto ${SRC}/ptypes ${SRC}/protoc-gen-go
+RUN echo $(ls ${SRC})
+RUN go install ${SRC}/protobuf/proto ${SRC}/protobuf/cmd/protoc-gen-go ${SRC}/grpc/cmd/protoc-gen-go-grpc
 
 
 WORKDIR /codegen