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.

Sign up for GitHub

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

Jump to bottom

Fix SSA for APIService #98576

Merged
merged 4 commits into from Jan 30, 2021
Merged

Fix SSA for APIService #98576

merged 4 commits into from Jan 30, 2021

Conversation

kevindelgado
Copy link
Contributor

What type of PR is this?
/kind bug

What this PR does / why we need it:
It removes the code to nil out the OpenAPIConfig on the aggregator server so that SSA requests are routed properly for the apiservices resource.

Which issue(s) this PR fixes:

Fixes #89264

Fixes using server-side apply with APIService resources

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jan 29, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @kevindelgado. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. area/test kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jan 29, 2021
@kevindelgado
Copy link
Contributor Author

kevindelgado commented Jan 29, 2021 •
edited

/assign @apelisse
/assign @liggitt

Please take another look, I had to update the generated proto and needed to create a new PR to change the branch. (Dupe of #98550)

@kevindelgado
Copy link
Contributor Author

/priority important-soon

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jan 29, 2021
@kevindelgado kevindelgado mentioned this pull request Jan 29, 2021
Closed
@kevindelgado
Copy link
Contributor Author

/triage accepted

@k8s-ci-robot
Copy link
Contributor

@kevindelgado: The label triage/accepted cannot be applied. Only GitHub organization members can add the label.

In response to this:

/triage accepted

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jan 29, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kevindelgado, liggitt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 29, 2021
@apelisse
Copy link
Member

/retest

@k8s-ci-robot k8s-ci-robot merged commit 0a0490e into kubernetes:master Jan 30, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Jan 30, 2021
@kevindelgado kevindelgado deleted the ssa branch February 1, 2021 16:38
@github-actions github-actions bot mentioned this pull request Feb 3, 2021
Open
@aermakov-zalando aermakov-zalando mentioned this pull request Feb 11, 2021
Draft
@Liujingfang1
Copy link
Contributor

@kevindelgado Thanks for fixing this issue. I came across it when switching our controller to server-side apply. Is there any plan to backport this fix to k8s versions like 1.18, or 1.17? Our controllers need to work on clusters with those versions.

@kevindelgado kevindelgado mentioned this pull request Feb 12, 2021
Closed
@kevindelgado
Copy link
Contributor Author

@Liujingfang1 I've made an issue to track it and will try to look into backporting it shortly. #99046

@cbandy cbandy mentioned this pull request Feb 13, 2021
Closed
This was referenced Mar 31, 2021
Merged
Merged
Merged
k8s-ci-robot added a commit that referenced this pull request Apr 8, 2021
@k8s-ci-robot
Merge pull request #100713 from kevindelgado/automated-cherry-pick-of…
64c9b22 
…-#100341-#98576-upstream-release-1.19

cherry pick  #100341 #98576 #95836 on 1.19 to enable SSA with APIService
k8s-ci-robot added a commit that referenced this pull request Apr 8, 2021
@k8s-ci-robot
Merge pull request #100714 from kevindelgado/automated-cherry-pick-of…
6edb1ec 
…-#100341-#98576-upstream-release-1.20

cherry pick #100341 #98576 on 1.20 to enable SSA with APIService
k8s-ci-robot added a commit that referenced this pull request Apr 9, 2021
@k8s-ci-robot
Merge pull request #100715 from kevindelgado/automated-cherry-pick-of…
c552288 
…-#100341-#98576-#--dry-run-upstream-release-1.18-1617135987

cherry pick  #100341 #98576 #95836 on 1.18 to enable SSA with APIService
@munnerz munnerz mentioned this pull request May 20, 2021
Closed
@alexsomesan alexsomesan mentioned this pull request Jun 11, 2021
Closed
@gordonbondon gordonbondon mentioned this pull request Jul 6, 2021
Open
This was referenced Oct 10, 2021
Merged
Merged
Merged
@stefanprodan stefanprodan mentioned this pull request Jan 26, 2022
Merged
haiyanmeng added a commit to haiyanmeng/kpt-config-sync that referenced this pull request Feb 24, 2023
@haiyanmeng
Remove the logic for setting the nested protocol field in k8s objects
550e87a 
containing an array of `ports`.

The logic was added in March 2021 as a workaround for a known k8s issue,
which causes getting the declared fields for k8s objects containing an
array of `ports` to fail. The fixes to the k8s issue have been merged
into k8s 1.20 and 1.21:
1) kubernetes/kubernetes#96317 (merged in 1.20)
2) kubernetes/kubernetes#98576 (merged in 1.21).

k8s 1.21 is no longer supported on GKE and Anthos:
1) GKE release schedule: https://cloud.google.com/kubernetes-engine/docs/release-schedule
2) Anthos version and upgrade support: https://cloud.google.com/anthos/docs/version-and-upgrade-support

Therefore, we can remove the logic and related unit tests. We can keep
the e2e test to make sure this change does not break things.
@haiyanmeng haiyanmeng mentioned this pull request Feb 24, 2023
Open
haiyanmeng added a commit to haiyanmeng/kpt-config-sync that referenced this pull request Feb 24, 2023
@haiyanmeng
Remove the logic for setting the nested protocol field in k8s objects
2dd18de 
containing an array of `ports`.

The logic was added in March 2021 as a workaround for a known k8s issue,
which causes getting the declared fields for k8s objects containing an
array of `ports` to fail. The fixes to the k8s issue have been merged
into k8s 1.20 and 1.21:
1) kubernetes/kubernetes#96317 (merged in 1.20)
2) kubernetes/kubernetes#98576 (merged in 1.21).

k8s 1.21 is no longer supported on GKE and Anthos:
1) GKE release schedule: https://cloud.google.com/kubernetes-engine/docs/release-schedule
2) Anthos version and upgrade support: https://cloud.google.com/anthos/docs/version-and-upgrade-support

Therefore, we can remove the logic and related unit tests. We can keep
the e2e test to make sure this change does not break things.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dims dims Awaiting requested review from dims

@lavalamp lavalamp Awaiting requested review from lavalamp

Assignees

@liggitt liggitt

@apelisse apelisse

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.

Server-side apply doesn't work for APIService
6 participants
@kevindelgado @k8s-ci-robot @fejta-bot @liggitt @apelisse @Liujingfang1