kubectl shell
diff --git a/app/kubernetes/rest/kubeconfig.js b/app/kubernetes/rest/kubeconfig.js
index 8d3a689c2..fb23029ee 100644
--- a/app/kubernetes/rest/kubeconfig.js
+++ b/app/kubernetes/rest/kubeconfig.js
@@ -6,11 +6,11 @@ angular.module('portainer.kubernetes').factory('KubernetesConfig', KubernetesCon
function KubernetesConfigFactory($http, EndpointProvider, API_ENDPOINT_KUBERNETES) {
return { get };
- async function get() {
- const endpointID = EndpointProvider.endpointID();
+ async function get(environmentIDs) {
return $http({
method: 'GET',
- url: `${API_ENDPOINT_KUBERNETES}/${endpointID}/config`,
+ url: `${API_ENDPOINT_KUBERNETES}/config`,
+ params: { ids: environmentIDs.map((x) => parseInt(x)) },
responseType: 'blob',
headers: {
Accept: 'text/yaml',
diff --git a/app/kubernetes/services/kubeconfigService.js b/app/kubernetes/services/kubeconfigService.js
index a3dd1d2fc..ed277bc6e 100644
--- a/app/kubernetes/services/kubeconfigService.js
+++ b/app/kubernetes/services/kubeconfigService.js
@@ -2,18 +2,38 @@ import angular from 'angular';
class KubernetesConfigService {
/* @ngInject */
- constructor(KubernetesConfig, FileSaver) {
+ constructor(KubernetesConfig, FileSaver, SettingsService) {
this.KubernetesConfig = KubernetesConfig;
this.FileSaver = FileSaver;
+ this.SettingsService = SettingsService;
}
- async downloadConfig() {
- const response = await this.KubernetesConfig.get();
+ async downloadKubeconfigFile(environmentIDs) {
+ const response = await this.KubernetesConfig.get(environmentIDs);
const headers = response.headers();
const contentDispositionHeader = headers['content-disposition'];
const filename = contentDispositionHeader.replace('attachment;', '').trim();
return this.FileSaver.saveAs(response.data, filename);
}
+
+ async expiryMessage() {
+ const settings = await this.SettingsService.publicSettings();
+ const expiryDays = settings.KubeconfigExpiry;
+ const prefix = 'Kubeconfig file will ';
+ switch (expiryDays) {
+ case '0':
+ return prefix + 'not expire.';
+ case '24h':
+ return prefix + 'expire in 1 day.';
+ case '168h':
+ return prefix + 'expire in 7 days.';
+ case '720h':
+ return prefix + 'expire in 30 days.';
+ case '8640h':
+ return prefix + 'expire in 1 year.';
+ }
+ return '';
+ }
}
export default KubernetesConfigService;
diff --git a/app/portainer/components/endpoint-list/endpoint-list-controller.js b/app/portainer/components/endpoint-list/endpoint-list-controller.js
index fdafb9fdb..41ae6829d 100644
--- a/app/portainer/components/endpoint-list/endpoint-list-controller.js
+++ b/app/portainer/components/endpoint-list/endpoint-list-controller.js
@@ -1,4 +1,5 @@
import _ from 'lodash-es';
+import { PortainerEndpointTypes } from '@/portainer/models/endpoint/models';
const ENDPOINTS_POLLING_INTERVAL = 30000; // in ms
const ENDPOINTS_CACHE_SIZE = 100;
@@ -6,8 +7,10 @@ const ENDPOINTS_CACHE_SIZE = 100;
angular.module('portainer.app').controller('EndpointListController', [
'DatatableService',
'PaginationService',
+ 'ModalService',
+ 'KubernetesConfigService',
'Notifications',
- function EndpointListController(DatatableService, PaginationService, Notifications) {
+ function EndpointListController(DatatableService, PaginationService, ModalService, KubernetesConfigService, Notifications) {
this.state = {
totalFilteredEndpoints: null,
textFilter: '',
@@ -126,6 +129,50 @@ angular.module('portainer.app').controller('EndpointListController', [
return status === 1 ? 'up' : 'down';
}
+ this.showKubeconfigButton = function () {
+ if (window.location.protocol !== 'https:') {
+ return false;
+ }
+ return _.some(this.endpoints, (endpoint) => isKubernetesMode(endpoint));
+ };
+
+ function isKubernetesMode(endpoint) {
+ return [
+ PortainerEndpointTypes.KubernetesLocalEnvironment,
+ PortainerEndpointTypes.AgentOnKubernetesEnvironment,
+ PortainerEndpointTypes.EdgeAgentOnKubernetesEnvironment,
+ ].includes(endpoint.Type);
+ }
+
+ this.showKubeconfigModal = async function () {
+ const kubeEnvironments = _.filter(this.endpoints, (endpoint) => isKubernetesMode(endpoint));
+ const options = kubeEnvironments.map(function (environment) {
+ return {
+ text: `${environment.Name} (${environment.URL})`,
+ value: environment.Id,
+ };
+ });
+
+ let expiryMessage = '';
+ try {
+ expiryMessage = await KubernetesConfigService.expiryMessage();
+ } catch (e) {
+ Notifications.error('Failed fetching kubeconfig expiry time', e);
+ }
+
+ ModalService.confirmKubeconfigSelection(options, expiryMessage, async function (selectedEnvironmentIDs) {
+ if (selectedEnvironmentIDs.length === 0) {
+ Notifications.warning('No environment was selected');
+ return;
+ }
+ try {
+ await KubernetesConfigService.downloadKubeconfigFile(selectedEnvironmentIDs);
+ } catch (e) {
+ Notifications.error('Failed downloading kubeconfig file', e);
+ }
+ });
+ };
+
this.$onInit = function () {
var textFilter = DatatableService.getDataTableTextFilters(this.tableKey);
this.state.paginatedItemLimit = PaginationService.getPaginationLimit(this.tableKey);
diff --git a/app/portainer/components/endpoint-list/endpointList.html b/app/portainer/components/endpoint-list/endpointList.html
index 98e12d2b6..92c9752ea 100644
--- a/app/portainer/components/endpoint-list/endpointList.html
+++ b/app/portainer/components/endpoint-list/endpointList.html
@@ -12,6 +12,17 @@
+
diff --git a/app/portainer/services/modalService.js b/app/portainer/services/modalService.js
index e7d24ec38..91632979b 100644
--- a/app/portainer/services/modalService.js
+++ b/app/portainer/services/modalService.js
@@ -82,17 +82,20 @@ angular.module('portainer.app').factory('ModalService', [
applyBoxCSS(box);
}
- function customPrompt(options, optionToggled) {
+ function customCheckboxPrompt(options) {
var box = bootbox.prompt({
title: options.title,
- inputType: options.inputType,
+ inputType: 'checkbox',
inputOptions: options.inputOptions,
buttons: confirmButtons(options),
callback: options.callback,
});
applyBoxCSS(box);
box.find('.bootbox-body').prepend('
' + options.message + '
');
- box.find('.bootbox-input-checkbox').prop('checked', optionToggled);
+ box.find('.bootbox-input-checkbox').prop('checked', options.optionToggled);
+ if (options.showCheck) {
+ box.find('.bootbox-input-checkbox').addClass('visible');
+ }
}
service.confirmAccessControlUpdate = function (callback) {
@@ -231,28 +234,25 @@ angular.module('portainer.app').factory('ModalService', [
};
service.confirmContainerRecreation = function (callback) {
- customPrompt(
- {
- title: 'Are you sure?',
- message:
- "You're about to re-create this container, any non-persisted data will be lost. This container will be removed and another one will be created using the same configuration.",
- inputType: 'checkbox',
- inputOptions: [
- {
- text: 'Pull latest image
',
- value: '1',
- },
- ],
- buttons: {
- confirm: {
- label: 'Recreate',
- className: 'btn-danger',
- },
+ customCheckboxPrompt({
+ title: 'Are you sure?',
+ message:
+ "You're about to re-create this container, any non-persisted data will be lost. This container will be removed and another one will be created using the same configuration.",
+ inputOptions: [
+ {
+ text: 'Pull latest image
',
+ value: '1',
+ },
+ ],
+ buttons: {
+ confirm: {
+ label: 'Recreate',
+ className: 'btn-danger',
},
- callback: callback,
},
- false
- );
+ callback: callback,
+ optionToggled: false,
+ });
};
service.confirmEndpointSnapshot = function (callback) {
@@ -285,27 +285,24 @@ angular.module('portainer.app').factory('ModalService', [
service.confirmServiceForceUpdate = function (message, callback) {
message = $sanitize(message);
- customPrompt(
- {
- title: 'Are you sure ?',
- message: message,
- inputType: 'checkbox',
- inputOptions: [
- {
- text: 'Pull latest image version
',
- value: '1',
- },
- ],
- buttons: {
- confirm: {
- label: 'Update',
- className: 'btn-primary',
- },
+ customCheckboxPrompt({
+ title: 'Are you sure ?',
+ message: message,
+ inputOptions: [
+ {
+ text: 'Pull latest image version
',
+ value: '1',
+ },
+ ],
+ buttons: {
+ confirm: {
+ label: 'Update',
+ className: 'btn-primary',
},
- callback: callback,
},
- false
- );
+ callback: callback,
+ optionToggled: false,
+ });
};
service.selectRegistry = function (options) {
@@ -319,6 +316,24 @@ angular.module('portainer.app').factory('ModalService', [
applyBoxCSS(box);
};
+ service.confirmKubeconfigSelection = function (options, expiryMessage, callback) {
+ const message = 'Select the kubernetes environment(s) to add to the kubeconfig file.' + expiryMessage;
+ customCheckboxPrompt({
+ title: 'Download kubeconfig file',
+ message: $sanitize(message),
+ inputOptions: options,
+ buttons: {
+ confirm: {
+ label: 'Download file',
+ className: 'btn-primary',
+ },
+ },
+ callback: callback,
+ optionToggled: true,
+ showCheck: true,
+ });
+ };
+
return service;
},
]);