From 880e2ed0c46e20cb0ce9737af0b529f279d2bced Mon Sep 17 00:00:00 2001 From: devthejo Date: Fri, 31 May 2024 21:35:16 +0200 Subject: [PATCH] fix: probe methods conflict force apply --- plugins/contrib/deploy-with/kubectl-dependency-tree.js | 5 ++++- plugins/fabrique/kontinuous.yaml | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/contrib/deploy-with/kubectl-dependency-tree.js b/plugins/contrib/deploy-with/kubectl-dependency-tree.js index a6d48b9aa..017c6bc3c 100644 --- a/plugins/contrib/deploy-with/kubectl-dependency-tree.js +++ b/plugins/contrib/deploy-with/kubectl-dependency-tree.js @@ -154,7 +154,10 @@ module.exports = async (options, context) => { } catch (err) { if ( err.message.includes("field is immutable") || - err.message.includes("invalid: spec: Forbidden: updates") + err.message.includes("invalid: spec: Forbidden: updates") || + err.message.includes( + "Forbidden: may not specify more than 1 handler type" + ) ) { return handleFieldIsImmutableError(manifest, err) } diff --git a/plugins/fabrique/kontinuous.yaml b/plugins/fabrique/kontinuous.yaml index 964dbd0c6..6d3c9cbff 100644 --- a/plugins/fabrique/kontinuous.yaml +++ b/plugins/fabrique/kontinuous.yaml @@ -155,7 +155,6 @@ dependencies: kindsForceRecreate: - "Job" - "Policy" - - "Deployment" # remove in future kapp: options: kubeApiQps: 1000