Skip to content

fix: support both types of default marker #164

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: support both types of default marker #164

Show file tree
Hide file tree
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
20 changes: 11 additions & 9 deletions processor/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,18 +554,20 @@ func parseMarkers(markers markers.MarkerValues) (string, []string) {
validation = append(validation, fmt.Sprintf("%s: %v", name, value))
}

if name == "kubebuilder:default" {
if value, ok := value.(crdmarkers.Default); ok {
defaultValue = fmt.Sprintf("%v", value.Value)
if strings.HasPrefix(defaultValue, "map[") {
defaultValue = strings.TrimPrefix(defaultValue, "map[")
defaultValue = strings.TrimSuffix(defaultValue, "]")
defaultValue = fmt.Sprintf("{ %s }", defaultValue)
}
}
switch v := value.(type) {
case crdmarkers.KubernetesDefault:
defaultValue = fmt.Sprintf("%v", v.Value)
case crdmarkers.Default:
defaultValue = fmt.Sprintf("%v", v.Value)
}
}

if strings.HasPrefix(defaultValue, "map[") {
defaultValue = strings.TrimPrefix(defaultValue, "map[")
defaultValue = strings.TrimSuffix(defaultValue, "]")
defaultValue = fmt.Sprintf("{ %s }", defaultValue)
}

return defaultValue, validation
}

Expand Down
2 changes: 1 addition & 1 deletion test/api/v1/guestbook_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ type Rating int
// +kubebuilder:validation:XValidation:rule="self.page < 200", message="Please start a new book."
type GuestbookSpec struct {
// Page indicates the page number
// +kubebuilder:default=1
// +default=1
// +kubebuilder:example=3
Page *PositiveInt `json:"page,omitempty"`
// Entries contain guest book entries for the page
Expand Down