Skip to content

Commit

Permalink
Update_Dependencies (istio#3154)
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

[DO NOT MERGE] Auto PR to update dependencies of istio

This PR will be merged automatically once checks are successful.
```release-note
none
```
  • Loading branch information
istio-testing authored and istio-merge-robot committed Feb 4, 2018
1 parent 9dbaf19 commit b5ff9d5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ required = [
### as we cache dep ensure.
[[constraint]]
name = "istio.io/api"
revision = "8f67f05eeb370d50f427169d6ccce976413ad764"
revision = "c5185ac91e928c8ccd94a5342d8ad193bdf8b000"

[[constraint]]
name = "github.com/envoyproxy/go-control-plane"
Expand Down
2 changes: 1 addition & 1 deletion istio.VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export MIXER_TAG="5253b6b574a98b209c0ef3d0d6e90c1b8d6a5c2a"
export PILOT_HUB="gcr.io/istio-testing"
export PILOT_TAG="3101ea9d82a5f83b699c2d3245b371a19fa6bef4"
export ISTIOCTL_URL="https://storage.googleapis.com/istio-artifacts/pilot/3101ea9d82a5f83b699c2d3245b371a19fa6bef4/artifacts/istioctl"
export PROXY_TAG="b9c8a9c6fc4b93bc15dc00b5e6a05844cdc5455c"
export PROXY_TAG="d3437ab589dbfe388d45b56a12d20ef628a713a2"
export PROXY_DEBUG=""
export ISTIO_NAMESPACE="istio-system"
export PILOT_DEBIAN_URL="https://storage.googleapis.com/istio-artifacts/pilot/3101ea9d82a5f83b699c2d3245b371a19fa6bef4/artifacts/debs"
Expand Down
8 changes: 4 additions & 4 deletions istio.deps
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
"repoName": "api",
"prodBranch": "master",
"file": "Gopkg.toml",
"lastStableSHA": "8f67f05eeb370d50f427169d6ccce976413ad764"
"lastStableSHA": "c5185ac91e928c8ccd94a5342d8ad193bdf8b000"
},
{
"name": "/envoy",
"repoName": "proxy",
"prodBranch": "master",
"file": "pilot/docker/Dockerfile.proxy",
"lastStableSHA": "b9c8a9c6fc4b93bc15dc00b5e6a05844cdc5455c"
"lastStableSHA": "d3437ab589dbfe388d45b56a12d20ef628a713a2"
},
{
"name": "/envoy-debug",
"repoName": "proxy",
"prodBranch": "master",
"file": "pilot/docker/Dockerfile.proxy_debug",
"lastStableSHA": "b9c8a9c6fc4b93bc15dc00b5e6a05844cdc5455c"
"lastStableSHA": "d3437ab589dbfe388d45b56a12d20ef628a713a2"
},
{
"name": "PROXY_TAG",
"repoName": "proxy",
"prodBranch": "master",
"file": "istio.VERSION",
"lastStableSHA": "b9c8a9c6fc4b93bc15dc00b5e6a05844cdc5455c"
"lastStableSHA": "d3437ab589dbfe388d45b56a12d20ef628a713a2"
}
]
2 changes: 1 addition & 1 deletion pilot/docker/Dockerfile.proxy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# keep Dockerfile.proxy and Dockerfile.proxy_debug consistent for proxy sha
FROM gcr.io/istio-testing/envoy:b9c8a9c6fc4b93bc15dc00b5e6a05844cdc5455c
FROM gcr.io/istio-testing/envoy:d3437ab589dbfe388d45b56a12d20ef628a713a2
ADD pilot-agent /usr/local/bin/pilot-agent

COPY envoy_pilot.json /etc/istio/proxy/envoy_pilot.json
Expand Down
2 changes: 1 addition & 1 deletion pilot/docker/Dockerfile.proxy_debug
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# keep Dockerfile.proxy and Dockerfile.proxy_debug consistent for proxy sha
FROM gcr.io/istio-testing/envoy-debug:b9c8a9c6fc4b93bc15dc00b5e6a05844cdc5455c
FROM gcr.io/istio-testing/envoy-debug:d3437ab589dbfe388d45b56a12d20ef628a713a2
ADD pilot-agent /usr/local/bin/pilot-agent

COPY envoy_pilot.json /etc/istio/proxy/envoy_pilot.json
Expand Down

0 comments on commit b5ff9d5

Please sign in to comment.