From 14ab9cdd4d94b87610301d1db474e8ef2cd01452 Mon Sep 17 00:00:00 2001 From: Snow Pettersen Date: Fri, 30 Jul 2021 17:06:15 -0400 Subject: [PATCH 1/3] examples: pin version of go-control-plane (#17553) Co-authored-by: Snow Pettersen (cherry picked from commit 38b6fd5a7f28e33b375f02e2b4546e47adefb5f0, PR #17553) Signed-off-by: Greg Greenway --- examples/dynamic-config-cp/Dockerfile-control-plane | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/dynamic-config-cp/Dockerfile-control-plane b/examples/dynamic-config-cp/Dockerfile-control-plane index 39c7f2ca4223b..3d475c7344219 100644 --- a/examples/dynamic-config-cp/Dockerfile-control-plane +++ b/examples/dynamic-config-cp/Dockerfile-control-plane @@ -8,5 +8,5 @@ RUN apt-get update \ RUN git clone https://github.com/envoyproxy/go-control-plane ADD ./resource.go /go/go-control-plane/internal/example/resource.go -RUN cd go-control-plane && make bin/example +RUN cd go-control-plane && git checkout b4adc3bb5fe5288bff01cd452dad418ef98c676e && make bin/example WORKDIR /go/go-control-plane From 57dbeef10aa05092e3b3b297882904278fe407c1 Mon Sep 17 00:00:00 2001 From: Greg Greenway Date: Wed, 11 Aug 2021 15:02:01 -0700 Subject: [PATCH 2/3] Pin to a commit near the 1.19 release Signed-off-by: Greg Greenway --- examples/dynamic-config-cp/Dockerfile-control-plane | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/dynamic-config-cp/Dockerfile-control-plane b/examples/dynamic-config-cp/Dockerfile-control-plane index 3d475c7344219..6317a41d5ac39 100644 --- a/examples/dynamic-config-cp/Dockerfile-control-plane +++ b/examples/dynamic-config-cp/Dockerfile-control-plane @@ -8,5 +8,5 @@ RUN apt-get update \ RUN git clone https://github.com/envoyproxy/go-control-plane ADD ./resource.go /go/go-control-plane/internal/example/resource.go -RUN cd go-control-plane && git checkout b4adc3bb5fe5288bff01cd452dad418ef98c676e && make bin/example +RUN cd go-control-plane && git checkout b19e718c57df1835047cfae67798ac861eb8847e && make bin/example WORKDIR /go/go-control-plane From 3376bd4a9074d010cc90004da3b1ee276b8b14c8 Mon Sep 17 00:00:00 2001 From: Greg Greenway Date: Wed, 11 Aug 2021 16:52:38 -0700 Subject: [PATCH 3/3] checkout specific commit before modifying resource.go With the previous order, the `git checkout` failed saying it would overwrite resource.go changes Signed-off-by: Greg Greenway --- examples/dynamic-config-cp/Dockerfile-control-plane | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/dynamic-config-cp/Dockerfile-control-plane b/examples/dynamic-config-cp/Dockerfile-control-plane index 6317a41d5ac39..1ebe92aa0ebfc 100644 --- a/examples/dynamic-config-cp/Dockerfile-control-plane +++ b/examples/dynamic-config-cp/Dockerfile-control-plane @@ -6,7 +6,7 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* -RUN git clone https://github.com/envoyproxy/go-control-plane +RUN git clone https://github.com/envoyproxy/go-control-plane && cd go-control-plane && git checkout b19e718c57df1835047cfae67798ac861eb8847e ADD ./resource.go /go/go-control-plane/internal/example/resource.go -RUN cd go-control-plane && git checkout b19e718c57df1835047cfae67798ac861eb8847e && make bin/example +RUN cd go-control-plane && make bin/example WORKDIR /go/go-control-plane