In a forthcoming Portainer release, we plan to remove support for docker-compose format manifests for Kubernetes deployments, and the Kompose conversion tool + which enables this. The reason for this is because Kompose now poses a security risk, since it has a number of Common Vulnerabilities and Exposures (CVEs).
+Unfortunately, while the Kompose project has a maintainer and is part of the CNCF, it is not being actively maintained. Releases are very infrequent and new + pull requests to the project (including ones we've submitted) are taking months to be merged, with new CVEs arising in the meantime.
diff --git a/app/kubernetes/views/deploy/deployController.js b/app/kubernetes/views/deploy/deployController.js index 9c5aa18c5..d248eaa7a 100644 --- a/app/kubernetes/views/deploy/deployController.js +++ b/app/kubernetes/views/deploy/deployController.js @@ -9,6 +9,7 @@ import { renderTemplate } from '@/react/portainer/custom-templates/components/ut import { isBE } from '@/react/portainer/feature-flags/feature-flags.service'; import { compose, kubernetes } from '@@/BoxSelector/common-options/deployment-methods'; import { editor, git, template, url } from '@@/BoxSelector/common-options/build-methods'; +import { getPublicSettings } from '@/react/portainer/settings/settings.service'; class KubernetesDeployController { /* @ngInject */ @@ -27,10 +28,7 @@ class KubernetesDeployController { this.isTemplateVariablesEnabled = isBE; - this.deployOptions = [ - { ...kubernetes, value: KubernetesDeployManifestTypes.KUBERNETES }, - { ...compose, value: KubernetesDeployManifestTypes.COMPOSE }, - ]; + this.deployOptions = [{ ...kubernetes, value: KubernetesDeployManifestTypes.KUBERNETES }]; this.methodOptions = [ { ...git, value: KubernetesDeployBuildMethods.GIT }, @@ -341,6 +339,16 @@ class KubernetesDeployController { } } + try { + const publicSettings = await getPublicSettings(); + this.showKomposeBuildOption = publicSettings.ShowKomposeBuildOption; + } catch (err) { + this.Notifications.error('Failure', err, 'Unable to get public settings'); + } + if (this.showKomposeBuildOption) { + this.deployOptions = [...this.deployOptions, { ...compose, value: KubernetesDeployManifestTypes.COMPOSE }]; + } + this.state.viewReady = true; this.$window.onbeforeunload = () => { diff --git a/app/portainer/models/settings.js b/app/portainer/models/settings.js index 59b82df04..2e9b1ca02 100644 --- a/app/portainer/models/settings.js +++ b/app/portainer/models/settings.js @@ -20,6 +20,7 @@ export function SettingsViewModel(data) { this.EnforceEdgeID = data.EnforceEdgeID; this.AgentSecret = data.AgentSecret; this.EdgePortainerUrl = data.EdgePortainerUrl; + this.ShowKomposeBuildOption = data.ShowKomposeBuildOption; } export function PublicSettingsViewModel(settings) { @@ -36,6 +37,7 @@ export function PublicSettingsViewModel(settings) { this.Features = settings.Features; this.Edge = new EdgeSettingsViewModel(settings.Edge); this.DefaultRegistry = settings.DefaultRegistry; + this.ShowKomposeBuildOption = settings.ShowKomposeBuildOption; } export function InternalAuthSettingsViewModel(data) { diff --git a/app/portainer/views/settings/settings.html b/app/portainer/views/settings/settings.html index 64ef297c4..440d03274 100644 --- a/app/portainer/views/settings/settings.html +++ b/app/portainer/views/settings/settings.html @@ -184,6 +184,16 @@ tooltip="'Hides the \'Add with form\' buttons and prevents adding/editing of resources via forms'" > +
In a forthcoming Portainer release, we plan to remove support for docker-compose format manifests for Kubernetes deployments, and the Kompose conversion tool which enables this. The reason for this is because Kompose now poses a security risk, since it has a number of Common Vulnerabilities and Exposures (CVEs).
+Unfortunately, while the Kompose project has a maintainer and is part of the CNCF, it is not being actively maintained. Releases are very infrequent and new pull requests to the project (including ones we've submitted) are taking months to be merged, with new CVEs arising in the meantime.
`, + buttons: { + confirm: { + label: 'Ok', + className: 'btn-warning', + }, + }, + callback: function (confirmed) { + $scope.setShowCompose(confirmed); + }, + }); + return; + } + $scope.setShowCompose(checked); + }; + + $scope.setShowCompose = function setShowCompose(checked) { + return $scope.$evalAsync(() => { + $scope.formValues.ShowKomposeBuildOption = checked; + }); + }; + $scope.onToggleAutoBackups = function onToggleAutoBackups(checked) { $scope.$evalAsync(() => { $scope.formValues.scheduleAutomaticBackups = checked; @@ -152,8 +186,13 @@ angular.module('portainer.app').controller('SettingsController', [ KubeconfigExpiry: $scope.formValues.KubeconfigExpiry, HelmRepositoryURL: $scope.formValues.HelmRepositoryURL, GlobalDeploymentOptions: $scope.formValues.GlobalDeploymentOptions, + ShowKomposeBuildOption: $scope.formValues.ShowKomposeBuildOption, }; + if (kubeSettingsPayload.ShowKomposeBuildOption !== $scope.initialFormValues.ShowKomposeBuildOption && $scope.initialFormValues.enableTelemetry) { + trackEvent('kubernetes-allow-compose', { category: 'kubernetes', metadata: { 'kubernetes-allow-compose': kubeSettingsPayload.ShowKomposeBuildOption } }); + } + $scope.state.kubeSettingsActionInProgress = true; updateSettings(kubeSettingsPayload, 'Kubernetes settings updated'); }; @@ -165,6 +204,8 @@ angular.module('portainer.app').controller('SettingsController', [ StateManager.updateLogo(settings.LogoURL); StateManager.updateSnapshotInterval(settings.SnapshotInterval); StateManager.updateEnableTelemetry(settings.EnableTelemetry); + $scope.initialFormValues.ShowKomposeBuildOption = response.ShowKomposeBuildOption; + $scope.initialFormValues.enableTelemetry = response.EnableTelemetry; $scope.formValues.BlackListedLabels = response.BlackListedLabels; }) .catch(function error(err) { @@ -193,6 +234,12 @@ angular.module('portainer.app').controller('SettingsController', [ $scope.formValues.KubeconfigExpiry = settings.KubeconfigExpiry; $scope.formValues.HelmRepositoryURL = settings.HelmRepositoryURL; $scope.formValues.BlackListedLabels = settings.BlackListedLabels; + if (settings.ShowKomposeBuildOption) { + $scope.formValues.ShowKomposeBuildOption = settings.ShowKomposeBuildOption; + } + + $scope.initialFormValues.ShowKomposeBuildOption = settings.ShowKomposeBuildOption; + $scope.initialFormValues.enableTelemetry = settings.EnableTelemetry; }) .catch(function error(err) { Notifications.error('Failure', err, 'Unable to retrieve application settings');