Skip to content

Commit 76f9497

Browse files
committed
Updates to display names for ocp 4.12
1 parent c238a0d commit 76f9497

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
@@ -285,6 +285,7 @@ type WebSphereLibertyApplicationAffinity struct {
285285

286286
// An array of architectures to be considered for deployment. Their position in the array indicates preference.
287287
// +listType=set
288+
// +operator-sdk:csv:customresourcedefinitions:type=spec
288289
Architecture []string `json:"architecture,omitempty"`
289290
}
290291

@@ -434,14 +435,17 @@ type WebSphereLibertyApplicationMonitoring struct {
434435
type WebSphereLibertyApplicationServiceability struct {
435436
// A convenient field to request the size of the persisted storage to use for serviceability.
436437
// +kubebuilder:validation:Pattern=^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
438+
// +operator-sdk:csv:customresourcedefinitions:type=spec
437439
Size string `json:"size,omitempty"`
438440

439441
// The name of the PersistentVolumeClaim resource you created to be used for serviceability.
440442
// +kubebuilder:validation:Pattern=.+
443+
// +operator-sdk:csv:customresourcedefinitions:type=spec
441444
VolumeClaimName string `json:"volumeClaimName,omitempty"`
442445

443446
// A convenient field to request the StorageClassName of the persisted storage to use for serviceability.
444447
// +kubebuilder:validation:Pattern=.+
448+
// +operator-sdk:csv:customresourcedefinitions:type=spec
445449
StorageClassName string `json:"storageClassName,omitempty"`
446450
}
447451

@@ -662,33 +666,43 @@ type OAuth2Client struct {
662666
ID string `json:"id,omitempty"`
663667

664668
// Specifies a token endpoint URL for the OAuth 2.0 provider. Required field.
669+
// +operator-sdk:csv:customresourcedefinitions:type=spec
665670
TokenEndpoint string `json:"tokenEndpoint"`
666671

667672
// Specifies an authorization endpoint URL for the OAuth 2.0 provider. Required field.
673+
// +operator-sdk:csv:customresourcedefinitions:type=spec
668674
AuthorizationEndpoint string `json:"authorizationEndpoint"`
669675

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

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

676684
// The name of the social login configuration for display.
685+
// +operator-sdk:csv:customresourcedefinitions:type=spec
677686
DisplayName string `json:"displayName,omitempty"`
678687

679688
// Specifies the name of the claim. Use its value as the subject realm.
689+
// +operator-sdk:csv:customresourcedefinitions:type=spec
680690
RealmNameAttribute string `json:"realmNameAttribute,omitempty"`
681691

682692
// Specifies the realm name for this social media.
693+
// +operator-sdk:csv:customresourcedefinitions:type=spec
683694
RealmName string `json:"realmName,omitempty"`
684695

685696
// Specifies one or more scopes to request.
697+
// +operator-sdk:csv:customresourcedefinitions:type=spec
686698
Scope string `json:"scope,omitempty"`
687699

688700
// Specifies the required authentication method.
701+
// +operator-sdk:csv:customresourcedefinitions:type=spec
689702
TokenEndpointAuthMethod string `json:"tokenEndpointAuthMethod,omitempty"`
690703

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

694708
// Determines whether the access token that is provided in the request is used for authentication.
@@ -711,6 +725,7 @@ type OAuth2Client struct {
711725
// Represents configuration for social login using GitHub.
712726
type GithubLogin struct {
713727
// Specifies the host name of your enterprise GitHub.
728+
// +operator-sdk:csv:customresourcedefinitions:type=spec
714729
Hostname string `json:"hostname,omitempty"`
715730
}
716731

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)