Skip to content

[release-4.19] OCPBUGS-62926: Add withCABundleDaemonSetHook() to AWS EFS operator #444

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
merged 1 commit into from
Oct 13, 2025
Merged

[release-4.19] OCPBUGS-62926: Add withCABundleDaemonSetHook() to AWS EFS operator #444

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
15 changes: 14 additions & 1 deletion pkg/driver/aws-efs/aws_efs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func GetAWSEFSOperatorControllerConfig(ctx context.Context, flavour generator.Cl
cfg := operator.NewDefaultOperatorControllerConfig(flavour, c, "AWSEFS")
cfg.AddDeploymentHookBuilders(c, withCABundleDeploymentHook, withFIPSDeploymentHook, withCustomTags)
cfg.DeploymentWatchedSecretNames = append(cfg.DeploymentWatchedSecretNames, cloudCredSecretName, metricsCertSecretName)
cfg.AddDaemonSetHookBuilders(c, withFIPSDaemonSetHook, withVolumeMetricsDaemonSetHook)
cfg.AddDaemonSetHookBuilders(c, withCABundleDaemonSetHook, withFIPSDaemonSetHook, withVolumeMetricsDaemonSetHook)
cfg.AddCredentialsRequestHook(stsCredentialsRequestHook)

accessPointsTagController := NewEFSAccessPointTagsController(cfg.GetControllerName("EFSAccessPointTagsController"), c, c.EventRecorder)
Expand All @@ -116,6 +116,19 @@ func GetAWSEFSOperatorControllerConfig(ctx context.Context, flavour generator.Cl
return cfg, nil
}

// withCABundleDaemonSetHook projects custom CA bundle ConfigMap into the CSI driver container
func withCABundleDaemonSetHook(c *clients.Clients) (csidrivernodeservicecontroller.DaemonSetHookFunc, []factory.Informer) {
hook := csidrivernodeservicecontroller.WithCABundleDaemonSetHook(
c.GuestNamespace,
trustedCAConfigMap,
c.GetConfigMapInformer(c.GuestNamespace),
)
informers := []factory.Informer{
c.GetConfigMapInformer(c.GuestNamespace).Informer(),
}
return hook, informers
}

// withCABundleDeploymentHook projects custom CA bundle ConfigMap into the CSI driver container
func withCABundleDeploymentHook(c *clients.Clients) (dc.DeploymentHookFunc, []factory.Informer) {
hook := csidrivercontrollerservicecontroller.WithCABundleDeploymentHook(
Expand Down