Skip to content

Commit a8b4763

Browse files
Implement GenStage based reconciliation of stacks/global services (#2520)
1 parent 459c71a commit a8b4763

File tree

37 files changed

+341
-260
lines changed

37 files changed

+341
-260
lines changed

.github/workflows/test-pr.yaml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: CI / Demo PR
2+
3+
env:
4+
DOCKER_METADATA_PR_HEAD_SHA: 'true'
5+
6+
on:
7+
push:
8+
branches:
9+
- master
10+
jobs:
11+
pr:
12+
permissions:
13+
id-token: write
14+
contents: read
15+
name: Generate PR
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout the repo
19+
uses: actions/checkout@v3
20+
with:
21+
fetch-depth: 0
22+
- name: Check Commit Type
23+
uses: gsactions/commit-message-checker@v2
24+
with:
25+
pattern: 'Plural Flow: console'
26+
error: 'The commit must include the annotation "Plural Flow: console".'
27+
- name: setup plural
28+
id: plural
29+
uses: pluralsh/setup-plural@v1
30+
with:
31+
32+
consoleUrl: https://console.plrldemo.onplural.sh
33+
- name: Set outputs
34+
id: sha
35+
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
36+
- name: Trigger PR
37+
uses: pluralsh/trigger-pull-request@v1
38+
with:
39+
url: https://console.plrldemo.onplural.sh
40+
token: ${{ steps.plural.outputs.consoleToken }}
41+
branch: plrl/console/update-${{ steps.sha.outputs.sha_short }}
42+
prAutomation: console-updater
43+
context: |
44+
{
45+
"tag": "sha-${{ steps.sha.outputs.sha_short }}"
46+
}

assets/src/components/cd/clusters/ClustersColumns.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,7 @@ export const ColProvider = columnHelper.accessor(
140140
size="medium"
141141
type="secondary"
142142
/>
143-
<StackedText
144-
first={getClusterDistroName(node?.distro, 'short')}
145-
second={getProviderName(node?.provider?.cloud)}
146-
/>
143+
{getClusterDistroName(node?.distro, 'short')}
147144
</ColClusterContentSC>
148145
)
149146
},
@@ -187,7 +184,7 @@ export const ColVersion = columnHelper.accessor(
187184
first={
188185
<div css={{ display: 'flex', flexDirection: 'column' }}>
189186
<TabularNumbers>
190-
Current: {toNiceVersion(node?.currentVersion)}
187+
Control Plane: {toNiceVersion(node?.currentVersion)}
191188
</TabularNumbers>
192189
<TabularNumbers>
193190
{node?.self || !node?.version

assets/src/components/cd/clusters/create/CreateCluster.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ function CreateClusterModal({
272272

273273
return (
274274
<ModalAlt
275-
header="Create a cluster"
275+
header="Import an existing cluster"
276276
size="large"
277277
style={{ padding: 0, position: 'absolute' }}
278278
open={open}
@@ -311,7 +311,7 @@ export default function CreateCluster() {
311311
primary
312312
{...buttonProps}
313313
>
314-
Create cluster
314+
Import Cluster
315315
</Button>
316316
<ModalMountTransition open={isOpen}>
317317
<CreateClusterModal

assets/src/components/cd/services/ServiceDeprecations.tsx

Lines changed: 0 additions & 91 deletions
This file was deleted.

assets/src/components/cd/services/ServicesColumns.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import DecoratedName from './DecoratedName'
4040
import { DeleteGlobalService } from './DeleteGlobalService'
4141
import { DeleteService } from './DeleteService'
4242
import { DetachService } from './DetachService'
43-
import { ServiceDeprecations } from './ServiceDeprecations'
4443
import { ServicePermissions } from './ServicePermissions'
4544
import { ServiceSettings } from './ServiceSettings'
4645
import { ServiceStatusChip } from './ServiceStatusChip'
@@ -247,7 +246,6 @@ export const ColErrors = columnHelper.accessor(
247246
gap="xsmall"
248247
>
249248
<ServicesTableErrors service={node} />
250-
<ServiceDeprecations service={node} />
251249
</Flex>
252250
),
253251
}

assets/src/components/flows/flow/previews/PreviewInstancesTableCols.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
Tooltip,
99
} from '@pluralsh/design-system'
1010
import { createColumnHelper } from '@tanstack/react-table'
11-
import { ServiceDeprecations } from 'components/cd/services/ServiceDeprecations'
1211
import {
1312
ClusterNameAndIcon,
1413
DecoratedServiceDeployment,
@@ -146,7 +145,6 @@ export const ColErrors = columnHelper.accessor(
146145
cell: ({ row: { original } }) => (
147146
<div>
148147
<ServicesTableErrors service={original?.service} />
149-
<ServiceDeprecations service={original?.service} />
150148
</div>
151149
),
152150
}

0 commit comments

Comments
 (0)