Fixes1 (#6)

* Fixes

* version 0.3.0

Makefile

@@ -1,4 +1,4 @@
-IMG ?= eu.gcr.io/sap-se-cx-gopher/sap-btp-service-operator-migration:v0.2.0
+IMG ?= eu.gcr.io/sap-se-cx-gopher/sap-btp-service-operator-migration:v0.3.0
 
 .PHONY: build-image
 build-image:

cleaner.go

@@ -86,10 +86,10 @@ func NewCleaner(kubeConfigContent []byte) (*Cleaner, error) {
 }
 
 func (c *Cleaner) RemoveRelease(releaseName string) error {
-	log.Println("Looking for Service Catalog release...")
+	log.Printf("Looking for %s release...", releaseName)
 	release, err := c.helmClient.GetRelease(releaseName)
 	if err == driver.ErrReleaseNotFound {
-		log.Println("service-catalog release not found, nothing to do")
+		log.Printf("%s release not found, nothing to do", releaseName)
 		return nil
 	}
 	if err != nil {
@@ -99,9 +99,11 @@ func (c *Cleaner) RemoveRelease(releaseName string) error {
 	log.Printf("Found %s release in the namespace %s: status %s", release.Name, release.Namespace, release.Info.Status.String())
 	log.Println(" Uninstalling...")
 	err = c.helmClient.UninstallRelease(&helmclient.ChartSpec{
-		ReleaseName: releaseName,
-		Timeout:     time.Minute,
-		Wait:        true,
+		ReleaseName:  releaseName,
+		DisableHooks: true,
+		Wait:         true,
+		Timeout:      time.Minute,
+		Force:        true,
 	})
 	if err != nil {
 		return err
@@ -118,6 +120,11 @@ func (c *Cleaner) RemoveResources() error {
 			Group:   "servicecatalog.kyma-project.io",
 			Version: "v1alpha1",
 		},
+		{
+			Kind:    "UsageKind",
+			Group:   "servicecatalog.kyma-project.io",
+			Version: "v1alpha1",
+		},
 		{
 			Kind:    "ServiceBinding",
 			Group:   "servicecatalog.k8s.io",
@@ -133,6 +140,16 @@ func (c *Cleaner) RemoveResources() error {
 			Group:   "servicecatalog.k8s.io",
 			Version: "v1beta1",
 		},
+		{
+			Kind:    "AddonsConfiguration",
+			Group:   "addons.kyma-project.io",
+			Version: "v1alpha1",
+		},
+		{
+			Kind:    "ClusterAddonsConfiguration",
+			Group:   "addons.kyma-project.io",
+			Version: "v1alpha1",
+		},
 	}
 
 	namespaces := &v1.NamespaceList{}
@@ -216,6 +233,11 @@ func (c *Cleaner) PrepareForRemoval() error {
 			Kind:    "ClusterServiceBrokerList",
 			Version: "v1beta1",
 		},
+		{
+			Kind:    "UsageKind",
+			Group:   "servicecatalog.kyma-project.io",
+			Version: "v1alpha1",
+		},
 	}
 
 	for _, gvk := range gvkList {
@@ -294,7 +316,10 @@ func (c *Cleaner) RemnoveCRDs() error {
 	for _, crd := range crdsList.Items {
 		if crd.Spec.Group == "servicecatalog.k8s.io" || crd.Spec.Group == "servicecatalog.kyma-project.io" {
 			log.Printf("Removing CRD %s", crd.Name)
-			c.k8sCli.Delete(context.Background(), &crd)
+			err := c.k8sCli.Delete(context.Background(), &crd)
+			if err != nil {
+				return err
+			}
 		}
 	}
 

deploy/chart/templates/clusterrole.yaml

@@ -3,86 +3,42 @@ kind: ClusterRole
 metadata:
   name: sap-btp-operator-migration
 rules:
-- apiGroups:
-  - "apiextensions.k8s.io"
-  resources:
-    - customresourcedefinitions
-  verbs:
-    - get
-    - list
-- apiGroups:
-    - "apps"
-  resources:
-    - customresourcedefinitions
-  verbs:
-    - get
-    - list
-    - delete
-- apiGroups:
-    - "rbac.authorization.k8s.io apps"
-  resources:
-    - customresourcedefinitions
-  verbs:
-    - get
-    - list
-    - delete
-- apiGroups:
-  - "admissionregistration.k8s.io"
-  resources:
+  - apiGroups:
+    - "apiextensions.k8s.io"
+    resources:
+      - customresourcedefinitions
+    verbs:
+      - get
+      - list
+      - delete
+  - apiGroups:
+    - ""
+    resources:
     - "*"
-  verbs:
+    verbs:
     - get
     - list
+    - watch
+    - patch
+    - update
     - delete
-- apiGroups:
-  - ""
-  resources:
-  - "*"
-  verbs:
-  - get
-  - list
-  - watch
-  - patch
-  - update
-  - delete
-- apiGroups:
-  - ""
-  resources:
-  # needs to get sap-btp-operator ConfigMap 
-  - configmaps
-  - customresourcedefinitions
-  - namespaces
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - services.cloud.sap.com
-  - servicecatalog.k8s.io
-  resources:
-  - servicebindings
-  - serviceinstances
-  - servicebrokers
-  - clusterservicebrokers
-  verbs:
-  - get
-  - list
-  - watch
-  - create
-  - update
-  - patch
-  - delete
-  - deletecollection
-- apiGroups:
-  - servicecatalog.kyma-project.io
-  verbs:
-  - get
-  - list
-  - watch
-  - create
-  - update
-  - patch
-  - delete
-  - deletecollection
-  resources:
-  - servicebindingusages
+  - apiGroups:
+    - "servicecatalog.kyma-project.io"
+    - "admissionregistration.k8s.io"
+    - "services.cloud.sap.com"
+    - "rbac.authorization.k8s.io"
+    - "monitoring.coreos.com"
+    - "security.istio.io"
+    - "ui.kyma-project.io"
+    - "testing.kyma-project.io"
+    - "servicecatalog.k8s.io"
+    - "apps"
+    - "apiextensions.k8s.io"
+    - "networking.istio.io"
+    - "policy"
+    - "security.istio.io"
+    - "addons.kyma-project.io"
+    verbs:
+    - "*"
+    resources:
+    - "*"

deploy/chart/templates/job.yaml

@@ -16,5 +16,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: migration
+# uncomment to test only cleaner
+#          command: ["cleaner"]
           image: {{.Values.image.repository}}:{{.Values.image.tag}}
           imagePullPolicy: Always

deploy/chart/values.yaml

@@ -1,3 +1,3 @@
 image:
   repository: eu.gcr.io/sap-se-cx-gopher/sap-btp-service-operator-migration
-  tag: v0.2.0
+  tag: v0.3.0

main.go

@@ -48,13 +48,13 @@ func main() {
 	}
 
 	log.Println("Removing service-catalog-addons release")
-	cleaner.RemoveRelease(ServiceCatalogAddonsReleaseName)
+	err = cleaner.RemoveRelease(ServiceCatalogAddonsReleaseName)
 	if err != nil {
 		panic(err)
 	}
 
 	log.Println("Removing Helm Broker release")
-	cleaner.RemoveRelease(HelmBrokerReleaseName)
+	err = cleaner.RemoveRelease(HelmBrokerReleaseName)
 	if err != nil {
 		panic(err)
 	}