Skip to content
Draft
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: 1 addition & 1 deletion assets/common/metrics/service_monitor_add_port.yaml.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: ${ASSET_PREFIX}-${SERVICE_PREFIX}-metrics.${NAMESPACE}.svc
serverName: ${ASSET_PREFIX}-${SERVICE_PREFIX}-metrics.${NODE_NAMESPACE}.svc
10 changes: 5 additions & 5 deletions assets/overlays/aws-ebs/generated/standalone/servicemonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,39 +23,39 @@ spec:
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: aws-ebs-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: aws-ebs-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: attacher-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: aws-ebs-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: aws-ebs-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: resizer-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: aws-ebs-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: aws-ebs-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: snapshotter-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: aws-ebs-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: aws-ebs-csi-driver-controller-metrics.${NODE_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: aws-ebs-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: aws-ebs-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
jobLabel: component
selector:
matchLabels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: aws-efs-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: aws-efs-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
jobLabel: component
selector:
matchLabels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: azure-disk-csi-driver-node-metrics.${NAMESPACE}.svc
serverName: azure-disk-csi-driver-node-metrics.${NODE_NAMESPACE}.svc
jobLabel: component
selector:
matchLabels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: azure-disk-csi-driver-node-metrics.${NAMESPACE}.svc
serverName: azure-disk-csi-driver-node-metrics.${NODE_NAMESPACE}.svc
jobLabel: component
selector:
matchLabels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,39 +23,39 @@ spec:
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: azure-disk-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: azure-disk-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: attacher-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: azure-disk-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: azure-disk-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: resizer-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: azure-disk-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: azure-disk-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: snapshotter-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: azure-disk-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: azure-disk-csi-driver-controller-metrics.${NODE_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: azure-disk-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: azure-disk-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
jobLabel: component
selector:
matchLabels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,39 +23,39 @@ spec:
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: azure-file-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: azure-file-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: attacher-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: azure-file-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: azure-file-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: resizer-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: azure-file-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: azure-file-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: snapshotter-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: azure-file-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: azure-file-csi-driver-controller-metrics.${NODE_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: azure-file-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: azure-file-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
jobLabel: component
selector:
matchLabels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,31 @@ spec:
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: gcp-pd-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: gcp-pd-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: attacher-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: gcp-pd-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: gcp-pd-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: resizer-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: gcp-pd-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: gcp-pd-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: snapshotter-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: gcp-pd-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: gcp-pd-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
jobLabel: component
selector:
matchLabels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,39 +23,39 @@ spec:
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: openstack-cinder-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: openstack-cinder-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: attacher-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: openstack-cinder-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: openstack-cinder-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: resizer-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: openstack-cinder-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: openstack-cinder-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: snapshotter-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: openstack-cinder-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: openstack-cinder-csi-driver-controller-metrics.${NODE_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: openstack-cinder-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: openstack-cinder-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
jobLabel: component
selector:
matchLabels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,23 @@ spec:
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: manila-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: manila-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: resizer-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: manila-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: manila-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: snapshotter-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: manila-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: manila-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
jobLabel: component
selector:
matchLabels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,23 @@ spec:
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: smb-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: smb-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
path: /metrics
port: resizer-m
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: smb-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: smb-csi-driver-controller-metrics.${NODE_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: smb-csi-driver-controller-metrics.${NAMESPACE}.svc
serverName: smb-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
jobLabel: component
selector:
matchLabels:
Expand Down
1 change: 1 addition & 0 deletions test/e2e/aws-ebs/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ DriverInfo:
multipods: true
multiplePVsSameID: true
readWriteOncePod: true
seLinuxMount: true
1 change: 1 addition & 0 deletions test/e2e/azure-disk/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ DriverInfo:
multipods: true
multiplePVsSameID: true
readWriteOncePod: true
seLinuxMount: true
Timeouts:
PodStart: 15m
PodDelete: 15m
Expand Down
1 change: 1 addition & 0 deletions test/e2e/gcp-pd/hyperdisk-manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ DriverInfo:
topology: true
multipods: true
multiplePVsSameID: true
seLinuxMount: true
Timeouts:
DataSourceProvision: 10m
1 change: 1 addition & 0 deletions test/e2e/gcp-pd/image-snapshot-manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ DriverInfo:
topology: true
multipods: true
multiplePVsSameID: true
seLinuxMount: true
VolumeSnapshotStressTestOptions:
NumPods: 2
NumSnapshots: 5
Expand Down
1 change: 1 addition & 0 deletions test/e2e/gcp-pd/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ DriverInfo:
topology: true
multipods: true
multiplePVsSameID: true
seLinuxMount: true
VolumeSnapshotStressTestOptions:
NumPods: 5
NumSnapshots: 2
Expand Down
1 change: 1 addition & 0 deletions test/e2e/openstack-cinder/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ DriverInfo:
topology: true
multipods: true
multiplePVsSameID: true
seLinuxMount: true