Skip to content

Commit

Permalink
Merge pull request #83 from mpatlasov/restart-controller-pods-if-webh…
Browse files Browse the repository at this point in the history
…ook-cert-changed

STOR-1442: Restart webhook Pods if webhook-serving-cert changed
  • Loading branch information
openshift-merge-robot committed Aug 11, 2023
2 parents 5d48701 + 4cb8c15 commit d340e59
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion pkg/deploymentcontroller/deployment.go
Expand Up @@ -19,6 +19,7 @@ const (
defaultNamespace = "openshift-cluster-csi-drivers"
envSharedResourceDriverWebhookImage = "WEBHOOK_IMAGE"
infraConfigName = "cluster"
webhookSecretName = "shared-resource-csi-driver-webhook-serving-cert"
)

func NewWebHookDeploymentController(kubeClient kubernetes.Interface,
Expand All @@ -28,6 +29,7 @@ func NewWebHookDeploymentController(kubeClient kubernetes.Interface,
recorder events.Recorder) factory.Controller {

nodeLister := kubeInformersForNamespaces.InformersFor("").Core().V1().Nodes().Lister()
secretInformer := kubeInformersForNamespaces.InformersFor(defaultNamespace).Core().V1().Secrets()

return deploymentcontroller.NewDeploymentController(
"SharedResourceCSIDriverWebhookController",
Expand All @@ -36,12 +38,20 @@ func NewWebHookDeploymentController(kubeClient kubernetes.Interface,
operatorClient,
kubeClient,
kubeInformersForNamespaces.InformersFor(defaultNamespace).Apps().V1().Deployments(),
[]factory.Informer{configInformer.Config().V1().Infrastructures().Informer()},
[]factory.Informer{
secretInformer.Informer(),
configInformer.Config().V1().Infrastructures().Informer(),
},
[]deploymentcontroller.ManifestHookFunc{
replaceAll("${WEBHOOK_IMAGE}", os.Getenv(envSharedResourceDriverWebhookImage)),
},
csidrivercontrollerservicecontroller.WithControlPlaneTopologyHook(configInformer),
csidrivercontrollerservicecontroller.WithReplicasHook(nodeLister),
csidrivercontrollerservicecontroller.WithSecretHashAnnotationHook(
defaultNamespace,
webhookSecretName,
secretInformer,
),
)
}

Expand Down

0 comments on commit d340e59

Please sign in to comment.