From a34b9f21dede5a8993fd0199d3d82a747445a884 Mon Sep 17 00:00:00 2001 From: nfuden Date: Tue, 21 Jan 2025 15:30:35 -0500 Subject: [PATCH 1/3] downgrade control plane --- changelog/v1.32.3-patch3/run-attempt.yaml | 8 ++++++++ go/go.mod | 1 + go/go.sum | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 changelog/v1.32.3-patch3/run-attempt.yaml diff --git a/changelog/v1.32.3-patch3/run-attempt.yaml b/changelog/v1.32.3-patch3/run-attempt.yaml new file mode 100644 index 00000000..b785967b --- /dev/null +++ b/changelog/v1.32.3-patch3/run-attempt.yaml @@ -0,0 +1,8 @@ +changelog: + - type: DEPENDENCY_BUMP + dependencyOwner: envoyproxy + dependencyRepo: go-control-plane + dependencyTag: v0.13.2 + resolvesIssue: false + description: >- + Downgrade control plane as the new tag that claimed it was 1.32.3 was actually based on 1.33 \ No newline at end of file diff --git a/go/go.mod b/go/go.mod index de5fdbd2..edb9a930 100644 --- a/go/go.mod +++ b/go/go.mod @@ -12,6 +12,7 @@ require ( require ( cel.dev/expr v0.16.0 // indirect + github.com/google/go-cmp v0.6.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect ) diff --git a/go/go.sum b/go/go.sum index cf01daa1..4481c7a5 100644 --- a/go/go.sum +++ b/go/go.sum @@ -6,8 +6,8 @@ github.com/envoyproxy/go-control-plane/envoy v1.32.2 h1:zidqwmijfcbyKqVxjQDFx042 github.com/envoyproxy/go-control-plane/envoy v1.32.2/go.mod h1:eR2SOX2IedqlPvmiKjUH7Wu//S602JKI7HPC/L3SRq8= github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6Uu2PdjCQwWCJ3bM= github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8= From 6846b4df9f8e853728bdea12a14ad85c4b1283ed Mon Sep 17 00:00:00 2001 From: nfuden Date: Tue, 21 Jan 2025 15:31:35 -0500 Subject: [PATCH 2/3] changelog: move --- .../downgrademeandependency.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog/{v1.32.3-patch3/run-attempt.yaml => v1.32.3-patch2/downgrademeandependency.yaml} (100%) diff --git a/changelog/v1.32.3-patch3/run-attempt.yaml b/changelog/v1.32.3-patch2/downgrademeandependency.yaml similarity index 100% rename from changelog/v1.32.3-patch3/run-attempt.yaml rename to changelog/v1.32.3-patch2/downgrademeandependency.yaml From 14336f9b193f698835facada4e9445d3a6e36129 Mon Sep 17 00:00:00 2001 From: nfuden Date: Tue, 21 Jan 2025 16:04:02 -0500 Subject: [PATCH 3/3] go mod bump --- go/go.mod | 2 +- go/go.sum | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/go/go.mod b/go/go.mod index edb9a930..a7fac057 100644 --- a/go/go.mod +++ b/go/go.mod @@ -4,7 +4,7 @@ go 1.23.1 require ( github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 - github.com/envoyproxy/go-control-plane/envoy v1.32.2 + github.com/envoyproxy/go-control-plane v0.13.2 github.com/envoyproxy/protoc-gen-validate v1.1.0 github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 google.golang.org/protobuf v1.36.1 diff --git a/go/go.sum b/go/go.sum index 4481c7a5..872ba404 100644 --- a/go/go.sum +++ b/go/go.sum @@ -1,18 +1,10 @@ -cel.dev/expr v0.16.0 h1:yloc84fytn4zmJX2GU3TkXGsaieaV7dQ057Qs4sIG2Y= cel.dev/expr v0.16.0/go.mod h1:TRSuuV7DlVCE/uwv5QbAiW/v8l5O8C4eEPHeu7gf7Sg= -github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 h1:boJj011Hh+874zpIySeApCX4GeOjPl9qhRF3QuIZq+Q= github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= -github.com/envoyproxy/go-control-plane/envoy v1.32.2 h1:zidqwmijfcbyKqVxjQDFx042PgX+p9U+/fu/f9VtSk8= -github.com/envoyproxy/go-control-plane/envoy v1.32.2/go.mod h1:eR2SOX2IedqlPvmiKjUH7Wu//S602JKI7HPC/L3SRq8= -github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6Uu2PdjCQwWCJ3bM= +github.com/envoyproxy/go-control-plane v0.13.2 h1:HoRou/hxH5VAnylep8UAh0jFAllMY0UlP0TwPmIEgYI= +github.com/envoyproxy/go-control-plane v0.13.2/go.mod h1:mcYj6+AKxG86c/jKeZsCIWv8oLzhR+SJynG0TB94Xw8= github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= -google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8= google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= -google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=