Skip to content

Commit b9d4c47

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #379 from shiftstack/fix-openstack-driver-metrics
OCPBUGS-54975: Fix Cinder, Manila driver metrics
2 parents d096201 + 521e741 commit b9d4c47

File tree

10 files changed

+8
-77
lines changed

10 files changed

+8
-77
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)"

‎assets/overlays/openstack-manila/generated/hypershift/controller.yaml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#
33
# Loaded from base/controller.yaml
44
# Applied strategic merge patch overlays/openstack-manila/patches/controller_add_driver.yaml
5-
# Applied strategic merge patch common/sidecars/controller_driver_kube_rbac_proxy.yaml
65
# provisioner.yaml: Loaded from common/sidecars/provisioner.yaml
76
# provisioner.yaml: Added arguments [--timeout=120s --feature-gates=Topology=true]
87
# provisioner.yaml: Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch
@@ -156,29 +155,6 @@ spec:
156155
volumeMounts:
157156
- mountPath: /plugin
158157
name: socket-dir
159-
- args:
160-
- --secure-listen-address=0.0.0.0:9202
161-
- --upstream=http://127.0.0.1:8202/
162-
- --tls-cert-file=/etc/tls/private/tls.crt
163-
- --tls-private-key-file=/etc/tls/private/tls.key
164-
- --tls-cipher-suites=${TLS_CIPHER_SUITES}
165-
- --tls-min-version=${TLS_MIN_VERSION}
166-
- --logtostderr=true
167-
image: ${KUBE_RBAC_PROXY_IMAGE}
168-
imagePullPolicy: IfNotPresent
169-
name: kube-rbac-proxy-8202
170-
ports:
171-
- containerPort: 9202
172-
name: driver-m
173-
protocol: TCP
174-
resources:
175-
requests:
176-
cpu: 10m
177-
memory: 20Mi
178-
terminationMessagePolicy: FallbackToLogsOnError
179-
volumeMounts:
180-
- mountPath: /etc/tls/private
181-
name: metrics-serving-cert
182158
- args:
183159
- --csi-address=/var/lib/csi/sockets/pluginproxy/csi.sock
184160
- --http-endpoint=localhost:8203

‎assets/overlays/openstack-manila/generated/hypershift/service.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# Applied strategic merge patch common/metrics/service_add_port.yaml
55
# Applied strategic merge patch common/metrics/service_add_port.yaml
66
# Applied strategic merge patch common/metrics/service_add_port.yaml
7-
# Applied strategic merge patch common/metrics/service_add_port.yaml
87
# Applied strategic merge patch overlays/openstack-manila/patches/modify_service_selector.yaml
98
#
109
#
@@ -32,10 +31,6 @@ spec:
3231
port: 9205
3332
protocol: TCP
3433
targetPort: snapshotter-m
35-
- name: driver-m
36-
port: 9202
37-
protocol: TCP
38-
targetPort: driver-m
3934
selector:
4035
app: openstack-manila-csi
4136
component: controllerplugin

‎assets/overlays/openstack-manila/generated/standalone/controller.yaml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#
33
# Loaded from base/controller.yaml
44
# Applied strategic merge patch overlays/openstack-manila/patches/controller_add_driver.yaml
5-
# Applied strategic merge patch common/sidecars/controller_driver_kube_rbac_proxy.yaml
65
# provisioner.yaml: Loaded from common/sidecars/provisioner.yaml
76
# provisioner.yaml: Added arguments [--timeout=120s --feature-gates=Topology=true]
87
# Applied strategic merge patch provisioner.yaml
@@ -126,29 +125,6 @@ spec:
126125
volumeMounts:
127126
- mountPath: /plugin
128127
name: socket-dir
129-
- args:
130-
- --secure-listen-address=0.0.0.0:9202
131-
- --upstream=http://127.0.0.1:8202/
132-
- --tls-cert-file=/etc/tls/private/tls.crt
133-
- --tls-private-key-file=/etc/tls/private/tls.key
134-
- --tls-cipher-suites=${TLS_CIPHER_SUITES}
135-
- --tls-min-version=${TLS_MIN_VERSION}
136-
- --logtostderr=true
137-
image: ${KUBE_RBAC_PROXY_IMAGE}
138-
imagePullPolicy: IfNotPresent
139-
name: kube-rbac-proxy-8202
140-
ports:
141-
- containerPort: 9202
142-
name: driver-m
143-
protocol: TCP
144-
resources:
145-
requests:
146-
cpu: 10m
147-
memory: 20Mi
148-
terminationMessagePolicy: FallbackToLogsOnError
149-
volumeMounts:
150-
- mountPath: /etc/tls/private
151-
name: metrics-serving-cert
152128
- args:
153129
- --csi-address=/var/lib/csi/sockets/pluginproxy/csi.sock
154130
- --http-endpoint=localhost:8203

