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
64 changes: 1 addition & 63 deletions api/v1alpha1/docs/apiref.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ Users with captcha score lower than the required one can still be approved manua
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationservicedeploymentstatus[$$RegistrationServiceDeploymentStatus$$]
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationservicehealth[$$RegistrationServiceHealth$$]
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationserviceresourcesstatus[$$RegistrationServiceResourcesStatus$$]
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-revisioncheck[$$RevisionCheck$$]
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-routes[$$Routes$$]
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-socialeventstatus[$$SocialEventStatus$$]
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-spacebindingrequeststatus[$$SpaceBindingRequestStatus$$]
Expand Down Expand Up @@ -585,31 +584,6 @@ Optional: \{} +
|===


[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-githubsecret"]
==== GitHubSecret



GitHubSecret defines all secrets related to GitHub authentication/integration



.Appears In:
****
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-memberstatusconfig[$$MemberStatusConfig$$]
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-toolchainstatusconfig[$$ToolchainStatusConfig$$]
****

[cols="20a,50a,15a,15a", options="header"]
|===
| Field | Description | Default | Validation
| *`ref`* __string__ | Reference is the name of the secret resource to look up + | | Optional: \{} +

| *`accessTokenKey`* __string__ | The key for the GitHub Access token in the secret values map + | | Optional: \{} +

|===


[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hostconfig"]
==== HostConfig

Expand Down Expand Up @@ -659,6 +633,7 @@ the same permissions the kubesaw-authenticated user has. + | | Optional: \{} +


HostOperatorStatus defines the observed state of a toolchain's host operator
DEPRECATED: using metrics instead of this status



Expand All @@ -677,8 +652,6 @@ HostOperatorStatus defines the observed state of a toolchain's host operator
| *`conditions`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-condition[$$Condition$$] array__ | Conditions is an array of current host operator status conditions +
Supported condition types: ConditionReady + | | Optional: \{} +

| *`revisionCheck`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-revisioncheck[$$RevisionCheck$$]__ | The status of the revision check for host operator's deployment + | | Optional: \{} +

|===


Expand All @@ -702,8 +675,6 @@ HostRegistrationServiceStatus defines the observed state of a toolchain's regist
| *`deployment`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationservicedeploymentstatus[$$RegistrationServiceDeploymentStatus$$]__ | Deployment is the status of the registration service's deployment + | |
| *`registrationServiceResources`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationserviceresourcesstatus[$$RegistrationServiceResourcesStatus$$]__ | RegistrationServiceResources is the status for resources created for the registration service + | |
| *`health`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationservicehealth[$$RegistrationServiceHealth$$]__ | Health provides health status of the registration service + | |
| *`revisionCheck`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-revisioncheck[$$RevisionCheck$$]__ | The status of the revision check for registration service + | | Optional: \{} +

|===


Expand Down Expand Up @@ -1172,8 +1143,6 @@ MemberOperatorStatus defines the observed state of a toolchain's member operator
| *`conditions`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-condition[$$Condition$$] array__ | Conditions is an array of current member operator status conditions +
Supported condition types: ConditionReady + | | Optional: \{} +

| *`revisionCheck`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-revisioncheck[$$RevisionCheck$$]__ | The status of the revision check for member operator's deployment + | | Optional: \{} +

|===


Expand Down Expand Up @@ -1223,8 +1192,6 @@ Defines all parameters concerned with member status
| Field | Description | Default | Validation
| *`refreshPeriod`* __string__ | Defines the period between refreshes of the member status + | | Optional: \{} +

| *`gitHubSecret`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-githubsecret[$$GitHubSecret$$]__ | Defines all secrets related to GitHub authentication/integration + | | Optional: \{} +

|===


Expand Down Expand Up @@ -2405,32 +2372,6 @@ Contains information about the resource usage of the cluster
|===


[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-revisioncheck"]
==== RevisionCheck



RevisionCheck contains status of revision check for the component,
it highlights if the component is up-to-date and the deployed version matches the latest one in the GitHub repository.



.Appears In:
****
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hostoperatorstatus[$$HostOperatorStatus$$]
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hostregistrationservicestatus[$$HostRegistrationServiceStatus$$]
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-memberoperatorstatus[$$MemberOperatorStatus$$]
****

[cols="20a,50a,15a,15a", options="header"]
|===
| Field | Description | Default | Validation
| *`conditions`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-condition[$$Condition$$] array__ | Conditions is an array of status conditions for the health of the registration service +
Supported condition types: ConditionReady + | | Optional: \{} +

|===


[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-routes"]
==== Routes

Expand Down Expand Up @@ -3624,7 +3565,6 @@ ToolchainSecret defines a reference to a secret, this type should be included in

.Appears In:
****
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-githubsecret[$$GitHubSecret$$]
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-notificationsecret[$$NotificationSecret$$]
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationserviceverificationsecret[$$RegistrationServiceVerificationSecret$$]
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-webhooksecret[$$WebhookSecret$$]
Expand Down Expand Up @@ -3684,8 +3624,6 @@ ToolchainStatusConfig contains all configuration parameters related to the toolc
| Field | Description | Default | Validation
| *`toolchainStatusRefreshTime`* __string__ | ToolchainStatusRefreshTime specifies how often the ToolchainStatus should load and refresh the current hosted-toolchain status + | | Optional: \{} +

| *`gitHubSecret`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-githubsecret[$$GitHubSecret$$]__ | Defines all secrets related to GitHub authentication/integration + | | Optional: \{} +

|===


Expand Down
16 changes: 0 additions & 16 deletions api/v1alpha1/memberoperatorconfig_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,6 @@ type ConsoleConfig struct {
RouteName *string `json:"routeName,omitempty"`
}

// GitHubSecret defines all secrets related to GitHub authentication/integration
// +k8s:openapi-gen=true
type GitHubSecret struct {
// The reference to the secret that is expected to contain the keys below
// +optional
ToolchainSecret `json:",inline"`

// The key for the GitHub Access token in the secret values map
// +optional
AccessTokenKey *string `json:"accessTokenKey,omitempty"`
}

// Defines all parameters concerned with the toolchaincluster resource
// +k8s:openapi-gen=true
type ToolchainClusterConfig struct {
Expand Down Expand Up @@ -135,10 +123,6 @@ type MemberStatusConfig struct {
// Defines the period between refreshes of the member status
// +optional
RefreshPeriod *string `json:"refreshPeriod,omitempty"`

// Defines all secrets related to GitHub authentication/integration
// +optional
GitHubSecret GitHubSecret `json:"gitHubSecret,omitempty"`
}

// MemberOperatorConfigStatus defines the observed state of MemberOperatorConfig
Expand Down
4 changes: 0 additions & 4 deletions api/v1alpha1/memberstatus_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,6 @@ type MemberOperatorStatus struct {
// +listType=map
// +listMapKey=type
Conditions []Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`

// The status of the revision check for member operator's deployment
// +optional
RevisionCheck RevisionCheck `json:"revisionCheck"`
}

//+kubebuilder:object:root=true
Expand Down
4 changes: 0 additions & 4 deletions api/v1alpha1/toolchainconfig_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -499,10 +499,6 @@ type ToolchainStatusConfig struct {
// ToolchainStatusRefreshTime specifies how often the ToolchainStatus should load and refresh the current hosted-toolchain status
// +optional
ToolchainStatusRefreshTime *string `json:"toolchainStatusRefreshTime,omitempty"`

// Defines all secrets related to GitHub authentication/integration
// +optional
GitHubSecret GitHubSecret `json:"gitHubSecret,omitempty"`
}

// TiersConfig contains all configuration parameters related to tiers
Expand Down
36 changes: 6 additions & 30 deletions api/v1alpha1/toolchainstatus_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,11 @@ const (
ToolchainStatusComponentsNotReadyReason = "ComponentsNotReady"

// deployment reasons
ToolchainStatusDeploymentReadyReason = "DeploymentReady"
ToolchainStatusDeploymentNotReadyReason = "DeploymentNotReady"
ToolchainStatusDeploymentNotFoundReason = "DeploymentNotFound"
ToolchainStatusDeploymentNotUpToDateReason = "DeploymentNotUpToDate"
ToolchainStatusDeploymentUpToDateReason = "DeploymentIsUpToDate"
ToolchainStatusDeploymentRevisionCheckDisabledReason = "DeploymentRevisionCheckDisabled"
ToolchainStatusDeploymentRevisionCheckGitHubErrorReason = "DeploymentRevisionCheckGitHubError"
ToolchainStatusDeploymentRevisionCheckOperatorErrorReason = "DeploymentRevisionCheckOperatorError"
ToolchainStatusDeploymentReadyReason = "DeploymentReady"
ToolchainStatusDeploymentNotReadyReason = "DeploymentNotReady"
ToolchainStatusDeploymentNotFoundReason = "DeploymentNotFound"
ToolchainStatusDeploymentNotUpToDateReason = "DeploymentNotUpToDate"
ToolchainStatusDeploymentUpToDateReason = "DeploymentIsUpToDate"

// host connection reasons
ToolchainStatusClusterConnectionReadyReason = "HostConnectionReady"
Expand Down Expand Up @@ -120,6 +117,7 @@ type HostRoutes struct {

// HostOperatorStatus defines the observed state of a toolchain's host operator
// +k8s:openapi-gen=true
// DEPRECATED: using metrics instead of this status
type HostOperatorStatus struct {
// Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file
// Add custom validation using kubebuilder tags: https://book.kubebuilder.io/beyond_basics/generating_crd.html
Expand All @@ -144,10 +142,6 @@ type HostOperatorStatus struct {
// +listType=map
// +listMapKey=type
Conditions []Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`

// The status of the revision check for host operator's deployment
// +optional
RevisionCheck RevisionCheck `json:"revisionCheck"`
}

// HostRegistrationServiceStatus defines the observed state of a toolchain's registration service
Expand All @@ -164,10 +158,6 @@ type HostRegistrationServiceStatus struct {

// Health provides health status of the registration service
Health RegistrationServiceHealth `json:"health"`

// The status of the revision check for registration service
// +optional
RevisionCheck RevisionCheck `json:"revisionCheck"`
}

// RegistrationServiceDeploymentStatus contains status of the registration service's deployment
Expand Down Expand Up @@ -232,20 +222,6 @@ type RegistrationServiceResourcesStatus struct {
Conditions []Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
}

// RevisionCheck contains status of revision check for the component,
// it highlights if the component is up-to-date and the deployed version matches the latest one in the GitHub repository.
// +k8s:openapi-gen=true
type RevisionCheck struct {
// Conditions is an array of status conditions for the health of the registration service
// Supported condition types: ConditionReady
// +optional
// +patchMergeKey=type
// +patchStrategy=merge
// +listType=map
// +listMapKey=type
Conditions []Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
}

//+kubebuilder:object:root=true
//+kubebuilder:subresource:status

Expand Down
48 changes: 0 additions & 48 deletions api/v1alpha1/zz_generated.deepcopy.go

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

Loading
Loading