Skip to content

Conversation

@atoato88
Copy link
Contributor

@atoato88 atoato88 commented Mar 6, 2019

There is a merge conflict at section of "Adding the framework into our types" in docs/addon/walkthrough/README.md
This PR fix conflict by following current contents of pkg/apis/addons/v1alpha1/dashboard_types.go

There is a merge conflict at section of
"Adding the framework into our types"
This PR fix conflict by following current contents of
pkg/apis/addons/v1alpha1/dashboard_types.go
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. labels Mar 6, 2019
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 6, 2019
@johnsonj
Copy link
Contributor

johnsonj commented Mar 6, 2019

Thank you!

/assign @justinsb

@justinsb
Copy link
Contributor

justinsb commented Mar 6, 2019

Awesome - thanks for fixing @atoato88

/ok-to-test
/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 Mar 6, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: atoato88, justinsb

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 Mar 6, 2019
@johnsonj
Copy link
Contributor

johnsonj commented Mar 6, 2019

@BenTheElder - is there something else we need to do here to kick off Prow?

@BenTheElder
Copy link
Member

/test pull-declarative-test

@BenTheElder
Copy link
Member

ah we need to enable the trigger plugin https://prow.k8s.io/plugins?repo=kubernetes-sigs%2Fkubebuilder-declarative-pattern

@BenTheElder
Copy link
Member

/test pull-declarative-test

@johnsonj
Copy link
Contributor

johnsonj commented Mar 6, 2019

This is a real failure (but in HEAD, not from this change). #12 should fix.

@johnsonj
Copy link
Contributor

johnsonj commented Mar 8, 2019

/test pull-declarative-test

@k8s-ci-robot k8s-ci-robot merged commit 44066a2 into kubernetes-sigs:master Mar 8, 2019
@johnsonj
Copy link
Contributor

johnsonj commented Mar 8, 2019

Thanks for the fix and patience @atoato88

@atoato88 atoato88 deleted the fix-docs-walkthrough branch December 12, 2022 00:11
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants