Skip to content

Commit

Permalink
Displayname updates for OCP 4.12
Browse files Browse the repository at this point in the history
  • Loading branch information
yongja79 committed May 3, 2023
1 parent a86ad85 commit 7f416cd
Show file tree
Hide file tree
Showing 8 changed files with 1,389 additions and 3 deletions.
16 changes: 16 additions & 0 deletions api/v1/openlibertyapplication_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ type OpenLibertyApplicationAffinity struct {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Expand Down
3 changes: 3 additions & 0 deletions api/v1/openlibertydump_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import (
// OpenLibertyDumpSpec defines the desired state of OpenLibertyDump
type OpenLibertyDumpSpec struct {
// The name of the Pod, which must be in the same namespace as the OpenLibertyDump CR.
// +operator-sdk:csv:customresourcedefinitions:type=spec
PodName string `json:"podName"`
// Optional. List of memory dump types to request: thread, heap, system.
// +listType=set
// +operator-sdk:csv:customresourcedefinitions:type=spec
Include []OpenLibertyDumpInclude `json:"include,omitempty"`
}

Expand Down Expand Up @@ -41,6 +43,7 @@ type OpenLibertyDumpStatus struct {
type DumpStatusVersions struct {
Reconciled string `json:"reconciled,omitempty"`
}

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:storageversion
Expand Down
6 changes: 6 additions & 0 deletions api/v1/openlibertytrace_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,23 @@ import (
// Defines the desired state of OpenLibertyTrace
type OpenLibertyTraceSpec struct {
// The name of the Pod, which must be in the same namespace as the OpenLibertyTrace CR.
// +operator-sdk:csv:customresourcedefinitions:type=spec
PodName string `json:"podName"`

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

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

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

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

Expand All @@ -36,6 +41,7 @@ type OpenLibertyTraceStatus struct {
type TraceStatusVersions struct {
Reconciled string `json:"reconciled,omitempty"`
}

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:storageversion
Expand Down
Loading

0 comments on commit 7f416cd

Please sign in to comment.