Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 17 additions & 1 deletion operator/internal/controller/llmmodel_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ func (r *LLMModelReconciler) reconcileAuthSecretAndConfigMap(
if err := r.createOrUpdateSecret(ctx, auth.APIKeySecret); err != nil {
return fmt.Errorf("reconciling api key secret: %w", err)
}
if err := r.createOrUpdateConfigMap(ctx, auth.APIKeyMetadataCM); err != nil {
if err := r.createOrUpdateConfigMapPreserveData(ctx, auth.APIKeyMetadataCM); err != nil {
return fmt.Errorf("reconciling api key metadata configmap: %w", err)
}
return nil
Expand Down Expand Up @@ -641,6 +641,22 @@ func (r *LLMModelReconciler) createOrUpdateConfigMap(ctx context.Context, cm *co
return r.Update(ctx, existing)
}

// createOrUpdateConfigMapPreserveData is for ConfigMaps whose data is owned by
// another writer (the key-manager stores API-key metadata in them); the
// operator only manages labels, mirroring createOrUpdateSecret.
func (r *LLMModelReconciler) createOrUpdateConfigMapPreserveData(ctx context.Context, cm *corev1.ConfigMap) error {
existing := &corev1.ConfigMap{}
err := r.Get(ctx, types.NamespacedName{Name: cm.Name, Namespace: cm.Namespace}, existing)
if apierrors.IsNotFound(err) {
return r.Create(ctx, cm)
}
if err != nil {
return err
}
existing.Labels = cm.Labels
return r.Update(ctx, existing)
}

func (r *LLMModelReconciler) createOrUpdateNetworkPolicy(ctx context.Context, np *networkingv1.NetworkPolicy) error {
existing := &networkingv1.NetworkPolicy{}
err := r.Get(ctx, types.NamespacedName{Name: np.Name, Namespace: np.Namespace}, existing)
Expand Down
32 changes: 32 additions & 0 deletions operator/internal/controller/llmmodel_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,38 @@ var _ = Describe("LLMModel Controller", func() {
Namespace: testNamespace,
}, cm)).To(Succeed())
})

It("preserves key data written by the key-manager across reconciles", func() {
By("creating the LLMModel and reconciling")
model := newMinimalModel(modelName)
Expect(k8sClient.Create(ctx, model)).To(Succeed())
r := newReconciler()
Expect(reconcileUntilStable(r, ctx, reconcileRequest(modelName))).To(Succeed())

By("simulating the key-manager writing a key + metadata")
secret := &corev1.Secret{}
secretKey := types.NamespacedName{Name: modelName + "-api-keys", Namespace: testNamespace}
Expect(k8sClient.Get(ctx, secretKey, secret)).To(Succeed())
secret.Data = map[string][]byte{"key-abc123": []byte("sk-secret-value")}
Expect(k8sClient.Update(ctx, secret)).To(Succeed())

cm := &corev1.ConfigMap{}
cmKey := types.NamespacedName{Name: modelName + "-api-key-metadata", Namespace: testNamespace}
Expect(k8sClient.Get(ctx, cmKey, cm)).To(Succeed())
cm.Data = map[string]string{"key-abc123": `{"name":"my key","created_by":"user"}`}
Expect(k8sClient.Update(ctx, cm)).To(Succeed())

By("reconciling again")
Expect(reconcileUntilStable(r, ctx, reconcileRequest(modelName))).To(Succeed())

By("verifying the Secret data survived the reconcile")
Expect(k8sClient.Get(ctx, secretKey, secret)).To(Succeed())
Expect(secret.Data).To(HaveKey("key-abc123"))

By("verifying the metadata ConfigMap data survived the reconcile")
Expect(k8sClient.Get(ctx, cmKey, cm)).To(Succeed())
Expect(cm.Data).To(HaveKey("key-abc123"))
})
})

Describe("Deletion with finalizer cleanup", func() {
Expand Down
Loading