From 5e3d5d6839b32df82c0275cfa53b03fbc27f4980 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 22 Mar 2024 12:21:55 +0000 Subject: [PATCH] fix: final fixes for cli tools of the v1.27 cycle --- admin/libhelm.sh | 3 +-- admin/upgrade_cluster.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/admin/libhelm.sh b/admin/libhelm.sh index 8a9e8e9c..2e4aa524 100644 --- a/admin/libhelm.sh +++ b/admin/libhelm.sh @@ -211,8 +211,7 @@ spec: hostIPC: true hostPID: true tolerations: - - key: node-role.kubernetes.io/control-plane - operator: Exists + - operator: Exists effect: NoSchedule initContainers: - name: node-upgrade diff --git a/admin/upgrade_cluster.sh b/admin/upgrade_cluster.sh index 34f1d0d2..c736eb9c 100755 --- a/admin/upgrade_cluster.sh +++ b/admin/upgrade_cluster.sh @@ -63,7 +63,7 @@ done # Fix for legacy cert-manager CRDs to be upgraded for crd_name in certificaterequests.cert-manager.io certificates.cert-manager.io challenges.acme.cert-manager.io clusterissuers.cert-manager.io issuers.cert-manager.io orders.acme.cert-manager.io; do - manager_index="$(kubectl get crd "${crd_name}" --show-managed-fields --output json | jq -r '.metadata.managedFields | map(.manager == "cainjector") | index(true)')" + manager_index="$(kubectl get crd "${crd_name}" --show-managed-fields --output json | jq -r '.metadata.managedFields | map(.manager == "cert-manager-cainjector") | index(true)')" [ "$manager_index" != "null" ] && kubectl patch crd "${crd_name}" --type=json -p="[{\"op\": \"remove\", \"path\": \"/metadata/managedFields/${manager_index}\"}]" done # v1.27