nydus-snapshotter: remove config related to nydus after uninstalling

Remove config related to nydus after uninstalling nydus snapshotter. Fixes dragonflyoss#206 Signed-off-by: ChengyuZhu6 <[email protected]>
ChengyuZhu6 · Dec 15, 2023 · c8f3f40 · c8f3f40
1 parent 73f3d70
commit c8f3f40
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/charts/nydus-snapshotter/Chart.yaml b/charts/nydus-snapshotter/Chart.yaml
@@ -3,7 +3,7 @@ name: nydus-snapshotter
 description: Nydus snapshotter is an external plugin of containerd for Nydus image service which implements a chunk-based content-addressable filesystem on top of a called RAFS.
 icon: https://github.com/dragonflyoss/image-service/raw/master/misc/logo.svg
 type: application
-version: 0.0.7
+version: 0.0.8
 appVersion: 0.9.0
 keywords:
   - nydus

diff --git a/charts/nydus-snapshotter/templates/nydus-snapshotter/snapshotter-daemonset.yaml b/charts/nydus-snapshotter/templates/nydus-snapshotter/snapshotter-daemonset.yaml
@@ -68,6 +68,18 @@ spec:
 {{ toYaml .Values.resources | indent 12 }}
         {{- if .Values.containerRuntime.containerd.enable }}
         lifecycle:
+          preStop:
+            exec:
+              command:
+              - "/bin/sh"
+              - "-c"
+              - |
+                # Recover the containerd config file.
+                etcContainerd={{ .Values.containerRuntime.containerd.configFile }}
+                rm -f ${etcContainerd}
+                mv ${etcContainerd}.bak ${etcContainerd}
+                # currently, without host pid in container, we can not nsenter with pid and can not invoke systemctl correctly.
+                nsenter -t 1 -m systemctl -- restart containerd.service
           postStart:
             exec:
               command:
@@ -101,13 +113,13 @@ spec:
       - name: update-containerd
         image: "{{ .Values.containerRuntime.initContainerImage }}"
         imagePullPolicy: {{ .Values.pullPolicy | quote }}
-        resources:
-{{ toYaml .Values.resources | indent 12 }}
+        resources: {{ toYaml .Values.resources | indent 12 }}
         command:
         - /bin/sh
         - -cx
         - |-
           etcContainerd={{ .Values.containerRuntime.containerd.configFile }}
+          cp ${etcContainerd} ${etcContainerd}.bak
 
           toml check $etcContainerd proxy_plugins.nydus
           if [ $? -eq 0 ]; then