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

Removed references to Docker in Kubernetes API #31393 #107691

Merged
merged 1 commit into from
Feb 10, 2022
Merged

Removed references to Docker in Kubernetes API #31393 #107691

merged 1 commit into from
Feb 10, 2022

Conversation

SubhasmitaSw
Copy link
Contributor

@SubhasmitaSw SubhasmitaSw commented Jan 21, 2022 •
edited

What type of PR is this?

/kind cleanup
/kind deprecation
/kind feature

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #31393

Special notes for your reviewer:

Additional changes can be implemented in docker-specific secrets mentions and further cited examples.

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. 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 21, 2022
@k8s-ci-robot
Copy link
Contributor

Welcome @SubhasmitaSw!

It looks like this is your first PR to kubernetes/kubernetes 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kubernetes has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jan 21, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @SubhasmitaSw. 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 the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Jan 21, 2022
@dims
Copy link
Member

dims commented Jan 21, 2022

@SubhasmitaSw looks like you have 2 commits that negate each other. can you please check?

@SubhasmitaSw
Copy link
Contributor Author

@dims actually I accidentally pushed the changes to the master branch and tried to revert back and push again in a new branch, looks it didn't work. Any nudges to resolve this?

@dims
Copy link
Member

dims commented Jan 22, 2022

@SubhasmitaSw ,

For this specific problem, please do this.

