Skip to content

Commit 0a9d577

Browse files
committed
[installer] Move namespace constant to common pkg
1 parent ecb2e5a commit 0a9d577

File tree

6 files changed

+5
-5
lines changed

6 files changed

+5
-5
lines changed

install/installer/pkg/common/constants.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ const (
5959
DBCaFileName = "ca.crt"
6060
DBCaBasePath = "/db-ssl"
6161
DBCaPath = DBCaBasePath + "/" + DBCaFileName
62+
WorkspaceSecretsNamespace = "workspace-secrets"
6263

6364
AnnotationConfigChecksum = "gitpod.io/checksum_config"
6465

install/installer/pkg/components/ws-manager-mk2/configmap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
185185
wsmcfg := config.ServiceConfiguration{
186186
Manager: config.Configuration{
187187
Namespace: ctx.Namespace,
188-
SecretsNamespace: WorkspaceSecretsNamespace,
188+
SecretsNamespace: common.WorkspaceSecretsNamespace,
189189
SchedulerName: schedulerName,
190190
SeccompProfile: fmt.Sprintf("workspace_default_%s.json", ctx.VersionManifest.Version),
191191
WorkspaceDaemon: config.WorkspaceDaemonConfiguration{

install/installer/pkg/components/ws-manager-mk2/constants.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@ const (
1818
VolumeWorkspaceTemplate = "workspace-template"
1919
WorkspaceTemplatePath = "/workspace-templates"
2020
WorkspaceTemplateConfigMap = "workspace-templates"
21-
WorkspaceSecretsNamespace = "workspace-secrets"
2221
)

install/installer/pkg/components/ws-manager-mk2/namespace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func namespace(ctx *common.RenderContext) ([]runtime.Object, error) {
1616
&v1.Namespace{
1717
TypeMeta: common.TypeMetaNamespace,
1818
ObjectMeta: metav1.ObjectMeta{
19-
Name: WorkspaceSecretsNamespace,
19+
Name: common.WorkspaceSecretsNamespace,
2020
},
2121
},
2222
}, nil

install/installer/pkg/components/ws-manager-mk2/role.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func role(ctx *common.RenderContext) ([]runtime.Object, error) {
145145
TypeMeta: common.TypeMetaRole,
146146
ObjectMeta: metav1.ObjectMeta{
147147
Name: Component,
148-
Namespace: WorkspaceSecretsNamespace,
148+
Namespace: common.WorkspaceSecretsNamespace,
149149
Labels: labels,
150150
},
151151
Rules: controllerRules,

install/installer/pkg/components/ws-manager-mk2/rolebinding.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func rolebinding(ctx *common.RenderContext) ([]runtime.Object, error) {
6262
TypeMeta: common.TypeMetaRoleBinding,
6363
ObjectMeta: metav1.ObjectMeta{
6464
Name: Component,
65-
Namespace: WorkspaceSecretsNamespace,
65+
Namespace: common.WorkspaceSecretsNamespace,
6666
Labels: labels,
6767
},
6868
RoleRef: rbacv1.RoleRef{

0 commit comments

Comments
 (0)