Skip to content

Fix HelmOps DownstreamResources - move from spec.helm to spec #15921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
torchiaf merged 2 commits into from
Nov 12, 2025
Merged

Fix HelmOps DownstreamResources - move from spec.helm to spec #15921

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fb7f3f
Fix HelmOps DownstreamResources - move from spec.helm to spec
torchiaf Nov 12, 2025
b074258
Fix check-i18n-links - accept 202 status
torchiaf Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions shell/edit/__tests__/fleet.cattle.io.helmop.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ describe.each([

await fleetSecretSelector.vm.$emit('update:value', ['secret2', 'secret3']);

expect(wrapper.vm.value.spec.helm.downstreamResources).toStrictEqual([{ name: 'secret2', kind: 'Secret' }, { name: 'secret3', kind: 'Secret' }]);
expect(wrapper.vm.value.spec.downstreamResources).toStrictEqual([{ name: 'secret2', kind: 'Secret' }, { name: 'secret3', kind: 'Secret' }]);
});

it('should update downstreamResources with new ConfigMaps when FleetConfigMapSelector emits update event', async() => {
Expand All @@ -260,6 +260,6 @@ describe.each([

await fleetConfigMapSelector.vm.$emit('update:value', ['configMap2', 'configMap3']);

expect(wrapper.vm.value.spec.helm.downstreamResources).toStrictEqual([{ name: 'configMap2', kind: 'ConfigMap' }, { name: 'configMap3', kind: 'ConfigMap' }]);
expect(wrapper.vm.value.spec.downstreamResources).toStrictEqual([{ name: 'configMap2', kind: 'ConfigMap' }, { name: 'configMap3', kind: 'ConfigMap' }]);
});
});
12 changes: 6 additions & 6 deletions shell/edit/fleet.cattle.io.helmop.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,11 @@ export default {
},

downstreamSecretsList() {
return (this.value.spec.helm.downstreamResources || []).filter((r) => r.kind === 'Secret').map((r) => r.name);
return (this.value.spec.downstreamResources || []).filter((r) => r.kind === 'Secret').map((r) => r.name);
},

downstreamConfigMapsList() {
return (this.value.spec.helm.downstreamResources || []).filter((r) => r.kind === 'ConfigMap').map((r) => r.name);
return (this.value.spec.downstreamResources || []).filter((r) => r.kind === 'ConfigMap').map((r) => r.name);
},
},

Expand Down Expand Up @@ -446,14 +446,14 @@ export default {
updateDownstreamResources(kind, list) {
switch (kind) {
case 'Secret':
this.value.spec.helm.downstreamResources = [
...(this.value.spec.helm.downstreamResources || []).filter((r) => r.kind !== 'Secret'),
this.value.spec.downstreamResources = [
...(this.value.spec.downstreamResources || []).filter((r) => r.kind !== 'Secret'),
...(list || []).map((name) => ({ name, kind: 'Secret' })),
];
break;
case 'ConfigMap':
this.value.spec.helm.downstreamResources = [
...(this.value.spec.helm.downstreamResources || []).filter((r) => r.kind !== 'ConfigMap'),
this.value.spec.downstreamResources = [
...(this.value.spec.downstreamResources || []).filter((r) => r.kind !== 'ConfigMap'),
...(list || []).map((name) => ({ name, kind: 'ConfigMap' })),
];
break;
Expand Down
Loading