Skip to content

K
k3s
Commit 96749565 authored by Dawn Chen's avatar Dawn Chen
Browse files
Options

Merge pull request #8304 from bcbroussard/web-ui-v1beta3

Web UI v1beta3 conversion
parents ddbf851b 90d22c48
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 290 additions and 91 deletions
pkg/ui/datafile.go
View file @ 96749565
This source diff could not be displayed because it is too large. You can view the blob instead.
www/app/assets/css/app.css
View file @ 96749565
...@@ -1506,3 +1506,6 @@ md-toolbar h1 { ...@@ -1506,3 +1506,6 @@ md-toolbar h1 {
.dashboard .detail .containerTable td { .dashboard .detail .containerTable td {
padding-right: 20px; padding-right: 20px;
} }
.dashboard .align-top tbody {
vertical-align: top;
}
www/app/shared/assets/sampleData1.json deleted 100644 → 0
View file @ ddbf851b
This source diff could not be displayed because it is too large. You can view the blob instead.
www/master/components/dashboard/js/modules/services/podsMock.js
View file @ 96749565
...@@ -12,57 +12,93 @@ ...@@ -12,57 +12,93 @@
*/ */
function PodDataService($q) { function PodDataService($q) {
var pods = { var pods = {
"kind": "PodList", "kind": "Pod",
"creationTimestamp": null, "apiVersion": "v1beta3",
"selfLink": "/api/v1beta1/pods", "metadata": {
"resourceVersion": 166552, "name": "redis-master-c0r1n",
"apiVersion": "v1beta1", "generateName": "redis-master-",
"items": [{
"id": "hello",
"uid": "0fe3644e-ab53-11e4-8ae8-061695c59fcf",
"creationTimestamp": "2015-02-03T03:16:36Z",
"selfLink": "/api/v1beta1/pods/hello?namespace=default",
"resourceVersion": 466,
"namespace": "default", "namespace": "default",
"labels": {"environment": "testing", "name": "hello"}, "selfLink": "/api/v1beta3/namespaces/default/pods/redis-master-c0r1n",
"desiredState": { "uid": "f12ddfaf-ff77-11e4-8f2d-080027213276",
"manifest": { "resourceVersion": "39",
"version": "v1beta2", "creationTimestamp": "2015-05-21T05:12:14Z",
"id": "", "labels": {
"volumes": null, "name": "redis-master"
"containers": [{
"name": "hello",
"image": "quay.io/kelseyhightower/hello",
"ports": [{"hostPort": 80, "containerPort": 80, "protocol": "TCP"}],
"imagePullPolicy": "PullIfNotPresent"
}],
"restartPolicy": {"always": {}},
"dnsPolicy": "ClusterFirst"
}
}, },
"currentState": { "annotations": {
"manifest": {"version": "", "id": "", "volumes": null, "containers": null, "restartPolicy": {}}, "kubernetes.io/created-by": "{\"kind\":\"SerializedReference\",\"apiVersion\":\"v1beta3\",\"reference\":{\"kind\":\"ReplicationController\",\"namespace\":\"default\",\"name\":\"redis-master\",\"uid\":\"f12969e0-ff77-11e4-8f2d-080027213276\",\"apiVersion\":\"v1beta3\",\"resourceVersion\":\"26\"}}"
"status": "Running",
"host": "172.31.12.204",
"podIP": "10.244.73.2",
"info": {
"hello": {
"state": {"running": {"startedAt": "2015-02-03T03:16:51Z"}},
"restartCount": 0,
"image": "quay.io/kelseyhightower/hello",
"containerID": "docker://96ade8ff30a44c4489969eaf343a7899317671b07a9766ecd0963e9b41501256"
},
"net": {
"state": {"running": {"startedAt": "2015-02-03T03:16:41Z"}},
"restartCount": 0,
"podIP": "10.244.73.2",
"image": "kubernetes/pause:latest",
"containerID": "docker://93d32603cafbff7165dadb1d4527899c24246bca2f5e6770b8297fd3721b272c"
}
}
} }
}] },
}; "spec": {
"volumes": [
{
"name": "default-token-zb4rq",
"secret": {
"secretName": "default-token-zb4rq"
}
}
],
"containers": [
{
"name": "master",
"image": "redis",
"ports": [
{
"containerPort": 6379,
"protocol": "TCP"
}
],
"resources": {},
"volumeMounts": [
{
"name": "default-token-zb4rq",
"readOnly": true,
"mountPath": "/var/run/secrets/kubernetes.io/serviceaccount"
}
],
"terminationMessagePath": "/dev/termination-log",
"imagePullPolicy": "IfNotPresent",
"capabilities": {},
"securityContext": {
"capabilities": {},
"privileged": false
}
}
],
"restartPolicy": "Always",
"dnsPolicy": "ClusterFirst",
"serviceAccount": "default",
"host": "127.0.0.1"
},
"status": {
"phase": "Running",
"Condition": [
{
"type": "Ready",
"status": "True"
}
],
"hostIP": "127.0.0.1",
"podIP": "172.17.0.1",
"startTime": "2015-05-21T05:12:14Z",
"containerStatuses": [
{
"name": "master",
"state": {
"running": {
"startedAt": "2015-05-21T05:12:14Z"
}
},
"lastState": {},
"ready": true,
"restartCount": 0,
"image": "redis",
"imageID": "docker://95af5842ddb9b03f7c6ec7601e65924cec516fcedd7e590ae31660057085cf67",
"containerID": "docker://ae2a1e0a91a8b1015191a0b8e2ce8c55a86fb1a9a2b1e8e3b29430c9d93c8c09"
}
]
}
};
// Uses promises // Uses promises
return { return {
......
www/master/components/dashboard/js/modules/services/replicationControllersMock.js
View file @ 96749565
...@@ -13,13 +13,68 @@ ...@@ -13,13 +13,68 @@
*/ */
function ReplicationControllerDataService($q) { function ReplicationControllerDataService($q) {
var replicationControllers = { var replicationControllers = {
"kind": "ReplicationControllerList", "kind": "List",
"creationTimestamp": null, "apiVersion": "v1beta3",
"selfLink": "/api/v1beta1/replicationControllers", "metadata": {},
"resourceVersion": 166552, "items": [
"apiVersion": "v1beta1", {
"items": [] "kind": "ReplicationController",
}; "apiVersion": "v1beta3",
"metadata": {
"name": "redis-master",
"namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/replicationcontrollers/redis-master",
"uid": "f12969e0-ff77-11e4-8f2d-080027213276",
"resourceVersion": "28",
"creationTimestamp": "2015-05-21T05:12:14Z",
"labels": {
"name": "redis-master"
}
},
"spec": {
"replicas": 1,
"selector": {
"name": "redis-master"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"name": "redis-master"
}
},
"spec": {
"containers": [
{
"name": "master",
"image": "redis",
"ports": [
{
"containerPort": 6379,
"protocol": "TCP"
}
],
"resources": {},
"terminationMessagePath": "/dev/termination-log",
"imagePullPolicy": "IfNotPresent",
"capabilities": {},
"securityContext": {
"capabilities": {},
"privileged": false
}
}
],
"restartPolicy": "Always",
"dnsPolicy": "ClusterFirst",
"serviceAccount": ""
}
}
},
"status": {
"replicas": 1
}
}
]};
// Uses promises // Uses promises
return { return {
......
www/master/components/dashboard/js/modules/services/servicesMock.js
View file @ 96749565
...@@ -12,44 +12,96 @@ ...@@ -12,44 +12,96 @@
*/ */
function ServiceDataService($q) { function ServiceDataService($q) {
var services = { var services = {
"kind": "ServiceList", "kind": "List",
"creationTimestamp": null, "apiVersion": "v1beta3",
"selfLink": "/api/v1beta1/services", "metadata": {},
"resourceVersion": 166552, "items": [
"apiVersion": "v1beta1",
"items": [
{ {
"id": "kubernetes", "kind": "Service",
"uid": "626dd08d-ab51-11e4-8ae8-061695c59fcf", "apiVersion": "v1beta3",
"creationTimestamp": "2015-02-03T03:04:36Z", "metadata": {
"selfLink": "/api/v1beta1/services/kubernetes?namespace=default", "name": "kubernetes",
"resourceVersion": 11, "namespace": "default",
"namespace": "default", "selfLink": "/api/v1beta3/namespaces/default/services/kubernetes",
"port": 443, "resourceVersion": "6",
"protocol": "TCP", "creationTimestamp": null,
"labels": {"component": "apiserver", "provider": "kubernetes"}, "labels": {
"selector": null, "component": "apiserver",
"containerPort": 0, "provider": "kubernetes"
"portalIP": "10.244.66.215", }
"sessionAffinity": "None" },
"spec": {
"ports": [
{
"protocol": "TCP",
"port": 443,
"targetPort": 443
}
],
"portalIP": "10.0.0.2",
"sessionAffinity": "None"
},
"status": {}
}, },
{ {
"id": "kubernetes-ro", "kind": "Service",
"uid": "626f9584-ab51-11e4-8ae8-061695c59fcf", "apiVersion": "v1beta3",
"creationTimestamp": "2015-02-03T03:04:36Z", "metadata": {
"selfLink": "/api/v1beta1/services/kubernetes-ro?namespace=default", "name": "kubernetes-ro",
"resourceVersion": 12, "namespace": "default",
"namespace": "default", "selfLink": "/api/v1beta3/namespaces/default/services/kubernetes-ro",
"port": 80, "resourceVersion": "8",
"protocol": "TCP", "creationTimestamp": null,
"labels": {"component": "apiserver", "provider": "kubernetes"}, "labels": {
"selector": null, "component": "apiserver",
"containerPort": 0, "provider": "kubernetes"
"portalIP": "10.244.182.142", }
"sessionAffinity": "None" },
"spec": {
"ports": [
{
"protocol": "TCP",
"port": 80,
"targetPort": 80
}
],
"portalIP": "10.0.0.1",
"sessionAffinity": "None"
},
"status": {}
},
{
"kind": "Service",
"apiVersion": "v1beta3",
"metadata": {
"name": "redis-master",
"namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/services/redis-master",
"uid": "a6fde246-ff78-11e4-8f2d-080027213276",
"resourceVersion": "72",
"creationTimestamp": "2015-05-21T05:17:19Z",
"labels": {
"name": "redis-master"
}
},
"spec": {
"ports": [
{
"protocol": "TCP",
"port": 6379,
"targetPort": 6379
}
],
"selector": {
"name": "redis-master"
},
"portalIP": "10.0.0.124",
"sessionAffinity": "None"
},
"status": {}
} }
] ]
}; };
// Uses promises // Uses promises
return { return {
......
www/master/components/dashboard/less/dashboard.less
View file @ 96749565
...@@ -70,4 +70,8 @@ ...@@ -70,4 +70,8 @@
} }
} }
} }
.align-top tbody {
vertical-align: top;
}
} }
www/master/gulpfile.js
View file @ 96749565
...@@ -348,7 +348,6 @@ gulp.task('copy:shared-assets', function() { ...@@ -348,7 +348,6 @@ gulp.task('copy:shared-assets', function() {
del.sync([build.assets], {force: true}); del.sync([build.assets], {force: true});
return gulp.src(source.assets.source, {base: 'shared/assets'}) return gulp.src(source.assets.source, {base: 'shared/assets'})
.pipe(expect(source.assets.source))
.pipe(gulp.dest(build.assets)); .pipe(gulp.dest(build.assets));
}); });
......
www/master/shared/assets/sampleData1.json deleted 100644 → 0
View file @ ddbf851b
This source diff could not be displayed because it is too large. You can view the blob instead.
www/master/shared/config/development.json
View file @ 96749565
{ {
"k8sApiServer": "/api/v1beta2", "k8sApiServer": "/api/v1beta2",
"k8sApiv1beta3Server": "/api/v1beta3",
"k8sDataServer": "/cluster", "k8sDataServer": "/cluster",
"k8sDataPollMinIntervalSec": 10, "k8sDataPollMinIntervalSec": 10,
"k8sDataPollMaxIntervalSec": 120, "k8sDataPollMaxIntervalSec": 120,
......
www/master/shared/config/generated-config.js
View file @ 96749565
...@@ -3,6 +3,7 @@ angular.module("kubernetesApp.config", []) ...@@ -3,6 +3,7 @@ angular.module("kubernetesApp.config", [])
.constant("ENV", { .constant("ENV", {
"/": { "/": {
"k8sApiServer": "/api/v1beta2", "k8sApiServer": "/api/v1beta2",
"k8sApiv1beta3Server": "/api/v1beta3",
"k8sDataServer": "/cluster", "k8sDataServer": "/cluster",
"k8sDataPollMinIntervalSec": 10, "k8sDataPollMinIntervalSec": 10,
"k8sDataPollMaxIntervalSec": 120, "k8sDataPollMaxIntervalSec": 120,
......
www/master/shared/js/modules/services/cAdvisor.js
View file @ 96749565
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.service('cAdvisorService', function($http, $q, ENV) { .service('cAdvisorService', function($http, $q, ENV) {
var _baseUrl = function(minionIp) { var _baseUrl = function(minionIp) {
var minionPort = ENV['/']['cAdvisorPort'] || "8081"; var minionPort = ENV['/']['cAdvisorPort'] || "8081";
var proxy = ENV['/']['cAdvisorProxy'] || "/api/v1beta2/proxy/nodes/"; var proxy = ENV['/']['cAdvisorProxy'] || "/api/v1beta3/proxy/nodes/";
return proxy + minionIp + ':' + minionPort + '/api/v1.0/'; return proxy + minionIp + ':' + minionPort + '/api/v1.0/';
}; };
......
www/master/shared/js/modules/services/k8sApiService.js
View file @ 96749565
...@@ -40,3 +40,51 @@ app.provider('k8sApi', ...@@ -40,3 +40,51 @@ app.provider('k8sApi',
k8sApiProvider.setUrlBase(proxy + ENV['/']['k8sApiServer']); k8sApiProvider.setUrlBase(proxy + ENV['/']['k8sApiServer']);
} }
}); });
app.provider('k8sv1Beta3Api',
function() {
var urlBase = '';
var _namespace = 'default';
this.setUrlBase = function(value) { urlBase = value; };
this.setNamespace = function(value) { _namespace = value; };
this.getNamespace = function() { return _namespace; };
var _get = function($http, baseUrl, query) {
var _fullUrl = baseUrl;
if (query !== undefined) {
_fullUrl += '/' + query;
}
return $http.get(_fullUrl);
};
this.$get = function($http, $q) {
var api = {};
api.getUrlBase = function() { return urlBase + '/namespaces/' + _namespace; };
api.getPods = function(query) { return _get($http, api.getUrlBase() + '/pods', query); };
api.getMinions = function(query) { return _get($http, urlBase + '/nodes', query); };
api.getServices = function(query) { return _get($http, api.getUrlBase() + '/services', query); };
api.getReplicationControllers = function(query) {
return _get($http, api.getUrlBase() + '/replicationcontrollers', query)
};
api.getEvents = function(query) { return _get($http, api.getUrlBase() + '/events', query); };
return api;
};
})
.config(function(k8sv1Beta3ApiProvider, ENV) {
if (ENV && ENV['/'] && ENV['/']['k8sApiv1beta3Server']) {
var proxy = ENV['/']['cAdvisorProxy'] || '';
k8sv1Beta3ApiProvider.setUrlBase(proxy + ENV['/']['k8sApiv1beta3Server']);
}
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment