[Bugfix] Fix Operator Debug mode (#1208)

Author: ajanikow

CHANGELOG.md

@@ -41,6 +41,7 @@
 - (Bugfix) Prevent Runtime update restarts
 - (Bugfix) Change member port discovery
 - (Feature) Do not change external service ports
+- (Bugfix) Fix Operator Debug mode
 
 ## [1.2.20](https://github.com/arangodb/kube-arangodb/tree/1.2.20) (2022-10-25)
 - (Feature) Add action progress

chart/kube-arangodb/templates/deployment-operator/role.yaml

@@ -38,11 +38,18 @@ rules:
     - apiGroups: ["backup.arangodb.com"]
       resources: ["arangobackuppolicies", "arangobackups"]
       verbs: ["get", "list", "watch"]
+{{- if .Values.rbac.extensions.debug }}
+    - apiGroups: ["events.k8s.io"]
+      resources: ["pods/log"]
+      verbs: ["list"]
+    - apiGroups: [""]
+      resources: ["pods/log"]
+      verbs: ["get", "ist"]
+{{- end }}
 {{- if .Values.rbac.extensions.monitoring }}
     - apiGroups: ["monitoring.coreos.com"]
       resources: ["servicemonitors"]
       verbs: ["get", "create", "delete", "update", "list", "watch", "patch"]
-  
 {{- end }}
 {{- end }}
 {{- end }}

chart/kube-arangodb/values.yaml

@@ -61,4 +61,5 @@ rbac:
   extensions:
     monitoring: true
     acs: true
-    at: true
+    at: true
+    debug: false

cmd/debug.go

@@ -22,6 +22,7 @@ package cmd
 
 import (
 	"compress/gzip"
+	"io"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -50,32 +51,48 @@ var debugPackageInput struct {
 }
 
 func debugPackageFunc(cmd *cobra.Command, _ []string) error {
-	out := os.Stdout
-
-	if debugPackageInput.Output != "-" {
-		f, err := os.OpenFile("./out.tar.gz", os.O_TRUNC|os.O_WRONLY|os.O_CREATE, 0644)
-		if err != nil {
-			return err
-		}
-
-		out = f
+	if debugPackageInput.Output == "-" {
+		return debugPackageStdOut(cmd)
 	}
 
-	gw := gzip.NewWriter(out)
+	return debugPackageFile(cmd)
+}
 
-	if err := debug_package.GenerateD(cmd, gw); err != nil {
-		return err
-	}
+func debugPackageStdOut(cmd *cobra.Command) (returnError error) {
+	return debugPackageGZip(cmd, os.Stdout)
+}
 
-	if err := gw.Close(); err != nil {
+func debugPackageFile(cmd *cobra.Command) (returnError error) {
+	out, err := os.OpenFile("./out.tar.gz", os.O_TRUNC|os.O_WRONLY|os.O_CREATE, 0644)
+	if err != nil {
 		return err
 	}
 
-	if debugPackageInput.Output != "-" {
+	defer func() {
 		if err := out.Close(); err != nil {
-			return err
+			if returnError == nil {
+				returnError = err
+			}
 		}
-	}
+	}()
+
+	return debugPackageGZip(cmd, out)
+}
+
+func debugPackageGZip(cmd *cobra.Command, out io.Writer) (returnError error) {
+	gw := gzip.NewWriter(out)
+
+	defer func() {
+		if err := gw.Close(); err != nil {
+			if returnError == nil {
+				returnError = err
+			}
+		}
+	}()
+
+	return debugPackageRaw(cmd, gw)
+}
 
-	return nil
+func debugPackageRaw(cmd *cobra.Command, gw io.Writer) error {
+	return debug_package.GenerateD(cmd, gw)
 }