Skip to content

Commit 0f0598e

Browse files
mandarjogkyessenov
authored andcommitted
Update and fix script (#199)
Signed-off-by: Mandar U Jog <[email protected]>
1 parent c7e2a12 commit 0f0598e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+7136
-5731
lines changed

.circleci/config.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ jobs:
33
build:
44
working_directory: /go-control-plane
55
docker:
6-
- image: gcr.io/istio-testing/go-control-plane-ci:05-31-2019
6+
- image: gcr.io/istio-testing/go-control-plane-ci:07-08-2019
77
steps:
88
- checkout
99
- run: make build
1010
- run: make test
1111
- run: make integration
12-
- run: make cover
13-
- run: curl -s https://codecov.io/bash | bash

Dockerfile.ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN go mod download
99

1010
# Fetch protoc modules
1111
RUN go get github.com/gogo/protobuf/[email protected]
12-
RUN go get github.com/envoyproxy/protoc-gen-validate@v0.0.14
12+
RUN go get github.com/envoyproxy/protoc-gen-validate@d6164de4910977d3c3c8dbd9299b5064ea9e7c2b
1313

1414
# Install protoc 3.6.1
1515
RUN apt-get update && apt-get install unzip

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,5 @@ generate-patch:
7575
@echo "--> patching generated code due to issue with protoc-gen-validate"
7676
find envoy -type f -print0 |\
7777
xargs -0 sed -i 's#"envoy/api/v2/core"#"github.com/envoyproxy/go-control-plane/envoy/api/v2/core"#g'
78+
find envoy -type f -print0 |\
79+
xargs -0 sed -i 's#"envoy/api/v2"#"github.com/envoyproxy/go-control-plane/envoy/api/v2"#g'

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
[![CircleCI](https://circleci.com/gh/envoyproxy/go-control-plane.svg?style=svg)](https://circleci.com/gh/envoyproxy/go-control-plane)
44
[![Go Report Card](https://goreportcard.com/badge/github.com/envoyproxy/go-control-plane)](https://goreportcard.com/report/github.com/envoyproxy/go-control-plane)
55
[![GoDoc](https://godoc.org/github.com/envoyproxy/go-control-plane?status.svg)](https://godoc.org/github.com/envoyproxy/go-control-plane)
6-
[![codecov](https://codecov.io/gh/envoyproxy/go-control-plane/branch/master/graph/badge.svg)](https://codecov.io/gh/envoyproxy/go-control-plane)
76

87

98
This repository contains a Go-based implementation of an API server that

build/generate_protos.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ do
7171
then
7272
echo "Generating protos ${path} ..."
7373
$protoc ${protocarg} ${path}/*.proto \
74-
--plugin=protoc-gen-gogofast=${root}/bin/gogofast --gogofast_out=${gogoarg}:. \
75-
--plugin=protoc-gen-validate=${root}/bin/validate --validate_out="lang=gogo:."
74+
--gogofast_out=${gogoarg}:. \
75+
--validate_out="lang=gogo:."
7676
fi
7777
done

data-plane-api

Submodule data-plane-api updated 36 files

envoy/admin/v2alpha/clusters.pb.go

Lines changed: 305 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

envoy/admin/v2alpha/clusters.pb.validate.go

Lines changed: 34 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

envoy/api/v2/cds.pb.go

Lines changed: 271 additions & 172 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

envoy/api/v2/cds.pb.validate.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)