Skip to content

Fix merge conflict section in walkthrough #11

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

Merged
merged 1 commit into from
Mar 8, 2019
Merged

Fix merge conflict section in walkthrough #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions docs/addon/walkthrough/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,15 @@ support (and we can hopefully evolve the contract with just a recompile!)

So in `pkg/apis/addons/v1alpha1/dashboard_types.go`:

<<<<<<< HEAD
* add an import for `"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/addon"`
=======
* add an import for `addonv1alpha1 "sigs.k8s.io/controller-runtime/alpha/patterns/addon/pkg/apis/v1alpha1"`
>>>>>>> 2af6c71c... pattern/declarative,addons: implement Status
* add a field `addon.CommonSpec` to the Spec object (and remove the placeholders)
* add a field `addon.CommonStatus` to the Status object (and remove the placeholders)
* add an import for `addonv1alpha1 "sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/addon/pkg/apis/v1alpha1"`
* add a field `addonv1alpha1.CommonSpec` to the Spec object (and remove the placeholders)
* add a field `addonv1alpha1.CommonStatus` to the Status object (and remove the placeholders)

We'll also need to add some accessor functions (we could use reflection, but
this doesn't feel too onerous - ?):

```go
import addonv1alpha1 "sigs.k8s.io/controller-runtime/alpha/patterns/addon/pkg/apis/v1alpha1"
import addonv1alpha1 "sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/addon/pkg/apis/v1alpha1"

var _ addonv1alpha1.CommonObject = &Dashboard{}

Expand Down