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.

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

fix(): fix datatype for CRD spec.BoundClaims #238

Merged
merged 1 commit into from
May 28, 2024
Merged

fix(): fix datatype for CRD spec.BoundClaims #238

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
3 changes: 2 additions & 1 deletion api/v1alpha1/jwtoidcauthenginerole_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"reflect"

vaultutils "github.com/redhat-cop/vault-config-operator/api/v1alpha1/utils"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down Expand Up @@ -105,7 +106,7 @@ type JWTOIDCRole struct {
// Keys support JSON pointer syntax for referencing claims
// +kubebuilder:validation:Optional
// +kubebuilder:default={}
BoundClaims map[string]string `json:"boundClaims,omitempty"`
BoundClaims *apiextensionsv1.JSON `json:"boundClaims,omitempty"`

// Configures the interpretation of the bound_claims values.
// If "string" (the default), the values will treated as string literals and must match exactly.
Expand Down
6 changes: 2 additions & 4 deletions api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions config/crd/bases/redhatcop.redhat.io_jwtoidcauthengineroles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,12 @@ spec:
type: array
x-kubernetes-list-type: set
boundClaims:
additionalProperties:
type: string
description: If set, a map of claims (keys) to match against respective
claim values (values) The expected value may be a single string
or a list of strings The interpretation of the bound claim values
is configured with bound_claims_type Keys support JSON pointer syntax
for referencing claims
type: object
x-kubernetes-preserve-unknown-fields: true
boundClaimsType:
default: string
description: Configures the interpretation of the bound_claims values.
Expand Down
Loading