Skip to content

Commit e74ce80

Browse files
Merge pull request #446 from mpatlasov/STOR-2523-Add-hypershif-managed-by-label
STOR-2523: Add hypershift managed-by labels for csi driver operators
2 parents 9816f92 + b90cada commit e74ce80

File tree

7 files changed

+19
-0
lines changed

7 files changed

+19
-0
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
metadata:
2+
labels:
3+
hypershift.openshift.io/managed-by: cluster-storage-operator

assets/overlays/aws-ebs/generated/hypershift/controller.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
# Applied strategic merge patch pod_network_livenessprobe.yaml
2525
# Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
2626
# Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
27+
# Applied strategic merge patch common/hypershift/controller_add_hypershift_managed_by_label.yaml
2728
# Applied strategic merge patch overlays/aws-ebs/patches/controller_add_hypershift_controller_minter.yaml
2829
#
2930
#
@@ -34,6 +35,8 @@ metadata:
3435
annotations:
3536
config.openshift.io/inject-proxy: csi-driver
3637
config.openshift.io/inject-proxy-cabundle: csi-driver
38+
labels:
39+
hypershift.openshift.io/managed-by: cluster-storage-operator
3740
name: aws-ebs-csi-driver-controller
3841
namespace: ${NAMESPACE}
3942
spec:

assets/overlays/azure-disk/generated/hypershift/controller.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
# Applied strategic merge patch pod_network_livenessprobe.yaml
2525
# Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
2626
# Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
27+
# Applied strategic merge patch common/hypershift/controller_add_hypershift_managed_by_label.yaml
2728
# Applied strategic merge patch overlays/azure-disk/patches/controller_add_hypershift_controller.yaml
2829
#
2930
#
@@ -34,6 +35,8 @@ metadata:
3435
annotations:
3536
config.openshift.io/inject-proxy: csi-driver
3637
config.openshift.io/inject-proxy-cabundle: csi-driver
38+
labels:
39+
hypershift.openshift.io/managed-by: cluster-storage-operator
3740
name: azure-disk-csi-driver-controller
3841
namespace: ${NAMESPACE}
3942
spec:

assets/overlays/azure-file/generated/hypershift/controller.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
# Applied strategic merge patch pod_network_livenessprobe.yaml
2525
# Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
2626
# Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
27+
# Applied strategic merge patch common/hypershift/controller_add_hypershift_managed_by_label.yaml
2728
# Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch
2829
# Applied strategic merge patch overlays/azure-file/patches/controller_add_hypershift_controller.yaml
2930
#
@@ -35,6 +36,8 @@ metadata:
3536
annotations:
3637
config.openshift.io/inject-proxy: csi-driver
3738
config.openshift.io/inject-proxy-cabundle: csi-driver
39+
labels:
40+
hypershift.openshift.io/managed-by: cluster-storage-operator
3841
name: azure-file-csi-driver-controller
3942
namespace: ${NAMESPACE}
4043
spec:

assets/overlays/openstack-cinder/generated/hypershift/controller.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
# Applied strategic merge patch pod_network_livenessprobe.yaml
2323
# Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
2424
# Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
25+
# Applied strategic merge patch common/hypershift/controller_add_hypershift_managed_by_label.yaml
2526
# Applied strategic merge patch overlays/openstack-cinder/patches/controller_add_hypershift_volumes.yaml
2627
#
2728
#
@@ -32,6 +33,8 @@ metadata:
3233
annotations:
3334
config.openshift.io/inject-proxy: csi-driver
3435
config.openshift.io/inject-proxy-cabundle: csi-driver
36+
labels:
37+
hypershift.openshift.io/managed-by: cluster-storage-operator
3538
name: openstack-cinder-csi-driver-controller
3639
namespace: ${NAMESPACE}
3740
spec:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# Applied strategic merge patch pod_network_livenessprobe.yaml
1919
# Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
2020
# Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
21+
# Applied strategic merge patch common/hypershift/controller_add_hypershift_managed_by_label.yaml
2122
# Applied strategic merge patch overlays/openstack-manila/patches/controller_add_hypershift_volumes.yaml
2223
# Applied strategic merge patch overlays/openstack-manila/patches/controller_rename_config_map.yaml
2324
# Applied strategic merge patch overlays/openstack-manila/patches/modify_anti_affinity_selector.yaml
@@ -30,6 +31,8 @@ metadata:
3031
annotations:
3132
config.openshift.io/inject-proxy: csi-driver
3233
config.openshift.io/inject-proxy-cabundle: csi-driver
34+
labels:
35+
hypershift.openshift.io/managed-by: cluster-storage-operator
3336
name: openstack-manila-csi-controllerplugin
3437
namespace: ${NAMESPACE}
3538
spec:

pkg/driver/common/generator/base_assets.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ var (
4545
"controller_sa.yaml", "common/hypershift/controller_sa_pull_secret.yaml",
4646
"controller.yaml", "common/hypershift/controller_add_affinity_tolerations.yaml",
4747
"controller.yaml", "common/hypershift/controller_add_kubeconfig_volume.yaml.patch",
48+
"controller.yaml", "common/hypershift/controller_add_hypershift_managed_by_label.yaml",
4849
)
4950
)
5051

0 commit comments

Comments
 (0)