Skip to content

Commit 18efc18

Browse files
committed
Updates to display names for ocp 4.12
1 parent 05ea106 commit 18efc18

8 files changed

+1374
-3
lines changed

api/v1/webspherelibertyapplication_types.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ type WebSphereLibertyApplicationAffinity struct {
252252

253253
// An array of architectures to be considered for deployment. Their position in the array indicates preference.
254254
// +listType=set
255+
// +operator-sdk:csv:customresourcedefinitions:type=spec
255256
Architecture []string `json:"architecture,omitempty"`
256257
}
257258

@@ -401,14 +402,17 @@ type WebSphereLibertyApplicationMonitoring struct {
401402
type WebSphereLibertyApplicationServiceability struct {
402403
// A convenient field to request the size of the persisted storage to use for serviceability.
403404
// +kubebuilder:validation:Pattern=^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
405+
// +operator-sdk:csv:customresourcedefinitions:type=spec
404406
Size string `json:"size,omitempty"`
405407

406408
// The name of the PersistentVolumeClaim resource you created to be used for serviceability.
407409
// +kubebuilder:validation:Pattern=.+
410+
// +operator-sdk:csv:customresourcedefinitions:type=spec
408411
VolumeClaimName string `json:"volumeClaimName,omitempty"`
409412

410413
// A convenient field to request the StorageClassName of the persisted storage to use for serviceability.
411414
// +kubebuilder:validation:Pattern=.+
415+
// +operator-sdk:csv:customresourcedefinitions:type=spec
412416
StorageClassName string `json:"storageClassName,omitempty"`
413417
}
414418

@@ -629,33 +633,43 @@ type OAuth2Client struct {
629633
ID string `json:"id,omitempty"`
630634

631635
// Specifies a token endpoint URL for the OAuth 2.0 provider. Required field.
636+
// +operator-sdk:csv:customresourcedefinitions:type=spec
632637
TokenEndpoint string `json:"tokenEndpoint"`
633638

634639
// Specifies an authorization endpoint URL for the OAuth 2.0 provider. Required field.
640+
// +operator-sdk:csv:customresourcedefinitions:type=spec
635641
AuthorizationEndpoint string `json:"authorizationEndpoint"`
636642

637643
// Specifies the name of the claim. Use its value as the user group membership
644+
// +operator-sdk:csv:customresourcedefinitions:type=spec
638645
GroupNameAttribute string `json:"groupNameAttribute,omitempty"`
639646

640647
// Specifies the name of the claim. Use its value as the authenticated user principal.
648+
// +operator-sdk:csv:customresourcedefinitions:type=spec
641649
UserNameAttribute string `json:"userNameAttribute,omitempty"`
642650

643651
// The name of the social login configuration for display.
652+
// +operator-sdk:csv:customresourcedefinitions:type=spec
644653
DisplayName string `json:"displayName,omitempty"`
645654

646655
// Specifies the name of the claim. Use its value as the subject realm.
656+
// +operator-sdk:csv:customresourcedefinitions:type=spec
647657
RealmNameAttribute string `json:"realmNameAttribute,omitempty"`
648658

649659
// Specifies the realm name for this social media.
660+
// +operator-sdk:csv:customresourcedefinitions:type=spec
650661
RealmName string `json:"realmName,omitempty"`
651662

652663
// Specifies one or more scopes to request.
664+
// +operator-sdk:csv:customresourcedefinitions:type=spec
653665
Scope string `json:"scope,omitempty"`
654666

655667
// Specifies the required authentication method.
668+
// +operator-sdk:csv:customresourcedefinitions:type=spec
656669
TokenEndpointAuthMethod string `json:"tokenEndpointAuthMethod,omitempty"`
657670

658671
// Name of the header to use when an OAuth access token is forwarded.
672+
// +operator-sdk:csv:customresourcedefinitions:type=spec
659673
AccessTokenHeaderName string `json:"accessTokenHeaderName,omitempty"`
660674

661675
// Determines whether the access token that is provided in the request is used for authentication.
@@ -678,6 +692,7 @@ type OAuth2Client struct {
678692
// Represents configuration for social login using GitHub.
679693
type GithubLogin struct {
680694
// Specifies the host name of your enterprise GitHub.
695+
// +operator-sdk:csv:customresourcedefinitions:type=spec
681696
Hostname string `json:"hostname,omitempty"`
682697
}
683698

api/v1/webspherelibertydump_types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ type WebSphereLibertyDumpSpec struct {
3030
License LicenseSimple `json:"license"`
3131

3232
// The name of the Pod, which must be in the same namespace as the WebSphereLibertyDump CR.
33+
// +operator-sdk:csv:customresourcedefinitions:type=spec
3334
PodName string `json:"podName"`
3435
// Optional. List of memory dump types to request: thread, heap, system.
3536
// +listType=set
37+
// +operator-sdk:csv:customresourcedefinitions:type=spec
3638
Include []WebSphereLibertyDumpInclude `json:"include,omitempty"`
3739
}
3840

api/v1/webspherelibertytrace_types.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,23 @@ type WebSphereLibertyTraceSpec struct {
3131
License LicenseSimple `json:"license"`
3232

3333
// The name of the Pod, which must be in the same namespace as the WebSphereLibertyTrace CR.
34+
// +operator-sdk:csv:customresourcedefinitions:type=spec
3435
PodName string `json:"podName"`
3536

3637
// The trace string to be used to selectively enable trace. The default is *=info.
38+
// +operator-sdk:csv:customresourcedefinitions:type=spec
3739
TraceSpecification string `json:"traceSpecification"`
3840

3941
// The maximum size (in MB) that a log file can reach before it is rolled. To disable this attribute, set the value to 0.
42+
// +operator-sdk:csv:customresourcedefinitions:type=spec
4043
MaxFileSize *int32 `json:"maxFileSize,omitempty"`
4144

4245
// If an enforced maximum file size exists, this setting is used to determine how many of each of the logs files are kept.
46+
// +operator-sdk:csv:customresourcedefinitions:type=spec
4347
MaxFiles *int32 `json:"maxFiles,omitempty"`
4448

4549
// Set to true to stop tracing.
50+
// +operator-sdk:csv:customresourcedefinitions:type=spec
4651
Disable *bool `json:"disable,omitempty"`
4752
}
4853

0 commit comments

Comments
 (0)