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

Merge pull request #5940 from richard-cox/initial-services-support 

Initial support for epinio services
This commit is contained in:
Richard Cox 2022-05-16 13:40:58 +01:00 committed by GitHub
parent e1af001b71 bf465a7666
commit a75342566a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 193 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
pkg/epinio/config/epinio.ts
View File

@ -13,7 +13,8 @@ export function init($plugin: any, store: any) {
headers,
configureType,
spoofedType,
weightType
weightType,
weightGroup
} = $plugin.DSL(store, $plugin.name);
const isEpinioSingleProduct = process.env.rancherEnv === 'epinio';
@ -93,6 +94,34 @@ export function init($plugin: any, store: any) {
customRoute: createEpinioRoute('c-cluster-resource', { resource: EPINIO_TYPES.CONFIGURATION }),
});
const SERVICE_GROUP = 'Services';
weightGroup(SERVICE_GROUP, 1, true);
// Service Instance
weightType(EPINIO_TYPES.SERVICE_INSTANCE, 151, true);
configureType(EPINIO_TYPES.SERVICE_INSTANCE, {
isCreatable: false,
isEditable: false,
isRemovable: false,
showState: true,
showAge: false,
canYaml: false,
customRoute: createEpinioRoute('c-cluster-resource', { resource: EPINIO_TYPES.SERVICE_INSTANCE }),
});
// Catalog Service
weightType(EPINIO_TYPES.CATALOG_SERVICE, 150, true);
configureType(EPINIO_TYPES.CATALOG_SERVICE, {
isCreatable: false,
isEditable: false,
isRemovable: false,
showState: false,
showAge: false,
canYaml: false,
customRoute: createEpinioRoute('c-cluster-resource', { resource: EPINIO_TYPES.CATALOG_SERVICE }),
});
// Namespace resource
weightType(EPINIO_TYPES.NAMESPACE, 100, true);
configureType(EPINIO_TYPES.NAMESPACE, {
@ -106,8 +135,14 @@ export function init($plugin: any, store: any) {
showListMasthead: false // Disable default masthead because we provide a custom one.
});
basicType([
EPINIO_TYPES.SERVICE_INSTANCE,
EPINIO_TYPES.CATALOG_SERVICE,
], SERVICE_GROUP);
basicType([
EPINIO_TYPES.APP,
SERVICE_GROUP,
EPINIO_TYPES.NAMESPACE,
EPINIO_TYPES.CONFIGURATION
]);
@ -250,4 +285,32 @@ export function init($plugin: any, store: any) {
sort: ['configuration.user'],
},
]);
headers(EPINIO_TYPES.SERVICE_INSTANCE, [
STATE,
SIMPLE_NAME,
{ // This will be a link once the service instance detail / create / edit pages are created
name: 'catalog_service',
labelKey: 'epinio.serviceInstance.tableHeaders.service',
value: 'catalog_service',
sort: ['catalog_service'],
},
]);
headers(EPINIO_TYPES.CATALOG_SERVICE, [
SIMPLE_NAME,
{
name: 'short_description',
labelKey: 'epinio.catalogService.tableHeaders.shortDesc',
value: 'short_description',
sort: ['short_description'],
},
{
name: 'description',
labelKey: 'epinio.catalogService.tableHeaders.desc',
value: 'description',
sort: ['description'],
},
]);
}

17
pkg/epinio/l10n/en-us.yaml
View File

@ -19,6 +19,16 @@ typeLabel:
one { Configurations }
other { Configurations }
}
"catalog-service": |-
{count, plural,
one { Service Catalog }
other { Catalog }
}
"service-instance": |-
{count, plural,
one { Service Instances }
other { Instances }
}
epinio:
label: Epinio
tableHeaders:
@ -177,5 +187,12 @@ epinio:
createBy: Created By
promptRemove:
unbind: Unbind from applications before deleting
serviceInstance:
tableHeaders:
service: Service
catalogService:
tableHeaders:
shortDesc: Headline
desc: Description
warnings:
noNamespace: There are no namespaces. Please create one before proceeding

