Skip to content

Commit 7f416cd

Browse files
committed
Displayname updates for OCP 4.12
1 parent a86ad85 commit 7f416cd

8 files changed

+1389
-3
lines changed

api/v1/openlibertyapplication_types.go

+16
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ type OpenLibertyApplicationAffinity struct {
173173

174174
// An array of architectures to be considered for deployment. Their position in the array indicates preference.
175175
// +listType=set
176+
// +operator-sdk:csv:customresourcedefinitions:type=spec
176177
Architecture []string `json:"architecture,omitempty"`
177178
}
178179

@@ -269,6 +270,7 @@ type OpenLibertyApplicationDeployment struct {
269270
UpdateStrategy *appsv1.DeploymentStrategy `json:"updateStrategy,omitempty"`
270271

271272
// Annotations to be added only to the Deployment and resources owned by the Deployment
273+
// +operator-sdk:csv:customresourcedefinitions:type=spec
272274
Annotations map[string]string `json:"annotations,omitempty"`
273275
}
274276

@@ -322,14 +324,17 @@ type OpenLibertyApplicationMonitoring struct {
322324
type OpenLibertyApplicationServiceability struct {
323325
// A convenient field to request the size of the persisted storage to use for serviceability.
324326
// +kubebuilder:validation:Pattern=^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
327+
// +operator-sdk:csv:customresourcedefinitions:type=spec
325328
Size string `json:"size,omitempty"`
326329

327330
// The name of the PersistentVolumeClaim resource you created to be used for serviceability.
328331
// +kubebuilder:validation:Pattern=.+
332+
// +operator-sdk:csv:customresourcedefinitions:type=spec
329333
VolumeClaimName string `json:"volumeClaimName,omitempty"`
330334

331335
// A convenient field to request the StorageClassName of the persisted storage to use for serviceability.
332336
// +kubebuilder:validation:Pattern=.+
337+
// +operator-sdk:csv:customresourcedefinitions:type=spec
333338
StorageClassName string `json:"storageClassName,omitempty"`
334339
}
335340

@@ -551,33 +556,43 @@ type OAuth2Client struct {
551556
ID string `json:"id,omitempty"`
552557

553558
// Specifies a token endpoint URL for the OAuth 2.0 provider. Required field.
559+
// +operator-sdk:csv:customresourcedefinitions:type=spec
554560
TokenEndpoint string `json:"tokenEndpoint"`
555561

556562
// Specifies an authorization endpoint URL for the OAuth 2.0 provider. Required field.
563+
// +operator-sdk:csv:customresourcedefinitions:type=spec
557564
AuthorizationEndpoint string `json:"authorizationEndpoint"`
558565

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

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

565574
// The name of the social login configuration for display.
575+
// +operator-sdk:csv:customresourcedefinitions:type=spec
566576
DisplayName string `json:"displayName,omitempty"`
567577

568578
// Specifies the name of the claim. Use its value as the subject realm.
579+
// +operator-sdk:csv:customresourcedefinitions:type=spec
569580
RealmNameAttribute string `json:"realmNameAttribute,omitempty"`
570581

571582
// Specifies the realm name for this social media.
583+
// +operator-sdk:csv:customresourcedefinitions:type=spec
572584
RealmName string `json:"realmName,omitempty"`
573585

574586
// Specifies one or more scopes to request.
587+
// +operator-sdk:csv:customresourcedefinitions:type=spec
575588
Scope string `json:"scope,omitempty"`
576589

577590
// Specifies the required authentication method.
591+
// +operator-sdk:csv:customresourcedefinitions:type=spec
578592
TokenEndpointAuthMethod string `json:"tokenEndpointAuthMethod,omitempty"`
579593

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

583598
// Determines whether the access token that is provided in the request is used for authentication.
@@ -600,6 +615,7 @@ type OAuth2Client struct {
600615
// Represents configuration for social login using GitHub.
601616
type GithubLogin struct {
602617
// Specifies the host name of your enterprise GitHub.
618+
// +operator-sdk:csv:customresourcedefinitions:type=spec
603619
Hostname string `json:"hostname,omitempty"`
604620
}
605621

api/v1/openlibertydump_types.go

+3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ import (
99
// OpenLibertyDumpSpec defines the desired state of OpenLibertyDump
1010
type OpenLibertyDumpSpec struct {
1111
// The name of the Pod, which must be in the same namespace as the OpenLibertyDump CR.
12+
// +operator-sdk:csv:customresourcedefinitions:type=spec
1213
PodName string `json:"podName"`
1314
// Optional. List of memory dump types to request: thread, heap, system.
1415
// +listType=set
16+
// +operator-sdk:csv:customresourcedefinitions:type=spec
1517
Include []OpenLibertyDumpInclude `json:"include,omitempty"`
1618
}
1719

@@ -41,6 +43,7 @@ type OpenLibertyDumpStatus struct {
4143
type DumpStatusVersions struct {
4244
Reconciled string `json:"reconciled,omitempty"`
4345
}
46+
4447
// +kubebuilder:object:root=true
4548
// +kubebuilder:subresource:status
4649
// +kubebuilder:storageversion

api/v1/openlibertytrace_types.go

+6
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,23 @@ import (
1010
// Defines the desired state of OpenLibertyTrace
1111
type OpenLibertyTraceSpec struct {
1212
// The name of the Pod, which must be in the same namespace as the OpenLibertyTrace CR.
13+
// +operator-sdk:csv:customresourcedefinitions:type=spec
1314
PodName string `json:"podName"`
1415

1516
// The trace string to be used to selectively enable trace. The default is *=info.
17+
// +operator-sdk:csv:customresourcedefinitions:type=spec
1618
TraceSpecification string `json:"traceSpecification"`
1719

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

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

2428
// Set to true to stop tracing.
29+
// +operator-sdk:csv:customresourcedefinitions:type=spec
2530
Disable *bool `json:"disable,omitempty"`
2631
}
2732

@@ -36,6 +41,7 @@ type OpenLibertyTraceStatus struct {
3641
type TraceStatusVersions struct {
3742
Reconciled string `json:"reconciled,omitempty"`
3843
}
44+
3945
// +kubebuilder:object:root=true
4046
// +kubebuilder:subresource:status
4147
// +kubebuilder:storageversion

0 commit comments

Comments
 (0)