From 0d9a8d17f9c79f2c21ec12732d2e68d36dd2a4ef Mon Sep 17 00:00:00 2001 From: Kjetil Haugland Date: Mon, 25 Nov 2024 12:32:34 +0100 Subject: [PATCH 1/6] Update radixconfig --- radixconfig_pcs5-demo.yaml | 118 +++++++++++++++++++++++++++++++------ 1 file changed, 101 insertions(+), 17 deletions(-) diff --git a/radixconfig_pcs5-demo.yaml b/radixconfig_pcs5-demo.yaml index b23d4236..11f422f2 100644 --- a/radixconfig_pcs5-demo.yaml +++ b/radixconfig_pcs5-demo.yaml @@ -7,21 +7,12 @@ spec: useBuildKit: true useBuildCache: true environments: - - name: admin - build: - from: main - - name: transfer - build: - from: main - - name: status - build: - from: main - - name: scoping + - name: test build: - from: main + from: feat/pcs5-radix components: - # Web Server (client backend) - - name: webserver + # Web Server - Admin + - name: admin identity: azure: clientId: ea425507-0de4-4f5f-bac8-48cea54f7a0c @@ -50,7 +41,7 @@ spec: port: 5000 publicPort: http environmentConfig: - - environment: admin + - environment: test identity: azure: clientId: 68e0c697-b713-4cd0-b24f-c2509f442e84 @@ -75,7 +66,38 @@ spec: limits: memory: "2048Mi" cpu: "800m" - - environment: transfer + + # Web Server - Transfer + - name: transfer + identity: + azure: + clientId: ea425507-0de4-4f5f-bac8-48cea54f7a0c + src: . # Dockerfile location + dockerfileName: clientBackend.Dockerfile + variables: + ASPNETCORE_URLS: "http://*:5000" + ApplicationInsights__ConnectionString: "" + AzureAd__ClientId: "" + ClientBundle__Msal__ClientId: "" + ClientBundle__PortalId: "" + FusionPortalApi__BaseAddress: "" + FusionPortalApi__Scope: "" + AssetProxy__FusionPortalUrl: "" + AssetProxy__FusionPeopleUrl: "" + AssetProxy__FusionAppsUrl: "" + AssetProxy__TokenScope: "" + FusionProjectPortalApi__BaseAddress: "" + FusionProjectPortalApi__Scope: "" + FusionBookmarks__Name: "" + FusionBookmarks__Identifier: "" + FusionBookmarks__Subsystem: "Project Portal" + ClientBundle__FusionLegacyEnvIdentifier: "ci" + ports: + - name: http + port: 5000 + publicPort: http + environmentConfig: + - environment: test identity: azure: clientId: 68e0c697-b713-4cd0-b24f-c2509f442e84 @@ -100,7 +122,38 @@ spec: limits: memory: "2048Mi" cpu: "800m" - - environment: status + + # Web Server - Scoping + - name: scoping + identity: + azure: + clientId: ea425507-0de4-4f5f-bac8-48cea54f7a0c + src: . # Dockerfile location + dockerfileName: clientBackend.Dockerfile + variables: + ASPNETCORE_URLS: "http://*:5000" + ApplicationInsights__ConnectionString: "" + AzureAd__ClientId: "" + ClientBundle__Msal__ClientId: "" + ClientBundle__PortalId: "" + FusionPortalApi__BaseAddress: "" + FusionPortalApi__Scope: "" + AssetProxy__FusionPortalUrl: "" + AssetProxy__FusionPeopleUrl: "" + AssetProxy__FusionAppsUrl: "" + AssetProxy__TokenScope: "" + FusionProjectPortalApi__BaseAddress: "" + FusionProjectPortalApi__Scope: "" + FusionBookmarks__Name: "" + FusionBookmarks__Identifier: "" + FusionBookmarks__Subsystem: "Project Portal" + ClientBundle__FusionLegacyEnvIdentifier: "ci" + ports: + - name: http + port: 5000 + publicPort: http + environmentConfig: + - environment: test identity: azure: clientId: 68e0c697-b713-4cd0-b24f-c2509f442e84 @@ -125,7 +178,38 @@ spec: limits: memory: "2048Mi" cpu: "800m" - - environment: scoping + + # Web Server - Status + - name: status + identity: + azure: + clientId: ea425507-0de4-4f5f-bac8-48cea54f7a0c + src: . # Dockerfile location + dockerfileName: clientBackend.Dockerfile + variables: + ASPNETCORE_URLS: "http://*:5000" + ApplicationInsights__ConnectionString: "" + AzureAd__ClientId: "" + ClientBundle__Msal__ClientId: "" + ClientBundle__PortalId: "" + FusionPortalApi__BaseAddress: "" + FusionPortalApi__Scope: "" + AssetProxy__FusionPortalUrl: "" + AssetProxy__FusionPeopleUrl: "" + AssetProxy__FusionAppsUrl: "" + AssetProxy__TokenScope: "" + FusionProjectPortalApi__BaseAddress: "" + FusionProjectPortalApi__Scope: "" + FusionBookmarks__Name: "" + FusionBookmarks__Identifier: "" + FusionBookmarks__Subsystem: "Project Portal" + ClientBundle__FusionLegacyEnvIdentifier: "ci" + ports: + - name: http + port: 5000 + publicPort: http + environmentConfig: + - environment: test identity: azure: clientId: 68e0c697-b713-4cd0-b24f-c2509f442e84 From b1cf5bca9f150308b50fa4408d8d2fd0fbe6d090 Mon Sep 17 00:00:00 2001 From: Kjetil Haugland Date: Mon, 25 Nov 2024 13:59:05 +0100 Subject: [PATCH 2/6] . --- backend/src/Equinor.ProjectExecutionPortal.sln | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/Equinor.ProjectExecutionPortal.sln b/backend/src/Equinor.ProjectExecutionPortal.sln index b3c135dd..226b750a 100644 --- a/backend/src/Equinor.ProjectExecutionPortal.sln +++ b/backend/src/Equinor.ProjectExecutionPortal.sln @@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Dockerfile = Dockerfile nuget.config = nuget.config ..\..\radixconfig.yaml = ..\..\radixconfig.yaml + ..\..\radixconfig_pcs5-demo.yaml = ..\..\radixconfig_pcs5-demo.yaml ..\README.md = ..\README.md EndProjectSection EndProject From 6b183bfe86044149e29f372d2a959d459310c065 Mon Sep 17 00:00:00 2001 From: Christopher Berge Hove Date: Mon, 9 Dec 2024 13:53:33 +0100 Subject: [PATCH 3/6] chore: add pcs one --- radixconfig_pcs5-demo.yaml | 57 +++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/radixconfig_pcs5-demo.yaml b/radixconfig_pcs5-demo.yaml index 11f422f2..b570e7b8 100644 --- a/radixconfig_pcs5-demo.yaml +++ b/radixconfig_pcs5-demo.yaml @@ -233,4 +233,59 @@ spec: cpu: "800m" limits: memory: "2048Mi" - cpu: "800m" \ No newline at end of file + cpu: "800m" + # Web Server - One + - name: one + identity: + azure: + clientId: ea425507-0de4-4f5f-bac8-48cea54f7a0c + src: . # Dockerfile location + dockerfileName: clientBackend.Dockerfile + variables: + ASPNETCORE_URLS: "http://*:5000" + ApplicationInsights__ConnectionString: "" + AzureAd__ClientId: "" + ClientBundle__Msal__ClientId: "" + ClientBundle__PortalId: "77a66936-2690-41c1-1042-08dd18502b67" + FusionPortalApi__BaseAddress: "" + FusionPortalApi__Scope: "" + AssetProxy__FusionPortalUrl: "" + AssetProxy__FusionPeopleUrl: "" + AssetProxy__FusionAppsUrl: "" + AssetProxy__TokenScope: "" + FusionProjectPortalApi__BaseAddress: "" + FusionProjectPortalApi__Scope: "" + FusionBookmarks__Name: "" + FusionBookmarks__Identifier: "" + FusionBookmarks__Subsystem: "Project Portal" + ClientBundle__FusionLegacyEnvIdentifier: "ci" + ports: + - name: http + port: 5000 + publicPort: http + environmentConfig: + - environment: test + identity: + azure: + clientId: 68e0c697-b713-4cd0-b24f-c2509f442e84 + secretRefs: + azureKeyVaults: + - name: kv-pep-ws-noe-test + path: /mnt/key-vault + useAzureIdentity: true + items: + - name: AzureAd--ClientSecret + type: secret + envVar: AzureAd__ClientSecret + - name: ClientBundle--AgGrid--LicenseKey + type: secret + envVar: ClientBundle__AgGrid__LicenseKey + replicas: 1 + monitoring: true + resources: + requests: + memory: "2048Mi" + cpu: "800m" + limits: + memory: "2048Mi" + cpu: "800m" From 60e2f322b0899cc9201f4760711b2d28bbdb18a0 Mon Sep 17 00:00:00 2001 From: Noggling Date: Mon, 9 Dec 2024 12:54:11 +0000 Subject: [PATCH 4/6] chore: create pr-874-2198328870.md --- .changeset/pr-874-2198328870.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changeset/pr-874-2198328870.md diff --git a/.changeset/pr-874-2198328870.md b/.changeset/pr-874-2198328870.md new file mode 100644 index 00000000..017b123f --- /dev/null +++ b/.changeset/pr-874-2198328870.md @@ -0,0 +1,3 @@ + +--- +--- From a7afddb323d16d5d2984ee6669bb236ddecb5f19 Mon Sep 17 00:00:00 2001 From: Christopher Berge Hove Date: Tue, 28 Jan 2025 11:57:54 +0100 Subject: [PATCH 5/6] feat: add new env dev --- radixconfig_pcs5-demo.yaml | 209 ++----------------------------------- 1 file changed, 6 insertions(+), 203 deletions(-) diff --git a/radixconfig_pcs5-demo.yaml b/radixconfig_pcs5-demo.yaml index b570e7b8..bbb3eeb9 100644 --- a/radixconfig_pcs5-demo.yaml +++ b/radixconfig_pcs5-demo.yaml @@ -7,180 +7,13 @@ spec: useBuildKit: true useBuildCache: true environments: - - name: test + - name: dev build: from: feat/pcs5-radix + - name: test components: - # Web Server - Admin - - name: admin - identity: - azure: - clientId: ea425507-0de4-4f5f-bac8-48cea54f7a0c - src: . # Dockerfile location - dockerfileName: clientBackend.Dockerfile - variables: - ASPNETCORE_URLS: "http://*:5000" - ApplicationInsights__ConnectionString: "" - AzureAd__ClientId: "" - ClientBundle__Msal__ClientId: "" - ClientBundle__PortalId: "" - FusionPortalApi__BaseAddress: "" - FusionPortalApi__Scope: "" - AssetProxy__FusionPortalUrl: "" - AssetProxy__FusionPeopleUrl: "" - AssetProxy__FusionAppsUrl: "" - AssetProxy__TokenScope: "" - FusionProjectPortalApi__BaseAddress: "" - FusionProjectPortalApi__Scope: "" - FusionBookmarks__Name: "" - FusionBookmarks__Identifier: "" - FusionBookmarks__Subsystem: "Project Portal" - ClientBundle__FusionLegacyEnvIdentifier: "ci" - ports: - - name: http - port: 5000 - publicPort: http - environmentConfig: - - environment: test - identity: - azure: - clientId: 68e0c697-b713-4cd0-b24f-c2509f442e84 - secretRefs: - azureKeyVaults: - - name: kv-pep-ws-noe-test - path: /mnt/key-vault - useAzureIdentity: true - items: - - name: AzureAd--ClientSecret - type: secret - envVar: AzureAd__ClientSecret - - name: ClientBundle--AgGrid--LicenseKey - type: secret - envVar: ClientBundle__AgGrid__LicenseKey - replicas: 1 - monitoring: true - resources: - requests: - memory: "2048Mi" - cpu: "800m" - limits: - memory: "2048Mi" - cpu: "800m" - - # Web Server - Transfer - - name: transfer - identity: - azure: - clientId: ea425507-0de4-4f5f-bac8-48cea54f7a0c - src: . # Dockerfile location - dockerfileName: clientBackend.Dockerfile - variables: - ASPNETCORE_URLS: "http://*:5000" - ApplicationInsights__ConnectionString: "" - AzureAd__ClientId: "" - ClientBundle__Msal__ClientId: "" - ClientBundle__PortalId: "" - FusionPortalApi__BaseAddress: "" - FusionPortalApi__Scope: "" - AssetProxy__FusionPortalUrl: "" - AssetProxy__FusionPeopleUrl: "" - AssetProxy__FusionAppsUrl: "" - AssetProxy__TokenScope: "" - FusionProjectPortalApi__BaseAddress: "" - FusionProjectPortalApi__Scope: "" - FusionBookmarks__Name: "" - FusionBookmarks__Identifier: "" - FusionBookmarks__Subsystem: "Project Portal" - ClientBundle__FusionLegacyEnvIdentifier: "ci" - ports: - - name: http - port: 5000 - publicPort: http - environmentConfig: - - environment: test - identity: - azure: - clientId: 68e0c697-b713-4cd0-b24f-c2509f442e84 - secretRefs: - azureKeyVaults: - - name: kv-pep-ws-noe-test - path: /mnt/key-vault - useAzureIdentity: true - items: - - name: AzureAd--ClientSecret - type: secret - envVar: AzureAd__ClientSecret - - name: ClientBundle--AgGrid--LicenseKey - type: secret - envVar: ClientBundle__AgGrid__LicenseKey - replicas: 1 - monitoring: true - resources: - requests: - memory: "2048Mi" - cpu: "800m" - limits: - memory: "2048Mi" - cpu: "800m" - - # Web Server - Scoping - - name: scoping - identity: - azure: - clientId: ea425507-0de4-4f5f-bac8-48cea54f7a0c - src: . # Dockerfile location - dockerfileName: clientBackend.Dockerfile - variables: - ASPNETCORE_URLS: "http://*:5000" - ApplicationInsights__ConnectionString: "" - AzureAd__ClientId: "" - ClientBundle__Msal__ClientId: "" - ClientBundle__PortalId: "" - FusionPortalApi__BaseAddress: "" - FusionPortalApi__Scope: "" - AssetProxy__FusionPortalUrl: "" - AssetProxy__FusionPeopleUrl: "" - AssetProxy__FusionAppsUrl: "" - AssetProxy__TokenScope: "" - FusionProjectPortalApi__BaseAddress: "" - FusionProjectPortalApi__Scope: "" - FusionBookmarks__Name: "" - FusionBookmarks__Identifier: "" - FusionBookmarks__Subsystem: "Project Portal" - ClientBundle__FusionLegacyEnvIdentifier: "ci" - ports: - - name: http - port: 5000 - publicPort: http - environmentConfig: - - environment: test - identity: - azure: - clientId: 68e0c697-b713-4cd0-b24f-c2509f442e84 - secretRefs: - azureKeyVaults: - - name: kv-pep-ws-noe-test - path: /mnt/key-vault - useAzureIdentity: true - items: - - name: AzureAd--ClientSecret - type: secret - envVar: AzureAd__ClientSecret - - name: ClientBundle--AgGrid--LicenseKey - type: secret - envVar: ClientBundle__AgGrid__LicenseKey - replicas: 1 - monitoring: true - resources: - requests: - memory: "2048Mi" - cpu: "800m" - limits: - memory: "2048Mi" - cpu: "800m" - - # Web Server - Status - - name: status + # Web Server - One + - name: one identity: azure: clientId: ea425507-0de4-4f5f-bac8-48cea54f7a0c @@ -191,7 +24,7 @@ spec: ApplicationInsights__ConnectionString: "" AzureAd__ClientId: "" ClientBundle__Msal__ClientId: "" - ClientBundle__PortalId: "" + ClientBundle__PortalId: "77a66936-2690-41c1-1042-08dd18502b67" FusionPortalApi__BaseAddress: "" FusionPortalApi__Scope: "" AssetProxy__FusionPortalUrl: "" @@ -234,37 +67,7 @@ spec: limits: memory: "2048Mi" cpu: "800m" - # Web Server - One - - name: one - identity: - azure: - clientId: ea425507-0de4-4f5f-bac8-48cea54f7a0c - src: . # Dockerfile location - dockerfileName: clientBackend.Dockerfile - variables: - ASPNETCORE_URLS: "http://*:5000" - ApplicationInsights__ConnectionString: "" - AzureAd__ClientId: "" - ClientBundle__Msal__ClientId: "" - ClientBundle__PortalId: "77a66936-2690-41c1-1042-08dd18502b67" - FusionPortalApi__BaseAddress: "" - FusionPortalApi__Scope: "" - AssetProxy__FusionPortalUrl: "" - AssetProxy__FusionPeopleUrl: "" - AssetProxy__FusionAppsUrl: "" - AssetProxy__TokenScope: "" - FusionProjectPortalApi__BaseAddress: "" - FusionProjectPortalApi__Scope: "" - FusionBookmarks__Name: "" - FusionBookmarks__Identifier: "" - FusionBookmarks__Subsystem: "Project Portal" - ClientBundle__FusionLegacyEnvIdentifier: "ci" - ports: - - name: http - port: 5000 - publicPort: http - environmentConfig: - - environment: test + - environment: dev identity: azure: clientId: 68e0c697-b713-4cd0-b24f-c2509f442e84 From 2befbcc26122cb8256da028133619e227edb4756 Mon Sep 17 00:00:00 2001 From: Christopher Berge Hove Date: Tue, 28 Jan 2025 12:00:10 +0100 Subject: [PATCH 6/6] feat: add build configuration for test component --- radixconfig_pcs5-demo.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/radixconfig_pcs5-demo.yaml b/radixconfig_pcs5-demo.yaml index bbb3eeb9..fb07360d 100644 --- a/radixconfig_pcs5-demo.yaml +++ b/radixconfig_pcs5-demo.yaml @@ -11,6 +11,8 @@ spec: build: from: feat/pcs5-radix - name: test + build: + from: feat/pcs5-radix components: # Web Server - One - name: one