Skip to content

OCPBUGS-54975: Fix Cinder, Manila driver metrics #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 21, 2025
Merged

OCPBUGS-54975: Fix Cinder, Manila driver metrics #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5094136
openstack-cinder: Add --http-endpoint option to controller container
stephenfin Apr 14, 2025
521e741
openstack-manila: Stop exposing driver metrics
stephenfin Apr 15, 2025
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
1 change: 1 addition & 0 deletions assets/overlays/openstack-cinder/generated/hypershift/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ spec:
- --provide-controller-service=true
- --provide-node-service=false
- --endpoint=$(CSI_ENDPOINT)
- --http-endpoint=localhost:8202
- --cloud-config=$(CLOUD_CONFIG)
- --cluster=${CLUSTER_ID}
- --with-topology=$(ENABLE_TOPOLOGY)
Expand Down
1 change: 1 addition & 0 deletions assets/overlays/openstack-cinder/generated/standalone/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ spec:
- --provide-controller-service=true
- --provide-node-service=false
- --endpoint=$(CSI_ENDPOINT)
- --http-endpoint=localhost:8202
- --cloud-config=$(CLOUD_CONFIG)
- --cluster=${CLUSTER_ID}
- --with-topology=$(ENABLE_TOPOLOGY)
Expand Down
3 changes: 3 additions & 0 deletions assets/overlays/openstack-cinder/patches/controller_add_driver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ spec:
- "--provide-controller-service=true"
- "--provide-node-service=false"
- "--endpoint=$(CSI_ENDPOINT)"
# this is the generated value of the LOCAL_METRICS_PORT variable
# we hardcode it because we don't currently support substitution
- "--http-endpoint=localhost:8202"
- "--cloud-config=$(CLOUD_CONFIG)"
- "--cluster=${CLUSTER_ID}"
- "--with-topology=$(ENABLE_TOPOLOGY)"
Expand Down
24 changes: 0 additions & 24 deletions assets/overlays/openstack-manila/generated/hypershift/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#
# Loaded from base/controller.yaml
# Applied strategic merge patch overlays/openstack-manila/patches/controller_add_driver.yaml
# Applied strategic merge patch common/sidecars/controller_driver_kube_rbac_proxy.yaml
# provisioner.yaml: Loaded from common/sidecars/provisioner.yaml
# provisioner.yaml: Added arguments [--timeout=120s --feature-gates=Topology=true]
# provisioner.yaml: Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch
Expand Down Expand Up @@ -156,29 +155,6 @@ spec:
volumeMounts:
- mountPath: /plugin
name: socket-dir
- args:
- --secure-listen-address=0.0.0.0:9202
- --upstream=http://127.0.0.1:8202/
- --tls-cert-file=/etc/tls/private/tls.crt
- --tls-private-key-file=/etc/tls/private/tls.key
- --tls-cipher-suites=${TLS_CIPHER_SUITES}
- --tls-min-version=${TLS_MIN_VERSION}
- --logtostderr=true
image: ${KUBE_RBAC_PROXY_IMAGE}
imagePullPolicy: IfNotPresent
name: kube-rbac-proxy-8202
ports:
- containerPort: 9202
name: driver-m
protocol: TCP
resources:
requests:
cpu: 10m
memory: 20Mi
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- mountPath: /etc/tls/private
name: metrics-serving-cert
- args:
- --csi-address=/var/lib/csi/sockets/pluginproxy/csi.sock
- --http-endpoint=localhost:8203
Expand Down
5 changes: 0 additions & 5 deletions assets/overlays/openstack-manila/generated/hypershift/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# Applied strategic merge patch common/metrics/service_add_port.yaml
# Applied strategic merge patch common/metrics/service_add_port.yaml
# Applied strategic merge patch common/metrics/service_add_port.yaml
# Applied strategic merge patch common/metrics/service_add_port.yaml
# Applied strategic merge patch overlays/openstack-manila/patches/modify_service_selector.yaml
#
#
Expand Down Expand Up @@ -32,10 +31,6 @@ spec:
port: 9205
protocol: TCP
targetPort: snapshotter-m
- name: driver-m
port: 9202
protocol: TCP
targetPort: driver-m
selector:
app: openstack-manila-csi
component: controllerplugin
Expand Down
24 changes: 0 additions & 24 deletions assets/overlays/openstack-manila/generated/standalone/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#
# Loaded from base/controller.yaml
# Applied strategic merge patch overlays/openstack-manila/patches/controller_add_driver.yaml
# Applied strategic merge patch common/sidecars/controller_driver_kube_rbac_proxy.yaml
# provisioner.yaml: Loaded from common/sidecars/provisioner.yaml
# provisioner.yaml: Added arguments [--timeout=120s --feature-gates=Topology=true]
# Applied strategic merge patch provisioner.yaml
Expand Down Expand Up @@ -126,29 +125,6 @@ spec:
volumeMounts:
- mountPath: /plugin
name: socket-dir
- args:
- --secure-listen-address=0.0.0.0:9202
- --upstream=http://127.0.0.1:8202/
- --tls-cert-file=/etc/tls/private/tls.crt
- --tls-private-key-file=/etc/tls/private/tls.key
- --tls-cipher-suites=${TLS_CIPHER_SUITES}
- --tls-min-version=${TLS_MIN_VERSION}
- --logtostderr=true
image: ${KUBE_RBAC_PROXY_IMAGE}
imagePullPolicy: IfNotPresent
name: kube-rbac-proxy-8202
ports:
- containerPort: 9202
name: driver-m
protocol: TCP
resources:
requests:
cpu: 10m
memory: 20Mi
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- mountPath: /etc/tls/private
name: metrics-serving-cert
- args:
- --csi-address=/var/lib/csi/sockets/pluginproxy/csi.sock
- --http-endpoint=localhost:8203
Expand Down
5 changes: 0 additions & 5 deletions assets/overlays/openstack-manila/generated/standalone/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# Applied strategic merge patch common/metrics/service_add_port.yaml
# Applied strategic merge patch common/metrics/service_add_port.yaml
# Applied strategic merge patch common/metrics/service_add_port.yaml
# Applied strategic merge patch common/metrics/service_add_port.yaml
# Applied strategic merge patch overlays/openstack-manila/patches/modify_service_selector.yaml
#
#
Expand Down Expand Up @@ -32,10 +31,6 @@ spec:
port: 9205
protocol: TCP
targetPort: snapshotter-m
- name: driver-m
port: 9202
protocol: TCP
targetPort: driver-m
selector:
app: openstack-manila-csi
component: controllerplugin
Expand Down
9 changes: 0 additions & 9 deletions assets/overlays/openstack-manila/generated/standalone/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# Applied JSON patch common/metrics/service_monitor_add_port.yaml.patch
# Applied JSON patch common/metrics/service_monitor_add_port.yaml.patch
# Applied JSON patch common/metrics/service_monitor_add_port.yaml.patch
# Applied JSON patch common/metrics/service_monitor_add_port.yaml.patch
#
#

