Skip to content

Commit 06282b8

Browse files
fbm3307fbm3307
authored
SANDBOX-1392: Drop dependency on Che instance (#488)
* SANDBOX-1392: Drop dependency on Che instance and its related code Signed-off-by: Feny Mehta <[email protected]>
1 parent 4ecb3a4 commit 06282b8

File tree

6 files changed

+9
-408
lines changed

6 files changed

+9
-408
lines changed

‎api/v1alpha1/docs/apiref.adoc‎

Lines changed: 1 addition & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -288,77 +288,6 @@ Users with captcha score lower than the required one can still be approved manua
288288
|===
289289

290290

291-
[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-checonfig"]
292-
==== CheConfig
293-
294-
295-
296-
Defines all parameters concerned with Che
297-
298-
299-
300-
.Appears In:
301-
****
302-
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-memberoperatorconfigspec[$$MemberOperatorConfigSpec$$]
303-
****
304-
305-
[cols="20a,50a,15a,15a", options="header"]
306-
|===
307-
| Field | Description | Default | Validation
308-
| *`keycloakRouteName`* __string__ | Defines the Che/CRW Keycloak route name + | |
309-
| *`routeName`* __string__ | Defines the Che/CRW route name + | |
310-
| *`namespace`* __string__ | Defines the Che/CRW operator namespace + | |
311-
| *`required`* __boolean__ | Defines a flag that indicates whether the Che/CRW operator is required to be installed on the cluster. May be used in monitoring. + | |
312-
| *`userDeletionEnabled`* __boolean__ | Defines a flag to turn the Che user deletion logic on/off + | |
313-
| *`secret`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-chesecret[$$CheSecret$$]__ | Defines all secrets related to Che configuration + | |
314-
|===
315-
316-
317-
[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-chesecret"]
318-
==== CheSecret
319-
320-
321-
322-
Defines all secrets related to Che configuration
323-
324-
325-
326-
.Appears In:
327-
****
328-
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-checonfig[$$CheConfig$$]
329-
****
330-
331-
[cols="20a,50a,15a,15a", options="header"]
332-
|===
333-
| Field | Description | Default | Validation
334-
| *`ref`* __string__ | Reference is the name of the secret resource to look up + | |
335-
| *`cheAdminUsernameKey`* __string__ | The key for the Che admin username in the secret values map + | |
336-
| *`cheAdminPasswordKey`* __string__ | The key for the Che admin password in the secret values map + | |
337-
|===
338-
339-
340-
[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-chestatus"]
341-
==== CheStatus
342-
343-
344-
345-
CheStatus contains information about the status of Che/CRW, such as installed and whether the member configuration is correct
346-
347-
348-
349-
.Appears In:
350-
****
351-
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-memberstatusstatus[$$MemberStatusStatus$$]
352-
****
353-
354-
[cols="20a,50a,15a,15a", options="header"]
355-
|===
356-
| Field | Description | Default | Validation
357-
| *`conditions`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-condition[$$Condition$$] array__ | Conditions is an array of current Che status conditions +
358-
Supported condition types: ConditionReady + | |
359-
|===
360-
361-
362291
[id="{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-cluster"]
363292
==== Cluster
364293

@@ -391,7 +320,6 @@ Supported condition types: ConditionReady + | |
391320

392321
.Appears In:
393322
****
394-
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-chestatus[$$CheStatus$$]
395323
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hostoperatorstatus[$$HostOperatorStatus$$]
396324
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hostroutes[$$HostRoutes$$]
397325
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hoststatus[$$HostStatus$$]
@@ -1089,7 +1017,6 @@ MemberOperatorConfigSpec contains all configuration parameters of the member ope
10891017
| Field | Description | Default | Validation
10901018
| *`auth`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-authconfig[$$AuthConfig$$]__ | Keeps parameters concerned with authentication + | |
10911019
| *`autoscaler`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-autoscalerconfig[$$AutoscalerConfig$$]__ | Keeps parameters concerned with the autoscaler + | |
1092-
| *`che`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-checonfig[$$CheConfig$$]__ | Keeps parameters concerned with Che/CRW + | |
10931020
| *`console`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-consoleconfig[$$ConsoleConfig$$]__ | Keeps parameters concerned with the console + | |
10941021
| *`environment`* __string__ | Environment specifies the member-operator environment such as prod, stage, unit-tests, e2e-tests, dev, etc + | |
10951022
| *`skipUserCreation`* __boolean__ | Defines the flag that determines whether User and Identity resources should be created for a UserAccount + | |
@@ -1248,14 +1175,13 @@ MemberStatusStatus defines the observed state of the toolchain member status
12481175
[cols="20a,50a,15a,15a", options="header"]
12491176
|===
12501177
| Field | Description | Default | Validation
1251-
| *`che`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-chestatus[$$CheStatus$$]__ | Che is the status of Che/CRW, such as installed and whether the member configuration is correct + | |
12521178
| *`memberOperator`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-memberoperatorstatus[$$MemberOperatorStatus$$]__ | MemberOperator is the status of a toolchain member operator + | |
12531179
| *`hostConnection`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-toolchainclusterstatus[$$ToolchainClusterStatus$$]__ | HostConnection is the status of the connection with the host cluster + | |
12541180
| *`host`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-hoststatus[$$HostStatus$$]__ | Host is the status of the connection with the host cluster + | |
12551181
| *`conditions`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-condition[$$Condition$$] array__ | Conditions is an array of current toolchain status conditions +
12561182
Supported condition types: ConditionReady + | |
12571183
| *`resourceUsage`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-resourceusage[$$ResourceUsage$$]__ | Resource usage of the cluster + | |
1258-
| *`routes`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-routes[$$Routes$$]__ | Routes/URLs of the cluster, such as Console and Che Dashboard URLs + | |
1184+
| *`routes`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-routes[$$Routes$$]__ | Routes/URLs of the cluster, such as Console + | |
12591185
|===
12601186

12611187

@@ -2329,7 +2255,6 @@ Routes contains information about the public routes available to the user in the
23292255
|===
23302256
| Field | Description | Default | Validation
23312257
| *`consoleURL`* __string__ | ConsoleURL is the web console URL of the cluster + | |
2332-
| *`cheDashboardURL`* __string__ | CheDashboardURL is the Che Dashboard URL of the cluster if Che is installed + | |
23332258
| *`conditions`* __xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-condition[$$Condition$$] array__ | Conditions is an array of current member operator status conditions +
23342259
Supported condition types: ConditionReady + | |
23352260
|===
@@ -3458,7 +3383,6 @@ ToolchainSecret defines a reference to a secret, this type should be included in
34583383

34593384
.Appears In:
34603385
****
3461-
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-chesecret[$$CheSecret$$]
34623386
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-githubsecret[$$GitHubSecret$$]
34633387
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-notificationsecret[$$NotificationSecret$$]
34643388
- xref:{anchor_prefix}-github-com-codeready-toolchain-api-api-v1alpha1-registrationserviceverificationsecret[$$RegistrationServiceVerificationSecret$$]

‎api/v1alpha1/memberoperatorconfig_types.go‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ type MemberOperatorConfigSpec struct {
1515
// +optional
1616
Autoscaler AutoscalerConfig `json:"autoscaler,omitempty"`
1717

18-
// Keeps parameters concerned with Che/CRW
19-
// +optional
20-
Che CheConfig `json:"che,omitempty"`
21-
2218
// Keeps parameters concerned with the console
2319
// +optional
2420
Console ConsoleConfig `json:"console,omitempty"`
@@ -72,50 +68,6 @@ type AutoscalerConfig struct {
7268
BufferReplicas *int `json:"bufferReplicas,omitempty"`
7369
}
7470

75-
// Defines all parameters concerned with Che
76-
// +k8s:openapi-gen=true
77-
type CheConfig struct {
78-
// Defines the Che/CRW Keycloak route name
79-
// +optional
80-
KeycloakRouteName *string `json:"keycloakRouteName,omitempty"`
81-
82-
// Defines the Che/CRW route name
83-
// +optional
84-
RouteName *string `json:"routeName,omitempty"`
85-
86-
// Defines the Che/CRW operator namespace
87-
// +optional
88-
Namespace *string `json:"namespace,omitempty"`
89-
90-
// Defines a flag that indicates whether the Che/CRW operator is required to be installed on the cluster. May be used in monitoring.
91-
// +optional
92-
Required *bool `json:"required,omitempty"`
93-
94-
// Defines a flag to turn the Che user deletion logic on/off
95-
// +optional
96-
UserDeletionEnabled *bool `json:"userDeletionEnabled,omitempty"`
97-
98-
// Defines all secrets related to Che configuration
99-
// +optional
100-
Secret CheSecret `json:"secret,omitempty"`
101-
}
102-
103-
// Defines all secrets related to Che configuration
104-
// +k8s:openapi-gen=true
105-
type CheSecret struct {
106-
// The reference to the secret that is expected to contain the keys below
107-
// +optional
108-
ToolchainSecret `json:",inline"`
109-
110-
// The key for the Che admin username in the secret values map
111-
// +optional
112-
CheAdminUsernameKey *string `json:"cheAdminUsernameKey,omitempty"`
113-
114-
// The key for the Che admin password in the secret values map
115-
// +optional
116-
CheAdminPasswordKey *string `json:"cheAdminPasswordKey,omitempty"`
117-
}
118-
11971
// Defines all parameters concerned with the console
12072
// +k8s:openapi-gen=true
12173
type ConsoleConfig struct {

‎api/v1alpha1/memberstatus_types.go‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ type MemberStatusStatus struct {
2121
// Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file
2222
// Add custom validation using kubebuilder tags: https://book.kubebuilder.io/beyond_basics/generating_crd.html
2323

24-
// Che is the status of Che/CRW, such as installed and whether the member configuration is correct
25-
// +optional
26-
Che *CheStatus `json:"che,omitempty"`
27-
2824
// MemberOperator is the status of a toolchain member operator
2925
// +optional
3026
MemberOperator *MemberOperatorStatus `json:"memberOperator,omitempty"`
@@ -50,35 +46,18 @@ type MemberStatusStatus struct {
5046
// +optional
5147
ResourceUsage ResourceUsage `json:"resourceUsage,omitempty"`
5248

53-
// Routes/URLs of the cluster, such as Console and Che Dashboard URLs
49+
// Routes/URLs of the cluster, such as Console
5450
// +optional
5551
Routes *Routes `json:"routes,omitempty"`
5652
}
5753

58-
// CheStatus contains information about the status of Che/CRW, such as installed and whether the member configuration is correct
59-
// +k8s:openapi-gen=true
60-
type CheStatus struct {
61-
// Conditions is an array of current Che status conditions
62-
// Supported condition types: ConditionReady
63-
// +optional
64-
// +patchMergeKey=type
65-
// +patchStrategy=merge
66-
// +listType=map
67-
// +listMapKey=type
68-
Conditions []Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
69-
}
70-
7154
// Routes contains information about the public routes available to the user in the cluster
7255
// +k8s:openapi-gen=true
7356
type Routes struct {
7457
// ConsoleURL is the web console URL of the cluster
7558
// +optional
7659
ConsoleURL string `json:"consoleURL,omitempty"`
7760

78-
// CheDashboardURL is the Che Dashboard URL of the cluster if Che is installed
79-
// +optional
80-
CheDashboardURL string `json:"cheDashboardURL,omitempty"`
81-
8261
// Conditions is an array of current member operator status conditions
8362
// Supported condition types: ConditionReady
8463
// +optional

‎api/v1alpha1/toolchainstatus_types.go‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,10 @@ const (
4848
ToolchainStatusHostRoutesAvailableReason = "HostRoutesAvailable"
4949

5050
// member status reasons
51-
ToolchainStatusMemberStatusNotFoundReason = "MemberStatusNotFound"
52-
ToolchainStatusMemberToolchainClusterMissingReason = "MemberToolchainClusterMissing"
53-
ToolchainStatusMemberStatusConsoleRouteUnavailableReason = "ConsoleRouteUnavailable"
54-
ToolchainStatusMemberStatusRoutesAvailableReason = "RoutesAvailable"
55-
ToolchainStatusMemberStatusCheRouteUnavailableReason = "CheRouteUnavailable"
56-
ToolchainStatusMemberStatusCheUserAPICheckFailedReason = "CheUserAPICheckFailed"
57-
ToolchainStatusMemberStatusCheNotRequiredReason = "CheNotRequired"
58-
ToolchainStatusMemberStatusCheAdminUserNotConfiguredReason = "CheAdminUserNotConfigured"
59-
ToolchainStatusMemberStatusCheUserDeletionNotEnabledReason = "CheUserDeletionNotEnabled"
60-
ToolchainStatusMemberStatusCheReadyReason = "CheReady"
51+
ToolchainStatusMemberStatusNotFoundReason = "MemberStatusNotFound"
52+
ToolchainStatusMemberToolchainClusterMissingReason = "MemberToolchainClusterMissing"
53+
ToolchainStatusMemberStatusConsoleRouteUnavailableReason = "ConsoleRouteUnavailable"
54+
ToolchainStatusMemberStatusRoutesAvailableReason = "RoutesAvailable"
6155

6256
// Metric Keys
6357
// MasterUserRecordsPerDomainMetricKey the key to store the metric for the number of MasterUserRecords per email address domain

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 0 additions & 95 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)