Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions class/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ parameters:

args: []

api_timeout: 20
api_timeout_default: 20
api_token: ?{vaultkv:${cluster:tenant}/${cluster:name}/cloudscale/token}
6 changes: 6 additions & 0 deletions component/main.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ local patchDaemonset(obj) =
'%(registry)s/%(repository)s:%(tag)s' %
params.images.cloudscale_cloud_controller_manager,
command+: params.args,
[if params.api_timeout != params.api_timeout_default then 'env']+: [
{
name: 'CLOUDSCALE_API_TIMEOUT',
value: params.api_timeout,
},
],
}
else
c
Expand Down
8 changes: 8 additions & 0 deletions docs/modules/ROOT/pages/references/parameters.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ defaults:: `[]`
Additional arguments to provide to the cloudscale CCM.
The contents of this parameter are appended to the upstream manifest verbatim.

== `api_timeout`

[horizontal]
type:: string
default:: https://github.com/cloudscale-ch/cloudscale-cloud-controller-manager/blob/74832bae401dc0fc79dcfba923ae154eac684779/pkg/cloudscale_ccm/cloud.go#L28

cloudscale.ch API timeout to be used by the CCM driver.

== `api_token`

[horizontal]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ spec:
secretKeyRef:
key: access-token
name: cloudscale
- name: CLOUDSCALE_API_TIMEOUT
value: 60
image: quay.io/cloudscalech/cloudscale-cloud-controller-manager:1.2.0
imagePullPolicy: IfNotPresent
name: cloudscale-cloud-controller-manager
Expand Down
3 changes: 3 additions & 0 deletions tests/openshift4.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
parameters:
facts:
distribution: openshift4

cloudscale_cloud_controller_manager:
api_timeout: 60