Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Automount resources into the project-clone container #737

Merged
merged 2 commits into from
Jan 17, 2022
Merged

fix: Automount resources into the project-clone container #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3f903c
Fix logging of config changes to properly format config
amisevsk Jan 13, 2022
b32141d
Automount resources into the project-clone container to get git creds
amisevsk Jan 13, 2022
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
14 changes: 7 additions & 7 deletions controllers/workspace/devworkspace_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,13 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
return r.failWorkspace(workspace, fmt.Sprintf("Failed to process workspace environment variables: %s", err), metrics.ReasonBadRequest, reqLogger, &reconcileStatus)
}

// Add init container to clone projects
if projectClone, err := projects.GetProjectCloneInitContainer(&workspace.Spec.Template); err != nil {
return r.failWorkspace(workspace, fmt.Sprintf("Failed to set up project-clone init container: %s", err), metrics.ReasonInfrastructureFailure, reqLogger, &reconcileStatus)
} else if projectClone != nil {
devfilePodAdditions.InitContainers = append(devfilePodAdditions.InitContainers, *projectClone)
}

// Add automount resources into devfile containers
if err := automount.ProvisionAutoMountResourcesInto(devfilePodAdditions, clusterAPI, workspace.Namespace); err != nil {
var fatalErr *automount.FatalError
Expand All @@ -294,13 +301,6 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
}
}

// Add init container to clone projects
if projectClone, err := projects.GetProjectCloneInitContainer(&workspace.Spec.Template); err != nil {
return r.failWorkspace(workspace, fmt.Sprintf("Failed to set up project-clone init container: %s", err), metrics.ReasonInfrastructureFailure, reqLogger, &reconcileStatus)
} else if projectClone != nil {
devfilePodAdditions.InitContainers = append(devfilePodAdditions.InitContainers, *projectClone)
}

err = storageProvisioner.ProvisionStorage(devfilePodAdditions, workspace, clusterAPI)
if err != nil {
switch storageErr := err.(type) {
Expand Down
6 changes: 4 additions & 2 deletions pkg/config/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,13 @@ func logCurrentConfig() {
if internalConfig.EnableExperimentalFeatures != nil && *internalConfig.EnableExperimentalFeatures {
config = append(config, "enableExperimentalFeatures=true")
}

if len(config) == 0 {
log.Info("(default config)")
log.Info("Updated config to [(default config)]")
} else {
log.Info("Updated config to [%s]", strings.Join(config, ","))
log.Info(fmt.Sprintf("Updated config to [%s]", strings.Join(config, ",")))
}

if internalConfig.Routing.ProxyConfig != nil {
log.Info("Resolved proxy configuration", "proxy", internalConfig.Routing.ProxyConfig)
}
Expand Down