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

feat: secure workspace services #1045

Merged
merged 6 commits into from
Sep 17, 2021
Merged

feat: secure workspace services #1045

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78b6367
feat: devworkspace services auth
sparkoo Sep 1, 2021
31e6f04
don't expose same path multiple times
sparkoo Sep 15, 2021
60cf838
cleanup
sparkoo Sep 15, 2021
bb0bae5
fix multiple routes on same port
sparkoo Sep 15, 2021
1ecbbb6
cleanup
sparkoo Sep 16, 2021
9966ab0
cleanup
sparkoo Sep 16, 2021
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
3 changes: 2 additions & 1 deletion api/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org
import (
v1 "github.com/eclipse-che/che-operator/api/v1"
"github.com/eclipse-che/che-operator/api/v2alpha1"
"github.com/eclipse-che/che-operator/pkg/deploy"
"github.com/eclipse-che/che-operator/pkg/util"
"sigs.k8s.io/yaml"
)
Expand Down Expand Up @@ -145,7 +146,7 @@ func v1ToV2alpha1_GatewayEnabled(v1 *v1.CheCluster, v2 *v2alpha1.CheCluster) {
}

func v1ToV2alpha1_GatewayImage(v1 *v1.CheCluster, v2 *v2alpha1.CheCluster) {
v2.Spec.Gateway.Image = v1.Spec.Server.SingleHostGatewayImage
v2.Spec.Gateway.Image = util.GetValue(v1.Spec.Server.SingleHostGatewayImage, deploy.DefaultSingleHostGatewayImage(v1))
}

func v1ToV2alpha1_GatewayConfigurerImage(v1 *v1.CheCluster, v2 *v2alpha1.CheCluster) {
Expand Down
4 changes: 2 additions & 2 deletions controllers/devworkspace/defaults/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ var (
}
)

func GetGatewayWorkpaceConfigMapName(workspaceID string) string {
return workspaceID
func GetGatewayWorkspaceConfigMapName(workspaceID string) string {
return workspaceID + "-route"
}

func GetLabelsForComponent(cluster *v2alpha1.CheCluster, component string) map[string]string {
Expand Down
Loading