From 309dcc31f7da0e229468c615a8fcf0c8def01f4d Mon Sep 17 00:00:00 2001
From: Kevin Minder <kminder@users.noreply.github.com>
Date: Tue, 20 Jul 2021 21:27:38 -0400
Subject: [PATCH] Update to use Rancher 2.5.9 (#1365) (#1367)

* Update BOM and additional rancher images for private registry
* Fix uninstall to remove additional rolebindings and MutatingWebhookConfiguration created by this version of Rancher

Co-authored-by: Deva Sagar <deva.sagar@oracle.com>
---
 .../2-uninstall-system-components.sh           |  6 ++++++
 platform-operator/verrazzano-bom.json          | 18 +++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/platform-operator/scripts/uninstall/uninstall-steps/2-uninstall-system-components.sh b/platform-operator/scripts/uninstall/uninstall-steps/2-uninstall-system-components.sh
index 7323fc47165..642208f9d1a 100755
--- a/platform-operator/scripts/uninstall/uninstall-steps/2-uninstall-system-components.sh
+++ b/platform-operator/scripts/uninstall/uninstall-steps/2-uninstall-system-components.sh
@@ -152,6 +152,8 @@ function delete_rancher() {
   do
     delete_k8s_resources rolebinding ":metadata.name" "Could not delete RoleBindings from Rancher in namespace ${namespace}" '/clusterrolebinding-/' "${namespace}" \
       || return $? # return on pipefail
+    delete_k8s_resources rolebinding ":metadata.name" "Could not delete RoleBindings from Rancher in namespace ${namespace}" '/^rb-/' "${namespace}" \
+      || return $? # return on pipefail
   done
 
   # delete configmap in kube-system
@@ -185,6 +187,10 @@ function delete_rancher() {
     | awk '/controller.cattle.io/ {print $1}' \
     | xargsr kubectl patch namespace -p '{"metadata":{"finalizers":null}}' --type=merge \
     || err_return $? "Could not remove Rancher finalizers from all namespaces" || return $? # return on pipefail
+
+  log "Removing Rancher MutatingWebhookConfiguration"
+  kubectl delete mutatingwebhookconfigurations.admissionregistration.k8s.io rancher.cattle.io --ignore-not-found \
+    || err_return $? "Failed to delete MutatingWebhookConfiguration rancher.cattle.io"
 }
 
 action "Deleting Rancher Components" delete_rancher || exit 1
diff --git a/platform-operator/verrazzano-bom.json b/platform-operator/verrazzano-bom.json
index 149068bb242..c4114928767 100644
--- a/platform-operator/verrazzano-bom.json
+++ b/platform-operator/verrazzano-bom.json
@@ -165,13 +165,13 @@
           "images": [
             {
               "image": "rancher",
-              "tag": "v2.5.7-20210407205410-1c7b39d0c",
+              "tag": "v2.5.9-20210716224636-3e2504adb",
               "helmFullImageKey": "rancherImage",
               "helmTagKey": "rancherImageTag"
             },
             {
               "image": "rancher-agent",
-              "tag": "v2.5.7-20210407205410-1c7b39d0c"
+              "tag": "v2.5.9-20210716224636-3e2504adb"
             }
           ]
         },
@@ -186,23 +186,27 @@
             },
             {
               "image": "rancher-webhook",
-              "tag": "v0.1.0-beta9"
+              "tag": "v0.1.1"
             },
             {
               "image": "fleet-agent",
-              "tag": "v0.3.4"
+              "tag": "v0.3.5"
             },
             {
               "image": "fleet",
-              "tag": "v0.3.4"
+              "tag": "v0.3.5"
             },
             {
               "image": "gitjob",
-              "tag": "v0.1.13"
+              "tag": "v0.1.15"
             },
             {
               "image": "rancher-operator",
-              "tag": "v0.1.3"
+              "tag": "v0.1.4"
+            },
+            {
+              "image": "local-path-provisioner",
+              "tag": "v0.0.14"
             }
           ]
         }