Skip to content

Commit 54c8c53

Browse files
committed
remove broken name prefix
[static] Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
1 parent 90f1515 commit 54c8c53

File tree

2 files changed

+36
-48
lines changed

2 files changed

+36
-48
lines changed

cluster/expected/cluster/expected.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
},
1010
"cluster": "cn-mocknet",
1111
"initialNodeCount": 0,
12-
"namePrefix": "cn-apps-pool",
1312
"nodeConfig": {
1413
"labels": {
1514
"cn_apps": "true"
@@ -38,7 +37,6 @@
3837
},
3938
"cluster": "cn-mocknet",
4039
"initialNodeCount": 1,
41-
"namePrefix": "cn-infra-pool",
4240
"nodeConfig": {
4341
"labels": {
4442
"cn_infra": "true"

cluster/pulumi/cluster/src/nodePools.ts

Lines changed: 36 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -11,59 +11,49 @@ export function installNodePools(): void {
1111
? `projects/${GCP_PROJECT}/locations/${config.requireEnv('CLOUDSDK_COMPUTE_ZONE')}/clusters/${clusterName}`
1212
: clusterName;
1313

14-
new gcp.container.NodePool(
15-
'cn-apps-node-pool',
16-
{
17-
namePrefix: 'cn-apps-pool',
18-
cluster,
19-
nodeConfig: {
20-
machineType: gkeClusterConfig.nodePools.apps.nodeType,
21-
taints: [
22-
{
23-
effect: 'NO_SCHEDULE',
24-
key: 'cn_apps',
25-
value: 'true',
26-
},
27-
],
28-
labels: {
29-
cn_apps: 'true',
14+
new gcp.container.NodePool('cn-apps-node-pool', {
15+
cluster,
16+
nodeConfig: {
17+
machineType: gkeClusterConfig.nodePools.apps.nodeType,
18+
taints: [
19+
{
20+
effect: 'NO_SCHEDULE',
21+
key: 'cn_apps',
22+
value: 'true',
3023
},
24+
],
25+
labels: {
26+
cn_apps: 'true',
3127
},
32-
initialNodeCount: 0,
33-
autoscaling: {
34-
minNodeCount: gkeClusterConfig.nodePools.apps.minNodes,
35-
maxNodeCount: gkeClusterConfig.nodePools.apps.maxNodes,
36-
},
3728
},
38-
{ aliases: [{ name: 'cn-apps-pool' }] }
39-
);
29+
initialNodeCount: 0,
30+
autoscaling: {
31+
minNodeCount: gkeClusterConfig.nodePools.apps.minNodes,
32+
maxNodeCount: gkeClusterConfig.nodePools.apps.maxNodes,
33+
},
34+
});
4035

41-
new gcp.container.NodePool(
42-
'cn-infra-node-pool',
43-
{
44-
namePrefix: 'cn-infra-pool',
45-
cluster,
46-
nodeConfig: {
47-
machineType: gkeClusterConfig.nodePools.infra.nodeType,
48-
taints: [
49-
{
50-
effect: 'NO_SCHEDULE',
51-
key: 'cn_infra',
52-
value: 'true',
53-
},
54-
],
55-
labels: {
56-
cn_infra: 'true',
36+
new gcp.container.NodePool('cn-infra-node-pool', {
37+
cluster,
38+
nodeConfig: {
39+
machineType: gkeClusterConfig.nodePools.infra.nodeType,
40+
taints: [
41+
{
42+
effect: 'NO_SCHEDULE',
43+
key: 'cn_infra',
44+
value: 'true',
5745
},
58-
},
59-
initialNodeCount: 1,
60-
autoscaling: {
61-
minNodeCount: gkeClusterConfig.nodePools.infra.minNodes,
62-
maxNodeCount: gkeClusterConfig.nodePools.infra.maxNodes,
46+
],
47+
labels: {
48+
cn_infra: 'true',
6349
},
6450
},
65-
{ aliases: [{ name: 'cn-infra-pool' }] }
66-
);
51+
initialNodeCount: 1,
52+
autoscaling: {
53+
minNodeCount: gkeClusterConfig.nodePools.infra.minNodes,
54+
maxNodeCount: gkeClusterConfig.nodePools.infra.maxNodes,
55+
},
56+
});
6757

6858
new gcp.container.NodePool('gke-node-pool', {
6959
name: 'gke-pool',

0 commit comments

Comments
 (0)