@@ -270,7 +270,7 @@ const networkPoliciesMigration = async (values: Record<string, any>): Promise<vo
270
270
servicePermissions . filter ( ( s : any ) => s !== 'networkPolicy' ) ,
271
271
)
272
272
273
- createFileSync ( `${ env . ENV_DIR } /env/ teams/netpols.${ teamName } .yaml` )
273
+ createFileSync ( `${ env . ENV_DIR } /teams/netpols.${ teamName } .yaml` )
274
274
let services = get ( values , `teamConfig.${ teamName } .services` )
275
275
if ( ! services || services . length === 0 ) return
276
276
const valuesToWrite = {
@@ -287,7 +287,7 @@ const networkPoliciesMigration = async (values: Record<string, any>): Promise<vo
287
287
} )
288
288
289
289
valuesToWrite . teamConfig [ teamName ] = { netpols }
290
- await writeValuesToFile ( `${ env . ENV_DIR } /env/ teams/netpols.${ teamName } .yaml` , valuesToWrite , true )
290
+ await writeValuesToFile ( `${ env . ENV_DIR } /teams/netpols.${ teamName } .yaml` , valuesToWrite , true )
291
291
set ( values , `teamConfig.${ teamName } .netpols` , netpols )
292
292
services = services . map ( ( service : any ) => {
293
293
if ( service . networkPolicy ) {
@@ -531,7 +531,7 @@ export const migrateLegacyValues = async (envDir: string, deps = { writeFile }):
531
531
532
532
// FIXME migrate workloadValues folder and change ApplicationSet !!
533
533
// ensure that all old files are gone
534
- await $ `rm -rf ${ env . ENV_DIR } /env `
534
+ await $ `rm -rf ${ env . ENV_DIR } `
535
535
536
536
//Write standalone files
537
537
await Promise . all (
@@ -550,13 +550,13 @@ export const migrate = async (): Promise<boolean> => {
550
550
const d = terminal ( `cmd:${ cmdName } :migrate` )
551
551
const argv : Arguments = getParsedArgs ( )
552
552
d . log ( 'Migrating values' )
553
- if ( await pathExists ( `${ env . ENV_DIR } /env/ settings.yaml` ) ) {
553
+ if ( await pathExists ( `${ env . ENV_DIR } /settings.yaml` ) ) {
554
554
d . log ( 'Detected the old values file structure' )
555
555
await migrateLegacyValues ( env . ENV_DIR )
556
556
}
557
557
const changes : Changes = ( await loadYaml ( `${ rootDir } /values-changes.yaml` ) ) ?. changes
558
- const versions = await loadYaml ( `${ env . ENV_DIR } /env/ settings/versions.yaml` , { noError : true } )
559
- d . log ( 'VERSIONS PATH: ' , `${ env . ENV_DIR } /env/ settings/versions.yaml` )
558
+ const versions = await loadYaml ( `${ env . ENV_DIR } /settings/versions.yaml` , { noError : true } )
559
+ d . log ( 'VERSIONS PATH: ' , `${ env . ENV_DIR } /settings/versions.yaml` )
560
560
d . log ( 'VERSIONS: ' , versions )
561
561
const prevVersion : number = versions ?. specVersion
562
562
if ( ! prevVersion ) {
0 commit comments