1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-23 15:29:42 +02:00

refactor(app): backport technical changes (#4679)

* refactor(app): backport technical changes

* refactor(app): remove EE only features

* feat(app): small review changes to match EE codebase layout on some files

Co-authored-by: xAt0mZ <baron_l@epitech.eu>
This commit is contained in:
Alice Groux 2021-02-26 16:50:33 +01:00 committed by GitHub
parent 158bdae10e
commit ccf6babc02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 951 additions and 976 deletions

View file

@ -153,9 +153,9 @@ export class KubernetesApplicationAutoScalerFormValue {
}
}
export function KubernetesFormValueDuplicate() {
export function KubernetesFormValidationReferences() {
return {
refs: {},
hasDuplicates: false,
hasRefs: false,
};
}

View file

@ -1,18 +1,11 @@
/**
* KubernetesNamespace Model
*/
const _KubernetesNamespace = Object.freeze({
Id: '',
Name: '',
CreationDate: '',
Status: '',
Yaml: '',
ResourcePoolName: '',
ResourcePoolOwner: '',
});
export class KubernetesNamespace {
constructor() {
Object.assign(this, JSON.parse(JSON.stringify(_KubernetesNamespace)));
}
export function KubernetesNamespace() {
return {
Id: '',
Name: '',
CreationDate: '',
Status: '',
Yaml: '',
ResourcePoolName: '',
ResourcePoolOwner: '',
};
}

View file

@ -1,8 +1,9 @@
export function KubernetesResourcePoolFormValues(defaults) {
return {
Name: '',
MemoryLimit: defaults.MemoryLimit,
CpuLimit: defaults.CpuLimit,
HasQuota: true,
HasQuota: false,
IngressClasses: [], // KubernetesResourcePoolIngressClassFormValue
};
}
@ -20,6 +21,7 @@ export function KubernetesResourcePoolIngressClassFormValue(ingressClass) {
Selected: false,
WasSelected: false,
AdvancedConfig: false,
Paths: [], // will be filled to save IngressClass.Paths inside ingressClassesToFormValues() on RP EDIT
};
}

View file

@ -1,34 +1,27 @@
import KubernetesResourceQuotaHelper from 'Kubernetes/helpers/resourceQuotaHelper';
export const KubernetesPortainerResourceQuotaPrefix = 'portainer-rq-';
export const KubernetesPortainerResourceQuotaCPULimit = 'limits.cpu';
export const KubernetesPortainerResourceQuotaMemoryLimit = 'limits.memory';
export const KubernetesPortainerResourceQuotaCPURequest = 'requests.cpu';
export const KubernetesPortainerResourceQuotaMemoryRequest = 'requests.memory';
export const KubernetesResourceQuotaDefaults = {
CpuLimit: 0,
MemoryLimit: 0,
};
/**
* KubernetesResourceQuota Model
*/
const _KubernetesResourceQuota = Object.freeze({
Id: '',
Namespace: '',
Name: '',
CpuLimit: KubernetesResourceQuotaDefaults.CpuLimit,
MemoryLimit: KubernetesResourceQuotaDefaults.MemoryLimit,
CpuLimitUsed: KubernetesResourceQuotaDefaults.CpuLimit,
MemoryLimitUsed: KubernetesResourceQuotaDefaults.MemoryLimit,
Yaml: '',
ResourcePoolName: '',
ResourcePoolOwner: '',
});
export class KubernetesResourceQuota {
constructor(namespace) {
Object.assign(this, JSON.parse(JSON.stringify(_KubernetesResourceQuota)));
if (namespace) {
this.Name = KubernetesResourceQuotaHelper.generateResourceQuotaName(namespace);
this.Namespace = namespace;
}
}
export function KubernetesResourceQuota(namespace) {
return {
Id: '',
Namespace: namespace ? namespace : '',
Name: namespace ? KubernetesResourceQuotaHelper.generateResourceQuotaName(namespace) : '',
CpuLimit: KubernetesResourceQuotaDefaults.CpuLimit,
MemoryLimit: KubernetesResourceQuotaDefaults.MemoryLimit,
CpuLimitUsed: KubernetesResourceQuotaDefaults.CpuLimit,
MemoryLimitUsed: KubernetesResourceQuotaDefaults.MemoryLimit,
Yaml: '',
ResourcePoolName: '',
ResourcePoolOwner: '',
};
}

View file

@ -1,43 +1,21 @@
import { KubernetesCommonMetadataPayload } from 'Kubernetes/models/common/payloads';
import {
KubernetesPortainerResourceQuotaCPURequest,
KubernetesPortainerResourceQuotaMemoryRequest,
KubernetesPortainerResourceQuotaCPULimit,
KubernetesPortainerResourceQuotaMemoryLimit,
} from './models';
/**
* KubernetesResourceQuotaCreatePayload Model
*/
const _KubernetesResourceQuotaCreatePayload = Object.freeze({
metadata: new KubernetesCommonMetadataPayload(),
spec: {
hard: {
'requests.cpu': 0,
'requests.memory': 0,
'limits.cpu': 0,
'limits.memory': 0,
export function KubernetesResourceQuotaCreatePayload() {
return {
metadata: new KubernetesCommonMetadataPayload(),
spec: {
hard: {
[KubernetesPortainerResourceQuotaCPURequest]: 0,
[KubernetesPortainerResourceQuotaMemoryRequest]: 0,
[KubernetesPortainerResourceQuotaCPULimit]: 0,
[KubernetesPortainerResourceQuotaMemoryLimit]: 0,
},
},
},
});
export class KubernetesResourceQuotaCreatePayload {
constructor() {
Object.assign(this, JSON.parse(JSON.stringify(_KubernetesResourceQuotaCreatePayload)));
}
}
/**
* KubernetesResourceQuotaUpdatePayload Model
*/
const _KubernetesResourceQuotaUpdatePayload = Object.freeze({
metadata: new KubernetesCommonMetadataPayload(),
spec: {
hard: {
'requests.cpu': 0,
'requests.memory': 0,
'limits.cpu': 0,
'limits.memory': 0,
},
},
});
export class KubernetesResourceQuotaUpdatePayload {
constructor() {
Object.assign(this, JSON.parse(JSON.stringify(_KubernetesResourceQuotaUpdatePayload)));
}
};
}