Skip to content

Commit

Permalink
Merge pull request #263 from crossplane-contrib/backport-262-to-relea…
Browse files Browse the repository at this point in the history
…se-0.19

[Backport release-0.19] fix: remove omitempty in invalid json tag combination
  • Loading branch information
lsviben authored Jan 8, 2025
2 parents a9f1e23 + 9ac6295 commit 282a939
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion apis/release/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ type NamespacedName struct {

// DataKeySelector defines required spec to access a key of a configmap or secret
type DataKeySelector struct {
NamespacedName `json:",inline,omitempty"`
NamespacedName `json:",inline"`
Key string `json:"key,omitempty"`
Optional bool `json:"optional,omitempty"`
}
Expand Down
2 changes: 1 addition & 1 deletion apis/release/v1beta1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ type NamespacedName struct {

// DataKeySelector defines required spec to access a key of a configmap or secret
type DataKeySelector struct {
NamespacedName `json:",inline,omitempty"`
NamespacedName `json:",inline"`
Key string `json:"key,omitempty"`
Optional bool `json:"optional,omitempty"`
}
Expand Down

0 comments on commit 282a939

Please sign in to comment.