Merge pull request replicatedhq#556 from replicatedhq/mike-one-cri

Only allow spec with on CRI specified
DeDuplicate · Jun 19, 2020 · fc430c0 · fc430c0
2 parents 3a70a6b + 241a1e1
commit fc430c0
Show file tree

Hide file tree

Showing 4 changed files with 585 additions and 66 deletions.
diff --git a/web/package.json b/web/package.json
@@ -36,7 +36,7 @@
     "codeclimate-test-reporter": "^0.5.0",
     "coveralls": "^3.0.0",
     "env-subst": "^1.0.3",
-    "mocha": "3.1.2",
+    "mocha": "^8.0.1",
     "mocha-jenkins-reporter": "^0.3.10",
     "mocha-junit-reporter": "^1.13.0",
     "mocha-typescript": "^1.0.23",

diff --git a/web/src/installers/index.ts b/web/src/installers/index.ts
@@ -843,6 +843,9 @@ export class Installer {
     if (this.spec.containerd && !Installer.hasVersion("containerd", this.spec.containerd.version)) {
       return { error: { message: `Containerd version "${_.escape(this.spec.containerd.version)}" is not supported` } };
     }
+    if (this.spec.containerd && this.spec.docker) {
+      return { error: { message: `This spec contains both docker and containerd, please specifiy only one CRI` } };
+    }
   }
 
   public packages(): string[] {

diff --git a/web/src/test/installers.ts b/web/src/test/installers.ts
@@ -88,8 +88,6 @@ spec:
     noProxy: false
     privateAddress: 10.38.1.1
     publicAddress: 101.38.1.1
-  containerd:
-    version: 1.2.13
 `;
 
 const typeMetaStableV1Beta1 = `