Skip to content

Commit 2eb9d7a

Browse files
mathieulaudeStephaneTrebel
authored andcommitted
feat: remove namespace resource usage
1 parent a2fa3ad commit 2eb9d7a

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

src/function.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ const okSkipped: PluginResult = {
1515

1616
export type ListPerms = Record<'prod' | 'hors-prod', Record<'view' | 'edit', UserObject['id'][]>>
1717

18-
const re = /[a-z0-9]{25}--[a-z0-9]{25}/
19-
function isNewNsName(ns: string) {
20-
return re.test(ns)
21-
}
22-
2318
function getListPerms(environments: Environment[]): ListPerms {
2419
const allProdPerms = environments
2520
.filter(env => env.stage === 'prod')
@@ -90,7 +85,7 @@ export const upsertProject: StepCall<Project> = async (payload) => {
9085
const tenantRbacProd = [`${keycloakRootGroupPath}/grafana/prod-RW`, `${keycloakRootGroupPath}/grafana/prod-RO`]
9186
const tenantRbacHProd = [`${keycloakRootGroupPath}/grafana/hprod-RW`, `${keycloakRootGroupPath}/grafana/hprod-RO`]
9287

93-
const compressedUUID = compressUUID(project.id)
88+
const tenantId = compressUUID(project.id)
9489

9590
const projectValue: ObservabilityProject = {
9691
projectName: project.slug,
@@ -114,11 +109,8 @@ export const upsertProject: StepCall<Project> = async (payload) => {
114109
if (!environment.apis.kubernetes) {
115110
throw new Error(`no kubernetes apis on environment ${environment.name}`)
116111
}
117-
const namespace = await environment.apis.kubernetes.getNsName()
118-
const name = isNewNsName(namespace) ? compressedUUID : project.slug
119-
console.log({ namespace, name })
120112
const env: EnvType = environment.stage === 'prod' ? 'prod' : 'hprod'
121-
projectValue.envs[env].tenants[`${env}-${name}`] = {}
113+
projectValue.envs[env].tenants[`${env}-${tenantId}`] = {}
122114
}
123115

124116
if (projectValue.envs.hprod && !Object.values(projectValue.envs.hprod.tenants).length) {

0 commit comments

Comments
 (0)