Skip to content

Commit 5094136

Browse files
committed
openstack-cinder: Add --http-endpoint option to controller container
We had configured the proxy sidecar container for the driver in the controller Deployment, but the upstream it was pointing to did not exist. Fix this by setting the --http-endpoint option. Per the upstream docs [1]: --http-endpoint <HTTP server> This argument is optional. The TCP network address where the HTTP server for providing metrics for diagnostics, will listen (example: `:8080`). The default is empty string, which means the server is disabled. There's a bit of cleanup needed here to avoid hardcoding something which is generated (via a loop-variable) elsewhere, but we'll do that separately. [1] https://github.com/kubernetes/cloud-provider-openstack/blob/release-1.32/docs/cinder-csi-plugin/using-cinder-csi-plugin.md#command-line-arguments Signed-off-by: Stephen Finucane <[email protected]>
1 parent 582e1dc commit 5094136

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

assets/overlays/openstack-cinder/generated/hypershift/controller.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ spec:
9191
- --provide-controller-service=true
9292
- --provide-node-service=false
9393
- --endpoint=$(CSI_ENDPOINT)
94+
- --http-endpoint=localhost:8202
9495
- --cloud-config=$(CLOUD_CONFIG)
9596
- --cluster=${CLUSTER_ID}
9697
- --with-topology=$(ENABLE_TOPOLOGY)

assets/overlays/openstack-cinder/generated/standalone/controller.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ spec:
6161
- --provide-controller-service=true
6262
- --provide-node-service=false
6363
- --endpoint=$(CSI_ENDPOINT)
64+
- --http-endpoint=localhost:8202
6465
- --cloud-config=$(CLOUD_CONFIG)
6566
- --cluster=${CLUSTER_ID}
6667
- --with-topology=$(ENABLE_TOPOLOGY)

assets/overlays/openstack-cinder/patches/controller_add_driver.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ spec:
3838
- "--provide-controller-service=true"
3939
- "--provide-node-service=false"
4040
- "--endpoint=$(CSI_ENDPOINT)"
41+
# this is the generated value of the LOCAL_METRICS_PORT variable
42+
# we hardcode it because we don't currently support substitution
43+
- "--http-endpoint=localhost:8202"
4144
- "--cloud-config=$(CLOUD_CONFIG)"
4245
- "--cluster=${CLUSTER_ID}"
4346
- "--with-topology=$(ENABLE_TOPOLOGY)"

0 commit comments

Comments
 (0)