Skip to content

Commit 7ae009e

Browse files
committed
Updates to display names for ocp 4.12
1 parent 3ba6d10 commit 7ae009e

8 files changed

+1373
-2
lines changed

api/v1/webspherelibertyapplication_types.go

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

272272
// An array of architectures to be considered for deployment. Their position in the array indicates preference.
273273
// +listType=set
274+
// +operator-sdk:csv:customresourcedefinitions:type=spec
274275
Architecture []string `json:"architecture,omitempty"`
275276
}
276277

@@ -420,14 +421,17 @@ type WebSphereLibertyApplicationMonitoring struct {
420421
type WebSphereLibertyApplicationServiceability struct {
421422
// A convenient field to request the size of the persisted storage to use for serviceability.
422423
// +kubebuilder:validation:Pattern=^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
424+
// +operator-sdk:csv:customresourcedefinitions:type=spec
423425
Size string `json:"size,omitempty"`
424426

425427
// The name of the PersistentVolumeClaim resource you created to be used for serviceability.
426428
// +kubebuilder:validation:Pattern=.+
429+
// +operator-sdk:csv:customresourcedefinitions:type=spec
427430
VolumeClaimName string `json:"volumeClaimName,omitempty"`
428431

429432
// A convenient field to request the StorageClassName of the persisted storage to use for serviceability.
430433
// +kubebuilder:validation:Pattern=.+
434+
// +operator-sdk:csv:customresourcedefinitions:type=spec
431435
StorageClassName string `json:"storageClassName,omitempty"`
432436
}
433437

@@ -648,33 +652,43 @@ type OAuth2Client struct {
648652
ID string `json:"id,omitempty"`
649653

650654
// Specifies a token endpoint URL for the OAuth 2.0 provider. Required field.
655+
// +operator-sdk:csv:customresourcedefinitions:type=spec
651656
TokenEndpoint string `json:"tokenEndpoint"`
652657

653658
// Specifies an authorization endpoint URL for the OAuth 2.0 provider. Required field.
659+
// +operator-sdk:csv:customresourcedefinitions:type=spec
654660
AuthorizationEndpoint string `json:"authorizationEndpoint"`
655661

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

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

662670
// The name of the social login configuration for display.
671+
// +operator-sdk:csv:customresourcedefinitions:type=spec
663672
DisplayName string `json:"displayName,omitempty"`
664673

665674
// Specifies the name of the claim. Use its value as the subject realm.
675+
// +operator-sdk:csv:customresourcedefinitions:type=spec
666676
RealmNameAttribute string `json:"realmNameAttribute,omitempty"`
667677

668678
// Specifies the realm name for this social media.
679+
// +operator-sdk:csv:customresourcedefinitions:type=spec
669680
RealmName string `json:"realmName,omitempty"`
670681

671682
// Specifies one or more scopes to request.
683+
// +operator-sdk:csv:customresourcedefinitions:type=spec
672684
Scope string `json:"scope,omitempty"`
673685

674686
// Specifies the required authentication method.
687+
// +operator-sdk:csv:customresourcedefinitions:type=spec
675688
TokenEndpointAuthMethod string `json:"tokenEndpointAuthMethod,omitempty"`
676689

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

680694
// Determines whether the access token that is provided in the request is used for authentication.
@@ -697,6 +711,7 @@ type OAuth2Client struct {
697711
// Represents configuration for social login using GitHub.
698712
type GithubLogin struct {
699713
// Specifies the host name of your enterprise GitHub.
714+
// +operator-sdk:csv:customresourcedefinitions:type=spec
700715
Hostname string `json:"hostname,omitempty"`
701716
}
702717

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)