Skip to content

Commit 2e6ba92

Browse files
author
Laurie T. Malau
committed
move to installer config
1 parent e74a946 commit 2e6ba92

File tree

13 files changed

+33
-20
lines changed

13 files changed

+33
-20
lines changed

‎components/ws-manager-bridge/src/bridge.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,6 @@ export class WorkspaceManagerBridge implements Disposable {
436436
clientProvider: ClientProvider,
437437
controllerIntervalSeconds: number,
438438
controllerMaxDisconnectSeconds: number,
439-
maxTimeToRunningPhaseSeconds = 60 * 60,
440439
) {
441440
let disconnectStarted = Number.MAX_SAFE_INTEGER;
442441
this.disposables.push(
@@ -457,7 +456,7 @@ export class WorkspaceManagerBridge implements Disposable {
457456
ctx,
458457
runningInstances,
459458
clientProvider,
460-
maxTimeToRunningPhaseSeconds,
459+
this.config.maxTimeToRunningPhaseSeconds,
461460
);
462461

463462
disconnectStarted = Number.MAX_SAFE_INTEGER; // Reset disconnect period

‎components/ws-manager-bridge/src/config.ts

+3
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,7 @@ export interface Configuration {
3838

3939
// clusterSyncIntervalSeconds configures how often we sync workspace cluster information
4040
clusterSyncIntervalSeconds: number;
41+
42+
// maxTimeToRunningPhaseSeconds is the timeout duration
43+
maxTimeToRunningPhaseSeconds: number;
4144
}

‎install/installer/cmd/testdata/render/aws-setup/output.golden

+3-2
Original file line numberDiff line numberDiff line change
@@ -4576,7 +4576,8 @@ data:
45764576
"buildingPhaseSeconds": 3600,
45774577
"unknownPhaseSeconds": 600
45784578
},
4579-
"clusterSyncIntervalSeconds": 60
4579+
"clusterSyncIntervalSeconds": 60,
4580+
"maxTimeToRunningPhaseSeconds": 3600
45804581
}
45814582
kind: ConfigMap
45824583
metadata:
@@ -8439,7 +8440,7 @@ spec:
84398440
template:
84408441
metadata:
84418442
annotations:
8442-
gitpod.io/checksum_config: f5d95af2308e35194d44403c42e269fbe9e4c596d138796fa95f705ec3b4d352
8443+
gitpod.io/checksum_config: 846469058fd082ae195479935c67054553bb448d05cf029a19af738503147aa7
84438444
creationTimestamp: null
84448445
labels:
84458446
app: gitpod

‎install/installer/cmd/testdata/render/azure-setup/output.golden

+3-2
Original file line numberDiff line numberDiff line change
@@ -4436,7 +4436,8 @@ data:
44364436
"buildingPhaseSeconds": 3600,
44374437
"unknownPhaseSeconds": 600
44384438
},
4439-
"clusterSyncIntervalSeconds": 60
4439+
"clusterSyncIntervalSeconds": 60,
4440+
"maxTimeToRunningPhaseSeconds": 3600
44404441
}
44414442
kind: ConfigMap
44424443
metadata:
@@ -8285,7 +8286,7 @@ spec:
82858286
template:
82868287
metadata:
82878288
annotations:
8288-
gitpod.io/checksum_config: f5d95af2308e35194d44403c42e269fbe9e4c596d138796fa95f705ec3b4d352
8289+
gitpod.io/checksum_config: 846469058fd082ae195479935c67054553bb448d05cf029a19af738503147aa7
82898290
creationTimestamp: null
82908291
labels:
82918292
app: gitpod

‎install/installer/cmd/testdata/render/customization/output.golden

