fix: cannot uninstall spiderpool when sriovOperatorConfig is installed

Signed-off-by: ty-dc <tao.yang@daocloud.io>

Makefile

@@ -430,11 +430,11 @@ clean: clean_e2e
 
 .PHONY: clean_e2e_spiderpool
 clean_e2e_spiderpool:
- -$(QUIET) make -C test uninstall_spiderpool
+ $(QUIET) make -C test uninstall_spiderpool
 
 .PHONY: upgrade_e2e_spiderpool
 upgrade_e2e_spiderpool:
- -$(QUIET) make -C test upgrade_spiderpool
+ $(QUIET) make -C test upgrade_spiderpool
 
 .PHONY: codegen
 codegen:

charts/spiderpool/templates/deleteHook.yaml

@@ -5,7 +5,7 @@ metadata:
  name: {{ .Values.spiderpoolController.name | trunc 48 | trimSuffix "-" }}-hook-pre-delete
  annotations:
  "helm.sh/hook": pre-delete
- "helm.sh/hook-delete-policy": hook-succeeded,hook-failed
+ "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 spec:
  template:
  spec:
@@ -22,6 +22,10 @@ spec:
  - --mutating
  - {{ .Values.spiderpoolController.name | trunc 63 | trimSuffix "-" }}
  env:
+ - name: SPIDERPOOL_POD_NAMESPACE
+ value: {{ .Release.Namespace | quote }}
+ - name: SPIDERPOOL_INIT_NAME
+ value: {{ .Values.spiderpoolInit.name | trunc 63 | trimSuffix "-" | quote }}
  - name: SPIDERPOOL_POD_NAME
  valueFrom:
  fieldRef:

charts/spiderpool/templates/role.yaml

@@ -46,6 +46,7 @@ rules:
  - mutatingwebhookconfigurations
  - validatingwebhookconfigurations
  verbs:
+ - delete
  - get
  - list
  - watch
@@ -88,6 +89,7 @@ rules:
  - cronjobs
  - jobs
  verbs:
+ - delete
  - get
  - list
  - update