Step 1: ensure you are still in master branch by running git branch (there will be * in front of the current branch
Step 2: if you don't see master as the current branch then run git checkout master to switch to master
Step 3: run git log to see the commits, you will see the 2 commits removed references to Docker in Kubernetes API right at the top
Step 4: now you know that you are in the correct branch and you will be dealing with the commits you want to fix. now run git reset --hard HEAD~1 to drop just the first commit
Step 5: run git log to check if that commit is gone.
Step 6: run git push -f origin master to update the PR

Note that these steps are just to recover from your problem with opening a PR with master. Our regular workflow is described here ( https://www.kubernetes.dev/docs/guide/github-workflow/ ) you can hit one of us up on slack if you have a problem in the future.

@SubhasmitaSw
Copy link
Contributor Author

@dims thank you for the steps, I followed them and hopefully, the problem is resolved since it shows aligned with master from my side.

@dims
Copy link
Member

dims commented Jan 22, 2022

@SubhasmitaSw https://github.com/kubernetes/kubernetes/pull/107691/commits shows 2 commits still. looks like you are using issue_31393 branch and not master so please repeat the steps replacing master with issue_31393` branch in my instructions. (my bad that i didn't cross check)

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 22, 2022
@SubhasmitaSw
Copy link
Contributor Author

Thanks again @dims, looks like this time it's resolved.

@dims
Copy link
Member

dims commented Jan 22, 2022

/ok-to-test
/release-note-none
/sig api-machinery

@k8s-ci-robot
Copy link
Contributor

@dims: you can not set the release note label to "release-note-none" because the PR has the label "kind/deprecation".

In response to this:

/ok-to-test
/release-note-none
/sig api-machinery

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 ok-to-test Indicates a non-member PR verified by an org member that is safe to test. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jan 22, 2022
@dims
Copy link
Member

dims commented Jan 22, 2022

/assign @liggitt

@dims
Copy link
Member

dims commented Jan 22, 2022

Thanks again @dims, looks like this time it's resolved.

yep! thanks!

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Feb 8, 2022
@MadhavJivrajani
Copy link
Contributor

/release-note-none

@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Feb 9, 2022
@dims
Copy link
Member

dims commented Feb 9, 2022

@SubhasmitaSw please rebase against master and then squash the commits. That should be enough to get this wrapped up.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/contains-merge-commits Indicates a PR which contains merge commits. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 9, 2022
@SubhasmitaSw
removed references to Docker in Kubernetes API
2d52a9f 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>

Run the hack/update* commands to regenerate files

Signed-off-by: Davanum Srinivas <davanum@gmail.com>

Update staging/src/k8s.io/api/core/v1/types.go

Co-authored-by: Jordan Liggitt <jordan@liggitt.net>

Update staging/src/k8s.io/api/core/v1/types.go

Co-authored-by: Jordan Liggitt <jordan@liggitt.net>

more files that needed updates

Signed-off-by: Davanum Srinivas <davanum@gmail.com>

removed references to Docker in Kubernetes API
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/contains-merge-commits Indicates a PR which contains merge commits. label Feb 9, 2022
@dims
Copy link
Member

dims commented Feb 9, 2022

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 9, 2022
@liggitt
Copy link
Member

liggitt commented Feb 9, 2022

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, liggitt, SubhasmitaSw

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

1 similar comment
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, liggitt, SubhasmitaSw

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 Feb 9, 2022
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Feb 9, 2022 •
edited

@SubhasmitaSw: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kubernetes-conformance-image-test 31f4051174681f15b4a5c820e4c50c15678b7a6c link false /test pull-kubernetes-conformance-image-test
pull-kubernetes-local-e2e 31f4051174681f15b4a5c820e4c50c15678b7a6c link false /test pull-kubernetes-local-e2e
pull-kubernetes-e2e-ubuntu-gce-network-policies 31f4051174681f15b4a5c820e4c50c15678b7a6c link false /test pull-kubernetes-e2e-ubuntu-gce-network-policies
pull-kubernetes-e2e-gce-alpha-features 31f4051174681f15b4a5c820e4c50c15678b7a6c link false /test pull-kubernetes-e2e-gce-alpha-features
pull-kubernetes-e2e-aks-engine-windows-containerd 31f4051174681f15b4a5c820e4c50c15678b7a6c link false /test pull-kubernetes-e2e-aks-engine-windows-containerd
pull-kubernetes-e2e-capz-azure-file-vmss 31f4051174681f15b4a5c820e4c50c15678b7a6c link false /test pull-kubernetes-e2e-capz-azure-file-vmss
pull-kubernetes-e2e-capz-conformance 31f4051174681f15b4a5c820e4c50c15678b7a6c link false /test pull-kubernetes-e2e-capz-conformance
pull-kubernetes-e2e-gci-gce-ipvs 31f4051174681f15b4a5c820e4c50c15678b7a6c link false /test pull-kubernetes-e2e-gci-gce-ipvs
pull-kubernetes-e2e-gci-gce-ingress 31f4051174681f15b4a5c820e4c50c15678b7a6c link false /test pull-kubernetes-e2e-gci-gce-ingress
pull-kubernetes-e2e-capz-azure-disk 31f4051174681f15b4a5c820e4c50c15678b7a6c link false /test pull-kubernetes-e2e-capz-azure-disk
pull-kubernetes-e2e-capz-azure-file 31f4051174681f15b4a5c820e4c50c15678b7a6c link false /test pull-kubernetes-e2e-capz-azure-file
pull-kubernetes-e2e-capz-azure-disk-vmss 31f4051174681f15b4a5c820e4c50c15678b7a6c link false /test pull-kubernetes-e2e-capz-azure-disk-vmss

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@neolit123
Copy link
Member

/remove-area kubeadm

@k8s-triage-robot
Copy link

The Kubernetes project has merge-blocking tests that are currently too flaky to consistently pass.

This bot retests PRs for certain kubernetes repos according to the following rules:

  • The PR does have any do-not-merge/* labels
  • The PR does not have the needs-ok-to-test label
  • The PR is mergeable (does not have a needs-rebase label)
  • The PR is approved (has cncf-cla: yes, lgtm, approved labels)
  • The PR is failing tests required for merge

You can:

/retest

@k8s-ci-robot k8s-ci-robot merged commit 71977b6 into kubernetes:master Feb 10, 2022
SIG Node PR Triage automation moved this from Triage to Done Feb 10, 2022
Docs - Dockershim Removal automation moved this from PRs in Flight to Done Feb 10, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.24 milestone Feb 10, 2022
@marosset marosset added this to Done (v1.24) in SIG-Windows Feb 24, 2022
@SubhasmitaSw SubhasmitaSw mentioned this pull request Sep 15, 2022
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liggitt liggitt liggitt left review comments

Assignees

@dims dims

@liggitt liggitt

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/cloudprovider area/conformance Issues or PRs related to kubernetes conformance tests area/e2e-test-framework Issues or PRs related to refactoring the kubernetes e2e test framework area/ipvs area/kubectl area/kubelet area/network-policy Issues or PRs related to Network Policy subproject area/provider/gcp Issues or PRs related to gcp provider area/release-eng Issues or PRs related to the Release Engineering subproject 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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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-none Denotes a PR that doesn't merit a release note. 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/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/autoscaling Categorizes an issue or PR as relevant to SIG Autoscaling. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/release Categorizes an issue or PR as relevant to SIG Release. sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. sig/storage Categorizes an issue or PR as relevant to SIG Storage. sig/testing Categorizes an issue or PR as relevant to SIG Testing. sig/windows Categorizes an issue or PR as relevant to SIG Windows. 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
Docs - Dockershim Removal
Done
SIG Node CI/Test Board
Triage
SIG Node CI/Test Board
Archived in project
SIG Node PR Triage
Archived in project
SIG-Windows
  
Done (v1.24)
SIG Node PR Triage
Done
Milestone
v1.24
Development

Successfully merging this pull request may close these issues.

Remove references to Docker in Kubernetes API
7 participants
@SubhasmitaSw @k8s-ci-robot @dims @liggitt @k8s-triage-robot @MadhavJivrajani @neolit123