From b760288adb4c9996852539b66d9087dc74cb745a Mon Sep 17 00:00:00 2001
From: Lukas Gross <35373687+grolu@users.noreply.github.com>
Date: Thu, 12 Aug 2021 09:26:30 +0200
Subject: [PATCH] Fixed: (#1084)

Existing workers may keep cri.name empty without failing validation
Selecting a container runtime validates correctly
Machine image included internal properties in create shoot editor
additional container runtimes selection did no longer show up
---
 .../components/ShootWorkers/ContainerRuntime.vue  | 15 +++++++++++----
 .../ShootWorkers/WorkerInputGeneric.vue           |  1 +
 frontend/src/store/index.js                       |  3 ++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/ShootWorkers/ContainerRuntime.vue b/frontend/src/components/ShootWorkers/ContainerRuntime.vue
index 83d0ac6f8f..7647030248 100644
--- a/frontend/src/components/ShootWorkers/ContainerRuntime.vue
+++ b/frontend/src/components/ShootWorkers/ContainerRuntime.vue
@@ -34,7 +34,7 @@ SPDX-License-Identifier: Apache-2.0
 </template>
 
 <script>
-import { required } from 'vuelidate/lib/validators'
+import { requiredIf } from 'vuelidate/lib/validators'
 import { getValidationErrors, defaultCriNameByKubernetesVersion } from '@/utils'
 import find from 'lodash/find'
 import map from 'lodash/map'
@@ -52,7 +52,7 @@ const validationErrors = {
 
 const validations = {
   criName: {
-    required
+    required: requiredIf('criNameIsRequired')
   }
 }
 
@@ -69,6 +69,10 @@ export default {
     kubernetesVersion: {
       type: String,
       required: true
+    },
+    criNameIsRequired: {
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -83,7 +87,7 @@ export default {
       return map(this.machineImageCri, 'name')
     },
     criContainerRuntimeTypes () {
-      const containerRuntime = find(this.machineImageCri, ['name', this.containerRuntime])
+      const containerRuntime = find(this.machineImageCri, ['name', this.criName])
       const ociRuntimes = get(containerRuntime, 'containerRuntimes', [])
       return map(ociRuntimes, 'type')
     },
@@ -92,7 +96,10 @@ export default {
         return get(this.worker, 'cri.name')
       },
       set (value) {
-        set(this.worker, 'cri.name', value)
+        this.$set(this.worker, 'cri', {
+          ...this.worker.cri,
+          name: value
+        })
       }
     },
     selectedCriContainerRuntimeTypes: {
diff --git a/frontend/src/components/ShootWorkers/WorkerInputGeneric.vue b/frontend/src/components/ShootWorkers/WorkerInputGeneric.vue
index 1558ad2edf..523c3bfafa 100644
--- a/frontend/src/components/ShootWorkers/WorkerInputGeneric.vue
+++ b/frontend/src/components/ShootWorkers/WorkerInputGeneric.vue
@@ -41,6 +41,7 @@ SPDX-License-Identifier: Apache-2.0
           :machine-image-cri="machineImageCri"
           :worker="worker"
           :kubernetes-version="kubernetesVersion"
+          :cri-name-is-required="isNew"
           @valid="onContainerRuntimeValid">
         </container-runtime>
       </div>
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index c6cacc7794..62cbf0fd5c 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -61,6 +61,7 @@ import forOwn from 'lodash/forOwn'
 import replace from 'lodash/replace'
 import sample from 'lodash/sample'
 import split from 'lodash/split'
+import pick from 'lodash/pick'
 
 import moment from '@/utils/moment'
 import { ioPlugin } from '@/utils/Emitter'
@@ -1114,7 +1115,7 @@ const getters = {
         maxSurge: 1,
         machine: {
           type: machineType.name,
-          image: machineImage
+          image: pick(machineImage, ['name', 'version'])
         },
         zones,
         cri: {