Skip to content

Commit 14497a5

Browse files
jsafranejsafrane
committed
Enable SELinuxMount tests
1 parent 9ce1841 commit 14497a5

17 files changed

Lines changed: 40 additions & 34 deletions

File tree

‎assets/common/metrics/service_monitor_add_port.yaml.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
scheme: https
1111
tlsConfig:
1212
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
13-
serverName: ${ASSET_PREFIX}-${SERVICE_PREFIX}-metrics.${NAMESPACE}.svc
13+
serverName: ${ASSET_PREFIX}-${SERVICE_PREFIX}-metrics.${NODE_NAMESPACE}.svc

‎assets/overlays/aws-ebs/generated/standalone/servicemonitor.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,39 @@ spec:
2323
scheme: https
2424
tlsConfig:
2525
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
26-
serverName: aws-ebs-csi-driver-controller-metrics.${NAMESPACE}.svc
26+
serverName: aws-ebs-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
2727
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
2828
interval: 30s
2929
path: /metrics
3030
port: attacher-m
3131
scheme: https
3232
tlsConfig:
3333
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
34-
serverName: aws-ebs-csi-driver-controller-metrics.${NAMESPACE}.svc
34+
serverName: aws-ebs-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
3535
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
3636
interval: 30s
3737
path: /metrics
3838
port: resizer-m
3939
scheme: https
4040
tlsConfig:
4141
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
42-
serverName: aws-ebs-csi-driver-controller-metrics.${NAMESPACE}.svc
42+
serverName: aws-ebs-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
4343
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
4444
interval: 30s
4545
path: /metrics
4646
port: snapshotter-m
4747
scheme: https
4848
tlsConfig:
4949
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
50-
serverName: aws-ebs-csi-driver-controller-metrics.${NAMESPACE}.svc
50+
serverName: aws-ebs-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
5151
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
5252
interval: 30s
5353
path: /metrics
5454
port: driver-m
5555
scheme: https
5656
tlsConfig:
5757
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
58-
serverName: aws-ebs-csi-driver-controller-metrics.${NAMESPACE}.svc
58+
serverName: aws-ebs-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
5959
jobLabel: component
6060
selector:
6161
matchLabels:

‎assets/overlays/aws-efs/generated/standalone/servicemonitor.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
scheme: https
2020
tlsConfig:
2121
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
22-
serverName: aws-efs-csi-driver-controller-metrics.${NAMESPACE}.svc
22+
serverName: aws-efs-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
2323
jobLabel: component
2424
selector:
2525
matchLabels:

‎assets/overlays/azure-disk/generated/hypershift/node_servicemonitor.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
scheme: https
2020
tlsConfig:
2121
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
22-
serverName: azure-disk-csi-driver-node-metrics.${NAMESPACE}.svc
22+
serverName: azure-disk-csi-driver-node-metrics.${NODE_NAMESPACE}.svc
2323
jobLabel: component
2424
selector:
2525
matchLabels:

‎assets/overlays/azure-disk/generated/standalone/node_servicemonitor.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
scheme: https
2020
tlsConfig:
2121
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
22-
serverName: azure-disk-csi-driver-node-metrics.${NAMESPACE}.svc
22+
serverName: azure-disk-csi-driver-node-metrics.${NODE_NAMESPACE}.svc
2323
jobLabel: component
2424
selector:
2525
matchLabels:

‎assets/overlays/azure-disk/generated/standalone/servicemonitor.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,39 @@ spec:
2323
scheme: https
2424
tlsConfig:
2525
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
26-
serverName: azure-disk-csi-driver-controller-metrics.${NAMESPACE}.svc
26+
serverName: azure-disk-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
2727
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
2828
interval: 30s
2929
path: /metrics
3030
port: attacher-m
3131
scheme: https
3232
tlsConfig:
3333
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
34-
serverName: azure-disk-csi-driver-controller-metrics.${NAMESPACE}.svc
34+
serverName: azure-disk-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
3535
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
3636
interval: 30s
3737
path: /metrics
3838
port: resizer-m
3939
scheme: https
4040
tlsConfig:
4141
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
42-
serverName: azure-disk-csi-driver-controller-metrics.${NAMESPACE}.svc
42+
serverName: azure-disk-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
4343
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
4444
interval: 30s
4545
path: /metrics
4646
port: snapshotter-m
4747
scheme: https
4848
tlsConfig:
4949
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
50-
serverName: azure-disk-csi-driver-controller-metrics.${NAMESPACE}.svc
50+
serverName: azure-disk-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
5151
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
5252
interval: 30s
5353
path: /metrics
5454
port: driver-m
5555
scheme: https
5656
tlsConfig:
5757
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
58-
serverName: azure-disk-csi-driver-controller-metrics.${NAMESPACE}.svc
58+
serverName: azure-disk-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
5959
jobLabel: component
6060
selector:
6161
matchLabels:

