Skip to content

Commit 46d4bab

Browse files
committed
Fix RayCluster CA Secret keys
1 parent 70a72b9 commit 46d4bab

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

pkg/controllers/raycluster_controller.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ const (
7575
oAuthServicePortName = "oauth-proxy"
7676
ingressServicePortName = "dashboard"
7777
logRequeueing = "requeueing"
78+
79+
CAPrivateKeyKey = "ca.key"
80+
CACertKey = "ca.crt"
7881
)
7982

8083
var (
@@ -169,8 +172,8 @@ func (r *RayClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
169172
logger.Error(err, "Failed to get CA Secret")
170173
return ctrl.Result{RequeueAfter: requeueTime}, err
171174
} else {
172-
key := caSecret.Data[corev1.TLSPrivateKeyKey]
173-
cert := caSecret.Data[corev1.TLSCertKey]
175+
key := caSecret.Data[CAPrivateKeyKey]
176+
cert := caSecret.Data[CACertKey]
174177
_, err = r.kubeClient.CoreV1().Secrets(cluster.Namespace).Apply(ctx, desiredCASecret(cluster, key, cert), metav1.ApplyOptions{FieldManager: controllerName, Force: true})
175178
if err != nil {
176179
logger.Error(err, "Failed to apply CA Secret")
@@ -404,8 +407,8 @@ func desiredCASecret(cluster *rayv1.RayCluster, key, cert []byte) *corev1ac.Secr
404407
return corev1ac.Secret(caSecretNameFromCluster(cluster), cluster.Namespace).
405408
WithLabels(map[string]string{"ray.io/cluster-name": cluster.Name}).
406409
WithData(map[string][]byte{
407-
corev1.TLSPrivateKeyKey: key,
408-
corev1.TLSCertKey: cert,
410+
CAPrivateKeyKey: key,
411+
CACertKey: cert,
409412
}).
410413
WithOwnerReferences(metav1ac.OwnerReference().
411414
WithUID(cluster.UID).

0 commit comments

Comments
 (0)