-
Notifications
You must be signed in to change notification settings - Fork 88
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: configure DWOC from che-operator CR (#1494)
* feat: configure DWOC from che-operator CR Currently, only the following fields from the checluster custom resource are propagated to the DevWorkspace-Operator Configuration: - `checluster.spec.devEnvironments.Storage.pvcStrategy` - `checluster.spec.devEnvironments.Storage.perUserStrategyPvcConfig.ClaimSize` - `checluster.spec.devEnvironments.Storage.perUserStrategyPvcConfig.StorageClass` - `checluster.spec.devEnvironments.Storage.perWorkspaceStrategyPvcConfig.ClaimSize` - `checluster.spec.devEnvironments.Storage.perWorkspaceStrategyPvcConfig.StorageClass` Signed-off-by: Andrew Obuchowicz <aobuchow@redhat.com> * Update CSV and autogenerated apiv2 deepcopy Signed-off-by: Andrew Obuchowicz <aobuchow@redhat.com> * Refactoring Signed-off-by: Anatolii Bazko <abazko@redhat.com> * make fmt Signed-off-by: Anatolii Bazko <abazko@redhat.com> Signed-off-by: Andrew Obuchowicz <aobuchow@redhat.com> Signed-off-by: Anatolii Bazko <abazko@redhat.com> Co-authored-by: Anatolii Bazko <abazko@redhat.com>
- Loading branch information
Showing
6 changed files
with
482 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
pkg/deploy/dev-workspace-config/dev_workspace_config.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| // | ||
| // Copyright (c) 2019-2022 Red Hat, Inc. | ||
| // This program and the accompanying materials are made | ||
| // available under the terms of the Eclipse Public License 2.0 | ||
| // which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| // | ||
| // SPDX-License-Identifier: EPL-2.0 | ||
| // | ||
| // Contributors: | ||
| // Red Hat, Inc. - initial API and implementation | ||
| // | ||
| package devworkspaceconfig | ||
|
|
||
| import ( | ||
| controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1" | ||
| chev2 "github.com/eclipse-che/che-operator/api/v2" | ||
| "github.com/eclipse-che/che-operator/pkg/common/chetypes" | ||
| "github.com/eclipse-che/che-operator/pkg/common/constants" | ||
| "github.com/eclipse-che/che-operator/pkg/common/utils" | ||
| "github.com/eclipse-che/che-operator/pkg/deploy" | ||
| "k8s.io/apimachinery/pkg/api/resource" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "sigs.k8s.io/controller-runtime/pkg/reconcile" | ||
| ) | ||
|
|
||
| const ( | ||
| devWorkspaceConfigName = "devworkspace-config" | ||
| ) | ||
|
|
||
| type DevWorkspaceConfigReconciler struct { | ||
| deploy.Reconcilable | ||
| } | ||
|
|
||
| func NewDevWorkspaceConfigReconciler() *DevWorkspaceConfigReconciler { | ||
| return &DevWorkspaceConfigReconciler{} | ||
| } | ||
|
|
||
| func (d *DevWorkspaceConfigReconciler) Reconcile(ctx *chetypes.DeployContext) (reconcile.Result, bool, error) { | ||
| dwoc := &controllerv1alpha1.DevWorkspaceOperatorConfig{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: devWorkspaceConfigName, | ||
| Namespace: ctx.CheCluster.Namespace, | ||
| }, | ||
| TypeMeta: metav1.TypeMeta{ | ||
| Kind: "DevWorkspaceOperatorConfig", | ||
| APIVersion: controllerv1alpha1.GroupVersion.String(), | ||
| }, | ||
| } | ||
|
|
||
| if _, err := deploy.GetNamespacedObject(ctx, devWorkspaceConfigName, dwoc); err != nil { | ||
| return reconcile.Result{}, false, err | ||
| } | ||
|
|
||
| if dwoc.Config == nil { | ||
| dwoc.Config = &controllerv1alpha1.OperatorConfiguration{} | ||
| } | ||
| err := updateOperatorConfig(ctx.CheCluster.Spec.DevEnvironments.Storage, dwoc.Config) | ||
| if err != nil { | ||
| return reconcile.Result{}, false, err | ||
| } | ||
|
|
||
| done, err := deploy.Sync(ctx, dwoc) | ||
| if !done { | ||
| return reconcile.Result{}, false, err | ||
| } | ||
|
|
||
| return reconcile.Result{}, true, nil | ||
| } | ||
|
|
||
| func (d *DevWorkspaceConfigReconciler) Finalize(ctx *chetypes.DeployContext) bool { | ||
| return true | ||
| } | ||
|
|
||
| func updateOperatorConfig(storage chev2.WorkspaceStorage, operatorConfig *controllerv1alpha1.OperatorConfiguration) error { | ||
| var pvc *chev2.PVC | ||
|
|
||
| pvcStrategy := utils.GetValue(storage.PvcStrategy, constants.DefaultPvcStorageStrategy) | ||
| switch pvcStrategy { | ||
| case constants.CommonPVCStorageStrategy: | ||
| fallthrough | ||
| case constants.PerUserPVCStorageStrategy: | ||
| if storage.PerUserStrategyPvcConfig != nil { | ||
| pvc = storage.PerUserStrategyPvcConfig | ||
| } | ||
| case constants.PerWorkspacePVCStorageStrategy: | ||
| if storage.PerWorkspaceStrategyPvcConfig != nil { | ||
| pvc = storage.PerWorkspaceStrategyPvcConfig | ||
| } | ||
| } | ||
|
|
||
| if pvc != nil { | ||
| if operatorConfig.Workspace == nil { | ||
| operatorConfig.Workspace = &controllerv1alpha1.WorkspaceConfig{} | ||
| } | ||
| return updateWorkspaceConfig(pvc, pvcStrategy == constants.PerWorkspacePVCStorageStrategy, operatorConfig.Workspace) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func updateWorkspaceConfig(pvc *chev2.PVC, isPerWorkspacePVCStorageStrategy bool, workspaceConfig *controllerv1alpha1.WorkspaceConfig) error { | ||
| if pvc.StorageClass != "" { | ||
| workspaceConfig.StorageClassName = &pvc.StorageClass | ||
| } | ||
|
|
||
| if pvc.ClaimSize != "" { | ||
| if workspaceConfig.DefaultStorageSize == nil { | ||
| workspaceConfig.DefaultStorageSize = &controllerv1alpha1.StorageSizes{} | ||
| } | ||
|
|
||
| pvcSize, err := resource.ParseQuantity(pvc.ClaimSize) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if isPerWorkspacePVCStorageStrategy { | ||
| workspaceConfig.DefaultStorageSize.PerWorkspace = &pvcSize | ||
| } else { | ||
| workspaceConfig.DefaultStorageSize.Common = &pvcSize | ||
| } | ||
| } | ||
| return nil | ||
| } |
Oops, something went wrong.