Skip to content

CSI-5278/ Add csi addons #320

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

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

CSI-5278/ Add csi addons #320

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f5da94c
add csiaddons to operator
matancarmeli7 Jan 15, 2023
7c17f15
New replication operator
ELENAGER Jan 15, 2023
9fc6d54
New replication operator
ELENAGER Jan 15, 2023
ee54f75
change csiaddons apiGroup in go
matancarmeli7 Jan 15, 2023
a74e514
New replication operator
ELENAGER Jan 15, 2023
0994930
update parameters for csiaddons
matancarmeli7 Feb 5, 2023
cdecaf8
add new line in rbac
matancarmeli7 Feb 5, 2023
de5e7db
Merge branch 'develop' into add_csi_addons
matancarmeli7 Feb 21, 2023
ea4f9aa
update rbac
matancarmeli7 Feb 21, 2023
0ed8353
update yaml files
matancarmeli7 Feb 21, 2023
8a3a6d2
change rules in csv files
matancarmeli7 Feb 21, 2023
fa2bcbf
remove replication api group
matancarmeli7 Feb 26, 2023
f5760c5
Merge branch 'develop' into add_csi_addons
matancarmeli7 Jun 21, 2023
42a10a3
Merge branch 'develop' into add_csi_addons
matancarmeli7 Jul 4, 2023
09e8c8e
Merge branch 'develop' into add_csi_addons
kasserater Jan 26, 2025
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
60 changes: 26 additions & 34 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,40 +154,6 @@ rules:
- list
- update
- watch
- apiGroups:
- replication.storage.openshift.io
resources:
- volumereplicationclasses
verbs:
- get
- list
- watch
- apiGroups:
- replication.storage.openshift.io
resources:
- volumereplications
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- replication.storage.openshift.io
resources:
- volumereplications/finalizers
verbs:
- update
- apiGroups:
- replication.storage.openshift.io
resources:
- volumereplications/status
verbs:
- get
- patch
- update
- apiGroups:
- security.openshift.io
resourceNames:
Expand Down Expand Up @@ -275,3 +241,29 @@ rules:
- volumeattachments/status
verbs:
- patch
- apiGroups:
- csiaddons.openshift.io
resources:
- csiaddonsnodes
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- csiaddons.openshift.io
resources:
- csiaddonsnodes/finalizers
verbs:
- update
- apiGroups:
- csiaddons.openshift.io
resources:
- csiaddonsnodes/status
verbs:
- get
- patch
- update
61 changes: 30 additions & 31 deletions controllers/ibmblockcsi_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,36 +76,35 @@ type IBMBlockCSIReconciler struct {
}

