Skip to content

Update Gateway API to 0.6.0-rc2#4933

Merged
sunjayBhatia merged 5 commits into
projectcontour:mainfrom
sunjayBhatia:bump-gw-api-0.6.0-rc2
Dec 19, 2022
Merged

Update Gateway API to 0.6.0-rc2#4933
sunjayBhatia merged 5 commits into
projectcontour:mainfrom
sunjayBhatia:bump-gw-api-0.6.0-rc2

Conversation

@sunjayBhatia

@sunjayBhatia sunjayBhatia commented Dec 16, 2022

Copy link
Copy Markdown
Member

Unfortunately includes a bump to controller-runtime and k8s API etc. since Gateway API bumped those as dependencies as well.

Can split them off into their own PRs if we need to.

@sunjayBhatia
Update Gateway API to 0.6.0-rc2
89cc659 
Unfortunately includes a bump to controller-runtime and k8s API etc.
since Gateway API bumped those as dependencies as well.

Can split them off into their own PRs if we need to.

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
@sunjayBhatia sunjayBhatia added the release-note/none-required Marks a PR as not requiring a release note. Should only be used for very small changes. label Dec 16, 2022
@sunjayBhatia sunjayBhatia requested a review from a team as a code owner December 16, 2022 20:57
@sunjayBhatia sunjayBhatia requested review from skriss and stevesloka and removed request for a team December 16, 2022 20:57
@skriss

skriss commented Dec 19, 2022

Copy link
Copy Markdown
Member

LGTM once lint errors are addressed

@sunjayBhatia
lint fixes
e3b79f9 
Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
@sunjayBhatia sunjayBhatia added the area/dependency Issues or PRs related to dependency changes. label Dec 19, 2022
@codecov

codecov Bot commented Dec 19, 2022 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #4933 (d31175f) into main (8eb8441) will decrease coverage by 0.02%.
The diff coverage is 61.76%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4933      +/-   ##
==========================================
- Coverage   76.51%   76.48%   -0.03%     
==========================================
  Files         140      140              
  Lines       16728    16750      +22     
==========================================
+ Hits        12800    12812      +12     
- Misses       3679     3688       +9     
- Partials      249      250       +1
Impacted Files Coverage Δ
cmd/contour/ingressstatus.go 31.57% <0.00%> (-1.03%) ⬇️
cmd/contour/serve.go 12.86% <0.00%> (ø)
internal/k8s/statusaddress.go 78.46% <65.00%> (-1.66%) ⬇️
internal/dag/gatewayapi_processor.go 96.89% <100.00%> (ø)

@sunjayBhatia

sunjayBhatia commented Dec 19, 2022

Copy link
Copy Markdown
Member Author

ah looks like might be blocked on #4937

@sunjayBhatia
Merge remote-tracking branch 'origin/main' into bump-gw-api-0.6.0-rc2
ac6bc49 
Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
@sunjayBhatia

sunjayBhatia commented Dec 19, 2022

Copy link
Copy Markdown
Member Author

manually applying this diff makes things work:

diff --git a/examples/contour/01-crds.yaml b/examples/contour/01-crds.yaml
index 7e7824b2..0e55a272 100644
--- a/examples/contour/01-crds.yaml
+++ b/examples/contour/01-crds.yaml
@@ -1001,6 +1001,7 @@ spec:
                           \n This is an alpha field and requires enabling the DynamicResourceAllocation
                           feature gate. \n This field is immutable."
                         items:
+                          x-kubernetes-map-type: atomic
                           description: ResourceClaim references one entry in PodSpec.ResourceClaims.
                           properties:
                             name:
@@ -1812,6 +1813,7 @@ spec:
                                             the DynamicResourceAllocation feature
                                             gate. \n This field is immutable."
                                           items:
+                                            x-kubernetes-map-type: atomic
                                             description: ResourceClaim references
                                               one entry in PodSpec.ResourceClaims.
                                             properties:
@@ -2967,6 +2969,7 @@ spec:
                           \n This is an alpha field and requires enabling the DynamicResourceAllocation
                           feature gate. \n This field is immutable."
                         items:
