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

Structured Kind configuration #1021

Merged
merged 1 commit into from
Apr 8, 2024

Conversation

wzshiming
Copy link
Member

What type of PR is this?

/kind bug
/kind cleanup
/kind feature

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Structured Kind configuration

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


@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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 7, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wzshiming

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 7, 2024
Copy link

netlify bot commented Apr 7, 2024

Deploy Preview for k8s-kwok canceled.

Name Link
🔨 Latest commit 3c4979c
🔍 Latest deploy log https://app.netlify.com/sites/k8s-kwok/deploys/661274f99ecb0d00082a090a

@wzshiming wzshiming force-pushed the fix/kind-config branch 2 times, most recently from f1fb25c to cef9262 Compare April 7, 2024 09:43
@wzshiming wzshiming merged commit 97b92c9 into kubernetes-sigs:main Apr 8, 2024
25 of 26 checks passed
@wzshiming wzshiming deleted the fix/kind-config branch April 8, 2024 02:04
@wzshiming
Copy link
Member Author

/cherrypick release-0.5

@k8s-infra-cherrypick-robot

@wzshiming: #1021 failed to apply on top of branch "release-0.5":

Applying: Structured Kind configuration
Using index info to reconstruct a base tree...
M	pkg/kwokctl/runtime/kind/cluster.go
M	pkg/kwokctl/runtime/kind/kind.go
M	pkg/kwokctl/runtime/kind/kind.yaml.tpl
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/kwokctl/runtime/kind/kind.yaml.tpl deleted in Structured Kind configuration and modified in HEAD. Version HEAD of pkg/kwokctl/runtime/kind/kind.yaml.tpl left in tree.
Auto-merging pkg/kwokctl/runtime/kind/kind.go
Auto-merging pkg/kwokctl/runtime/kind/cluster.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Structured Kind configuration
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-0.5

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. kind/feature Categorizes issue or PR as related to a new feature. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants