Skip to content

Commit

Permalink
Update secret with new cert only if needed
Browse files Browse the repository at this point in the history
  • Loading branch information
dzeromski-hazelcast committed Apr 18, 2023
1 parent 14f5d22 commit 5661a00
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
Expand Up @@ -81,7 +81,7 @@ jobs:
runs-on: ubuntu-latest
permissions: {}
if: ( !cancelled() && github.event_name == 'pull_request' )
timeout-minutes: 30
timeout-minutes: 10
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
32 changes: 19 additions & 13 deletions controllers/hazelcast/hazelcast_resources.go
Expand Up @@ -602,6 +602,7 @@ func (r *HazelcastReconciler) isServicePerPodReady(ctx context.Context, h *hazel
func (r *HazelcastReconciler) reconcileSecret(ctx context.Context, h *hazelcastv1alpha1.Hazelcast, logger logr.Logger) error {
cm := &corev1.Secret{
ObjectMeta: metadata(h),
Data: make(map[string][]byte),
}

err := controllerutil.SetControllerReference(h, cm, r.Scheme)
Expand All @@ -614,21 +615,26 @@ func (r *HazelcastReconciler) reconcileSecret(ctx context.Context, h *hazelcastv
if err != nil {
return err
}
keystore, err := hazelcastKeystore(ctx, r.Client, h)
if err != nil {
return err
}
mtlsCert, mtlsKey, err := mtls.NewCertificateAuthority()
if err != nil {
return err
cm.Data["hazelcast.yaml"] = config

if _, ok := cm.Data["hazelcast.jks"]; !ok {
keystore, err := hazelcastKeystore(ctx, r.Client, h)
if err != nil {
return err
}
cm.Data["hazelcast.jks"] = keystore
}
cm.Data = map[string][]byte{
"hazelcast.yaml": config,
"hazelcast.jks": keystore,
"ca.crt": mtlsCert,
"tls.crt": mtlsCert,
"tls.key": mtlsKey,

if _, ok := cm.Data["ca.crt"]; !ok {
mtlsCert, mtlsKey, err := mtls.NewCertificateAuthority()
if err != nil {
return err
}
cm.Data["ca.crt"] = mtlsCert
cm.Data["tls.crt"] = mtlsCert
cm.Data["tls.key"] = mtlsKey
}

return nil
})
if opResult != controllerutil.OperationResultNone {
Expand Down

0 comments on commit 5661a00

Please sign in to comment.