+                          x-kubernetes-map-type: atomic
                           description: ResourceClaim references one entry in PodSpec.ResourceClaims.
                           properties:
                             name:

unfortunately the issue seems to be in the corev1.ResourceRequirements etc. types, which we've included in our CRDs

Been looking for ways we can get around this and maybe if controller-gen needs an update

@skriss

skriss commented Dec 19, 2022

Copy link
Copy Markdown
Member

Found kubernetes/kubernetes#114585 upstream, so maybe we'll get an upstream patch for this

I guess if we have to we could hack our generate-crds step to insert the needed YAML patch..

@sunjayBhatia

sunjayBhatia commented Dec 19, 2022

Copy link
Copy Markdown
Member Author

Found kubernetes/kubernetes#114585 upstream, so maybe we'll get an upstream patch for this

I guess if we have to we could hack our generate-crds step to insert the needed YAML patch..

oh sweet good find, yeah might have to do that in the meantime

@skriss

skriss commented Dec 19, 2022

Copy link
Copy Markdown
Member

Found kubernetes/kubernetes#114585 upstream, so maybe we'll get an upstream patch for this
I guess if we have to we could hack our generate-crds step to insert the needed YAML patch..

oh sweet good find, yeah might have to do that in the meantime

Yeah that works for me for now and we'll keep an eye on the upstream PR

@sunjayBhatia
Hack for now to make API server happy
742426c 
corev1.ResourceRequirements "claims" field has missing
annotations that cause API server to reject it

Can be reverted once
kubernetes/kubernetes#114585 is fixed

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
@sunjayBhatia
Merge remote-tracking branch 'origin/main' into bump-gw-api-0.6.0-rc2
d31175f 
Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
@sunjayBhatia sunjayBhatia merged commit 1995ff2 into projectcontour:main Dec 19, 2022
@sunjayBhatia sunjayBhatia deleted the bump-gw-api-0.6.0-rc2 branch December 19, 2022 22:19
yangyy93 pushed a commit to projectsesame/contour that referenced this pull request Feb 16, 2023
@sunjayBhatia @yangyy93
Update Gateway API to 0.6.0-rc2 (projectcontour#4933)
7f4c63e 
Includes a bump to controller-runtime and k8s API etc.
since Gateway API bumped those as dependencies as well.

Also inclused a hack for now to make API server happy

corev1.ResourceRequirements "claims" field has missing
annotations that cause API server to reject it

Those changes can be reverted once
kubernetes/kubernetes#114585 is fixed

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
Signed-off-by: yy <yang.yang@daocloud.io>
yangyy93 pushed a commit to projectsesame/contour that referenced this pull request Feb 16, 2023
@sunjayBhatia @yangyy93
Update Gateway API to 0.6.0-rc2 (projectcontour#4933)
9d63d69 
Includes a bump to controller-runtime and k8s API etc.
since Gateway API bumped those as dependencies as well.

Also inclused a hack for now to make API server happy

corev1.ResourceRequirements "claims" field has missing
annotations that cause API server to reject it

Those changes can be reverted once
kubernetes/kubernetes#114585 is fixed

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
Signed-off-by: yy <yang.yang@daocloud.io>
vmw-yingy pushed a commit to vmw-yingy/contour that referenced this pull request Feb 28, 2023
@sunjayBhatia @vmw-yingy
Update Gateway API to 0.6.0-rc2 (projectcontour#4933)
fc8affe 
Includes a bump to controller-runtime and k8s API etc.
since Gateway API bumped those as dependencies as well.

Also inclused a hack for now to make API server happy

corev1.ResourceRequirements "claims" field has missing
annotations that cause API server to reject it

Those changes can be reverted once
kubernetes/kubernetes#114585 is fixed

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@skriss skriss skriss approved these changes

@stevesloka stevesloka Awaiting requested review from stevesloka stevesloka is a code owner automatically assigned from projectcontour/maintainers

Assignees

No one assigned

Labels

area/dependency Issues or PRs related to dependency changes. release-note/none-required Marks a PR as not requiring a release note. Should only be used for very small changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sunjayBhatia @skriss