Expand Down Expand Up @@ -39,14 +38,6 @@ spec:
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: manila-csi-driver-controller-metrics.${NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: driver-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: manila-csi-driver-controller-metrics.${NAMESPACE}.svc
jobLabel: component
selector:
matchLabels:
Expand Down
4 changes: 2 additions & 2 deletions assets/overlays/openstack-manila/patches/controller_add_driver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ spec:
image: ${DRIVER_IMAGE}
imagePullPolicy: IfNotPresent
args:
- "--provide-controller-service=true"
- "--provide-node-service=false"
- --provide-controller-service=true
- --provide-node-service=false
- --v=${LOG_LEVEL}
- --cluster-id=${CLUSTER_ID}
- --nodeid=$(NODE_ID)
Expand Down
9 changes: 1 addition & 8 deletions pkg/driver/openstack-manila/openstack_manila.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,7 @@ func GetOpenStackManilaGeneratorConfig() *generator.CSIDriverGeneratorConfig {
ControllerConfig: &generator.ControlPlaneConfig{
DeploymentTemplateAssetName: "overlays/openstack-manila/patches/controller_add_driver.yaml",
LivenessProbePort: 10306,
MetricsPorts: []generator.MetricsPort{
{
LocalPort: commongenerator.OpenStackManilaLoopbackMetricsPortStart,
InjectKubeRBACProxy: true,
ExposedPort: commongenerator.OpenStackManilaExposedMetricsPortStart,
Name: "driver-m",
},
},
// TODO(stephenfin): Expose metrics port once the driver supports it
SidecarLocalMetricsPortStart: commongenerator.OpenStackManilaLoopbackMetricsPortStart + 1,
SidecarExposedMetricsPortStart: commongenerator.OpenStackManilaExposedMetricsPortStart + 1,
Sidecars: []generator.SidecarConfig{
Expand Down