Skip to content
This repository was archived by the owner on Aug 19, 2024. It is now read-only.

Commit 4ac5a97

Browse files
rm3lrm3l
committed
Revert "Make sure to use backward compatible names for all resources"
This reverts commit 0b1be1c2720d96dd6bdd60f230e66819b2bc9e4b.
1 parent 608839b commit 4ac5a97

13 files changed

+13
-19
lines changed

‎pkg/model/appconfig.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ func init() {
4646
}
4747

4848
func AppConfigDefaultName(backstageName string) string {
49-
// TODO(rm3l): auth-app-config as suffix for backward compatibility with 1.1
50-
return utils.GenerateRuntimeObjectName(backstageName, "auth-app-config", true)
49+
return utils.GenerateRuntimeObjectName(backstageName, "backstage-appconfig")
5150
}
5251

5352
func addAppConfigs(spec bsv1alpha1.BackstageSpec, deployment *appsv1.Deployment, model *BackstageModel) {

‎pkg/model/configmapenvs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (p *ConfigMapEnvs) validate(_ *BackstageModel, _ v1alpha1.Backstage) error
8686
}
8787

8888
func (p *ConfigMapEnvs) setMetaInfo(backstageName string) {
89-
p.ConfigMap.SetName(utils.GenerateRuntimeObjectName(backstageName, "backstage-envs", false))
89+
p.ConfigMap.SetName(utils.GenerateRuntimeObjectName(backstageName, "backstage-envs"))
9090
}
9191

9292
// implementation of BackstagePodContributor interface

‎pkg/model/configmapfiles.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func (p *ConfigMapFiles) validate(_ *BackstageModel, _ v1alpha1.Backstage) error
9494
}
9595

9696
func (p *ConfigMapFiles) setMetaInfo(backstageName string) {
97-
p.ConfigMap.SetName(utils.GenerateRuntimeObjectName(backstageName, "backstage-files", false))
97+
p.ConfigMap.SetName(utils.GenerateRuntimeObjectName(backstageName, "backstage-files"))
9898
}
9999

100100
// implementation of BackstagePodContributor interface

‎pkg/model/db-secret.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func init() {
3939
}
4040

4141
func DbSecretDefaultName(backstageName string) string {
42-
return utils.GenerateRuntimeObjectName(backstageName, "backstage-psql-secret", false)
42+
return utils.GenerateRuntimeObjectName(backstageName, "backstage-psql-secret")
4343
}
4444

4545
// implementation of RuntimeObject interface

‎pkg/model/db-service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func init() {
3939
}
4040

4141
func DbServiceName(backstageName string) string {
42-
return utils.GenerateRuntimeObjectName(backstageName, "backstage-psql", false)
42+
return utils.GenerateRuntimeObjectName(backstageName, "backstage-psql")
4343
}
4444

4545
// implementation of RuntimeObject interface

‎pkg/model/db-statefulset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func init() {
4444
}
4545

4646
func DbStatefulSetName(backstageName string) string {
47-
return utils.GenerateRuntimeObjectName(backstageName, "backstage-psql", false)
47+
return utils.GenerateRuntimeObjectName(backstageName, "backstage-psql")
4848
}
4949

5050
// implementation of RuntimeObject interface

‎pkg/model/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func init() {
4949
}
5050

5151
func DeploymentName(backstageName string) string {
52-
return utils.GenerateRuntimeObjectName(backstageName, "backstage", false)
52+
return utils.GenerateRuntimeObjectName(backstageName, "backstage")
5353
}
5454

5555
// implementation of RuntimeObject interface

‎pkg/model/dynamic-plugins.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func init() {
4545
}
4646

4747
func DynamicPluginsDefaultName(backstageName string) string {
48-
return utils.GenerateRuntimeObjectName(backstageName, "dynamic-plugins", true)
48+
return utils.GenerateRuntimeObjectName(backstageName, "backstage-dynamic-plugins")
4949
}
5050

5151
func addDynamicPlugins(spec v1alpha1.BackstageSpec, deployment *appsv1.Deployment, model *BackstageModel) error {

‎pkg/model/route.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type BackstageRoute struct {
3333
}
3434

3535
func RouteName(backstageName string) string {
36-
return utils.GenerateRuntimeObjectName(backstageName, "backstage", false)
36+
return utils.GenerateRuntimeObjectName(backstageName, "backstage")
3737
}
3838

3939
func (b *BackstageRoute) setRoute(specified *bsv1alpha1.Route) {

‎pkg/model/secretenvs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func (p *SecretEnvs) validate(_ *BackstageModel, _ v1alpha1.Backstage) error {
8787
}
8888

8989
func (p *SecretEnvs) setMetaInfo(backstageName string) {
90-
p.Secret.SetName(utils.GenerateRuntimeObjectName(backstageName, "backstage-envs", true))
90+
p.Secret.SetName(utils.GenerateRuntimeObjectName(backstageName, "backstage-envs"))
9191
}
9292

9393
// implementation of BackstagePodContributor interface

‎pkg/model/secretfiles.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (p *SecretFiles) validate(_ *BackstageModel, _ v1alpha1.Backstage) error {
104104
}
105105

106106
func (p *SecretFiles) setMetaInfo(backstageName string) {
107-
p.Secret.SetName(utils.GenerateRuntimeObjectName(backstageName, "backstage-files", true))
107+
p.Secret.SetName(utils.GenerateRuntimeObjectName(backstageName, "backstage-files"))
108108
}
109109

110110
// implementation of BackstagePodContributor interface

‎pkg/model/service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func init() {
3939
}
4040

4141
func ServiceName(backstageName string) string {
42-
return utils.GenerateRuntimeObjectName(backstageName, "backstage", false)
42+
return utils.GenerateRuntimeObjectName(backstageName, "backstage")
4343
}
4444

4545
// implementation of RuntimeObject interface

‎pkg/utils/utils.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,7 @@ func GenerateLabel(labels *map[string]string, name string, value string) {
5151
}
5252

5353
// GenerateRuntimeObjectName generates name using BackstageCR name and objectType which is ConfigObject Key without '.yaml' (like 'deployment')
54-
func GenerateRuntimeObjectName(backstageCRName string, objectType string, crNameAsPrefix bool) string {
55-
if crNameAsPrefix {
56-
// For backwards compatibility with 1.1 (even if not consistent).
57-
// Some resources were named with the CR name as prefix, while some others had the CR name as suffix.
58-
return fmt.Sprintf("%s-%s", backstageCRName, objectType)
59-
}
54+
func GenerateRuntimeObjectName(backstageCRName string, objectType string) string {
6055
return fmt.Sprintf("%s-%s", objectType, backstageCRName)
6156
}
6257

0 commit comments

Comments
 (0)