Skip to content

Registry configuration page - create/edit a registry #82

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
merged 1 commit into from
Aug 12, 2025
Merged

Registry configuration page - create/edit a registry #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions pkg/sbombastic-image-vulnerability-scanner/constants/scan-interval-options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import {
RegistryTypeOptions,
ScanIntervalOptions
} from '@sbombastic-image-vulnerability-scanner/types/sbombastic-image-vulnerability-scanner';

export const SCAN_INTERVAL_OPTIONS: { label: string; value: ScanIntervalOptions }[] = [
{ label: 'Every 1 hour', value: '1h' },
{ label: 'Every 3 hours', value: '3h' },
{ label: 'Every 6 hours', value: '6h' },
{ label: 'Every 12 hours', value: '12h' },
{ label: 'Every 24 hours', value: '24h' },
{ label: 'Manual Scan', value: '0s' } // backend disables auto-scan
];

export const REGISTRY_TYPE_OPTIONS: {label: string; value: RegistryTypeOptions }[] = [
{ label: 'Docker Hub', value: 'dockerhub'}
];
194 changes: 94 additions & 100 deletions pkg/sbombastic-image-vulnerability-scanner/edit/sbombastic.rancher.io.registry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ import SelectOrCreateAuthSecret from '@shell/components/form/SelectOrCreateAuthS
import LabeledSelect from '@shell/components/form/LabeledSelect';
import Banner from '@components/Banner/Banner.vue';
import { Checkbox } from '@components/Form/Checkbox';
import { MANAGEMENT, NAMESPACE, CLUSTER_REPO_TYPES } from '@shell/config/types';
import { MANAGEMENT, NAMESPACE } from '@shell/config/types';
import UnitInput from '@shell/components/form/UnitInput.vue';
import {ref} from "vue";
import {
REGISTRY_TYPE_OPTIONS,
SCAN_INTERVAL_OPTIONS
} from "@sbombastic-image-vulnerability-scanner/constants/scan-interval-options";

