diff --git a/assets/common/metrics/service_monitor_add_port.yaml.patch b/assets/common/metrics/service_monitor_add_port.yaml.patch index f2a3cd33a..a74648381 100644 --- a/assets/common/metrics/service_monitor_add_port.yaml.patch +++ b/assets/common/metrics/service_monitor_add_port.yaml.patch @@ -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 diff --git a/assets/overlays/aws-ebs/generated/standalone/servicemonitor.yaml b/assets/overlays/aws-ebs/generated/standalone/servicemonitor.yaml index 263059b6c..a4626640a 100644 --- a/assets/overlays/aws-ebs/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/aws-ebs/generated/standalone/servicemonitor.yaml @@ -23,7 +23,7 @@ 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 @@ -31,7 +31,7 @@ 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 @@ -39,7 +39,7 @@ 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 @@ -47,7 +47,7 @@ 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 @@ -55,7 +55,7 @@ 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 jobLabel: component selector: matchLabels: diff --git a/assets/overlays/aws-efs/generated/standalone/servicemonitor.yaml b/assets/overlays/aws-efs/generated/standalone/servicemonitor.yaml index e0bc1cbe0..77f85c3c9 100644 --- a/assets/overlays/aws-efs/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/aws-efs/generated/standalone/servicemonitor.yaml @@ -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: diff --git a/assets/overlays/azure-disk/generated/hypershift/node_servicemonitor.yaml b/assets/overlays/azure-disk/generated/hypershift/node_servicemonitor.yaml index 1268095b8..eed68aa62 100644 --- a/assets/overlays/azure-disk/generated/hypershift/node_servicemonitor.yaml +++ b/assets/overlays/azure-disk/generated/hypershift/node_servicemonitor.yaml @@ -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: diff --git a/assets/overlays/azure-disk/generated/standalone/node_servicemonitor.yaml b/assets/overlays/azure-disk/generated/standalone/node_servicemonitor.yaml index 1268095b8..eed68aa62 100644 --- a/assets/overlays/azure-disk/generated/standalone/node_servicemonitor.yaml +++ b/assets/overlays/azure-disk/generated/standalone/node_servicemonitor.yaml @@ -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: diff --git a/assets/overlays/azure-disk/generated/standalone/servicemonitor.yaml b/assets/overlays/azure-disk/generated/standalone/servicemonitor.yaml index ce15fecbb..e660e736f 100644 --- a/assets/overlays/azure-disk/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/azure-disk/generated/standalone/servicemonitor.yaml @@ -23,7 +23,7 @@ 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 @@ -31,7 +31,7 @@ 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 @@ -39,7 +39,7 @@ 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 @@ -47,7 +47,7 @@ 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 @@ -55,7 +55,7 @@ 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 jobLabel: component selector: matchLabels: diff --git a/assets/overlays/azure-file/generated/standalone/servicemonitor.yaml b/assets/overlays/azure-file/generated/standalone/servicemonitor.yaml index d8aefc9c0..6c4d2d4fb 100644 --- a/assets/overlays/azure-file/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/azure-file/generated/standalone/servicemonitor.yaml @@ -23,7 +23,7 @@ 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 @@ -31,7 +31,7 @@ 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 @@ -39,7 +39,7 @@ 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 @@ -47,7 +47,7 @@ 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 @@ -55,7 +55,7 @@ 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 jobLabel: component selector: matchLabels: diff --git a/assets/overlays/gcp-pd/generated/standalone/servicemonitor.yaml b/assets/overlays/gcp-pd/generated/standalone/servicemonitor.yaml index 0ffa7f1a5..f8679f699 100644 --- a/assets/overlays/gcp-pd/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/gcp-pd/generated/standalone/servicemonitor.yaml @@ -22,7 +22,7 @@ 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 @@ -30,7 +30,7 @@ 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 @@ -38,7 +38,7 @@ 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 @@ -46,7 +46,7 @@ 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 jobLabel: component selector: matchLabels: diff --git a/assets/overlays/openstack-cinder/generated/standalone/servicemonitor.yaml b/assets/overlays/openstack-cinder/generated/standalone/servicemonitor.yaml index 2c35f3ede..8e8b8680a 100644 --- a/assets/overlays/openstack-cinder/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/openstack-cinder/generated/standalone/servicemonitor.yaml @@ -23,7 +23,7 @@ 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 @@ -31,7 +31,7 @@ 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 @@ -39,7 +39,7 @@ 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 @@ -47,7 +47,7 @@ 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 @@ -55,7 +55,7 @@ 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 jobLabel: component selector: matchLabels: diff --git a/assets/overlays/openstack-manila/generated/standalone/servicemonitor.yaml b/assets/overlays/openstack-manila/generated/standalone/servicemonitor.yaml index badb73623..8a57d14bf 100644 --- a/assets/overlays/openstack-manila/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/openstack-manila/generated/standalone/servicemonitor.yaml @@ -21,7 +21,7 @@ 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 @@ -29,7 +29,7 @@ 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 @@ -37,7 +37,7 @@ 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 jobLabel: component selector: matchLabels: diff --git a/assets/overlays/samba/generated/standalone/servicemonitor.yaml b/assets/overlays/samba/generated/standalone/servicemonitor.yaml index 6204b77a9..0593abd7e 100644 --- a/assets/overlays/samba/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/samba/generated/standalone/servicemonitor.yaml @@ -21,7 +21,7 @@ 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 @@ -29,7 +29,7 @@ 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 @@ -37,7 +37,7 @@ 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 jobLabel: component selector: matchLabels: diff --git a/test/e2e/aws-ebs/manifest.yaml b/test/e2e/aws-ebs/manifest.yaml index b6b954ebc..96d603fcc 100644 --- a/test/e2e/aws-ebs/manifest.yaml +++ b/test/e2e/aws-ebs/manifest.yaml @@ -30,3 +30,4 @@ DriverInfo: multipods: true multiplePVsSameID: true readWriteOncePod: true + seLinuxMount: true diff --git a/test/e2e/azure-disk/manifest.yaml b/test/e2e/azure-disk/manifest.yaml index 8f6f40b4d..3ab50655d 100644 --- a/test/e2e/azure-disk/manifest.yaml +++ b/test/e2e/azure-disk/manifest.yaml @@ -30,6 +30,7 @@ DriverInfo: multipods: true multiplePVsSameID: true readWriteOncePod: true + seLinuxMount: true Timeouts: PodStart: 15m PodDelete: 15m diff --git a/test/e2e/gcp-pd/hyperdisk-manifest.yaml b/test/e2e/gcp-pd/hyperdisk-manifest.yaml index 9abd5fcd8..e774c7749 100644 --- a/test/e2e/gcp-pd/hyperdisk-manifest.yaml +++ b/test/e2e/gcp-pd/hyperdisk-manifest.yaml @@ -35,5 +35,6 @@ DriverInfo: topology: true multipods: true multiplePVsSameID: true + seLinuxMount: true Timeouts: DataSourceProvision: 10m diff --git a/test/e2e/gcp-pd/image-snapshot-manifest.yaml b/test/e2e/gcp-pd/image-snapshot-manifest.yaml index 0b3e35be2..00885e67f 100644 --- a/test/e2e/gcp-pd/image-snapshot-manifest.yaml +++ b/test/e2e/gcp-pd/image-snapshot-manifest.yaml @@ -30,6 +30,7 @@ DriverInfo: topology: true multipods: true multiplePVsSameID: true + seLinuxMount: true VolumeSnapshotStressTestOptions: NumPods: 2 NumSnapshots: 5 diff --git a/test/e2e/gcp-pd/manifest.yaml b/test/e2e/gcp-pd/manifest.yaml index 29b04e666..6e7aa7812 100644 --- a/test/e2e/gcp-pd/manifest.yaml +++ b/test/e2e/gcp-pd/manifest.yaml @@ -30,6 +30,7 @@ DriverInfo: topology: true multipods: true multiplePVsSameID: true + seLinuxMount: true VolumeSnapshotStressTestOptions: NumPods: 5 NumSnapshots: 2 diff --git a/test/e2e/openstack-cinder/manifest.yaml b/test/e2e/openstack-cinder/manifest.yaml index 436514175..d2ef971e3 100644 --- a/test/e2e/openstack-cinder/manifest.yaml +++ b/test/e2e/openstack-cinder/manifest.yaml @@ -27,3 +27,4 @@ DriverInfo: topology: true multipods: true multiplePVsSameID: true + seLinuxMount: true