‎assets/overlays/openstack-manila/generated/standalone/service.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# Applied strategic merge patch common/metrics/service_add_port.yaml
55
# Applied strategic merge patch common/metrics/service_add_port.yaml
66
# Applied strategic merge patch common/metrics/service_add_port.yaml
7-
# Applied strategic merge patch common/metrics/service_add_port.yaml
87
# Applied strategic merge patch overlays/openstack-manila/patches/modify_service_selector.yaml
98
#
109
#
@@ -32,10 +31,6 @@ spec:
3231
port: 9205
3332
protocol: TCP
3433
targetPort: snapshotter-m
35-
- name: driver-m
36-
port: 9202
37-
protocol: TCP
38-
targetPort: driver-m
3934
selector:
4035
app: openstack-manila-csi
4136
component: controllerplugin

‎assets/overlays/openstack-manila/generated/standalone/servicemonitor.yaml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# Applied JSON patch common/metrics/service_monitor_add_port.yaml.patch
55
# Applied JSON patch common/metrics/service_monitor_add_port.yaml.patch
66
# Applied JSON patch common/metrics/service_monitor_add_port.yaml.patch
7-
# Applied JSON patch common/metrics/service_monitor_add_port.yaml.patch
87
#
98
#
109

@@ -39,14 +38,6 @@ spec:
3938
tlsConfig:
4039
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
4140
serverName: manila-csi-driver-controller-metrics.${NAMESPACE}.svc
42-
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
43-
interval: 30s
44-
path: /metrics
45-
port: driver-m
46-
scheme: https
47-
tlsConfig:
48-
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
49-
serverName: manila-csi-driver-controller-metrics.${NAMESPACE}.svc
5041
jobLabel: component
5142
selector:
5243
matchLabels:

‎assets/overlays/openstack-manila/patches/controller_add_driver.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ spec:
3838
image: ${DRIVER_IMAGE}
3939
imagePullPolicy: IfNotPresent
4040
args:
41-
- "--provide-controller-service=true"
42-
- "--provide-node-service=false"
41+
- --provide-controller-service=true
42+
- --provide-node-service=false
4343
- --v=${LOG_LEVEL}
4444
- --cluster-id=${CLUSTER_ID}
4545
- --nodeid=$(NODE_ID)

‎pkg/driver/openstack-manila/openstack_manila.go‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,7 @@ func GetOpenStackManilaGeneratorConfig() *generator.CSIDriverGeneratorConfig {
5656
ControllerConfig: &generator.ControlPlaneConfig{
5757
DeploymentTemplateAssetName: "overlays/openstack-manila/patches/controller_add_driver.yaml",
5858
LivenessProbePort: 10306,
59-
MetricsPorts: []generator.MetricsPort{
60-
{
61-
LocalPort: commongenerator.OpenStackManilaLoopbackMetricsPortStart,
62-
InjectKubeRBACProxy: true,
63-
ExposedPort: commongenerator.OpenStackManilaExposedMetricsPortStart,
64-
Name: "driver-m",
65-
},
66-
},
59+
// TODO(stephenfin): Expose metrics port once the driver supports it
6760
SidecarLocalMetricsPortStart: commongenerator.OpenStackManilaLoopbackMetricsPortStart + 1,
6861
SidecarExposedMetricsPortStart: commongenerator.OpenStackManilaExposedMetricsPortStart + 1,
6962
Sidecars: []generator.SidecarConfig{

0 commit comments

Comments
 (0)