// the rbac rule requires an empty row at the end to render
//+kubebuilder:rbac:groups="",resources=pods,verbs=get;delete;list;watch
//+kubebuilder:rbac:groups="",resources=configmaps,verbs=get;create;delete
//+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
//+kubebuilder:rbac:groups="",resources=persistentvolumeclaims,verbs=get;list;watch;update;patch
//+kubebuilder:rbac:groups="",resources=persistentvolumeclaims/status,verbs=get;update;patch
//+kubebuilder:rbac:groups="",resources=persistentvolumeclaims/finalizers,verbs=update
//+kubebuilder:rbac:groups="",resources=persistentvolumes,verbs=get;delete;list;watch;update;create;patch
//+kubebuilder:rbac:groups="",resources=events,verbs=*
//+kubebuilder:rbac:groups="",resources=nodes,verbs=get;list;watch
//+kubebuilder:rbac:groups=apps,resources=deployments;daemonsets;statefulsets,verbs=get;list;watch;update;create;delete
//+kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=create;delete;get;watch;list
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles;clusterrolebindings,verbs=create;delete;get;watch;list;update
//+kubebuilder:rbac:groups=storage.k8s.io,resources=volumeattachments,verbs=get;list;watch;update;patch
//+kubebuilder:rbac:groups=storage.k8s.io,resources=volumeattachments/status,verbs=patch
//+kubebuilder:rbac:groups=storage.k8s.io,resources=storageclasses,verbs=get;list;watch
//+kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors,verbs=get;create
//+kubebuilder:rbac:groups=apps,resourceNames=ibm-block-csi-operator,resources=deployments/finalizers,verbs=update
//+kubebuilder:rbac:groups=storage.k8s.io,resources=csidrivers,verbs=create;delete;get;watch;list
//+kubebuilder:rbac:groups=storage.k8s.io,resources=csinodes,verbs=get;list;watch
//+kubebuilder:rbac:groups=security.openshift.io,resourceNames=anyuid;privileged,resources=securitycontextconstraints,verbs=use
//+kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=create;list;watch;delete
//+kubebuilder:rbac:groups=csi.ibm.com,resources=*,verbs=*
//+kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshotclasses,verbs=get;watch;list
//+kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshotcontents,verbs=get;watch;list;create;update;delete
//+kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshotcontents/status,verbs=update
//+kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshots,verbs=get;watch;list;update
//+kubebuilder:rbac:groups=replication.storage.openshift.io,resources=volumereplicationclasses,verbs=get;list;watch
//+kubebuilder:rbac:groups=replication.storage.openshift.io,resources=volumereplications,verbs=create;delete;get;list;patch;update;watch
//+kubebuilder:rbac:groups=replication.storage.openshift.io,resources=volumereplications/finalizers,verbs=update
//+kubebuilder:rbac:groups=replication.storage.openshift.io,resources=volumereplications/status,verbs=get;patch;update
// +kubebuilder:rbac:groups="",resources=pods,verbs=get;delete;list;watch
// +kubebuilder:rbac:groups="",resources=configmaps,verbs=get;create;delete
// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
// +kubebuilder:rbac:groups="",resources=persistentvolumeclaims,verbs=get;list;watch;update;patch
// +kubebuilder:rbac:groups="",resources=persistentvolumeclaims/status,verbs=get;update;patch
// +kubebuilder:rbac:groups="",resources=persistentvolumeclaims/finalizers,verbs=update
// +kubebuilder:rbac:groups="",resources=persistentvolumes,verbs=get;delete;list;watch;update;create;patch
// +kubebuilder:rbac:groups="",resources=events,verbs=*
// +kubebuilder:rbac:groups="",resources=nodes,verbs=get;list;watch
// +kubebuilder:rbac:groups=apps,resources=deployments;daemonsets;statefulsets,verbs=get;list;watch;update;create;delete
// +kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=create;delete;get;watch;list
// +kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles;clusterrolebindings,verbs=create;delete;get;watch;list;update
// +kubebuilder:rbac:groups=storage.k8s.io,resources=volumeattachments,verbs=get;list;watch;update;patch
// +kubebuilder:rbac:groups=storage.k8s.io,resources=volumeattachments/status,verbs=patch
// +kubebuilder:rbac:groups=storage.k8s.io,resources=storageclasses,verbs=get;list;watch
// +kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors,verbs=get;create
// +kubebuilder:rbac:groups=apps,resourceNames=ibm-block-csi-operator,resources=deployments/finalizers,verbs=update
// +kubebuilder:rbac:groups=storage.k8s.io,resources=csidrivers,verbs=create;delete;get;watch;list
// +kubebuilder:rbac:groups=storage.k8s.io,resources=csinodes,verbs=get;list;watch
// +kubebuilder:rbac:groups=security.openshift.io,resourceNames=anyuid;privileged,resources=securitycontextconstraints,verbs=use
// +kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=create;list;watch;delete
// +kubebuilder:rbac:groups=csi.ibm.com,resources=*,verbs=*
// +kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshotclasses,verbs=get;watch;list
// +kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshotcontents,verbs=get;watch;list;create;update;delete
// +kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshotcontents/status,verbs=update
// +kubebuilder:rbac:groups=snapshot.storage.k8s.io,resources=volumesnapshots,verbs=get;watch;list;update
// +kubebuilder:rbac:groups=csiaddons.openshift.io,resources=csiaddonsnodes,verbs=create;delete;get;list;patch;update;watch
// +kubebuilder:rbac:groups=csiaddons.openshift.io,resources=csiaddonsnodes/finalizers,verbs=update
// +kubebuilder:rbac:groups=csiaddons.openshift.io,resources=csiaddonsnodes/status,verbs=get;patch;update
func (r *IBMBlockCSIReconciler) Reconcile(ctx context.Context, req ctrl.Request) (reconcile.Result, error) {
reqLogger := log.WithValues("Request.Namespace", req.Namespace, "Request.Name", req.Name)
reqLogger.Info("Reconciling IBMBlockCSI")
Expand Down Expand Up @@ -360,7 +359,7 @@ func (r *IBMBlockCSIReconciler) restartControllerPodfromStatefulSet(logger logr.
}

func (r *IBMBlockCSIReconciler) getControllerPod(controllerStatefulset *appsv1.StatefulSet, controllerPod *corev1.Pod) error {
controllerPodName := fmt.Sprintf("%s-0", controllerStatefulset.Name)
controllerPodName := oconfig.GetControllerPodName(controllerStatefulset.Name)
err := r.Get(context.TODO(), types.NamespacedName{
Name: controllerPodName,
Namespace: controllerStatefulset.Namespace,
Expand Down
31 changes: 13 additions & 18 deletions controllers/internal/crutils/static_resource_generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const (
storageApiGroup string = "storage.k8s.io"
rbacAuthorizationApiGroup string = "rbac.authorization.k8s.io"
replicationStorageOpenshiftApiGroup string = "replication.storage.openshift.io"
csiAddonsApiGroup string = "csiaddons.openshift.io"
storageClassesResource string = "storageclasses"
persistentVolumesResource string = "persistentvolumes"
persistentVolumeClaimsResource string = "persistentvolumeclaims"
Expand All @@ -50,10 +51,9 @@ const (
volumeSnapshotsResource string = "volumesnapshots"
volumeSnapshotContentsResource string = "volumesnapshotcontents"
volumeSnapshotContentsStatusResource string = "volumesnapshotcontents/status"
volumeReplicationClassesResource string = "volumereplicationclasses"
volumeReplicationsResource string = "volumereplications"
volumeReplicationsFinalizersResource string = "volumereplications/finalizers"
volumeReplicationsStatusResource string = "volumereplications/status"
csiAddonsNodesResource string = "csiaddonsnodes"
csiAddonsNodesFinalizersResource string = "csiaddonsnodes/finalizers"
csiAddonsNodesStatusResource string = "csiaddonsnodes/status"
eventsResource string = "events"
nodesResource string = "nodes"
csiNodesResource string = "csinodes"
Expand Down Expand Up @@ -357,30 +357,25 @@ func (c *IBMBlockCSI) GenerateCSIAddonsReplicatorClusterRole() *rbacv1.ClusterRo
},
Rules: []rbacv1.PolicyRule{
{
APIGroups: []string{replicationStorageOpenshiftApiGroup},
Resources: []string{volumeReplicationClassesResource},
Verbs: []string{verbGet, verbList, verbWatch},
APIGroups: []string{""},
Resources: []string{secretsResource},
Verbs: []string{verbGet},
},
{
APIGroups: []string{replicationStorageOpenshiftApiGroup},
Resources: []string{volumeReplicationsResource},
APIGroups: []string{csiAddonsApiGroup},
Resources: []string{csiAddonsNodesResource},
Verbs: []string{verbCreate, verbDelete, verbGet, verbList, verbPatch, verbUpdate, verbWatch},
},
{
APIGroups: []string{replicationStorageOpenshiftApiGroup},
Resources: []string{volumeReplicationsFinalizersResource},
APIGroups: []string{csiAddonsApiGroup},
Resources: []string{csiAddonsNodesFinalizersResource},
Verbs: []string{verbUpdate},
},
{
APIGroups: []string{replicationStorageOpenshiftApiGroup},
Resources: []string{volumeReplicationsStatusResource},
APIGroups: []string{csiAddonsApiGroup},
Resources: []string{csiAddonsNodesStatusResource},
Verbs: []string{verbGet, verbPatch, verbUpdate},
},
{
APIGroups: []string{""},
Resources: []string{secretsResource},
Verbs: []string{verbGet},
},
},
}
}
Expand Down
58 changes: 53 additions & 5 deletions controllers/syncer/csi_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func (s *csiControllerSyncer) ensurePodSpec() corev1.PodSpec {
func (s *csiControllerSyncer) ensureContainersSpec() []corev1.Container {
controllerPlugin := s.ensureContainer(ControllerContainerName,
s.driver.GetCSIControllerImage(),
[]string{"--csi-endpoint=$(CSI_ENDPOINT)"},
[]string{"--csi-endpoint=$(CSI_ENDPOINT)", "--csi-addons-endpoint=$(CSI_ADDONS_ENDPOINT)"},
)

controllerPlugin.Resources = ensureResources("40m", "800m", "40Mi", "400Mi")
Expand Down Expand Up @@ -206,12 +206,17 @@ func (s *csiControllerSyncer) ensureContainersSpec() []corev1.Container {
)
resizer.ImagePullPolicy = s.getCSIResizerPullPolicy()

leaderElectionNamespaceFlag := fmt.Sprintf("--leader-election-namespace=%s", s.driver.Namespace)
driverNameFlag := fmt.Sprintf("--driver-name=%s", config.DriverName)
statfulSetName := config.GetNameForResource(config.CSIController, s.driver.Name)
controllerPodName := fmt.Sprintf("--pod=%s", config.GetControllerPodName(statfulSetName))
controllerPodNamespace := fmt.Sprintf("--namespace=%s", s.driver.Namespace)
controllerPort := fmt.Sprintf("--controller-port=%s", "9087")
replicator := s.ensureContainer(replicatorContainerName,
s.getCSIAddonsReplicatorImage(),
[]string{leaderElectionNamespaceFlag, driverNameFlag,
"--csi-address=$(ADDRESS)", "--zap-log-level=5", "--rpc-timeout=30s"},
[]string{controllerPodName, controllerPodNamespace, controllerPort,
"--csi-addons-address=$(CSI_ADDONS_ENDPOINT)",
"--node-id=$(NODE_ID)", "--pod-uid=$(POD_UID)",
"--controller-ip=$(POD_IP)"},
)
replicator.ImagePullPolicy = s.getCSIAddonsReplicatorPullPolicy()

Expand Down Expand Up @@ -326,14 +331,57 @@ func (s *csiControllerSyncer) getEnvFor(name string) []corev1.EnvVar {
Name: "CSI_ENDPOINT",
Value: config.CSIEndpoint,
},
{
Name: "CSI_ADDONS_ENDPOINT",
Value: config.CSIAddonsEndpoint,
},
{
Name: "NODE_ID",
ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
FieldPath: "spec.nodeName",
},
},
},
{
Name: "CSI_LOGLEVEL",
Value: config.DefaultLogLevel,
},
}
case replicatorContainerName:
return []corev1.EnvVar{
{
Name: "CSI_ADDONS_ENDPOINT",
Value: config.CSIAddonsEndpoint,
},
{
Name: "NODE_ID",
ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
FieldPath: "spec.nodeName",
},
},
},
{
Name: "POD_IP",
ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
FieldPath: "status.podIP",
},
},
},
{
Name: "POD_UID",
ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
FieldPath: "metadata.uid",
},
},
},
}