+3-2
Original file line numberDiff line numberDiff line change
@@ -5363,7 +5363,8 @@ data:
53635363
"buildingPhaseSeconds": 3600,
53645364
"unknownPhaseSeconds": 600
53655365
},
5366-
"clusterSyncIntervalSeconds": 60
5366+
"clusterSyncIntervalSeconds": 60,
5367+
"maxTimeToRunningPhaseSeconds": 3600
53675368
}
53685369
kind: ConfigMap
53695370
metadata:
@@ -9817,7 +9818,7 @@ spec:
98179818
metadata:
98189819
annotations:
98199820
gitpod.io: hello
9820-
gitpod.io/checksum_config: fdb0c0adb6ea187bd587fb7c286084b4853439fdfafa7f32bbdcacee744e5c3e
9821+
gitpod.io/checksum_config: 1af8949463afb559e837a140ecdb4ca73db58e3da8fb0680570a1cdada3c3abe
98219822
hello: world
98229823
creationTimestamp: null
98239824
labels:

‎install/installer/cmd/testdata/render/external-registry/output.golden

+3-2
Original file line numberDiff line numberDiff line change
@@ -4623,7 +4623,8 @@ data:
46234623
"buildingPhaseSeconds": 3600,
46244624
"unknownPhaseSeconds": 600
46254625
},
4626-
"clusterSyncIntervalSeconds": 60
4626+
"clusterSyncIntervalSeconds": 60,
4627+
"maxTimeToRunningPhaseSeconds": 3600
46274628
}
46284629
kind: ConfigMap
46294630
metadata:
@@ -8711,7 +8712,7 @@ spec:
87118712
template:
87128713
metadata:
87138714
annotations:
8714-
gitpod.io/checksum_config: bacace964780fd56bdd04b997df0017c24563c2aac6bffd10962c297b54c91ba
8715+
gitpod.io/checksum_config: 19a15d16ea83f7cd1c61948f0e433f3f72ce175524ea639c1c050a485f17f74d
87158716
creationTimestamp: null
87168717
labels:
87178718
app: gitpod

‎install/installer/cmd/testdata/render/gcp-setup/output.golden

+3-2
Original file line numberDiff line numberDiff line change
@@ -4395,7 +4395,8 @@ data:
43954395
"buildingPhaseSeconds": 3600,
43964396
"unknownPhaseSeconds": 600
43974397
},
4398-
"clusterSyncIntervalSeconds": 60
4398+
"clusterSyncIntervalSeconds": 60,
4399+
"maxTimeToRunningPhaseSeconds": 3600
43994400
}
44004401
kind: ConfigMap
44014402
metadata:
@@ -8208,7 +8209,7 @@ spec:
82088209
template:
82098210
metadata:
82108211
annotations:
8211-
gitpod.io/checksum_config: 6d44bef12145215794685e52c3139f04195bcf8e7ca1f1d7b3803da845e837eb
8212+
gitpod.io/checksum_config: f0b5a025d81fce48adb9fd1ad8445422fa80b136acba6b2eb69263df3388c388
82128213
creationTimestamp: null
82138214
labels:
82148215
app: gitpod

‎install/installer/cmd/testdata/render/minimal/output.golden

+3-2
Original file line numberDiff line numberDiff line change
@@ -4843,7 +4843,8 @@ data:
48434843
"buildingPhaseSeconds": 3600,
48444844
"unknownPhaseSeconds": 600
48454845
},
4846-
"clusterSyncIntervalSeconds": 60
4846+
"clusterSyncIntervalSeconds": 60,
4847+
"maxTimeToRunningPhaseSeconds": 3600
48474848
}
48484849
kind: ConfigMap
48494850
metadata:
@@ -9086,7 +9087,7 @@ spec:
90869087
template:
90879088
metadata:
90889089
annotations:
9089-
gitpod.io/checksum_config: bacace964780fd56bdd04b997df0017c24563c2aac6bffd10962c297b54c91ba
9090+
gitpod.io/checksum_config: 19a15d16ea83f7cd1c61948f0e433f3f72ce175524ea639c1c050a485f17f74d
90909091
creationTimestamp: null
90919092
labels:
90929093
app: gitpod

‎install/installer/cmd/testdata/render/statefulset-customization/output.golden

+3-2
Original file line numberDiff line numberDiff line change
@@ -4855,7 +4855,8 @@ data:
48554855
"buildingPhaseSeconds": 3600,
48564856
"unknownPhaseSeconds": 600
48574857
},
4858-
"clusterSyncIntervalSeconds": 60
4858+
"clusterSyncIntervalSeconds": 60,
4859+
"maxTimeToRunningPhaseSeconds": 3600
48594860
}
48604861
kind: ConfigMap
48614862
metadata:
@@ -9098,7 +9099,7 @@ spec:
90989099
template:
90999100
metadata:
91009101
annotations:
9101-
gitpod.io/checksum_config: bacace964780fd56bdd04b997df0017c24563c2aac6bffd10962c297b54c91ba
9102+
gitpod.io/checksum_config: 19a15d16ea83f7cd1c61948f0e433f3f72ce175524ea639c1c050a485f17f74d
91029103
creationTimestamp: null
91039104
labels:
91049105
app: gitpod

‎install/installer/cmd/testdata/render/use-pod-security-policies/output.golden

+3-2
Original file line numberDiff line numberDiff line change
@@ -5176,7 +5176,8 @@ data:
51765176
"buildingPhaseSeconds": 3600,
51775177
"unknownPhaseSeconds": 600
51785178
},
5179-
"clusterSyncIntervalSeconds": 60
5179+
"clusterSyncIntervalSeconds": 60,
5180+
"maxTimeToRunningPhaseSeconds": 3600
51805181
}
51815182
kind: ConfigMap
51825183
metadata:
@@ -9530,7 +9531,7 @@ spec:
95309531
template:
95319532
metadata:
95329533
annotations:
9533-
gitpod.io/checksum_config: bacace964780fd56bdd04b997df0017c24563c2aac6bffd10962c297b54c91ba
9534+
gitpod.io/checksum_config: 19a15d16ea83f7cd1c61948f0e433f3f72ce175524ea639c1c050a485f17f74d
95349535
creationTimestamp: null
95359536
labels:
95369537
app: gitpod

‎install/installer/cmd/testdata/render/workspace-requests-limits/output.golden

+3-2
Original file line numberDiff line numberDiff line change
@@ -4846,7 +4846,8 @@ data:
48464846
"buildingPhaseSeconds": 3600,
48474847
"unknownPhaseSeconds": 600
48484848
},
4849-
"clusterSyncIntervalSeconds": 60
4849+
"clusterSyncIntervalSeconds": 60,
4850+
"maxTimeToRunningPhaseSeconds": 3600
48504851
}
48514852
kind: ConfigMap
48524853
metadata:
@@ -9089,7 +9090,7 @@ spec:
90899090
template:
90909091
metadata:
90919092
annotations:
9092-
gitpod.io/checksum_config: bacace964780fd56bdd04b997df0017c24563c2aac6bffd10962c297b54c91ba
9093+
gitpod.io/checksum_config: 19a15d16ea83f7cd1c61948f0e433f3f72ce175524ea639c1c050a485f17f74d
90939094
creationTimestamp: null
90949095
labels:
90959096
app: gitpod

‎install/installer/pkg/components/ws-manager-bridge/configmap.go

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
3232
EmulatePreparingIntervalSeconds: 10,
3333
StaticBridges: WSManagerList(ctx),
3434
ClusterSyncIntervalSeconds: 60,
35+
MaxTimeToRunningPhaseSeconds: 60 * 60,
3536
}
3637

3738
fc, err := common.ToJSONString(wsmbcfg)

‎install/installer/pkg/components/ws-manager-bridge/types.go

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ type Configuration struct {
1515
EmulatePreparingIntervalSeconds int32 `json:"emulatePreparingIntervalSeconds"`
1616
Timeouts Timeouts `json:"timeouts"`
1717
ClusterSyncIntervalSeconds int32 `json:"clusterSyncIntervalSeconds"`
18+
MaxTimeToRunningPhaseSeconds int32 `json:"maxTimeToRunningPhaseSeconds"`
1819
}
1920

2021
type ClusterService struct {

0 commit comments

Comments
 (0)