26
pkg/epinio/models/applications.js
View File

@ -2,7 +2,7 @@ import { APPLICATION_MANIFEST_SOURCE_TYPE, EPINIO_PRODUCT_NAME, EPINIO_TYPES } f
import { createEpinioRoute } from '../utils/custom-routing';
import { formatSi } from '@shell/utils/units';
import { classify } from '@shell/plugins/dashboard-store/classify';
import EpinioResource from './epinio-resource';
import EpinioNamespacedResource from './epinio-namespaced-resource';
import { downloadFile } from '@shell/utils/download';
// See https://github.com/epinio/epinio/blob/00684bc36780a37ab90091498e5c700337015a96/pkg/api/core/v1/models/app.go#L11
@ -22,7 +22,7 @@ const STATES_MAPPED = {
unknown: 'unknown',
};
export default class EpinioApplication extends EpinioResource {
export default class EpinioApplication extends EpinioNamespacedResource {
buildCache = {};
get details() {
@ -317,28 +317,6 @@ export default class EpinioApplication extends EpinioResource {
};
}
// ------------------------------------------------------------------
// Methods here are required for generic components to handle `namespaced` concept
set metadata(metadata) {
this.meta = {
namespace: metadata.namespace,
name: metadata.name,
};
}
get metadata() {
return this.meta || {};
}
get namespaceLocation() {
return createEpinioRoute(`c-cluster-resource-id`, {
cluster: this.$rootGetters['clusterId'],
resource: EPINIO_TYPES.NAMESPACE,
id: this.meta.namespace,
});
}
// ------------------------------------------------------------------
trace(text, ...args) {

24
pkg/epinio/models/catalog-service.js Normal file
View File

@ -0,0 +1,24 @@
import EpinioNamespacedResource from './epinio-namespaced-resource';
export default class EpinioCatalogService extends EpinioNamespacedResource {
get links() {
return {
update: this.getUrl(),
self: this.getUrl(),
remove: this.getUrl(),
create: this.getUrl(null), // ensure name is null
};
}
getUrl(name = this.meta?.name) {
// Add baseUrl in a generic way
return this.$getters['urlFor'](this.type, this.id, { url: `/api/v1/services/${ name || '' }` });
}
get metadata() {
return this.meta || {
name: this.name,
namespace: this.namespace
};
}
}

27
pkg/epinio/models/configurations.js
View File

@ -1,11 +1,10 @@
import { EPINIO_TYPES } from '../types';
import { createEpinioRoute } from '../utils/custom-routing';
import EpinioResource from './epinio-resource';
import EpinioNamespacedResource from './epinio-namespaced-resource';
// POST - {"name":"my-service","data":{"foo":"bar"}}
// GET - { "boundapps": null, "name": "my-service" }
export default class EpinioConfiguration extends EpinioResource {
export default class EpinioConfiguration extends EpinioNamespacedResource {
get links() {
return {
update: this.getUrl(),
@ -37,28 +36,6 @@ export default class EpinioConfiguration extends EpinioResource {
return Object.keys(this.configuration?.details || {}).length;
}
// ------------------------------------------------------------------
// Methods here are required for generic components to handle `namespaced` concept
set metadata(metadata) {
this.meta = {
namespace: metadata.namespace,
name: metadata.name,
};
}
get metadata() {
return this.meta;
}
get namespaceLocation() {
return createEpinioRoute(`c-cluster-resource-id`, {
cluster: this.$rootGetters['clusterId'],
resource: EPINIO_TYPES.NAMESPACE,
id: this.meta.namespace,
});
}
// ------------------------------------------------------------------
trace(text, ...args) {

23
pkg/epinio/models/epinio-namespaced-resource.js Normal file
View File

@ -0,0 +1,23 @@
import { createEpinioRoute } from '~/pkg/epinio/utils/custom-routing';
import EpinioResource from './epinio-resource';
export default class EpinioNamespacedResource extends EpinioResource {
set metadata(metadata) {
this.meta = {
namespace: metadata.namespace,
name: metadata.name,
};
}
get metadata() {
return this.meta;
}
get namespaceLocation() {
return createEpinioRoute(`c-cluster-resource-id`, {
cluster: this.$rootGetters['clusterId'],
resource: this.schema.id,
id: this.meta.namespace,
});
}
}

33
pkg/epinio/models/service-instance.js Normal file
View File

@ -0,0 +1,33 @@
import EpinioNamespacedResource from './epinio-namespaced-resource';
export default class EpinioServiceInstance extends EpinioNamespacedResource {
get links() {
return {
update: this.getUrl(),
self: this.getUrl(),
remove: this.getUrl(),
create: this.getUrl(this.meta?.namespace, null), // ensure name is null
};
}
getUrl(namespace = 'from-ui', name = this.meta?.name) {
// getUrl(namespace = this.meta?.namespace, name = this.meta?.name) {
// Add baseUrl in a generic way
return this.$getters['urlFor'](this.type, this.id, { url: `/api/v1/namespaces/${ namespace }/services/${ name || '' }` });
}
// ------------------------------------------------------------------
set metadata(metadata) {
this.name = metadata.name;
this.namespace = metadata.namespace;
}
get metadata() {
return { // TODO: See https://github.com/epinio/ui/issues/97#issuecomment-1124880156
name: this.name,
namespace: this.namespace,
state: this.status
};
}
}

16
pkg/epinio/store/epinio-store/actions.ts
View File

@ -104,7 +104,8 @@ export default {
if ( opt.responseType ) {
return res;
} else {
const out = res.data || {};
const preOut = res.data || {};
const out = preOut.services || preOut.catalog_services || preOut;// TODO: See https://github.com/epinio/ui/issues/97#issuecomment-1124880156
const schema = getters.schemaFor(type);
if (Array.isArray(out)) {
@ -184,6 +185,19 @@ export default {
type: 'schema',
links: { collection: '/api/v1/namespaces' },
collectionMethods: ['get', 'post'],
}, {
product: EPINIO_PRODUCT_NAME,
id: EPINIO_TYPES.CATALOG_SERVICE,
type: 'schema',
links: { collection: '/api/v1/services' },
collectionMethods: ['get', 'post'],
}, {
product: EPINIO_PRODUCT_NAME,
id: EPINIO_TYPES.SERVICE_INSTANCE,
type: 'schema',
links: { collection: '/api/v1/namespaces/from-ui/services' },
collectionMethods: ['get', 'post'],
attributes: { namespaced: true }
}, {
product: EPINIO_PRODUCT_NAME,
id: EPINIO_TYPES.APP_INSTANCE,

14
pkg/epinio/types.ts
View File

@ -7,13 +7,15 @@ export const EPINIO_STANDALONE_CLUSTER_NAME = 'default';
export const EPINIO_TYPES = {
// From API
APP: 'applications',
NAMESPACE: 'namespaces',
CONFIGURATION: 'configurations',
APP: 'applications',
NAMESPACE: 'namespaces',
CONFIGURATION: 'configurations',
CATALOG_SERVICE: 'catalog-service',
SERVICE_INSTANCE: 'service-instance',
// Internal
INSTANCE: 'instance',
APP_ACTION: 'application-action',
APP_INSTANCE: 'application-instance',
INSTANCE: 'instance',
APP_ACTION: 'application-action',
APP_INSTANCE: 'application-instance',
};
// // https://github.com/epinio/epinio/blob/7eb93b6dc735f8a6db26b8a242ae62a34877014c/pkg/api/core/v1/models/models.go#L96

6
shell/components/form/NameNsDescription.vue
View File

@ -96,6 +96,10 @@ export default {
type: Boolean,
default: false
},
namespacesOverride: {
type: Array,
default: null,
},
descriptionLabel: {
type: String,
default: 'nameNsDescription.description.label',
@ -132,7 +136,7 @@ export default {
horizontal: {
type: Boolean,
default: true,
},
}
},
data() {