case provisionerContainerName, attacherContainerName, snapshotterContainerName,
resizerContainerName, replicatorContainerName, volumeGroupContainerName:
resizerContainerName, volumeGroupContainerName:
return []corev1.EnvVar{
{
Name: "ADDRESS",
Expand Down
60 changes: 26 additions & 34 deletions deploy/installer/generated/ibm-block-csi-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1946,40 +1946,6 @@ rules:
- list
- update
- watch
- apiGroups:
- replication.storage.openshift.io
resources:
- volumereplicationclasses
verbs:
- get
- list
- watch
- apiGroups:
- replication.storage.openshift.io
resources:
- volumereplications
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- replication.storage.openshift.io
resources:
- volumereplications/finalizers
verbs:
- update
- apiGroups:
- replication.storage.openshift.io
resources:
- volumereplications/status
verbs:
- get
- patch
- update
- apiGroups:
- security.openshift.io
resourceNames:
Expand Down Expand Up @@ -2067,6 +2033,32 @@ rules:
- volumeattachments/status
verbs:
- patch
- apiGroups:
- csiaddons.openshift.io
resources:
- csiaddonsnodes
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- csiaddons.openshift.io
resources:
- csiaddonsnodes/finalizers
verbs:
- update
- apiGroups:
- csiaddons.openshift.io
resources:
- csiaddonsnodes/status
verbs:
- get
- patch
- update
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Expand Down
Loading