Skip to content

OCPBUGS-78291: Allow azure-disk sidecars to read VolumeAttributeClasses #525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Mar 31, 2026
+85 −1
Merged

OCPBUGS-78291: Allow azure-disk sidecars to read VolumeAttributeClasses #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions assets/overlays/azure-disk/generated/hypershift/manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,7 @@ guestStaticAssetNames:
- prometheus_role.yaml
- storageclass.yaml
- storageclass_reader_resizer_binding.yaml
- volumeattributesclass_reader_provisioner_binding.yaml
- volumeattributesclass_reader_resizer_binding.yaml
- volumesnapshot_reader_provisioner_binding.yaml
- volumesnapshotclass.yaml
19 changes: 19 additions & 0 deletions ...ays/azure-disk/generated/hypershift/volumeattributesclass_reader_provisioner_binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated file. Do not edit. Update using "make update".
#
# Loaded from base/rbac/volumeattributesclass_reader_provisioner_binding.yaml
# because it's needed by controller sidecar common/sidecars/provisioner.yaml
#
#

apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: azure-disk-csi-volumeattributesclass-reader-provisioner-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: openshift-csi-provisioner-volumeattributesclass-reader-role
subjects:
- kind: ServiceAccount
name: azure-disk-csi-driver-controller-sa
namespace: ${NODE_NAMESPACE}
19 changes: 19 additions & 0 deletions ...verlays/azure-disk/generated/hypershift/volumeattributesclass_reader_resizer_binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated file. Do not edit. Update using "make update".
#
# Loaded from base/rbac/volumeattributesclass_reader_resizer_binding.yaml
# because it's needed by controller sidecar common/sidecars/resizer.yaml
#
#

apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: azure-disk-csi-volumeattributesclass-reader-resizer-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: openshift-csi-resizer-volumeattributesclass-reader-role
subjects:
- kind: ServiceAccount
name: azure-disk-csi-driver-controller-sa
namespace: ${NODE_NAMESPACE}
2 changes: 2 additions & 0 deletions assets/overlays/azure-disk/generated/standalone/manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@ guestStaticAssetNames:
- prometheus_role.yaml
- storageclass.yaml
- storageclass_reader_resizer_binding.yaml
- volumeattributesclass_reader_provisioner_binding.yaml
- volumeattributesclass_reader_resizer_binding.yaml
- volumesnapshot_reader_provisioner_binding.yaml
- volumesnapshotclass.yaml
19 changes: 19 additions & 0 deletions ...ays/azure-disk/generated/standalone/volumeattributesclass_reader_provisioner_binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated file. Do not edit. Update using "make update".
#
# Loaded from base/rbac/volumeattributesclass_reader_provisioner_binding.yaml
# because it's needed by controller sidecar common/sidecars/provisioner.yaml
#
#

apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: azure-disk-csi-volumeattributesclass-reader-provisioner-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: openshift-csi-provisioner-volumeattributesclass-reader-role
subjects:
- kind: ServiceAccount
name: azure-disk-csi-driver-controller-sa
namespace: ${NODE_NAMESPACE}
19 changes: 19 additions & 0 deletions ...verlays/azure-disk/generated/standalone/volumeattributesclass_reader_resizer_binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated file. Do not edit. Update using "make update".
#
# Loaded from base/rbac/volumeattributesclass_reader_resizer_binding.yaml
# because it's needed by controller sidecar common/sidecars/resizer.yaml
#
#

apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: azure-disk-csi-volumeattributesclass-reader-resizer-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: openshift-csi-resizer-volumeattributesclass-reader-role
subjects:
- kind: ServiceAccount
name: azure-disk-csi-driver-controller-sa
namespace: ${NODE_NAMESPACE}
6 changes: 5 additions & 1 deletion pkg/driver/azure-disk/azure_disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/openshift/library-go/pkg/operator/csi/csidrivercontrollerservicecontroller"
"github.com/openshift/library-go/pkg/operator/csi/csidrivernodeservicecontroller"
"github.com/openshift/library-go/pkg/operator/csi/csistorageclasscontroller"
"github.com/openshift/library-go/pkg/operator/hypershift/deploymentversion"
deploymentversioncontroller "github.com/openshift/library-go/pkg/operator/hypershift/deploymentversion"
"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"

dc "github.com/openshift/library-go/pkg/operator/deploymentcontroller"
Expand Down Expand Up @@ -89,6 +89,8 @@ func GetAzureDiskGeneratorConfig() *generator.CSIDriverGeneratorConfig {
"--worker-threads=100",
"--kube-api-qps=50",
"--kube-api-burst=100",
).WithAdditionalAssets(
"base/rbac/volumeattributesclass_reader_provisioner_binding.yaml",
),
commongenerator.DefaultAttacher.WithExtraArguments(
"--timeout=1200s",
Expand All @@ -99,6 +101,8 @@ func GetAzureDiskGeneratorConfig() *generator.CSIDriverGeneratorConfig {
commongenerator.DefaultResizer.WithExtraArguments(
"--timeout=240s",
"-handle-volume-inuse-error=false",
).WithAdditionalAssets(
"base/rbac/volumeattributesclass_reader_resizer_binding.yaml",
),
commongenerator.DefaultSnapshotter.WithExtraArguments(
"--timeout=600s",
Expand Down