@@ -179,7 +179,26 @@ func (r *REST) pendingTapByName(ctx context.Context, name string) (*corev1alpha1
179179// materialization is pending.
180180// -----------------------------------------------------------------------------
181181
182- func (r * REST ) Create (ctx context.Context , obj runtime.Object , createValidation rest.ValidateObjectFunc , _ * metav1.CreateOptions ) (runtime.Object , error ) {
182+ // createDryRun and deleteDryRun carry the caller's dry-run directive down to
183+ // the backing write. The dynamic client takes the directive by value, so a
184+ // request that reaches it without one performs the write for real: a
185+ // --dry-run=server connect would create the Flux source and a dry-run
186+ // disconnect would delete the PackageSource.
187+ func createDryRun (opts * metav1.CreateOptions ) []string {
188+ if opts == nil {
189+ return nil
190+ }
191+ return opts .DryRun
192+ }
193+
194+ func deleteDryRun (opts * metav1.DeleteOptions ) []string {
195+ if opts == nil {
196+ return nil
197+ }
198+ return opts .DryRun
199+ }
200+
201+ func (r * REST ) Create (ctx context.Context , obj runtime.Object , createValidation rest.ValidateObjectFunc , opts * metav1.CreateOptions ) (runtime.Object , error ) {
183202 in , ok := obj .(* corev1alpha1.Tap )
184203 if ! ok {
185204 return nil , apierrors .NewBadRequest (fmt .Sprintf ("expected a Tap object, got %T" , obj ))
@@ -219,7 +238,7 @@ func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation
219238 // Create the Flux source, idempotently: a repeat connect updates the
220239 // existing source (new tag/secret) rather than erroring.
221240 src := r .dyn .Resource (gvrOCIRepos ).Namespace ("cozy-system" )
222- if _ , err := src .Create (ctx , repo , metav1.CreateOptions {FieldManager : "cozystack-api" }); err != nil {
241+ if _ , err := src .Create (ctx , repo , metav1.CreateOptions {FieldManager : "cozystack-api" , DryRun : createDryRun ( opts ) }); err != nil {
223242 if ! apierrors .IsAlreadyExists (err ) {
224243 return nil , apierrors .NewInternalError (fmt .Errorf ("create Flux source for tap %s: %w" , target .FluxSourceName , err ))
225244 }
@@ -251,7 +270,7 @@ func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation
251270 }
252271 ann [tapconst .NameAnnotation ] = target .FluxSourceName
253272 cur .SetAnnotations (ann )
254- if _ , err := src .Update (ctx , cur , metav1.UpdateOptions {FieldManager : "cozystack-api" }); err != nil {
273+ if _ , err := src .Update (ctx , cur , metav1.UpdateOptions {FieldManager : "cozystack-api" , DryRun : createDryRun ( opts ) }); err != nil {
255274 return nil , apierrors .NewInternalError (fmt .Errorf ("update Flux source for tap %s: %w" , target .FluxSourceName , err ))
256275 }
257276 }
@@ -273,7 +292,7 @@ func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation
273292// GracefulDeleter — disconnect a community tap (mirrors `cozypkg untap`)
274293// -----------------------------------------------------------------------------
275294
276- func (r * REST ) Delete (ctx context.Context , name string , deleteValidation rest.ValidateObjectFunc , _ * metav1.DeleteOptions ) (runtime.Object , bool , error ) {
295+ func (r * REST ) Delete (ctx context.Context , name string , deleteValidation rest.ValidateObjectFunc , opts * metav1.DeleteOptions ) (runtime.Object , bool , error ) {
277296 u , err := r .dyn .Resource (gvrPackageSources ).Get (ctx , name , metav1.GetOptions {})
278297 if err != nil {
279298 if apierrors .IsNotFound (err ) {
@@ -282,7 +301,7 @@ func (r *REST) Delete(ctx context.Context, name string, deleteValidation rest.Va
282301 // name). Fall back to removing that source so a pending or
283302 // collision-blocked connect is still recoverable from the dashboard
284303 // rather than orphaning a finalized OCIRepository.
285- return r .deleteOrphanTapSource (ctx , name )
304+ return r .deleteOrphanTapSource (ctx , name , deleteDryRun ( opts ) )
286305 }
287306 return nil , false , apierrors .NewInternalError (fmt .Errorf ("get PackageSource %q: %w" , name , err ))
288307 }
@@ -304,7 +323,7 @@ func (r *REST) Delete(ctx context.Context, name string, deleteValidation rest.Va
304323 }
305324 }
306325
307- if err := r .dyn .Resource (gvrPackageSources ).Delete (ctx , name , metav1.DeleteOptions {}); err != nil {
326+ if err := r .dyn .Resource (gvrPackageSources ).Delete (ctx , name , metav1.DeleteOptions {DryRun : deleteDryRun ( opts ) }); err != nil {
308327 return nil , false , apierrors .NewInternalError (fmt .Errorf ("delete PackageSource %q: %w" , name , err ))
309328 }
310329
@@ -317,7 +336,7 @@ func (r *REST) Delete(ctx context.Context, name string, deleteValidation rest.Va
317336 if ns == "" {
318337 ns = "cozy-system"
319338 }
320- if err := r .dyn .Resource (gvrOCIRepos ).Namespace (ns ).Delete (ctx , ref .Name , metav1.DeleteOptions {}); err != nil && ! apierrors .IsNotFound (err ) {
339+ if err := r .dyn .Resource (gvrOCIRepos ).Namespace (ns ).Delete (ctx , ref .Name , metav1.DeleteOptions {DryRun : deleteDryRun ( opts ) }); err != nil && ! apierrors .IsNotFound (err ) {
321340 klog .V (2 ).InfoS ("tap disconnected but its OCIRepository could not be deleted" , "source" , ref .Name , "err" , err )
322341 }
323342 }
@@ -329,7 +348,7 @@ func (r *REST) Delete(ctx context.Context, name string, deleteValidation rest.Va
329348// deleteOrphanTapSource removes a tap whose OCIRepository exists but whose
330349// PackageSource has not been materialized. It matches the labeled OCIRepository
331350// carrying the tap-name annotation and deletes it.
332- func (r * REST ) deleteOrphanTapSource (ctx context.Context , name string ) (runtime.Object , bool , error ) {
351+ func (r * REST ) deleteOrphanTapSource (ctx context.Context , name string , dryRun [] string ) (runtime.Object , bool , error ) {
333352 list , err := r .dyn .Resource (gvrOCIRepos ).Namespace ("cozy-system" ).List (ctx , metav1.ListOptions {
334353 LabelSelector : tapconst .Label + "=true" ,
335354 })
@@ -341,7 +360,7 @@ func (r *REST) deleteOrphanTapSource(ctx context.Context, name string) (runtime.
341360 if item .GetAnnotations ()[tapconst .NameAnnotation ] != name {
342361 continue
343362 }
344- if err := r .dyn .Resource (gvrOCIRepos ).Namespace ("cozy-system" ).Delete (ctx , item .GetName (), metav1.DeleteOptions {}); err != nil && ! apierrors .IsNotFound (err ) {
363+ if err := r .dyn .Resource (gvrOCIRepos ).Namespace ("cozy-system" ).Delete (ctx , item .GetName (), metav1.DeleteOptions {DryRun : dryRun }); err != nil && ! apierrors .IsNotFound (err ) {
345364 return nil , false , apierrors .NewInternalError (fmt .Errorf ("delete tap source %q: %w" , item .GetName (), err ))
346365 }
347366 tap := & corev1alpha1.Tap {
0 commit comments