‎assets/overlays/azure-file/generated/standalone/servicemonitor.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,39 @@ spec:
2323
scheme: https
2424
tlsConfig:
2525
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
26-
serverName: azure-file-csi-driver-controller-metrics.${NAMESPACE}.svc
26+
serverName: azure-file-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
2727
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
2828
interval: 30s
2929
path: /metrics
3030
port: attacher-m
3131
scheme: https
3232
tlsConfig:
3333
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
34-
serverName: azure-file-csi-driver-controller-metrics.${NAMESPACE}.svc
34+
serverName: azure-file-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
3535
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
3636
interval: 30s
3737
path: /metrics
3838
port: resizer-m
3939
scheme: https
4040
tlsConfig:
4141
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
42-
serverName: azure-file-csi-driver-controller-metrics.${NAMESPACE}.svc
42+
serverName: azure-file-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
4343
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
4444
interval: 30s
4545
path: /metrics
4646
port: snapshotter-m
4747
scheme: https
4848
tlsConfig:
4949
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
50-
serverName: azure-file-csi-driver-controller-metrics.${NAMESPACE}.svc
50+
serverName: azure-file-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
5151
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
5252
interval: 30s
5353
path: /metrics
5454
port: driver-m
5555
scheme: https
5656
tlsConfig:
5757
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
58-
serverName: azure-file-csi-driver-controller-metrics.${NAMESPACE}.svc
58+
serverName: azure-file-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
5959
jobLabel: component
6060
selector:
6161
matchLabels:

‎assets/overlays/gcp-pd/generated/standalone/servicemonitor.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,31 @@ spec:
2222
scheme: https
2323
tlsConfig:
2424
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
25-
serverName: gcp-pd-csi-driver-controller-metrics.${NAMESPACE}.svc
25+
serverName: gcp-pd-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
2626
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
2727
interval: 30s
2828
path: /metrics
2929
port: attacher-m
3030
scheme: https
3131
tlsConfig:
3232
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
33-
serverName: gcp-pd-csi-driver-controller-metrics.${NAMESPACE}.svc
33+
serverName: gcp-pd-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
3434
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
3535
interval: 30s
3636
path: /metrics
3737
port: resizer-m
3838
scheme: https
3939
tlsConfig:
4040
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
41-
serverName: gcp-pd-csi-driver-controller-metrics.${NAMESPACE}.svc
41+
serverName: gcp-pd-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
4242
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
4343
interval: 30s
4444
path: /metrics
4545
port: snapshotter-m
4646
scheme: https
4747
tlsConfig:
4848
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
49-
serverName: gcp-pd-csi-driver-controller-metrics.${NAMESPACE}.svc
49+
serverName: gcp-pd-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
5050
jobLabel: component
5151
selector:
5252
matchLabels:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,39 @@ spec:
2323
scheme: https
2424
tlsConfig:
2525
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
26-
serverName: openstack-cinder-csi-driver-controller-metrics.${NAMESPACE}.svc
26+
serverName: openstack-cinder-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
2727
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
2828
interval: 30s
2929
path: /metrics
3030
port: attacher-m
3131
scheme: https
3232
tlsConfig:
3333
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
34-
serverName: openstack-cinder-csi-driver-controller-metrics.${NAMESPACE}.svc
34+
serverName: openstack-cinder-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
3535
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
3636
interval: 30s
3737
path: /metrics
3838
port: resizer-m
3939
scheme: https
4040
tlsConfig:
4141
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
42-
serverName: openstack-cinder-csi-driver-controller-metrics.${NAMESPACE}.svc
42+
serverName: openstack-cinder-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
4343
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
4444
interval: 30s
4545
path: /metrics
4646
port: snapshotter-m
4747
scheme: https
4848
tlsConfig:
4949
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
50-
serverName: openstack-cinder-csi-driver-controller-metrics.${NAMESPACE}.svc
50+
serverName: openstack-cinder-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
5151
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
5252
interval: 30s
5353
path: /metrics
5454
port: driver-m
5555
scheme: https
5656
tlsConfig:
5757
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
58-
serverName: openstack-cinder-csi-driver-controller-metrics.${NAMESPACE}.svc
58+
serverName: openstack-cinder-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
5959
jobLabel: component
6060
selector:
6161
matchLabels:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ spec:
2121
scheme: https
2222
tlsConfig:
2323
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
24-
serverName: manila-csi-driver-controller-metrics.${NAMESPACE}.svc
24+
serverName: manila-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
2525
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
2626
interval: 30s
2727
path: /metrics
2828
port: resizer-m
2929
scheme: https
3030
tlsConfig:
3131
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
32-
serverName: manila-csi-driver-controller-metrics.${NAMESPACE}.svc
32+
serverName: manila-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
3333
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
3434
interval: 30s
3535
path: /metrics
3636
port: snapshotter-m
3737
scheme: https
3838
tlsConfig:
3939
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
40-
serverName: manila-csi-driver-controller-metrics.${NAMESPACE}.svc
40+
serverName: manila-csi-driver-controller-metrics.${NODE_NAMESPACE}.svc
4141
jobLabel: component
4242
selector:
4343
matchLabels:

0 commit comments

Comments
 (0)