Allow unset value for upstream default, improve docs, include unit in name, allow numbers

Author: bastjan

class/defaults.yml

@@ -13,5 +13,5 @@ parameters:
 
     args: []
 
-    api_timeout: '20'
+    api_timeout_seconds: null
     api_token: ?{vaultkv:${cluster:tenant}/${cluster:name}/cloudscale/token}

component/main.jsonnet

@@ -36,12 +36,13 @@ local patchDaemonset(obj) =
                     '%(registry)s/%(repository)s:%(tag)s' %
                     params.images.cloudscale_cloud_controller_manager,
                   command+: params.args,
-                  env+: [
-                    {
-                      name: 'CLOUDSCALE_API_TIMEOUT',
-                      value: params.api_timeout,
-                    },
-                  ],
+                  env+:
+                    if params.api_timeout_seconds != null then [
+                      {
+                        name: 'CLOUDSCALE_API_TIMEOUT',
+                        value: std.toString(params.api_timeout_seconds),
+                      },
+                    ] else [],
                 }
               else
                 c

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

@@ -43,13 +43,17 @@ defaults:: `[]`
 Additional arguments to provide to the cloudscale CCM.
 The contents of this parameter are appended to the upstream manifest verbatim.
 
-== `api_timeout`
+== `api_timeout_seconds`
 
 [horizontal]
-type:: string
-default:: https://github.com/cloudscale-ch/cloudscale-cloud-controller-manager/blob/74832bae401dc0fc79dcfba923ae154eac684779/pkg/cloudscale_ccm/cloud.go#L28
+type:: number
+default:: `null`
+
+The API timeout to be used by the CCM driver when communicating with the cloudscale.ch API.
+Unit is seconds.
+If not set the CCM driver will use its upstream default.
 
-cloudscale.ch API timeout to be used by the CCM driver.
+The current upstream timeout default is 20 seconds (https://github.com/cloudscale-ch/cloudscale-cloud-controller-manager/blob/74832bae401dc0fc79dcfba923ae154eac684779/pkg/cloudscale_ccm/cloud.go#L28[upstream code]).
 
 == `api_token`
 

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

@@ -28,8 +28,6 @@ spec:
                 secretKeyRef:
                   key: access-token
                   name: cloudscale
-            - name: CLOUDSCALE_API_TIMEOUT
-              value: '20'
           image: quay.io/cloudscalech/cloudscale-cloud-controller-manager:1.2.0
           imagePullPolicy: IfNotPresent
           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

@@ -29,7 +29,7 @@ spec:
                   key: access-token
                   name: cloudscale
             - name: CLOUDSCALE_API_TIMEOUT
-              value: '20'
+              value: '50'
           image: quay.io/cloudscalech/cloudscale-cloud-controller-manager:1.2.0
           imagePullPolicy: IfNotPresent
           name: cloudscale-cloud-controller-manager

tests/openshift4.yml

@@ -1,3 +1,6 @@
 parameters:
   facts:
     distribution: openshift4
+
+  cloudscale_cloud_controller_manager:
+    api_timeout_seconds: 50