Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions api/v1alpha1/docs/apiref.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -593,8 +593,6 @@ HostConfig contains all configuration parameters of the host operator

| *`deactivation`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-deactivationconfig[$$DeactivationConfig$$]__ | Keeps parameters concerned with user deactivation + | | Optional: \{} +

| *`metrics`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-metricsconfig[$$MetricsConfig$$]__ | Keeps parameters concerned with metrics + | | Optional: \{} +

| *`notifications`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-notificationsconfig[$$NotificationsConfig$$]__ | Keeps parameters concerned with notifications + | | Optional: \{} +

| *`registrationService`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationserviceconfig[$$RegistrationServiceConfig$$]__ | Keeps parameters necessary for the registration service + | | Optional: \{} +
Expand Down Expand Up @@ -1003,8 +1001,6 @@ Member contains the status of a member cluster
| *`apiEndpoint`* __string__ | APIEndpoint is the server API URL of the cluster + | | Optional: \{} +

| *`clusterName`* __string__ | The cluster identifier + | |
| *`spaceCount`* __integer__ | Number of Spaces created within the member cluster + | | Optional: \{} +

| *`memberStatus`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-memberstatusstatus[$$MemberStatusStatus$$]__ | The array of member status objects + | |
|===

Expand Down Expand Up @@ -1289,45 +1285,6 @@ Members contains all configuration for member operators
|===


[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-metric"]
==== Metric

_Underlying type:_ _object_





.Appears In:
****
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-toolchainstatusstatus[$$ToolchainStatusStatus$$]
****



[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-metricsconfig"]
==== MetricsConfig



MetricsConfig contains all configuration parameters related to metrics gathering



.Appears In:
****
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hostconfig[$$HostConfig$$]
****

[cols="20a,50a,15a,15a", options="header"]
|===
| Field | Description | Default | Validation
| *`forceSynchronization`* __boolean__ | ForceSynchronization is a flag used to trigger synchronization of the metrics +
based on the resources rather than on the content of `ToolchainStatus.status.metrics` + | | Optional: \{} +

|===


[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-nstemplateset"]
==== NSTemplateSet

Expand Down Expand Up @@ -3718,8 +3675,6 @@ ToolchainStatusStatus defines the observed state of the toolchain, including hos

| *`members`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-member[$$Member$$] array__ | Members is an array of member status objects + | | Optional: \{} +

| *`metrics`* __object (keys:string, values:xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-metric[$$Metric$$])__ | Metrics is a map that stores metrics to be exposed on Prometheus. + | | Optional: \{} +

| *`hostRoutes`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hostroutes[$$HostRoutes$$]__ | HostRoutes/URLs of the host cluster, such as Proxy URL + | | Optional: \{} +

| *`conditions`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-condition[$$Condition$$] array__ | Conditions is an array of the current overall toolchain status conditions +
Expand Down
13 changes: 0 additions & 13 deletions api/v1alpha1/toolchainconfig_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ type HostConfig struct {
// +optional
Deactivation DeactivationConfig `json:"deactivation,omitempty"`

// Keeps parameters concerned with metrics
// +optional
Metrics MetricsConfig `json:"metrics,omitempty"`

// Keeps parameters concerned with notifications
// +optional
Notifications NotificationsConfig `json:"notifications,omitempty"`
Expand Down Expand Up @@ -152,15 +148,6 @@ type ToolchainSecret struct {
Ref *string `json:"ref,omitempty"`
}

// MetricsConfig contains all configuration parameters related to metrics gathering
// +k8s:openapi-gen=true
type MetricsConfig struct {
// ForceSynchronization is a flag used to trigger synchronization of the metrics
// based on the resources rather than on the content of `ToolchainStatus.status.metrics`
// +optional
ForceSynchronization *bool `json:"forceSynchronization,omitempty"`
}

// NotificationsConfig contains all configuration parameters related to notifications
// +k8s:openapi-gen=true
type NotificationsConfig struct {
Expand Down
19 changes: 0 additions & 19 deletions api/v1alpha1/toolchainstatus_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,6 @@ const (
ToolchainStatusMemberToolchainClusterMissingReason = "MemberToolchainClusterMissing"
ToolchainStatusMemberStatusConsoleRouteUnavailableReason = "ConsoleRouteUnavailable"
ToolchainStatusMemberStatusRoutesAvailableReason = "RoutesAvailable"

// Metric Keys
// MasterUserRecordsPerDomainMetricKey the key to store the metric for the number of MasterUserRecords per email address domain
MasterUserRecordsPerDomainMetricKey = "masterUserRecordsPerDomain"
// UserSignupsPerActivationAndDomainMetricKey the key to store the metric for the number of UserSignups per activations and per email address domain
UserSignupsPerActivationAndDomainMetricKey = "userSignupsPerActivationAndDomain"
)

// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
Expand Down Expand Up @@ -93,12 +87,6 @@ type ToolchainStatusStatus struct {
// +listMapKey=clusterName
Members []Member `json:"members,omitempty" patchStrategy:"merge" patchMergeKey:"clusterName"`

// Metrics is a map that stores metrics to be exposed on Prometheus.
// +optional
// +mapType=atomic
// +patchStrategy=merge
Metrics map[string]Metric `json:"metrics,omitempty" patchStrategy:"merge"`

// HostRoutes/URLs of the host cluster, such as Proxy URL
// +optional
HostRoutes HostRoutes `json:"hostRoutes,omitempty"`
Expand Down Expand Up @@ -130,8 +118,6 @@ type HostRoutes struct {
Conditions []Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
}

type Metric map[string]int

// HostOperatorStatus defines the observed state of a toolchain's host operator
// +k8s:openapi-gen=true
type HostOperatorStatus struct {
Expand Down Expand Up @@ -229,10 +215,6 @@ type Member struct {
// The cluster identifier
ClusterName string `json:"clusterName"`

// Number of Spaces created within the member cluster
// +optional
SpaceCount int `json:"spaceCount,omitempty"`

// The array of member status objects
MemberStatus MemberStatusStatus `json:"memberStatus"`
}
Expand Down Expand Up @@ -271,7 +253,6 @@ type RevisionCheck struct {
// +k8s:openapi-gen=true
// +kubebuilder:subresource:status
// +kubebuilder:resource:scope=Namespaced
// +kubebuilder:printcolumn:name="MURs",type="integer",JSONPath=`.status.hostOperator.masterUserRecordCount`
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=`.status.conditions[?(@.type=="Ready")].status`
// +kubebuilder:printcolumn:name="Last Updated",type="string",JSONPath=`.status.conditions[?(@.type=="Ready")].lastUpdatedTime`
// +kubebuilder:validation:XPreserveUnknownFields
Expand Down
60 changes: 0 additions & 60 deletions api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 1 addition & 66 deletions api/v1alpha1/zz_generated.openapi.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading