rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3361 from codyrancher/unsupported-volume-filtering 

Hide unsupported storage providers
This commit is contained in:
Vincent Fiduccia 2019-09-18 17:36:44 -07:00 committed by GitHub
parent 727dbae5b7 348c1c38e2
commit 058a8f32e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 80 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/authenticated/route.js
View File

@ -116,6 +116,7 @@ export default Route.extend(Preload, {
this.preload('authConfig', 'globalStore', { url: 'authConfigs' }),
this.preload('globalRoleBinding', 'globalStore', { url: 'globalRoleBinding' }),
this.preload('user', 'globalStore', { url: 'user' }),
this.preload('features', 'globalStore', { url: 'features' }),
globalStore.findAll('principal').then((principals) => {
const me = principals.filter((p) => p.me === true);

10
app/components/cru-persistent-volume/component.js
View File

@ -9,6 +9,7 @@ import { parseSi } from 'shared/utils/parse-unit';
export default Component.extend(ViewNewEdit, {
intl: service(),
clusterStore: service(),
globalStore: service(),
layout,
model: null,
@ -58,7 +59,8 @@ export default Component.extend(ViewNewEdit, {
sourceChoices: computed('intl.locale', function() {
const intl = get(this, 'intl');
const out = getSources('persistent').map((p) => {
const showUnsupported = get(this, 'globalStore').all('feature').filterBy('name', 'unsupported-storage-drivers').get('firstObject.value');
const out = getSources('persistent', showUnsupported).map((p) => {
const entry = Object.assign({}, p);
const key = `volumeSource.${ entry.name }.title`;
@ -85,7 +87,8 @@ export default Component.extend(ViewNewEdit, {
sourceComponent: computed('sourceName', function() {
const name = get(this, 'sourceName');
const sources = getSources('persistent');
const showUnsupported = get(this, 'globalStore').all('feature').filterBy('name', 'unsupported-storage-drivers').get('firstObject.value');
const sources = getSources('persistent', showUnsupported);
const entry = sources.findBy('name', name);
if (entry) {
@ -95,8 +98,7 @@ export default Component.extend(ViewNewEdit, {
willSave() {
const vol = get(this, 'primaryResource');
const entry = getSources('persistent').findBy('name', get(this, 'sourceName'));
const entry = getSources('persistent', true).findBy('name', get(this, 'sourceName'));
if ( !entry ) {
const errors = [];

6
app/components/cru-storage-class/component.js
View File

@ -7,7 +7,8 @@ import { getProvisioners } from 'ui/models/storageclass';
import ChildHook from 'shared/mixins/child-hook';
export default Component.extend(ViewNewEdit, ChildHook, {
intl: service(),
intl: service(),
globalStore: service(),
layout,
model: null,
@ -42,7 +43,8 @@ export default Component.extend(ViewNewEdit, ChildHook, {
provisionerChoices: computed('intl.locale', function() {
const intl = get(this, 'intl');
const out = getProvisioners().map((p) => {
const showUnsupported = get(this, 'globalStore').all('feature').filterBy('name', 'unsupported-storage-drivers').get('firstObject.value');
const out = getProvisioners(showUnsupported).map((p) => {
const entry = Object.assign({}, p);
const key = `storageClass.${ entry.name }.title`;

13
app/components/cru-volume/component.js
View File

@ -6,7 +6,8 @@ import layout from './template';
import { getSources } from 'ui/models/volume';
export default Component.extend(ViewNewEdit, {
intl: service(),
intl: service(),
globalStore: service(),
layout,
model: null,
@ -24,7 +25,9 @@ export default Component.extend(ViewNewEdit, {
actions: {
updateParams(key, map) {
getSources('ephemeral').forEach((source) => {
const showUnsupported = get(this, 'globalStore').all('feature').filterBy('name', 'unsupported-storage-drivers').get('firstObject.value');
getSources('ephemeral', showUnsupported).forEach((source) => {
if (source.value === key){
set(this, `primaryResource.${ key }`, map);
} else {
@ -45,7 +48,8 @@ export default Component.extend(ViewNewEdit, {
sourceChoices: computed('intl.locale', function() {
const intl = get(this, 'intl');
const skip = ['host-path', 'secret'];
const out = getSources('ephemeral').map((p) => {
const showUnsupported = get(this, 'globalStore').all('feature').filterBy('name', 'unsupported-storage-drivers').get('firstObject.value');
const out = getSources('ephemeral', showUnsupported).map((p) => {
const entry = Object.assign({}, p);
const key = `volumeSource.${ entry.name }.title`;
@ -71,7 +75,8 @@ export default Component.extend(ViewNewEdit, {
sourceComponent: computed('sourceName', function() {
const name = get(this, 'sourceName');
const sources = getSources('ephemeral');
const showUnsupported = get(this, 'globalStore').all('feature').filterBy('name', 'unsupported-storage-drivers').get('firstObject.value');
const sources = getSources('ephemeral', showUnsupported);
const entry = sources.findBy('name', name);
if (entry) {

37
app/models/storageclass.js
View File

@ -8,21 +8,21 @@ const DEFAULT_ANNOTATION = 'storageclass.kubernetes.io/is-default-class';
const PROVISIONERS = [];
registerProvisioner('aws-ebs', 'kubernetes.io/aws-ebs', true);
registerProvisioner('gce-pd', 'kubernetes.io/gce-pd', true);
registerProvisioner('glusterfs', 'kubernetes.io/glusterfs', true);
registerProvisioner('cinder', 'kubernetes.io/cinder', true);
registerProvisioner('vsphere-volume', 'kubernetes.io/vsphere-volume', true);
registerProvisioner('rbd', 'kubernetes.io/rbd', true);
registerProvisioner('quobyte', 'kubernetes.io/quobyte', true);
registerProvisioner('azure-disk', 'kubernetes.io/azure-disk', true);
registerProvisioner('azure-file', 'kubernetes.io/azure-file', true);
registerProvisioner('portworx-volume', 'kubernetes.io/portworx-volume', true);
registerProvisioner('scaleio', 'kubernetes.io/scaleio', true);
registerProvisioner('storageos', 'kubernetes.io/storageos', true);
registerProvisioner('longhorn', 'rancher.io/longhorn', true);
registerProvisioner('aws-ebs', 'kubernetes.io/aws-ebs', true, true);
registerProvisioner('gce-pd', 'kubernetes.io/gce-pd', true, true);
registerProvisioner('glusterfs', 'kubernetes.io/glusterfs', true, false);
registerProvisioner('cinder', 'kubernetes.io/cinder', true, false);
registerProvisioner('vsphere-volume', 'kubernetes.io/vsphere-volume', true, true);
registerProvisioner('rbd', 'kubernetes.io/rbd', true, false);
registerProvisioner('quobyte', 'kubernetes.io/quobyte', true, false);
registerProvisioner('azure-disk', 'kubernetes.io/azure-disk', true, true);
registerProvisioner('azure-file', 'kubernetes.io/azure-file', true, true);
registerProvisioner('portworx-volume', 'kubernetes.io/portworx-volume', true, false);
registerProvisioner('scaleio', 'kubernetes.io/scaleio', true, false);
registerProvisioner('storageos', 'kubernetes.io/storageos', true, false);
registerProvisioner('longhorn', 'rancher.io/longhorn', true, true);
export function registerProvisioner(name, provisioner, component) {
export function registerProvisioner(name, provisioner, component, supported) {
if ( component === true ) {
component = name;
}
@ -37,11 +37,16 @@ export function registerProvisioner(name, provisioner, component) {
name,
value: provisioner,
component,
supported,
});
}
export function getProvisioners() {
return JSON.parse(JSON.stringify(PROVISIONERS));
export function getProvisioners(showUnsupported = false) {
const supportedProvisioners = showUnsupported
? PROVISIONERS
: PROVISIONERS.filter((p) => p.supported);
return JSON.parse(JSON.stringify(supportedProvisioners));
}
export default Resource.extend({

73
app/models/volume.js
View File

@ -5,37 +5,37 @@ import Resource from '@rancher/ember-api-store/models/resource';
const SOURCES = [];
// name/component field component ephemeral persistent driver
registerSource('aws-ebs', 'awsElasticBlockStore', true, true, true);
registerSource('azure-disk', 'azureDisk', true, true, true);
registerSource('azure-file', 'azureFile', true, true, true);
registerSource('cephfs', 'cephfs', true, true, true);
registerSource('cinder', 'cinder', true, true, true);
registerSource('config-map', 'configMap', true, false, false);
// registerSource('downward-api', 'downwardAPI', true, true, false);
registerSource('empty-dir', 'emptyDir', true, true, false);
registerSource('fc', 'fc', true, true, true);
registerSource('flex-volume', 'flexVolume', true, true, true);
registerSource('flex-volume-longhorn', 'flexVolume', true, true, true, 'rancher.io/longhorn');
registerSource('flocker', 'flocker', true, true, true);
registerSource('gce-pd', 'gcePersistentDisk', true, true, true);
// registerSource('git-repo', 'gitRepo', true, true, false);
registerSource('glusterfs', 'glusterfs', true, true, true);
registerSource('host-path', 'hostPath', true, true, true);
registerSource('iscsi', 'iscsi', true, true, true);
registerSource('local', 'local', true, false, true);
registerSource('nfs', 'nfs', true, true, true);
// registerSource('pvc', 'persisitentVolumeClaim', true, true, false);
registerSource('photon', 'photonPersistentDisk', true, true, true);
registerSource('portworx', 'portworxVolume', true, true, true);
// registerSource('projected', 'projected', true, true, false);
registerSource('quobyte', 'quobyte', true, true, true);
registerSource('rbd', 'rbd', true, true, true);
registerSource('scaleio', 'scaleIO', true, true, true);
registerSource('secret', 'secret', true, true, false);
registerSource('storageos', 'storageos', true, true, true);
registerSource('vsphere-volume', 'vsphereVolume', true, true, true);
registerSource('aws-ebs', 'awsElasticBlockStore', true, true, true, true);
registerSource('azure-disk', 'azureDisk', true, true, true, true);
registerSource('azure-file', 'azureFile', true, true, true, true);
registerSource('cephfs', 'cephfs', true, true, true, false);
registerSource('cinder', 'cinder', true, true, true, false);
registerSource('config-map', 'configMap', true, false, false, false);
// registerSource('downward-api', 'downwardAPI', true, true, false, false);
registerSource('empty-dir', 'emptyDir', true, true, false, false);
registerSource('fc', 'fc', true, true, true, false);
registerSource('flex-volume', 'flexVolume', true, true, true, false);
registerSource('flex-volume-longhorn', 'flexVolume', true, true, true, true, 'rancher.io/longhorn');
registerSource('flocker', 'flocker', true, true, true, false);
registerSource('gce-pd', 'gcePersistentDisk', true, true, true, true);
// registerSource('git-repo', 'gitRepo', true, true, false, false);
registerSource('glusterfs', 'glusterfs', true, true, true, false);
registerSource('host-path', 'hostPath', true, true, true, true);
registerSource('iscsi', 'iscsi', true, true, true, false);
registerSource('local', 'local', true, false, true, true);
registerSource('nfs', 'nfs', true, true, true, true);
// registerSource('pvc', 'persisitentVolumeClaim', true, true, false, false);
registerSource('photon', 'photonPersistentDisk', true, true, true, false);
registerSource('portworx', 'portworxVolume', true, true, true, false);
// registerSource('projected', 'projected', true, true, false, false);
registerSource('quobyte', 'quobyte', true, true, true, false);
registerSource('rbd', 'rbd', true, true, true, false);
registerSource('scaleio', 'scaleIO', true, true, true, false);
registerSource('secret', 'secret', true, true, false, false);
registerSource('storageos', 'storageos', true, true, true, false);
registerSource('vsphere-volume', 'vsphereVolume', true, true, true, true);
export function registerSource(name, field, component, ephemeral = true, persistent = true, driver = '') {
export function registerSource(name, field, component, ephemeral = true, persistent = true, supported = false, driver = '') {
if ( component === true ) {
component = name;
}
@ -53,16 +53,21 @@ export function registerSource(name, field, component, ephemeral = true, persist
component,
ephemeral: !!ephemeral,
persistent: !!persistent,
supported: !!supported,
});
}
export function getSources(which = 'all') {
export function getSources(which = 'all', showUnsupported = false) {
const supportedSources = showUnsupported
? SOURCES
: SOURCES.filter((s) => s.supported);
if (which === 'ephemeral') {
return JSON.parse(JSON.stringify(SOURCES.filter((s) => s.ephemeral)));
return JSON.parse(JSON.stringify(supportedSources.filter((s) => s.ephemeral)));
} else if ( which === 'persistent' ) {
return JSON.parse(JSON.stringify(SOURCES.filter((s) => s.persistent)));
return JSON.parse(JSON.stringify(supportedSources.filter((s) => s.persistent)));
} else {
return JSON.parse(JSON.stringify(SOURCES));
return JSON.parse(JSON.stringify(supportedSources));
}
}