2021-02-26 15:50:33 +00:00
|
|
|
import _ from 'lodash-es';
|
2020-07-05 23:21:03 +00:00
|
|
|
import { KubernetesPortMapping, KubernetesPortMappingPort } from 'Kubernetes/models/port/models';
|
2022-01-16 19:37:46 +00:00
|
|
|
import { KubernetesService, KubernetesServicePort, KubernetesServiceTypes } from 'Kubernetes/models/service/models';
|
2022-09-23 04:35:47 +00:00
|
|
|
import { KubernetesConfigurationKinds } from 'Kubernetes/models/configuration/models';
|
2020-07-05 23:21:03 +00:00
|
|
|
import {
|
2020-08-31 05:21:25 +00:00
|
|
|
KubernetesApplicationAutoScalerFormValue,
|
2020-07-05 23:21:03 +00:00
|
|
|
KubernetesApplicationConfigurationFormValue,
|
|
|
|
KubernetesApplicationConfigurationFormValueOverridenKey,
|
2020-08-31 05:21:25 +00:00
|
|
|
KubernetesApplicationConfigurationFormValueOverridenKeyTypes,
|
|
|
|
KubernetesApplicationEnvironmentVariableFormValue,
|
2020-07-05 23:21:03 +00:00
|
|
|
KubernetesApplicationPersistedFolderFormValue,
|
2020-08-13 23:56:53 +00:00
|
|
|
KubernetesApplicationPlacementFormValue,
|
2020-08-31 05:21:25 +00:00
|
|
|
KubernetesApplicationPublishedPortFormValue,
|
2020-07-05 23:21:03 +00:00
|
|
|
} from 'Kubernetes/models/application/formValues';
|
|
|
|
import {
|
|
|
|
KubernetesApplicationEnvConfigMapPayload,
|
|
|
|
KubernetesApplicationEnvPayload,
|
|
|
|
KubernetesApplicationEnvSecretPayload,
|
|
|
|
KubernetesApplicationVolumeConfigMapPayload,
|
|
|
|
KubernetesApplicationVolumeEntryPayload,
|
|
|
|
KubernetesApplicationVolumeMountPayload,
|
|
|
|
KubernetesApplicationVolumePersistentPayload,
|
|
|
|
KubernetesApplicationVolumeSecretPayload,
|
|
|
|
} from 'Kubernetes/models/application/payloads';
|
|
|
|
import KubernetesVolumeHelper from 'Kubernetes/helpers/volumeHelper';
|
feat(helm/templates): helm app templates EE-943 (#5449)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* feat(helm): list and configure helm chart (#5431)
* backport and tidyup code
* --amend
* using rocket icon for charts
* helm chart bugfix - clear category button
* added matomo analytics for helm chart install
* fix web editor exit warning without changes
* editor modified exit bugfix
* fixed notifications typo
* updated helm template text
* helper text to convey slow helm templates load
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* removing redundant time-consuming api call by using prop attribute
* feat(helm) helm chart backport from ee EE-1311 (#5436)
* Add missing defaultHelmRepoUrl and mock testing
* Backport EE-1477
* Backport updates to helm tests from EE
* add https by default changes and ssl to tls renaming from EE
* Port install integration test. Disabled by default to pass CI checks
* merged changes from EE for the integration test
* kube proxy whitelist updated to support internal helm install command
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* bugfix: kubectl shell not opening - bearer token bug
* tidy go modules & remove yarn-error.log
* removed redundant handler (not used) - to match EE
* resolved merge conflicts, updated code
* feat(helm/views): helm release and application views EE-1236 (#5529)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* removed redundant handler (not used) - to match EE
* feat(helm) display helm charts - backend EE-1236
* copy over components for new applications view EE-1236
* Add new applications datatable component
* Add more migrated files
* removed test not applicable to CE
* baclkported EE app data table code to CE
* removed redundant helm repo url
* resolved conflicts, updated code
* using endpoint middleware
* PR review fixes
* using constants, openapi updated
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* fixed test conflicts, go linted
* feat(helm/templates-add): helm templates add repo for user support EE-1278 (#5514)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* feat(helm) helm chart backport from ee EE-1311 (#5436)
* Add missing defaultHelmRepoUrl and mock testing
* Backport EE-1477
* Backport updates to helm tests from EE
* add https by default changes and ssl to tls renaming from EE
* Port install integration test. Disabled by default to pass CI checks
* merged changes from EE for the integration test
* kube proxy whitelist updated to support internal helm install command
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* Pull in all changes from tech review in EE-943
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* backport EE-1278, squashed, diffed, updated
* helm install openapi spec update
* resolved conflicts, updated code
* - matching ee codebase at 0afe57034449ee0e9f333d92c252a13995a93019
- helm install using endpoint middleware
- remove trailing slash from added/persisted helm repo urls
* feat(helm) use libhelm url validator and improved path assembly EE-1554 (#5561)
* feat(helm/userrepos) fix getting global repo for ordinary users EE-1562 (#5567)
* feat(helm/userrepos) fix getting global repo for ordinary users EE-1562
* post review changes and further backported changes from EE
* resolved conflicts, updated code
* fixed helm_install handler unit test
* user cannot add existing repo if suffix is '/' (#5571)
* feat(helm/docs) fix broken swagger docs EE-1278 (#5572)
* Fix swagger docs
* minor correction
* fix(helm): migrating code from user handler to helm handler (#5573)
* - migrated user_helm_repos to helm endpoint handler
- migrated api operations from user factory/service to helm factory/service
- passing endpointId into helm service/factory as endpoint provider is deprecated
* upgrade libhelm to hide secrets
Co-authored-by: Matt Hook <hookenz@gmail.com>
* removed duplicate file - due to merge conflict
* dependency injection in helm factory
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: Matt Hook <hookenz@gmail.com>
* kubernetes.templates -> kubernetes.templates.helm name conflict fix
* Validate the URL added as a public helm repo (#5579)
* fix(helm): helm app deletion fix EE-1581 (#5582)
* updated helm lib to show correct error on uninstall failure
* passing down helm app namespace on deletion
* fix(k8s): EE-1591 non-admin users cannot deploy charts containing secrets (#5590)
Co-authored-by: Simon Meng <simon.meng@portainer.io>
* fix(helm): helm epic bugfixes EE-1582 EE-1593 (#5585)
* - trim trailing slash and lowercase before persisting helm repo
- browser helm templates url /kubernetes/templates/templates -> /kubernetes/templates/helm
- fix publish url
- fix helm repo add refresh
- semi-fix k8s app expansion
* Tidy up swagger documentation related to helm. Make json consistent
* fixed helm release page for non-default namespaces
* k8s app view table expansion bugfix
* EE-1593: publish url load balancer fallback
Co-authored-by: Matt Hook <hookenz@gmail.com>
* k8s app list fix for charts with deployments containing multiple pods - which use the same label (#5599)
* fix(kubernetes): app list view fix for secrets with long keys or values EE-1600 (#5600)
* k8s app secrets key value text overflow ellipses
* wrapping key value pairs instead of ellipses
* fix(helm): helm apps bundling issue across different namespaces EE-1619 (#5602)
* helm apps bundling issue across different namespaces
* - code comments and indentation to ease reading
- moved namespace calc out of loop
* feat(helm/test) disable slow helm search test by default EE-1599 (#5598)
* skip helm_repo_search as it's an integration test
* switch to portainer built in integration test checker
* make module order match EE
* don't print test struct out when skipping integration test
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: Matt Hook <hookenz@gmail.com>
Co-authored-by: cong meng <mcpacino@gmail.com>
Co-authored-by: Simon Meng <simon.meng@portainer.io>
2021-09-10 02:06:57 +00:00
|
|
|
import { KubernetesApplicationDeploymentTypes, KubernetesApplicationPlacementTypes, KubernetesApplicationTypes, HelmApplication } from 'Kubernetes/models/application/models';
|
2020-08-31 05:21:25 +00:00
|
|
|
import { KubernetesPodAffinity, KubernetesPodNodeAffinityNodeSelectorRequirementOperators } from 'Kubernetes/pod/models';
|
2020-08-13 23:56:53 +00:00
|
|
|
import {
|
2020-08-31 05:21:25 +00:00
|
|
|
KubernetesNodeSelectorRequirementPayload,
|
2020-08-13 23:56:53 +00:00
|
|
|
KubernetesNodeSelectorTermPayload,
|
|
|
|
KubernetesPodNodeAffinityPayload,
|
2020-08-31 05:21:25 +00:00
|
|
|
KubernetesPreferredSchedulingTermPayload,
|
2020-08-13 23:56:53 +00:00
|
|
|
} from 'Kubernetes/pod/payloads/affinities';
|
2020-07-05 23:21:03 +00:00
|
|
|
|
feat(helm/templates): helm app templates EE-943 (#5449)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* feat(helm): list and configure helm chart (#5431)
* backport and tidyup code
* --amend
* using rocket icon for charts
* helm chart bugfix - clear category button
* added matomo analytics for helm chart install
* fix web editor exit warning without changes
* editor modified exit bugfix
* fixed notifications typo
* updated helm template text
* helper text to convey slow helm templates load
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* removing redundant time-consuming api call by using prop attribute
* feat(helm) helm chart backport from ee EE-1311 (#5436)
* Add missing defaultHelmRepoUrl and mock testing
* Backport EE-1477
* Backport updates to helm tests from EE
* add https by default changes and ssl to tls renaming from EE
* Port install integration test. Disabled by default to pass CI checks
* merged changes from EE for the integration test
* kube proxy whitelist updated to support internal helm install command
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* bugfix: kubectl shell not opening - bearer token bug
* tidy go modules & remove yarn-error.log
* removed redundant handler (not used) - to match EE
* resolved merge conflicts, updated code
* feat(helm/views): helm release and application views EE-1236 (#5529)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* removed redundant handler (not used) - to match EE
* feat(helm) display helm charts - backend EE-1236
* copy over components for new applications view EE-1236
* Add new applications datatable component
* Add more migrated files
* removed test not applicable to CE
* baclkported EE app data table code to CE
* removed redundant helm repo url
* resolved conflicts, updated code
* using endpoint middleware
* PR review fixes
* using constants, openapi updated
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* fixed test conflicts, go linted
* feat(helm/templates-add): helm templates add repo for user support EE-1278 (#5514)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* feat(helm) helm chart backport from ee EE-1311 (#5436)
* Add missing defaultHelmRepoUrl and mock testing
* Backport EE-1477
* Backport updates to helm tests from EE
* add https by default changes and ssl to tls renaming from EE
* Port install integration test. Disabled by default to pass CI checks
* merged changes from EE for the integration test
* kube proxy whitelist updated to support internal helm install command
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* Pull in all changes from tech review in EE-943
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* backport EE-1278, squashed, diffed, updated
* helm install openapi spec update
* resolved conflicts, updated code
* - matching ee codebase at 0afe57034449ee0e9f333d92c252a13995a93019
- helm install using endpoint middleware
- remove trailing slash from added/persisted helm repo urls
* feat(helm) use libhelm url validator and improved path assembly EE-1554 (#5561)
* feat(helm/userrepos) fix getting global repo for ordinary users EE-1562 (#5567)
* feat(helm/userrepos) fix getting global repo for ordinary users EE-1562
* post review changes and further backported changes from EE
* resolved conflicts, updated code
* fixed helm_install handler unit test
* user cannot add existing repo if suffix is '/' (#5571)
* feat(helm/docs) fix broken swagger docs EE-1278 (#5572)
* Fix swagger docs
* minor correction
* fix(helm): migrating code from user handler to helm handler (#5573)
* - migrated user_helm_repos to helm endpoint handler
- migrated api operations from user factory/service to helm factory/service
- passing endpointId into helm service/factory as endpoint provider is deprecated
* upgrade libhelm to hide secrets
Co-authored-by: Matt Hook <hookenz@gmail.com>
* removed duplicate file - due to merge conflict
* dependency injection in helm factory
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: Matt Hook <hookenz@gmail.com>
* kubernetes.templates -> kubernetes.templates.helm name conflict fix
* Validate the URL added as a public helm repo (#5579)
* fix(helm): helm app deletion fix EE-1581 (#5582)
* updated helm lib to show correct error on uninstall failure
* passing down helm app namespace on deletion
* fix(k8s): EE-1591 non-admin users cannot deploy charts containing secrets (#5590)
Co-authored-by: Simon Meng <simon.meng@portainer.io>
* fix(helm): helm epic bugfixes EE-1582 EE-1593 (#5585)
* - trim trailing slash and lowercase before persisting helm repo
- browser helm templates url /kubernetes/templates/templates -> /kubernetes/templates/helm
- fix publish url
- fix helm repo add refresh
- semi-fix k8s app expansion
* Tidy up swagger documentation related to helm. Make json consistent
* fixed helm release page for non-default namespaces
* k8s app view table expansion bugfix
* EE-1593: publish url load balancer fallback
Co-authored-by: Matt Hook <hookenz@gmail.com>
* k8s app list fix for charts with deployments containing multiple pods - which use the same label (#5599)
* fix(kubernetes): app list view fix for secrets with long keys or values EE-1600 (#5600)
* k8s app secrets key value text overflow ellipses
* wrapping key value pairs instead of ellipses
* fix(helm): helm apps bundling issue across different namespaces EE-1619 (#5602)
* helm apps bundling issue across different namespaces
* - code comments and indentation to ease reading
- moved namespace calc out of loop
* feat(helm/test) disable slow helm search test by default EE-1599 (#5598)
* skip helm_repo_search as it's an integration test
* switch to portainer built in integration test checker
* make module order match EE
* don't print test struct out when skipping integration test
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: Matt Hook <hookenz@gmail.com>
Co-authored-by: cong meng <mcpacino@gmail.com>
Co-authored-by: Simon Meng <simon.meng@portainer.io>
2021-09-10 02:06:57 +00:00
|
|
|
export const PodKubernetesInstanceLabel = 'app.kubernetes.io/instance';
|
|
|
|
export const PodManagedByLabel = 'app.kubernetes.io/managed-by';
|
|
|
|
|
2020-07-05 23:21:03 +00:00
|
|
|
class KubernetesApplicationHelper {
|
2020-08-13 23:56:53 +00:00
|
|
|
/* #region UTILITY FUNCTIONS */
|
|
|
|
static isExternalApplication(application) {
|
|
|
|
return !application.ApplicationOwner;
|
|
|
|
}
|
|
|
|
|
2020-10-26 18:34:07 +00:00
|
|
|
static associatePodsAndApplication(pods, selector) {
|
|
|
|
return _.filter(pods, ['metadata.labels', selector.matchLabels]);
|
2020-07-05 23:21:03 +00:00
|
|
|
}
|
|
|
|
|
2020-08-13 23:27:10 +00:00
|
|
|
static associateContainerPersistedFoldersAndConfigurations(app, containers) {
|
|
|
|
_.forEach(containers, (container) => {
|
|
|
|
container.PersistedFolders = _.without(
|
|
|
|
_.map(app.PersistedFolders, (pf) => {
|
|
|
|
if (pf.MountPath && _.includes(_.map(container.VolumeMounts, 'mountPath'), pf.MountPath)) {
|
|
|
|
return pf;
|
|
|
|
}
|
|
|
|
}),
|
|
|
|
undefined
|
|
|
|
);
|
|
|
|
|
|
|
|
container.ConfigurationVolumes = _.without(
|
|
|
|
_.map(app.ConfigurationVolumes, (cv) => {
|
|
|
|
if (cv.rootMountPath && _.includes(_.map(container.VolumeMounts, 'mountPath'), cv.rootMountPath)) {
|
|
|
|
return cv;
|
|
|
|
}
|
|
|
|
}),
|
|
|
|
undefined
|
|
|
|
);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
static associateContainersAndApplication(app) {
|
2020-08-31 05:21:25 +00:00
|
|
|
if (!app.Pods || app.Pods.length === 0) {
|
2020-08-13 23:27:10 +00:00
|
|
|
return [];
|
|
|
|
}
|
|
|
|
const containers = app.Pods[0].Containers;
|
|
|
|
KubernetesApplicationHelper.associateContainerPersistedFoldersAndConfigurations(app, containers);
|
|
|
|
return containers;
|
|
|
|
}
|
|
|
|
|
|
|
|
static associateAllContainersAndApplication(app) {
|
|
|
|
const containers = _.flatMap(_.map(app.Pods, 'Containers'));
|
|
|
|
KubernetesApplicationHelper.associateContainerPersistedFoldersAndConfigurations(app, containers);
|
|
|
|
return containers;
|
|
|
|
}
|
|
|
|
|
2020-07-05 23:21:03 +00:00
|
|
|
static portMappingsFromApplications(applications) {
|
|
|
|
const res = _.reduce(
|
|
|
|
applications,
|
|
|
|
(acc, app) => {
|
|
|
|
if (app.PublishedPorts.length > 0) {
|
|
|
|
const mapping = new KubernetesPortMapping();
|
|
|
|
mapping.Name = app.Name;
|
|
|
|
mapping.ResourcePool = app.ResourcePool;
|
|
|
|
mapping.ServiceType = app.ServiceType;
|
|
|
|
mapping.LoadBalancerIPAddress = app.LoadBalancerIPAddress;
|
|
|
|
mapping.ApplicationOwner = app.ApplicationOwner;
|
|
|
|
|
|
|
|
mapping.Ports = _.map(app.PublishedPorts, (item) => {
|
|
|
|
const port = new KubernetesPortMappingPort();
|
2020-07-14 20:45:19 +00:00
|
|
|
port.Port = mapping.ServiceType === KubernetesServiceTypes.NODE_PORT ? item.NodePort : item.Port;
|
|
|
|
port.TargetPort = item.TargetPort;
|
|
|
|
port.Protocol = item.Protocol;
|
|
|
|
port.IngressRules = item.IngressRules;
|
2020-07-05 23:21:03 +00:00
|
|
|
return port;
|
|
|
|
});
|
|
|
|
acc.push(mapping);
|
|
|
|
}
|
|
|
|
return acc;
|
|
|
|
},
|
|
|
|
[]
|
|
|
|
);
|
|
|
|
return res;
|
|
|
|
}
|
2020-08-13 23:56:53 +00:00
|
|
|
/* #endregion */
|
2020-07-05 23:21:03 +00:00
|
|
|
|
2020-08-13 23:56:53 +00:00
|
|
|
/* #region ENV VARIABLES FV <> ENV */
|
2020-07-05 23:21:03 +00:00
|
|
|
static generateEnvFromEnvVariables(envVariables) {
|
|
|
|
_.remove(envVariables, (item) => item.NeedsDeletion);
|
|
|
|
const env = _.map(envVariables, (item) => {
|
|
|
|
const res = new KubernetesApplicationEnvPayload();
|
|
|
|
res.name = item.Name;
|
2021-03-22 19:58:11 +00:00
|
|
|
if (item.Value === undefined) {
|
|
|
|
delete res.value;
|
|
|
|
} else {
|
|
|
|
res.value = item.Value;
|
|
|
|
}
|
2020-07-05 23:21:03 +00:00
|
|
|
return res;
|
|
|
|
});
|
|
|
|
return env;
|
|
|
|
}
|
|
|
|
|
2020-08-13 23:56:53 +00:00
|
|
|
static generateEnvVariablesFromEnv(env) {
|
|
|
|
const envVariables = _.map(env, (item) => {
|
2021-03-22 19:58:11 +00:00
|
|
|
if (item.valueFrom) {
|
|
|
|
return;
|
|
|
|
}
|
2020-08-13 23:56:53 +00:00
|
|
|
const res = new KubernetesApplicationEnvironmentVariableFormValue();
|
|
|
|
res.Name = item.name;
|
|
|
|
res.Value = item.value;
|
|
|
|
res.IsNew = false;
|
2021-02-18 13:46:26 +00:00
|
|
|
res.NameIndex = item.name;
|
2020-08-13 23:56:53 +00:00
|
|
|
return res;
|
|
|
|
});
|
|
|
|
return _.without(envVariables, undefined);
|
|
|
|
}
|
|
|
|
/* #endregion */
|
|
|
|
|
|
|
|
/* #region CONFIGURATIONS FV <> ENV & VOLUMES */
|
|
|
|
static generateConfigurationFormValuesFromEnvAndVolumes(env, volumes, configurations) {
|
|
|
|
const finalRes = _.flatMap(configurations, (cfg) => {
|
2022-12-14 04:49:20 +00:00
|
|
|
const filterCondition = cfg.Kind === KubernetesConfigurationKinds.CONFIGMAP ? 'valueFrom.configMapKeyRef.name' : 'valueFrom.secretKeyRef.name';
|
2020-08-13 23:56:53 +00:00
|
|
|
|
|
|
|
const cfgEnv = _.filter(env, [filterCondition, cfg.Name]);
|
|
|
|
const cfgVol = _.filter(volumes, { configurationName: cfg.Name });
|
|
|
|
if (!cfgEnv.length && !cfgVol.length) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
const keys = _.reduce(
|
|
|
|
_.keys(cfg.Data),
|
|
|
|
(acc, k) => {
|
|
|
|
const keyEnv = _.filter(cfgEnv, { name: k });
|
|
|
|
const keyVol = _.filter(cfgVol, { configurationKey: k });
|
|
|
|
const key = {
|
|
|
|
Key: k,
|
|
|
|
Count: keyEnv.length + keyVol.length,
|
|
|
|
Sum: _.concat(keyEnv, keyVol),
|
|
|
|
EnvCount: keyEnv.length,
|
|
|
|
VolCount: keyVol.length,
|
|
|
|
};
|
|
|
|
acc.push(key);
|
|
|
|
return acc;
|
|
|
|
},
|
|
|
|
[]
|
|
|
|
);
|
|
|
|
|
|
|
|
const max = _.max(_.map(keys, 'Count'));
|
|
|
|
const overrideThreshold = max - _.max(_.map(keys, 'VolCount'));
|
|
|
|
const res = _.map(new Array(max), () => new KubernetesApplicationConfigurationFormValue());
|
|
|
|
_.forEach(res, (item, index) => {
|
|
|
|
item.SelectedConfiguration = cfg;
|
|
|
|
const overriden = index >= overrideThreshold;
|
|
|
|
if (overriden) {
|
|
|
|
item.Overriden = true;
|
|
|
|
item.OverridenKeys = _.map(keys, (k) => {
|
|
|
|
const fvKey = new KubernetesApplicationConfigurationFormValueOverridenKey();
|
|
|
|
fvKey.Key = k.Key;
|
2021-01-07 23:51:27 +00:00
|
|
|
if (!k.Count) {
|
|
|
|
// !k.Count indicates k.Key is new added to the configuration and has not been loaded to the application yet
|
|
|
|
fvKey.Type = KubernetesApplicationConfigurationFormValueOverridenKeyTypes.NONE;
|
|
|
|
} else if (index < k.EnvCount) {
|
2020-08-13 23:56:53 +00:00
|
|
|
fvKey.Type = KubernetesApplicationConfigurationFormValueOverridenKeyTypes.ENVIRONMENT;
|
|
|
|
} else {
|
|
|
|
fvKey.Type = KubernetesApplicationConfigurationFormValueOverridenKeyTypes.FILESYSTEM;
|
|
|
|
fvKey.Path = k.Sum[index].rootMountPath;
|
|
|
|
}
|
|
|
|
return fvKey;
|
|
|
|
});
|
|
|
|
}
|
|
|
|
});
|
|
|
|
return res;
|
|
|
|
});
|
|
|
|
return _.without(finalRes, undefined);
|
|
|
|
}
|
|
|
|
|
2020-07-05 23:21:03 +00:00
|
|
|
static generateEnvOrVolumesFromConfigurations(app, configurations) {
|
|
|
|
let finalEnv = [];
|
|
|
|
let finalVolumes = [];
|
|
|
|
let finalMounts = [];
|
|
|
|
|
|
|
|
_.forEach(configurations, (config) => {
|
2022-12-14 04:49:20 +00:00
|
|
|
const isBasic = config.SelectedConfiguration.Kind === KubernetesConfigurationKinds.CONFIGMAP;
|
2020-07-05 23:21:03 +00:00
|
|
|
|
|
|
|
if (!config.Overriden) {
|
|
|
|
const envKeys = _.keys(config.SelectedConfiguration.Data);
|
|
|
|
_.forEach(envKeys, (item) => {
|
|
|
|
const res = isBasic ? new KubernetesApplicationEnvConfigMapPayload() : new KubernetesApplicationEnvSecretPayload();
|
|
|
|
res.name = item;
|
|
|
|
if (isBasic) {
|
|
|
|
res.valueFrom.configMapKeyRef.name = config.SelectedConfiguration.Name;
|
|
|
|
res.valueFrom.configMapKeyRef.key = item;
|
|
|
|
} else {
|
|
|
|
res.valueFrom.secretKeyRef.name = config.SelectedConfiguration.Name;
|
|
|
|
res.valueFrom.secretKeyRef.key = item;
|
|
|
|
}
|
|
|
|
finalEnv.push(res);
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
const envKeys = _.filter(config.OverridenKeys, (item) => item.Type === KubernetesApplicationConfigurationFormValueOverridenKeyTypes.ENVIRONMENT);
|
|
|
|
_.forEach(envKeys, (item) => {
|
|
|
|
const res = isBasic ? new KubernetesApplicationEnvConfigMapPayload() : new KubernetesApplicationEnvSecretPayload();
|
|
|
|
res.name = item.Key;
|
|
|
|
if (isBasic) {
|
|
|
|
res.valueFrom.configMapKeyRef.name = config.SelectedConfiguration.Name;
|
|
|
|
res.valueFrom.configMapKeyRef.key = item.Key;
|
|
|
|
} else {
|
|
|
|
res.valueFrom.secretKeyRef.name = config.SelectedConfiguration.Name;
|
|
|
|
res.valueFrom.secretKeyRef.key = item.Key;
|
|
|
|
}
|
|
|
|
finalEnv.push(res);
|
|
|
|
});
|
|
|
|
|
|
|
|
const volKeys = _.filter(config.OverridenKeys, (item) => item.Type === KubernetesApplicationConfigurationFormValueOverridenKeyTypes.FILESYSTEM);
|
|
|
|
const groupedVolKeys = _.groupBy(volKeys, 'Path');
|
|
|
|
_.forEach(groupedVolKeys, (items, path) => {
|
|
|
|
const volumeName = KubernetesVolumeHelper.generatedApplicationConfigVolumeName(app.Name);
|
|
|
|
const configurationName = config.SelectedConfiguration.Name;
|
|
|
|
const itemsMap = _.map(items, (item) => {
|
|
|
|
const entry = new KubernetesApplicationVolumeEntryPayload();
|
|
|
|
entry.key = item.Key;
|
|
|
|
entry.path = item.Key;
|
|
|
|
return entry;
|
|
|
|
});
|
|
|
|
|
|
|
|
const mount = isBasic ? new KubernetesApplicationVolumeMountPayload() : new KubernetesApplicationVolumeMountPayload(true);
|
|
|
|
const volume = isBasic ? new KubernetesApplicationVolumeConfigMapPayload() : new KubernetesApplicationVolumeSecretPayload();
|
|
|
|
|
|
|
|
mount.name = volumeName;
|
|
|
|
mount.mountPath = path;
|
|
|
|
volume.name = volumeName;
|
|
|
|
if (isBasic) {
|
|
|
|
volume.configMap.name = configurationName;
|
|
|
|
volume.configMap.items = itemsMap;
|
|
|
|
} else {
|
|
|
|
volume.secret.secretName = configurationName;
|
|
|
|
volume.secret.items = itemsMap;
|
|
|
|
}
|
|
|
|
|
|
|
|
finalMounts.push(mount);
|
|
|
|
finalVolumes.push(volume);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
});
|
|
|
|
app.Env = _.concat(app.Env, finalEnv);
|
|
|
|
app.Volumes = _.concat(app.Volumes, finalVolumes);
|
|
|
|
app.VolumeMounts = _.concat(app.VolumeMounts, finalMounts);
|
|
|
|
return app;
|
|
|
|
}
|
2020-08-13 23:56:53 +00:00
|
|
|
/* #endregion */
|
2020-07-05 23:21:03 +00:00
|
|
|
|
2022-01-16 19:37:46 +00:00
|
|
|
/* #region SERVICES -> SERVICES FORM VALUES */
|
|
|
|
static generateServicesFormValuesFromServices(app) {
|
|
|
|
let services = [];
|
2022-01-19 19:21:03 +00:00
|
|
|
if (app.Services) {
|
|
|
|
app.Services.forEach(function (service) {
|
2022-04-05 17:42:01 +00:00
|
|
|
//skip generate formValues if service = headless service ( clusterIp === "None" )
|
|
|
|
if (service.spec.clusterIP !== 'None') {
|
|
|
|
const svc = new KubernetesService();
|
|
|
|
svc.Namespace = service.metadata.namespace;
|
|
|
|
svc.Name = service.metadata.name;
|
|
|
|
svc.StackName = service.StackName;
|
|
|
|
svc.ApplicationOwner = app.ApplicationOwner;
|
|
|
|
svc.ApplicationName = app.ApplicationName;
|
|
|
|
svc.Type = service.spec.type;
|
|
|
|
if (service.spec.type === KubernetesServiceTypes.CLUSTER_IP) {
|
|
|
|
svc.Type = 1;
|
|
|
|
} else if (service.spec.type === KubernetesServiceTypes.NODE_PORT) {
|
|
|
|
svc.Type = 2;
|
|
|
|
} else if (service.spec.type === KubernetesServiceTypes.LOAD_BALANCER) {
|
|
|
|
svc.Type = 3;
|
|
|
|
}
|
2022-01-16 19:37:46 +00:00
|
|
|
|
2022-04-05 17:42:01 +00:00
|
|
|
let ports = [];
|
|
|
|
service.spec.ports.forEach(function (port) {
|
|
|
|
const svcport = new KubernetesServicePort();
|
|
|
|
svcport.name = port.name;
|
|
|
|
svcport.port = port.port;
|
|
|
|
svcport.nodePort = port.nodePort;
|
|
|
|
svcport.protocol = port.protocol;
|
|
|
|
svcport.targetPort = port.targetPort;
|
2022-01-16 19:37:46 +00:00
|
|
|
|
2022-04-05 17:42:01 +00:00
|
|
|
app.Ingresses.value.forEach((ingress) => {
|
2022-10-07 03:55:11 +00:00
|
|
|
const ingressNameMatched = ingress.Paths.find((ingPath) => ingPath.ServiceName === service.metadata.name);
|
|
|
|
const ingressPortMatched = ingress.Paths.find((ingPath) => ingPath.Port === port.port);
|
|
|
|
// only add ingress info to the port if the ingress serviceport matches the port in the service
|
|
|
|
if (ingressPortMatched) {
|
2022-04-05 17:42:01 +00:00
|
|
|
svcport.ingress = {
|
2022-10-07 03:55:11 +00:00
|
|
|
IngressName: ingressPortMatched.IngressName,
|
|
|
|
Host: ingressPortMatched.Host,
|
|
|
|
Path: ingressPortMatched.Path,
|
2022-04-05 17:42:01 +00:00
|
|
|
};
|
2022-10-07 03:55:11 +00:00
|
|
|
}
|
|
|
|
if (ingressNameMatched) {
|
2022-04-05 17:42:01 +00:00
|
|
|
svc.Ingress = true;
|
|
|
|
}
|
|
|
|
});
|
2022-01-16 19:37:46 +00:00
|
|
|
|
2022-04-05 17:42:01 +00:00
|
|
|
ports.push(svcport);
|
|
|
|
});
|
|
|
|
svc.Ports = ports;
|
|
|
|
svc.Selector = app.Raw.spec.selector.matchLabels;
|
|
|
|
services.push(svc);
|
|
|
|
}
|
2022-01-16 19:37:46 +00:00
|
|
|
});
|
|
|
|
|
2022-01-19 19:21:03 +00:00
|
|
|
return services;
|
|
|
|
}
|
2022-01-16 19:37:46 +00:00
|
|
|
}
|
|
|
|
/* #endregion */
|
|
|
|
static generateSelectorFromService(app) {
|
2022-01-19 19:21:03 +00:00
|
|
|
if (app.Raw.kind !== 'Pod') {
|
|
|
|
const selector = app.Raw.spec.selector.matchLabels;
|
|
|
|
return selector;
|
|
|
|
}
|
2022-01-16 19:37:46 +00:00
|
|
|
}
|
|
|
|
|
2020-08-13 23:56:53 +00:00
|
|
|
/* #region PUBLISHED PORTS FV <> PUBLISHED PORTS */
|
2021-07-05 06:17:20 +00:00
|
|
|
static generatePublishedPortsFormValuesFromPublishedPorts(serviceType, publishedPorts, ingress) {
|
2020-08-12 23:30:23 +00:00
|
|
|
const generatePort = (port, rule) => {
|
2020-07-05 23:21:03 +00:00
|
|
|
const res = new KubernetesApplicationPublishedPortFormValue();
|
2020-08-12 23:30:23 +00:00
|
|
|
res.IsNew = false;
|
|
|
|
if (rule) {
|
|
|
|
res.IngressName = rule.IngressName;
|
|
|
|
res.IngressRoute = rule.Path;
|
|
|
|
res.IngressHost = rule.Host;
|
2021-07-08 22:39:14 +00:00
|
|
|
res.IngressHosts = ingress && ingress.find((i) => i.Name === rule.IngressName).Hosts;
|
2020-08-12 23:30:23 +00:00
|
|
|
}
|
2020-07-14 20:45:19 +00:00
|
|
|
res.Protocol = port.Protocol;
|
|
|
|
res.ContainerPort = port.TargetPort;
|
2020-07-05 23:21:03 +00:00
|
|
|
if (serviceType === KubernetesServiceTypes.LOAD_BALANCER) {
|
2020-07-14 20:45:19 +00:00
|
|
|
res.LoadBalancerPort = port.Port;
|
|
|
|
res.LoadBalancerNodePort = port.NodePort;
|
2020-07-05 23:21:03 +00:00
|
|
|
} else if (serviceType === KubernetesServiceTypes.NODE_PORT) {
|
2020-07-14 20:45:19 +00:00
|
|
|
res.NodePort = port.NodePort;
|
2020-07-05 23:21:03 +00:00
|
|
|
}
|
|
|
|
return res;
|
2020-08-12 23:30:23 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
const finalRes = _.flatMap(publishedPorts, (port) => {
|
|
|
|
if (port.IngressRules.length) {
|
|
|
|
return _.map(port.IngressRules, (rule) => generatePort(port, rule));
|
|
|
|
}
|
|
|
|
return generatePort(port);
|
2020-07-05 23:21:03 +00:00
|
|
|
});
|
|
|
|
return finalRes;
|
|
|
|
}
|
2020-08-13 23:56:53 +00:00
|
|
|
/* #endregion */
|
2020-07-05 23:21:03 +00:00
|
|
|
|
2020-08-13 23:56:53 +00:00
|
|
|
/* #region AUTOSCALER FV <> HORIZONTAL POD AUTOSCALER */
|
2020-08-10 22:57:20 +00:00
|
|
|
static generateAutoScalerFormValueFromHorizontalPodAutoScaler(autoScaler, replicasCount) {
|
2020-08-04 22:08:11 +00:00
|
|
|
const res = new KubernetesApplicationAutoScalerFormValue();
|
|
|
|
if (autoScaler) {
|
|
|
|
res.IsUsed = true;
|
|
|
|
res.MinReplicas = autoScaler.MinReplicas;
|
|
|
|
res.MaxReplicas = autoScaler.MaxReplicas;
|
|
|
|
res.TargetCPUUtilization = autoScaler.TargetCPUUtilization;
|
|
|
|
res.ApiVersion = autoScaler.ApiVersion;
|
|
|
|
} else {
|
|
|
|
res.ApiVersion = 'apps/v1';
|
2020-08-10 22:57:20 +00:00
|
|
|
res.MinReplicas = replicasCount;
|
|
|
|
res.MaxReplicas = replicasCount;
|
2020-08-04 22:08:11 +00:00
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2020-08-13 23:56:53 +00:00
|
|
|
/* #endregion */
|
2020-07-05 23:21:03 +00:00
|
|
|
|
2020-08-13 23:56:53 +00:00
|
|
|
/* #region PERSISTED FOLDERS FV <> VOLUMES */
|
|
|
|
static generatePersistedFoldersFormValuesFromPersistedFolders(persistedFolders, persistentVolumeClaims) {
|
|
|
|
const finalRes = _.map(persistedFolders, (folder) => {
|
|
|
|
const pvc = _.find(persistentVolumeClaims, (item) => _.startsWith(item.Name, folder.PersistentVolumeClaimName));
|
|
|
|
const res = new KubernetesApplicationPersistedFolderFormValue(pvc.StorageClass);
|
|
|
|
res.PersistentVolumeClaimName = folder.PersistentVolumeClaimName;
|
2021-02-26 15:50:33 +00:00
|
|
|
res.Size = parseInt(pvc.Storage, 10);
|
2020-08-13 23:56:53 +00:00
|
|
|
res.SizeUnit = pvc.Storage.slice(-2);
|
|
|
|
res.ContainerPath = folder.MountPath;
|
|
|
|
return res;
|
|
|
|
});
|
|
|
|
return finalRes;
|
|
|
|
}
|
|
|
|
|
|
|
|
static generateVolumesFromPersistentVolumClaims(app, volumeClaims) {
|
|
|
|
app.VolumeMounts = [];
|
|
|
|
app.Volumes = [];
|
|
|
|
_.forEach(volumeClaims, (item) => {
|
|
|
|
const volumeMount = new KubernetesApplicationVolumeMountPayload();
|
|
|
|
const name = item.Name;
|
|
|
|
volumeMount.name = name;
|
|
|
|
volumeMount.mountPath = item.MountPath;
|
|
|
|
app.VolumeMounts.push(volumeMount);
|
|
|
|
|
|
|
|
const volume = new KubernetesApplicationVolumePersistentPayload();
|
|
|
|
volume.name = name;
|
|
|
|
volume.persistentVolumeClaim.claimName = name;
|
|
|
|
app.Volumes.push(volume);
|
|
|
|
});
|
|
|
|
}
|
2021-02-22 19:05:43 +00:00
|
|
|
|
|
|
|
static hasRWOOnly(formValues) {
|
|
|
|
return _.find(formValues.PersistedFolders, (item) => item.StorageClass && _.isEqual(item.StorageClass.AccessModes, ['RWO']));
|
|
|
|
}
|
|
|
|
|
|
|
|
static hasRWX(claims) {
|
|
|
|
return _.find(claims, (item) => item.StorageClass && _.includes(item.StorageClass.AccessModes, 'RWX')) !== undefined;
|
|
|
|
}
|
2020-08-13 23:56:53 +00:00
|
|
|
/* #endregion */
|
|
|
|
|
|
|
|
/* #region PLACEMENTS FV <> AFFINITY */
|
|
|
|
static generatePlacementsFormValuesFromAffinity(formValues, podAffinity, nodesLabels) {
|
|
|
|
let placements = formValues.Placements;
|
|
|
|
let type = formValues.PlacementType;
|
|
|
|
const affinity = podAffinity.nodeAffinity;
|
|
|
|
if (affinity && affinity.requiredDuringSchedulingIgnoredDuringExecution) {
|
|
|
|
type = KubernetesApplicationPlacementTypes.MANDATORY;
|
|
|
|
_.forEach(affinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms, (term) => {
|
|
|
|
_.forEach(term.matchExpressions, (exp) => {
|
|
|
|
const placement = new KubernetesApplicationPlacementFormValue();
|
|
|
|
const label = _.find(nodesLabels, { Key: exp.key });
|
|
|
|
placement.Label = label;
|
|
|
|
placement.Value = exp.values[0];
|
|
|
|
placement.IsNew = false;
|
|
|
|
placements.push(placement);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
} else if (affinity && affinity.preferredDuringSchedulingIgnoredDuringExecution) {
|
|
|
|
type = KubernetesApplicationPlacementTypes.PREFERRED;
|
|
|
|
_.forEach(affinity.preferredDuringSchedulingIgnoredDuringExecution, (term) => {
|
|
|
|
_.forEach(term.preference.matchExpressions, (exp) => {
|
|
|
|
const placement = new KubernetesApplicationPlacementFormValue();
|
|
|
|
const label = _.find(nodesLabels, { Key: exp.key });
|
|
|
|
placement.Label = label;
|
|
|
|
placement.Value = exp.values[0];
|
|
|
|
placement.IsNew = false;
|
|
|
|
placements.push(placement);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
formValues.Placements = placements;
|
|
|
|
formValues.PlacementType = type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static generateAffinityFromPlacements(app, formValues) {
|
|
|
|
if (formValues.DeploymentType === KubernetesApplicationDeploymentTypes.REPLICATED) {
|
|
|
|
const placements = formValues.Placements;
|
|
|
|
const res = new KubernetesPodNodeAffinityPayload();
|
|
|
|
let expressions = _.map(placements, (p) => {
|
|
|
|
if (!p.NeedsDeletion) {
|
|
|
|
const exp = new KubernetesNodeSelectorRequirementPayload();
|
|
|
|
exp.key = p.Label.Key;
|
|
|
|
if (p.Value) {
|
|
|
|
exp.operator = KubernetesPodNodeAffinityNodeSelectorRequirementOperators.IN;
|
|
|
|
exp.values = [p.Value];
|
|
|
|
} else {
|
|
|
|
exp.operator = KubernetesPodNodeAffinityNodeSelectorRequirementOperators.EXISTS;
|
|
|
|
delete exp.values;
|
|
|
|
}
|
|
|
|
return exp;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
expressions = _.without(expressions, undefined);
|
|
|
|
if (expressions.length) {
|
|
|
|
if (formValues.PlacementType === KubernetesApplicationPlacementTypes.MANDATORY) {
|
|
|
|
const term = new KubernetesNodeSelectorTermPayload();
|
|
|
|
term.matchExpressions = expressions;
|
|
|
|
res.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms.push(term);
|
|
|
|
delete res.preferredDuringSchedulingIgnoredDuringExecution;
|
|
|
|
} else if (formValues.PlacementType === KubernetesApplicationPlacementTypes.PREFERRED) {
|
|
|
|
const term = new KubernetesPreferredSchedulingTermPayload();
|
|
|
|
term.preference = new KubernetesNodeSelectorTermPayload();
|
|
|
|
term.preference.matchExpressions = expressions;
|
|
|
|
res.preferredDuringSchedulingIgnoredDuringExecution.push(term);
|
|
|
|
delete res.requiredDuringSchedulingIgnoredDuringExecution;
|
|
|
|
}
|
|
|
|
app.Affinity = new KubernetesPodAffinity();
|
|
|
|
app.Affinity.nodeAffinity = res;
|
|
|
|
}
|
|
|
|
}
|
2020-07-05 23:21:03 +00:00
|
|
|
}
|
2020-08-13 23:56:53 +00:00
|
|
|
/* #endregion */
|
feat(helm/templates): helm app templates EE-943 (#5449)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* feat(helm): list and configure helm chart (#5431)
* backport and tidyup code
* --amend
* using rocket icon for charts
* helm chart bugfix - clear category button
* added matomo analytics for helm chart install
* fix web editor exit warning without changes
* editor modified exit bugfix
* fixed notifications typo
* updated helm template text
* helper text to convey slow helm templates load
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* removing redundant time-consuming api call by using prop attribute
* feat(helm) helm chart backport from ee EE-1311 (#5436)
* Add missing defaultHelmRepoUrl and mock testing
* Backport EE-1477
* Backport updates to helm tests from EE
* add https by default changes and ssl to tls renaming from EE
* Port install integration test. Disabled by default to pass CI checks
* merged changes from EE for the integration test
* kube proxy whitelist updated to support internal helm install command
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* bugfix: kubectl shell not opening - bearer token bug
* tidy go modules & remove yarn-error.log
* removed redundant handler (not used) - to match EE
* resolved merge conflicts, updated code
* feat(helm/views): helm release and application views EE-1236 (#5529)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* removed redundant handler (not used) - to match EE
* feat(helm) display helm charts - backend EE-1236
* copy over components for new applications view EE-1236
* Add new applications datatable component
* Add more migrated files
* removed test not applicable to CE
* baclkported EE app data table code to CE
* removed redundant helm repo url
* resolved conflicts, updated code
* using endpoint middleware
* PR review fixes
* using constants, openapi updated
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* fixed test conflicts, go linted
* feat(helm/templates-add): helm templates add repo for user support EE-1278 (#5514)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* feat(helm) helm chart backport from ee EE-1311 (#5436)
* Add missing defaultHelmRepoUrl and mock testing
* Backport EE-1477
* Backport updates to helm tests from EE
* add https by default changes and ssl to tls renaming from EE
* Port install integration test. Disabled by default to pass CI checks
* merged changes from EE for the integration test
* kube proxy whitelist updated to support internal helm install command
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* Pull in all changes from tech review in EE-943
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* backport EE-1278, squashed, diffed, updated
* helm install openapi spec update
* resolved conflicts, updated code
* - matching ee codebase at 0afe57034449ee0e9f333d92c252a13995a93019
- helm install using endpoint middleware
- remove trailing slash from added/persisted helm repo urls
* feat(helm) use libhelm url validator and improved path assembly EE-1554 (#5561)
* feat(helm/userrepos) fix getting global repo for ordinary users EE-1562 (#5567)
* feat(helm/userrepos) fix getting global repo for ordinary users EE-1562
* post review changes and further backported changes from EE
* resolved conflicts, updated code
* fixed helm_install handler unit test
* user cannot add existing repo if suffix is '/' (#5571)
* feat(helm/docs) fix broken swagger docs EE-1278 (#5572)
* Fix swagger docs
* minor correction
* fix(helm): migrating code from user handler to helm handler (#5573)
* - migrated user_helm_repos to helm endpoint handler
- migrated api operations from user factory/service to helm factory/service
- passing endpointId into helm service/factory as endpoint provider is deprecated
* upgrade libhelm to hide secrets
Co-authored-by: Matt Hook <hookenz@gmail.com>
* removed duplicate file - due to merge conflict
* dependency injection in helm factory
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: Matt Hook <hookenz@gmail.com>
* kubernetes.templates -> kubernetes.templates.helm name conflict fix
* Validate the URL added as a public helm repo (#5579)
* fix(helm): helm app deletion fix EE-1581 (#5582)
* updated helm lib to show correct error on uninstall failure
* passing down helm app namespace on deletion
* fix(k8s): EE-1591 non-admin users cannot deploy charts containing secrets (#5590)
Co-authored-by: Simon Meng <simon.meng@portainer.io>
* fix(helm): helm epic bugfixes EE-1582 EE-1593 (#5585)
* - trim trailing slash and lowercase before persisting helm repo
- browser helm templates url /kubernetes/templates/templates -> /kubernetes/templates/helm
- fix publish url
- fix helm repo add refresh
- semi-fix k8s app expansion
* Tidy up swagger documentation related to helm. Make json consistent
* fixed helm release page for non-default namespaces
* k8s app view table expansion bugfix
* EE-1593: publish url load balancer fallback
Co-authored-by: Matt Hook <hookenz@gmail.com>
* k8s app list fix for charts with deployments containing multiple pods - which use the same label (#5599)
* fix(kubernetes): app list view fix for secrets with long keys or values EE-1600 (#5600)
* k8s app secrets key value text overflow ellipses
* wrapping key value pairs instead of ellipses
* fix(helm): helm apps bundling issue across different namespaces EE-1619 (#5602)
* helm apps bundling issue across different namespaces
* - code comments and indentation to ease reading
- moved namespace calc out of loop
* feat(helm/test) disable slow helm search test by default EE-1599 (#5598)
* skip helm_repo_search as it's an integration test
* switch to portainer built in integration test checker
* make module order match EE
* don't print test struct out when skipping integration test
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: Matt Hook <hookenz@gmail.com>
Co-authored-by: cong meng <mcpacino@gmail.com>
Co-authored-by: Simon Meng <simon.meng@portainer.io>
2021-09-10 02:06:57 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Get Helm managed applications
|
|
|
|
* @param {KubernetesApplication[]} applications Application list
|
|
|
|
* @returns {Object} { [releaseName]: [app1, app2, ...], [releaseName2]: [app3, app4, ...] }
|
|
|
|
*/
|
|
|
|
static getHelmApplications(applications) {
|
|
|
|
// filter out all the applications that are managed by helm
|
|
|
|
// to identify the helm managed applications, we need to check if the applications pod labels include
|
|
|
|
// `app.kubernetes.io/instance` and `app.kubernetes.io/managed-by` = `helm`
|
2021-09-16 04:09:39 +00:00
|
|
|
const helmManagedApps = applications.filter(
|
|
|
|
(app) => app.Metadata.labels && app.Metadata.labels[PodKubernetesInstanceLabel] && app.Metadata.labels[PodManagedByLabel] === 'Helm'
|
feat(helm/templates): helm app templates EE-943 (#5449)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* feat(helm): list and configure helm chart (#5431)
* backport and tidyup code
* --amend
* using rocket icon for charts
* helm chart bugfix - clear category button
* added matomo analytics for helm chart install
* fix web editor exit warning without changes
* editor modified exit bugfix
* fixed notifications typo
* updated helm template text
* helper text to convey slow helm templates load
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* removing redundant time-consuming api call by using prop attribute
* feat(helm) helm chart backport from ee EE-1311 (#5436)
* Add missing defaultHelmRepoUrl and mock testing
* Backport EE-1477
* Backport updates to helm tests from EE
* add https by default changes and ssl to tls renaming from EE
* Port install integration test. Disabled by default to pass CI checks
* merged changes from EE for the integration test
* kube proxy whitelist updated to support internal helm install command
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* bugfix: kubectl shell not opening - bearer token bug
* tidy go modules & remove yarn-error.log
* removed redundant handler (not used) - to match EE
* resolved merge conflicts, updated code
* feat(helm/views): helm release and application views EE-1236 (#5529)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* removed redundant handler (not used) - to match EE
* feat(helm) display helm charts - backend EE-1236
* copy over components for new applications view EE-1236
* Add new applications datatable component
* Add more migrated files
* removed test not applicable to CE
* baclkported EE app data table code to CE
* removed redundant helm repo url
* resolved conflicts, updated code
* using endpoint middleware
* PR review fixes
* using constants, openapi updated
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* fixed test conflicts, go linted
* feat(helm/templates-add): helm templates add repo for user support EE-1278 (#5514)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* feat(helm) helm chart backport from ee EE-1311 (#5436)
* Add missing defaultHelmRepoUrl and mock testing
* Backport EE-1477
* Backport updates to helm tests from EE
* add https by default changes and ssl to tls renaming from EE
* Port install integration test. Disabled by default to pass CI checks
* merged changes from EE for the integration test
* kube proxy whitelist updated to support internal helm install command
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* Pull in all changes from tech review in EE-943
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* backport EE-1278, squashed, diffed, updated
* helm install openapi spec update
* resolved conflicts, updated code
* - matching ee codebase at 0afe57034449ee0e9f333d92c252a13995a93019
- helm install using endpoint middleware
- remove trailing slash from added/persisted helm repo urls
* feat(helm) use libhelm url validator and improved path assembly EE-1554 (#5561)
* feat(helm/userrepos) fix getting global repo for ordinary users EE-1562 (#5567)
* feat(helm/userrepos) fix getting global repo for ordinary users EE-1562
* post review changes and further backported changes from EE
* resolved conflicts, updated code
* fixed helm_install handler unit test
* user cannot add existing repo if suffix is '/' (#5571)
* feat(helm/docs) fix broken swagger docs EE-1278 (#5572)
* Fix swagger docs
* minor correction
* fix(helm): migrating code from user handler to helm handler (#5573)
* - migrated user_helm_repos to helm endpoint handler
- migrated api operations from user factory/service to helm factory/service
- passing endpointId into helm service/factory as endpoint provider is deprecated
* upgrade libhelm to hide secrets
Co-authored-by: Matt Hook <hookenz@gmail.com>
* removed duplicate file - due to merge conflict
* dependency injection in helm factory
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: Matt Hook <hookenz@gmail.com>
* kubernetes.templates -> kubernetes.templates.helm name conflict fix
* Validate the URL added as a public helm repo (#5579)
* fix(helm): helm app deletion fix EE-1581 (#5582)
* updated helm lib to show correct error on uninstall failure
* passing down helm app namespace on deletion
* fix(k8s): EE-1591 non-admin users cannot deploy charts containing secrets (#5590)
Co-authored-by: Simon Meng <simon.meng@portainer.io>
* fix(helm): helm epic bugfixes EE-1582 EE-1593 (#5585)
* - trim trailing slash and lowercase before persisting helm repo
- browser helm templates url /kubernetes/templates/templates -> /kubernetes/templates/helm
- fix publish url
- fix helm repo add refresh
- semi-fix k8s app expansion
* Tidy up swagger documentation related to helm. Make json consistent
* fixed helm release page for non-default namespaces
* k8s app view table expansion bugfix
* EE-1593: publish url load balancer fallback
Co-authored-by: Matt Hook <hookenz@gmail.com>
* k8s app list fix for charts with deployments containing multiple pods - which use the same label (#5599)
* fix(kubernetes): app list view fix for secrets with long keys or values EE-1600 (#5600)
* k8s app secrets key value text overflow ellipses
* wrapping key value pairs instead of ellipses
* fix(helm): helm apps bundling issue across different namespaces EE-1619 (#5602)
* helm apps bundling issue across different namespaces
* - code comments and indentation to ease reading
- moved namespace calc out of loop
* feat(helm/test) disable slow helm search test by default EE-1599 (#5598)
* skip helm_repo_search as it's an integration test
* switch to portainer built in integration test checker
* make module order match EE
* don't print test struct out when skipping integration test
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: Matt Hook <hookenz@gmail.com>
Co-authored-by: cong meng <mcpacino@gmail.com>
Co-authored-by: Simon Meng <simon.meng@portainer.io>
2021-09-10 02:06:57 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
// groups the helm managed applications by helm release name
|
|
|
|
// the release name is retrieved from the `app.kubernetes.io/instance` label on the pods within the apps
|
|
|
|
// `namespacedHelmReleases` object structure:
|
|
|
|
// {
|
|
|
|
// [namespace1]: {
|
|
|
|
// [releaseName]: [app1, app2, ...],
|
|
|
|
// },
|
|
|
|
// [namespace2]: {
|
|
|
|
// [releaseName2]: [app1, app2, ...],
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
const namespacedHelmReleases = {};
|
|
|
|
helmManagedApps.forEach((app) => {
|
|
|
|
const namespace = app.ResourcePool;
|
2021-09-16 04:09:39 +00:00
|
|
|
const instanceLabel = app.Metadata.labels[PodKubernetesInstanceLabel];
|
|
|
|
if (namespacedHelmReleases[namespace]) {
|
|
|
|
namespacedHelmReleases[namespace][instanceLabel] = [...(namespacedHelmReleases[namespace][instanceLabel] || []), app];
|
|
|
|
} else {
|
|
|
|
namespacedHelmReleases[namespace] = { [instanceLabel]: [app] };
|
|
|
|
}
|
feat(helm/templates): helm app templates EE-943 (#5449)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* feat(helm): list and configure helm chart (#5431)
* backport and tidyup code
* --amend
* using rocket icon for charts
* helm chart bugfix - clear category button
* added matomo analytics for helm chart install
* fix web editor exit warning without changes
* editor modified exit bugfix
* fixed notifications typo
* updated helm template text
* helper text to convey slow helm templates load
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* removing redundant time-consuming api call by using prop attribute
* feat(helm) helm chart backport from ee EE-1311 (#5436)
* Add missing defaultHelmRepoUrl and mock testing
* Backport EE-1477
* Backport updates to helm tests from EE
* add https by default changes and ssl to tls renaming from EE
* Port install integration test. Disabled by default to pass CI checks
* merged changes from EE for the integration test
* kube proxy whitelist updated to support internal helm install command
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* bugfix: kubectl shell not opening - bearer token bug
* tidy go modules & remove yarn-error.log
* removed redundant handler (not used) - to match EE
* resolved merge conflicts, updated code
* feat(helm/views): helm release and application views EE-1236 (#5529)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* removed redundant handler (not used) - to match EE
* feat(helm) display helm charts - backend EE-1236
* copy over components for new applications view EE-1236
* Add new applications datatable component
* Add more migrated files
* removed test not applicable to CE
* baclkported EE app data table code to CE
* removed redundant helm repo url
* resolved conflicts, updated code
* using endpoint middleware
* PR review fixes
* using constants, openapi updated
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* fixed test conflicts, go linted
* feat(helm/templates-add): helm templates add repo for user support EE-1278 (#5514)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* feat(helm) helm chart backport from ee EE-1311 (#5436)
* Add missing defaultHelmRepoUrl and mock testing
* Backport EE-1477
* Backport updates to helm tests from EE
* add https by default changes and ssl to tls renaming from EE
* Port install integration test. Disabled by default to pass CI checks
* merged changes from EE for the integration test
* kube proxy whitelist updated to support internal helm install command
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* Pull in all changes from tech review in EE-943
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* backport EE-1278, squashed, diffed, updated
* helm install openapi spec update
* resolved conflicts, updated code
* - matching ee codebase at 0afe57034449ee0e9f333d92c252a13995a93019
- helm install using endpoint middleware
- remove trailing slash from added/persisted helm repo urls
* feat(helm) use libhelm url validator and improved path assembly EE-1554 (#5561)
* feat(helm/userrepos) fix getting global repo for ordinary users EE-1562 (#5567)
* feat(helm/userrepos) fix getting global repo for ordinary users EE-1562
* post review changes and further backported changes from EE
* resolved conflicts, updated code
* fixed helm_install handler unit test
* user cannot add existing repo if suffix is '/' (#5571)
* feat(helm/docs) fix broken swagger docs EE-1278 (#5572)
* Fix swagger docs
* minor correction
* fix(helm): migrating code from user handler to helm handler (#5573)
* - migrated user_helm_repos to helm endpoint handler
- migrated api operations from user factory/service to helm factory/service
- passing endpointId into helm service/factory as endpoint provider is deprecated
* upgrade libhelm to hide secrets
Co-authored-by: Matt Hook <hookenz@gmail.com>
* removed duplicate file - due to merge conflict
* dependency injection in helm factory
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: Matt Hook <hookenz@gmail.com>
* kubernetes.templates -> kubernetes.templates.helm name conflict fix
* Validate the URL added as a public helm repo (#5579)
* fix(helm): helm app deletion fix EE-1581 (#5582)
* updated helm lib to show correct error on uninstall failure
* passing down helm app namespace on deletion
* fix(k8s): EE-1591 non-admin users cannot deploy charts containing secrets (#5590)
Co-authored-by: Simon Meng <simon.meng@portainer.io>
* fix(helm): helm epic bugfixes EE-1582 EE-1593 (#5585)
* - trim trailing slash and lowercase before persisting helm repo
- browser helm templates url /kubernetes/templates/templates -> /kubernetes/templates/helm
- fix publish url
- fix helm repo add refresh
- semi-fix k8s app expansion
* Tidy up swagger documentation related to helm. Make json consistent
* fixed helm release page for non-default namespaces
* k8s app view table expansion bugfix
* EE-1593: publish url load balancer fallback
Co-authored-by: Matt Hook <hookenz@gmail.com>
* k8s app list fix for charts with deployments containing multiple pods - which use the same label (#5599)
* fix(kubernetes): app list view fix for secrets with long keys or values EE-1600 (#5600)
* k8s app secrets key value text overflow ellipses
* wrapping key value pairs instead of ellipses
* fix(helm): helm apps bundling issue across different namespaces EE-1619 (#5602)
* helm apps bundling issue across different namespaces
* - code comments and indentation to ease reading
- moved namespace calc out of loop
* feat(helm/test) disable slow helm search test by default EE-1599 (#5598)
* skip helm_repo_search as it's an integration test
* switch to portainer built in integration test checker
* make module order match EE
* don't print test struct out when skipping integration test
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: Matt Hook <hookenz@gmail.com>
Co-authored-by: cong meng <mcpacino@gmail.com>
Co-authored-by: Simon Meng <simon.meng@portainer.io>
2021-09-10 02:06:57 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
// `helmAppsEntriesList` object structure:
|
|
|
|
// [
|
|
|
|
// ["airflow-test", Array(5)],
|
|
|
|
// ["traefik", Array(1)],
|
|
|
|
// ["airflow-test", Array(2)],
|
|
|
|
// ...,
|
|
|
|
// ]
|
|
|
|
const helmAppsEntriesList = Object.values(namespacedHelmReleases).flatMap((r) => Object.entries(r));
|
|
|
|
const helmAppsList = helmAppsEntriesList.map(([helmInstance, applications]) => {
|
|
|
|
const helmApp = new HelmApplication();
|
|
|
|
helmApp.Name = helmInstance;
|
|
|
|
helmApp.ApplicationType = KubernetesApplicationTypes.HELM;
|
2021-09-29 00:12:45 +00:00
|
|
|
helmApp.ApplicationOwner = applications[0].ApplicationOwner;
|
feat(helm/templates): helm app templates EE-943 (#5449)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* feat(helm): list and configure helm chart (#5431)
* backport and tidyup code
* --amend
* using rocket icon for charts
* helm chart bugfix - clear category button
* added matomo analytics for helm chart install
* fix web editor exit warning without changes
* editor modified exit bugfix
* fixed notifications typo
* updated helm template text
* helper text to convey slow helm templates load
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* removing redundant time-consuming api call by using prop attribute
* feat(helm) helm chart backport from ee EE-1311 (#5436)
* Add missing defaultHelmRepoUrl and mock testing
* Backport EE-1477
* Backport updates to helm tests from EE
* add https by default changes and ssl to tls renaming from EE
* Port install integration test. Disabled by default to pass CI checks
* merged changes from EE for the integration test
* kube proxy whitelist updated to support internal helm install command
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* bugfix: kubectl shell not opening - bearer token bug
* tidy go modules & remove yarn-error.log
* removed redundant handler (not used) - to match EE
* resolved merge conflicts, updated code
* feat(helm/views): helm release and application views EE-1236 (#5529)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* removed redundant handler (not used) - to match EE
* feat(helm) display helm charts - backend EE-1236
* copy over components for new applications view EE-1236
* Add new applications datatable component
* Add more migrated files
* removed test not applicable to CE
* baclkported EE app data table code to CE
* removed redundant helm repo url
* resolved conflicts, updated code
* using endpoint middleware
* PR review fixes
* using constants, openapi updated
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* fixed test conflicts, go linted
* feat(helm/templates-add): helm templates add repo for user support EE-1278 (#5514)
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* feat(helm) helm chart backport from ee EE-1311 (#5436)
* Add missing defaultHelmRepoUrl and mock testing
* Backport EE-1477
* Backport updates to helm tests from EE
* add https by default changes and ssl to tls renaming from EE
* Port install integration test. Disabled by default to pass CI checks
* merged changes from EE for the integration test
* kube proxy whitelist updated to support internal helm install command
Co-authored-by: zees-dev <dev.786zshan@gmail.com>
* Pull in all changes from tech review in EE-943
* feat(helm): add helm chart backport to ce EE-1409 (#5425)
* EE-1311 Helm Chart Backport from EE
* backport to ce
Co-authored-by: Matt Hook <hookenz@gmail.com>
* Pull in all changes from tech review in EE-943
* added helm to sidebar after rebase, sync CE with EE
* backport EE-1278, squashed, diffed, updated
* helm install openapi spec update
* resolved conflicts, updated code
* - matching ee codebase at 0afe57034449ee0e9f333d92c252a13995a93019
- helm install using endpoint middleware
- remove trailing slash from added/persisted helm repo urls
* feat(helm) use libhelm url validator and improved path assembly EE-1554 (#5561)
* feat(helm/userrepos) fix getting global repo for ordinary users EE-1562 (#5567)
* feat(helm/userrepos) fix getting global repo for ordinary users EE-1562
* post review changes and further backported changes from EE
* resolved conflicts, updated code
* fixed helm_install handler unit test
* user cannot add existing repo if suffix is '/' (#5571)
* feat(helm/docs) fix broken swagger docs EE-1278 (#5572)
* Fix swagger docs
* minor correction
* fix(helm): migrating code from user handler to helm handler (#5573)
* - migrated user_helm_repos to helm endpoint handler
- migrated api operations from user factory/service to helm factory/service
- passing endpointId into helm service/factory as endpoint provider is deprecated
* upgrade libhelm to hide secrets
Co-authored-by: Matt Hook <hookenz@gmail.com>
* removed duplicate file - due to merge conflict
* dependency injection in helm factory
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: Matt Hook <hookenz@gmail.com>
* kubernetes.templates -> kubernetes.templates.helm name conflict fix
* Validate the URL added as a public helm repo (#5579)
* fix(helm): helm app deletion fix EE-1581 (#5582)
* updated helm lib to show correct error on uninstall failure
* passing down helm app namespace on deletion
* fix(k8s): EE-1591 non-admin users cannot deploy charts containing secrets (#5590)
Co-authored-by: Simon Meng <simon.meng@portainer.io>
* fix(helm): helm epic bugfixes EE-1582 EE-1593 (#5585)
* - trim trailing slash and lowercase before persisting helm repo
- browser helm templates url /kubernetes/templates/templates -> /kubernetes/templates/helm
- fix publish url
- fix helm repo add refresh
- semi-fix k8s app expansion
* Tidy up swagger documentation related to helm. Make json consistent
* fixed helm release page for non-default namespaces
* k8s app view table expansion bugfix
* EE-1593: publish url load balancer fallback
Co-authored-by: Matt Hook <hookenz@gmail.com>
* k8s app list fix for charts with deployments containing multiple pods - which use the same label (#5599)
* fix(kubernetes): app list view fix for secrets with long keys or values EE-1600 (#5600)
* k8s app secrets key value text overflow ellipses
* wrapping key value pairs instead of ellipses
* fix(helm): helm apps bundling issue across different namespaces EE-1619 (#5602)
* helm apps bundling issue across different namespaces
* - code comments and indentation to ease reading
- moved namespace calc out of loop
* feat(helm/test) disable slow helm search test by default EE-1599 (#5598)
* skip helm_repo_search as it's an integration test
* switch to portainer built in integration test checker
* make module order match EE
* don't print test struct out when skipping integration test
Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: Matt Hook <hookenz@gmail.com>
Co-authored-by: cong meng <mcpacino@gmail.com>
Co-authored-by: Simon Meng <simon.meng@portainer.io>
2021-09-10 02:06:57 +00:00
|
|
|
helmApp.KubernetesApplications = applications;
|
|
|
|
|
|
|
|
// the status of helm app is `Ready` based on whether the underlying RunningPodsCount of the k8s app
|
|
|
|
// reaches the TotalPodsCount of the app
|
|
|
|
const appsNotReady = applications.some((app) => app.RunningPodsCount < app.TotalPodsCount);
|
|
|
|
helmApp.Status = appsNotReady ? 'Not ready' : 'Ready';
|
|
|
|
|
|
|
|
// use earliest date
|
|
|
|
helmApp.CreationDate = applications.map((app) => app.CreationDate).sort((a, b) => new Date(a) - new Date(b))[0];
|
|
|
|
|
|
|
|
// use first app namespace as helm app namespace
|
|
|
|
helmApp.ResourcePool = applications[0].ResourcePool;
|
|
|
|
|
|
|
|
// required for persisting table expansion state and differenting same named helm apps across different namespaces
|
|
|
|
helmApp.Id = helmApp.ResourcePool + '-' + helmApp.Name.toLowerCase().replaceAll(' ', '-');
|
|
|
|
|
|
|
|
return helmApp;
|
|
|
|
});
|
|
|
|
|
|
|
|
return helmAppsList;
|
|
|
|
}
|
2021-09-16 04:09:39 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Get nested applications -
|
|
|
|
* @param {KubernetesApplication[]} applications Application list
|
|
|
|
* @returns {Object} { helmApplications: [app1, app2, ...], nonHelmApplications: [app3, app4, ...] }
|
|
|
|
*/
|
|
|
|
static getNestedApplications(applications) {
|
|
|
|
const helmApplications = KubernetesApplicationHelper.getHelmApplications(applications);
|
|
|
|
|
|
|
|
// filter out helm managed applications
|
|
|
|
const helmAppNames = [...new Set(helmApplications.map((hma) => hma.Name))]; // distinct helm app names
|
|
|
|
const nonHelmApplications = applications.filter((app) => {
|
|
|
|
if (app.Metadata.labels) {
|
|
|
|
return !helmAppNames.includes(app.Metadata.labels[PodKubernetesInstanceLabel]);
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
});
|
|
|
|
|
|
|
|
return { helmApplications, nonHelmApplications };
|
|
|
|
}
|
2020-07-05 23:21:03 +00:00
|
|
|
}
|
|
|
|
export default KubernetesApplicationHelper;
|