export default {
name: 'CruRegistry',
Expand All @@ -32,7 +35,6 @@ export default {
mixins: [CreateEditView],

data() {

if (!this.value.spec) {
this.value.spec = {
insecure: true,
Expand All @@ -49,8 +51,6 @@ export default {
};
}

console.log('this.value after:',this.value);

return {
selectedRegistryType: this.value.type || 'ecr',
secretNamespace: this.$store.getters['defaultNamespace'],
Expand All @@ -60,19 +60,6 @@ export default {
},

computed: {
registryTypeOptions(){
return [
{
label: this.t('imageScanner.registries.configuration.cru.registry.type.ecr'),
value: 'ecr',
},
{
label: this.t('imageScanner.registries.configuration.cru.registry.type.azure'),
value: 'azure',
},
];
},

namespace(){
console.log('this.value.spec.type:',this.value.spec.type);
return this.value.spec.type === 'ecr'?"kube-system":""
Expand All @@ -93,6 +80,14 @@ export default {
return this.$store.getters[`${ this.inStore }/all`](NAMESPACE)[0]?.id;
},

SCAN_INTERVAL_OPTIONS: function() {
return SCAN_INTERVAL_OPTIONS;
},

REGISTRY_TYPE_OPTIONS: function() {
return REGISTRY_TYPE_OPTIONS;
},

useProxy: {
get() {
return !this.value.spec.insecure;
Expand All @@ -111,103 +106,102 @@ export default {
{{t('imageScanner.registries.configuration.cru.description')}}
</Banner>
<CruResource
:done-route="doneRoute"
:mode="mode"
:resource="value"
:subtypes="[]"
:validation-passed="true"
:errors="errors"
@error="(e) => (errors = e)"
@finish="save"
@cancel="done"
>
<NameNsDescription
:value="value"
:mode="mode"
:namespaced="isNamespaced"
@update:value="$emit('input', $event)"
/>

<div class="registry-input-label">
{{ t('imageScanner.registries.configuration.cru.registry.label') }}
</div>

<div class="row">
<div class="col span-6" >
<LabeledSelect
v-model:value="value.spec.type"
data-testid="registry-type-select"
:label="t('imageScanner.registries.configuration.cru.registry.type.label')"
:options="registryTypeOptions"
:placeholder="t('imageScanner.registry.configuration.cru.registry.type.placeholder')"
required
/>
</div>
<div class="col span-3">
<LabeledInput
:label="t('imageScanner.registries.configuration.cru.registry.namespace.label')"
:value="namespace"
:placeholderKey="t('imageScanner.registries.configuration.cru.registry.namespace.placeholder')"
disabled=true
/>
</div>
</div>

<Checkbox
v-model:value="useProxy"
class="mt-20 mb-10"
:done-route="doneRoute"
:mode="mode"
:label="t('imageScanner.registries.configuration.cru.proxy.enable')"
:tooltipKey="t('imageScanner.registries.configuration.cru.proxy.tooltip')"
data-testid="registry-use-proxy"
/>

<div v-if="useProxy">
<div class="registry-input-label mb-0">
{{ t('imageScanner.registries.configuration.cru.authLabel') }}
</div>
<SelectOrCreateAuthSecret
:value="value.spec.authSecret"
:resource="value"
:subtypes="[]"
:validation-passed="true"
:errors="errors"
@error="(e) => (errors = e)"
@finish="save"
@cancel="done"
>
<NameNsDescription
:value="value"
:mode="mode"
data-testid="registry-auth-secret"
:register-before-hook="registerBeforeHook"
:namespace="secretNamespace"
:limit-to-namespace="false"
:in-store="inStore"
:allow-ssh=false
generate-name="registry-auth-"
:cache-secrets="true"
@input="val => value.spec.authSecret = val"
@update:value="$emit('input', $event)"
/>

<div class="registry-input-label mt-24">
{{ t('imageScanner.registries.configuration.cru.scan.label') }}
<div class="registry-input-label">
{{ t('imageScanner.registries.configuration.cru.registry.label') }}
</div>

<div class="row">
<div class="col span-6" >
<LabeledSelect
v-model:value="value.spec.repositories"
:label="t('imageScanner.registries.configuration.cru.scan.type')"
>
</LabeledSelect>
data-testid="registry-type-select"
:label="t('imageScanner.registries.configuration.cru.registry.type.label')"
:options="REGISTRY_TYPE_OPTIONS"
option-key="value"
option-label="label"
value="dockerhub"
required
/>
</div>
<div class="col span-3">
<UnitInput
v-model:value="unitInput"
:label="t('imageScanner.registries.configuration.cru.scan.schedule.label')"
:mode="mode"
min="0"
:suffix="t('unit.hour', { count: 3 })"
:placeholder="t('imageScanner.registries.configuration.cru.scan.schedule.placeholder', { hours: 3 })"
@update:value="updateRefreshInterval($event)"
<div class="col span-6">
<LabeledInput
:label="t('imageScanner.registries.configuration.cru.registry.uri.label')"
v-model:value="value.spec.uri"
:placeholderKey="t('imageScanner.registries.configuration.cru.registry.uri.placeholder')"
/>
</div>
</div>

</div>
<Checkbox
v-model:value="useProxy"
class="mt-20 mb-10"
:mode="mode"
:label="t('imageScanner.registries.configuration.cru.proxy.enable')"
:tooltipKey="t('imageScanner.registries.configuration.cru.proxy.tooltip')"
data-testid="registry-use-proxy"
/>

<div v-if="useProxy">
<div class="registry-input-label mb-0">
{{ t('imageScanner.registries.configuration.cru.authLabel') }}
</div>
<SelectOrCreateAuthSecret
:value="value.spec.authSecret"
:mode="mode"
data-testid="registry-auth-secret"
:register-before-hook="registerBeforeHook"
:namespace="secretNamespace"
:limit-to-namespace="true"
:in-store="inStore"
:allow-ssh=false
generate-name="registry-auth-"
:cache-secrets="true"
@input="val => value.spec.authSecret = val"
/>

<div class="registry-input-label mt-24">
{{ t('imageScanner.registries.configuration.cru.scan.label') }}
</div>

<div class="row">
<div class="col span-6" >
<LabeledSelect
v-model:value="value.spec.repositories"
:label="t('imageScanner.registries.configuration.cru.scan.type')"
>
</LabeledSelect>
</div>
<div class="col span-3">
<LabeledSelect
v-model:value="value.spec.scanInterval"
data-testid="registry-scan-interval-select"
:options = "SCAN_INTERVAL_OPTIONS"
option-key="value"
option-label="label"
value="0s"
:label="t('imageScanner.registries.configuration.cru.scan.schedule.label')"
/>
</div>
</div>

</div>

</CruResource>
</CruResource>
</div>
</template>

Expand Down
14 changes: 6 additions & 8 deletions pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
product:
imageScanner: Image Vulnerability Scanner
imageScanner: Image Vulnerability Scanner
imageScanner:
registries:
title: Registries configuration
Expand Down Expand Up @@ -30,13 +30,12 @@ imageScanner:
label: Registry
type:
label: Type
ecr: Amazon ECR Registry
azure: Azure Container Registry
ecr: Docker Hub Registry
custom: Custom Registry
placeholder: Choose a registry type
namespace:
label: Namespace
placeholder: "Choose the registry first"
uri:
label: URI
placeholder: "The registry address URI"
proxy:
enable: Use the embedded proxy
tooltip: "When enabled, Rancher routes all registry traffic through its secure proxy instead of direct connections."
Expand All @@ -45,8 +44,7 @@ imageScanner:
label: Scanning
type: Repositories to scan
schedule:
label: Refresh Interval
placeholder: 'default: {hours}'
label: Scan Interval
scan: Start Scan
meta:
registry: Registry
Expand Down
4 changes: 4 additions & 0 deletions pkg/sbombastic-image-vulnerability-scanner/types/sbombastic-image-vulnerability-scanner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ export interface MetadataProperty {
value?: string;
tags?: string[];
}

export type ScanIntervalOptions = "1h" | "3h" | "6h" | "12h" | "24h" | "0s";

export type RegistryTypeOptions = "dockerhub" | "custom";