Merge pull request #215 from aalves08/189-channel-automatic-deletion-…

…backport BP: Support managed os channel automatic deletion
rancher · Aug 6, 2024 · e137dc5 · e137dc5
2 parents 605e64f + dcdb58a
commit e137dc5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "elemental-ui",
   "description": "Elemental UI extension",
-  "version": "1.3.1-rc8",
+  "version": "1.3.1-rc9",
   "private": false,
   "engines": {
     "node": ">=12"

diff --git a/pkg/elemental/edit/elemental.cattle.io.managedosversionchannel.vue b/pkg/elemental/edit/elemental.cattle.io.managedosversionchannel.vue
@@ -4,11 +4,16 @@ import CruResource from '@shell/components/CruResource.vue';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
+import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
 
 export default {
   name:       'ManagedOsVersionChannelEditView',
   components: {
-    Loading, LabeledInput, CruResource, NameNsDescription
+    Loading,
+    LabeledInput,
+    CruResource,
+    NameNsDescription,
+    Checkbox
   },
   mixins:     [CreateEditView],
   props:      {
@@ -44,7 +49,7 @@ export default {
       </div>
     </div>
     <div v-if="value.spec" class="row mb-20">
-      <div class="col span-6 mb-20">
+      <div class="col span-8 mb-20">
         <h3>{{ t('elemental.osversionchannels.create.spec') }}</h3>
         <LabeledInput
           v-model.trim="value.spec.options.image"
@@ -53,6 +58,13 @@ export default {
           :placeholder="t('elemental.osversionchannels.create.registryUri.placeholder', null, true)"
           :mode="mode"
         />
+        <Checkbox
+          v-model="value.spec.deleteNoLongerInSyncVersions"
+          :mode="mode"
+          :label="t('elemental.osversionchannels.create.automaticDelete')"
+          data-testid="os-version-channel-automatic-deletion"
+          class="mt-20"
+        />
       </div>
     </div>
   </CruResource>

diff --git a/pkg/elemental/l10n/en-us.yaml b/pkg/elemental/l10n/en-us.yaml
@@ -201,6 +201,7 @@ elemental:
     create:
       configuration: Configuration
       spec: Spec
+      automaticDelete: Automatically delete deprecated OS versions that are no longer included in the channel
       registryUri:
         label: Image registry path
         placeholder: Enter an image registry path
diff --git a/pkg/elemental/package.json b/pkg/elemental/package.json
@@ -1,7 +1,7 @@
 {
   "name": "elemental",
   "description": "OS Management extension",
-  "version": "1.3.1-rc8",
+  "version": "1.3.1-rc9",
   "private": false,
   "rancher": {
     "annotations": {