ccruntime: Set INSTALL_OFFICIAL_CONTAINERD to false

The majority of the managed kubernetes solutions are already relying on a new enough (v1.7+) version of containerd. Fixes: confidential-containers#272 Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
fidencio · Nov 6, 2023 · 475c686 · 475c686
1 parent c443135
commit 475c686
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 1 deletion.
diff --git a/config/samples/ccruntime/default/kustomization.yaml b/config/samples/ccruntime/default/kustomization.yaml
@@ -36,5 +36,13 @@ patches:
     - op: add
       path: /spec/config/debug
       value: false
+    - op: add
+      path: /spec/config/environmentVariables
+      value:
+        # It means that we're relying on the cluster to already have
+        # containerd v1.7+ running.  If you know for sure that's not
+        # the case, please, set this variable to `true`
+        - name: "INSTALL_OFFICIAL_CONTAINERD"
+          value: "false"
   target:
     kind: CcRuntime
diff --git a/config/samples/ccruntime/peer-pods/kustomization.yaml b/config/samples/ccruntime/peer-pods/kustomization.yaml
@@ -23,5 +23,13 @@ patches:
     - op: add
       path: /spec/config/debug
       value: false
+    - op: add
+      path: /spec/config/environmentVariables
+      value:
+        # It means that we're relying on the cluster to already have
+        # containerd v1.7+ running.  If you know for sure that's not
+        # the case, please, set this variable to `true`
+        - name: "INSTALL_OFFICIAL_CONTAINERD"
+          value: "false"
   target:
     kind: CcRuntime
diff --git a/config/samples/ccruntime/s390x/kustomization.yaml b/config/samples/ccruntime/s390x/kustomization.yaml
@@ -26,5 +26,13 @@ patches:
     - op: add
       path: /spec/config/debug
       value: false
+    - op: add
+      path: /spec/config/environmentVariables
+      value:
+        # It means that we're relying on the cluster to already have
+        # containerd v1.7+ running.  If you know for sure that's not
+        # the case, please, set this variable to `true`
+        - name: "INSTALL_OFFICIAL_CONTAINERD"
+          value: "false"
   target:
     kind: CcRuntime
diff --git a/config/samples/ccruntime/ssh-demo/kustomization.yaml b/config/samples/ccruntime/ssh-demo/kustomization.yaml
@@ -23,6 +23,14 @@ patches:
         snapshotter: "nydus"
       - name: "kata-qemu"
         snapshotter: "nydus"
+    - op: add
+      path: /spec/config/environmentVariables
+      value:
+        # It means that we're relying on the cluster to already have
+        # containerd v1.7+ running.  If you know for sure that's not
+        # the case, please, set this variable to `true`
+        - name: "INSTALL_OFFICIAL_CONTAINERD"
+          value: "false"
   target:
     kind: CcRuntime
 
diff --git a/install/pre-install-payload/scripts/reqs-deploy.sh b/install/pre-install-payload/scripts/reqs-deploy.sh
@@ -5,7 +5,7 @@ set -o pipefail
 set -o nounset
 
 INSTALL_COCO_CONTAINERD=${INSTALL_COCO_CONTAINERD:-false}
-INSTALL_OFFICIAL_CONTAINERD=${INSTALL_OFFICIAL_CONTAINERD:-true}
+INSTALL_OFFICIAL_CONTAINERD=${INSTALL_OFFICIAL_CONTAINERD:-false}
 INSTALL_VFIO_GPU_CONTAINERD=${INSTALL_VFIO_GPU_CONTAINERD:-false}
 INSTALL_NYDUS_SNAPSHOTTER=${INSTALL_NYDUS_SNAPSHOTTER:-true}