Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sysdump: Use intermediate import package for supported envoy resources #1763

Merged
merged 2 commits into from
Jun 30, 2023

Conversation

sayboras
Copy link
Member

@sayboras sayboras commented Jun 24, 2023

This is to avoid the similar happening again in the future, when we add more envoy resource types.

Relates: #1756
Relates: cilium/cilium#26469

@sayboras sayboras requested review from a team as code owners June 24, 2023 00:24
@sayboras sayboras requested review from rolinh and derailed June 24, 2023 00:24
@sayboras sayboras force-pushed the tam/envoy-unmarshal-sync branch from ecdb8e4 to 93a12c6 Compare June 24, 2023 00:25
@sayboras sayboras marked this pull request as draft June 24, 2023 00:30
@sayboras sayboras force-pushed the tam/envoy-unmarshal-sync branch from 93a12c6 to 4c37fcf Compare June 24, 2023 00:41
@sayboras sayboras temporarily deployed to ci June 24, 2023 00:41 — with GitHub Actions Inactive
@sayboras sayboras force-pushed the tam/envoy-unmarshal-sync branch from 4c37fcf to dd39fab Compare June 24, 2023 01:21
@sayboras sayboras temporarily deployed to ci June 24, 2023 01:21 — with GitHub Actions Inactive
@sayboras sayboras added the dont-merge/preview-only Only for preview or testing, don't merge it. label Jun 24, 2023
@sayboras sayboras force-pushed the tam/envoy-unmarshal-sync branch from dd39fab to 1fcb3cf Compare June 28, 2023 23:13
@sayboras sayboras marked this pull request as ready for review June 28, 2023 23:13
@sayboras sayboras removed the dont-merge/preview-only Only for preview or testing, don't merge it. label Jun 28, 2023
Copy link
Member

@rolinh rolinh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there's now a new replace directive in v1.14.0-rc.0:

replace (
	github.com/miekg/dns => github.com/cilium/dns v1.1.51-0.20220729113855-5b94b11b46fc
	go.universe.tf/metallb => github.com/cilium/metallb v0.1.1-0.20220829170633-5d7dfb1129f7
	k8s.io/client-go => github.com/cilium/client-go v0.27.2-fix
	sigs.k8s.io/controller-tools => github.com/cilium/controller-tools v0.6.2
)

@sayboras sayboras force-pushed the tam/envoy-unmarshal-sync branch from 1fcb3cf to e3ac1c0 Compare June 30, 2023 04:51
@sayboras sayboras temporarily deployed to ci June 30, 2023 04:51 — with GitHub Actions Inactive
@sayboras
Copy link
Member Author

I think there's now a new replace directive in v1.14.0-rc.0:

replace (
	github.com/miekg/dns => github.com/cilium/dns v1.1.51-0.20220729113855-5b94b11b46fc
	go.universe.tf/metallb => github.com/cilium/metallb v0.1.1-0.20220829170633-5d7dfb1129f7
	k8s.io/client-go => github.com/cilium/client-go v0.27.2-fix
	sigs.k8s.io/controller-tools => github.com/cilium/controller-tools v0.6.2
)

Good catch, thanks 💯

@sayboras sayboras requested a review from rolinh June 30, 2023 04:51
@sayboras sayboras force-pushed the tam/envoy-unmarshal-sync branch from e3ac1c0 to b79773a Compare June 30, 2023 07:06
@sayboras sayboras temporarily deployed to ci June 30, 2023 07:06 — with GitHub Actions Inactive
Copy link
Member

@rolinh rolinh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please split the go.mod update into a separate commit.

@sayboras sayboras force-pushed the tam/envoy-unmarshal-sync branch from b79773a to 73fd80d Compare June 30, 2023 10:09
@maintainer-s-little-helper
Copy link

Commit 370fa54 does not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

sayboras added 2 commits June 30, 2023 20:10
This is to avoid the similar happening again in the future, when we
add more envoy resource types.

Relates: cilium#1756
Signed-off-by: Tam Mach <[email protected]>
@sayboras sayboras force-pushed the tam/envoy-unmarshal-sync branch from 73fd80d to 7a87052 Compare June 30, 2023 10:10
@sayboras sayboras temporarily deployed to ci June 30, 2023 10:11 — with GitHub Actions Inactive
@sayboras sayboras requested a review from tklauser June 30, 2023 10:11
@sayboras sayboras merged commit d4862e8 into cilium:main Jun 30, 2023
@sayboras sayboras deleted the tam/envoy-unmarshal-sync branch June 30, 2023 11:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants