Skip to content

Commit e5a97ca

Browse files
committed
Add the configurability of the cloudscale API timeout
1 parent 706f4c0 commit e5a97ca

File tree

5 files changed

+19
-0
lines changed

5 files changed

+19
-0
lines changed

class/defaults.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ parameters:
1313

1414
args: []
1515

16+
api_timeout: 20
1617
api_token: ?{vaultkv:${cluster:tenant}/${cluster:name}/cloudscale/token}

component/main.jsonnet

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ local patchDaemonset(obj) =
3636
'%(registry)s/%(repository)s:%(tag)s' %
3737
params.images.cloudscale_cloud_controller_manager,
3838
command+: params.args,
39+
env+: [
40+
{
41+
name: 'CLOUDSCALE_API_TIMEOUT',
42+
value: params.api_timeout,
43+
},
44+
],
3945
}
4046
else
4147
c

docs/modules/ROOT/pages/references/parameters.adoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@ defaults:: `[]`
4343
Additional arguments to provide to the cloudscale CCM.
4444
The contents of this parameter are appended to the upstream manifest verbatim.
4545

46+
== `api_timeout`
47+
48+
[horizontal]
49+
type:: string
50+
default:: https://github.com/cloudscale-ch/cloudscale-cloud-controller-manager/blob/74832bae401dc0fc79dcfba923ae154eac684779/pkg/cloudscale_ccm/cloud.go#L28
51+
52+
cloudscale.ch API timeout to be used by the CCM driver.
53+
4654
== `api_token`
4755

4856
[horizontal]

tests/golden/defaults/cloudscale-cloud-controller-manager/cloudscale-cloud-controller-manager/10_ccm_daemonset_kube_system_cloudscale_cloud_controller_manager.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ spec:
2828
secretKeyRef:
2929
key: access-token
3030
name: cloudscale
31+
- name: CLOUDSCALE_API_TIMEOUT
32+
value: 20
3133
image: quay.io/cloudscalech/cloudscale-cloud-controller-manager:1.2.0
3234
imagePullPolicy: IfNotPresent
3335
name: cloudscale-cloud-controller-manager

tests/golden/openshift4/cloudscale-cloud-controller-manager/cloudscale-cloud-controller-manager/10_ccm_daemonset_kube_system_cloudscale_cloud_controller_manager.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ spec:
2828
secretKeyRef:
2929
key: access-token
3030
name: cloudscale
31+
- name: CLOUDSCALE_API_TIMEOUT
32+
value: 20
3133
image: quay.io/cloudscalech/cloudscale-cloud-controller-manager:1.2.0
3234
imagePullPolicy: IfNotPresent
3335
name: cloudscale-cloud-controller-manager

0 commit comments

Comments
 (0)