scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9408 from bcbroussard/v1api

Browse Source 
Update web ui to v1 api
This commit is contained in:
krousey
2015-06-09 11:00:06 -07:00
parent 0487c65fab 4efa564c7b
commit 044d4868ca
8 changed files with 322 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

584
pkg/ui/datafile.go
View File

File diff suppressed because it is too large Load Diff

28
www/app/assets/js/app.js
View File

@@ -200,7 +200,7 @@ angular.module("kubernetesApp.config", [])
.constant("ENV", { .constant("ENV", {
"/": { "/": {
"k8sApiServer": "/api/v1beta3", "k8sApiServer": "/api/v1",
"k8sDataServer": "", "k8sDataServer": "",
"k8sDataPollMinIntervalSec": 10, "k8sDataPollMinIntervalSec": 10,
"k8sDataPollMaxIntervalSec": 120, "k8sDataPollMaxIntervalSec": 120,
@@ -2388,12 +2388,12 @@ angular.module('kubernetesApp.components.dashboard')
function PodDataService($q) { function PodDataService($q) {
var pods = { var pods = {
"kind": "Pod", "kind": "Pod",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-master-c0r1n", "name": "redis-master-c0r1n",
"generateName": "redis-master-", "generateName": "redis-master-",
"namespace": "default", "namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/pods/redis-master-c0r1n", "selfLink": "/api/v1/namespaces/default/pods/redis-master-c0r1n",
"uid": "f12ddfaf-ff77-11e4-8f2d-080027213276", "uid": "f12ddfaf-ff77-11e4-8f2d-080027213276",
"resourceVersion": "39", "resourceVersion": "39",
"creationTimestamp": "2015-05-21T05:12:14Z", "creationTimestamp": "2015-05-21T05:12:14Z",
@@ -2401,7 +2401,7 @@ angular.module('kubernetesApp.components.dashboard')
"name": "redis-master" "name": "redis-master"
}, },
"annotations": { "annotations": {
"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\"}}" "kubernetes.io/created-by": "{\"kind\":\"SerializedReference\",\"apiVersion\":\"v1\",\"reference\":{\"kind\":\"ReplicationController\",\"namespace\":\"default\",\"name\":\"redis-master\",\"uid\":\"f12969e0-ff77-11e4-8f2d-080027213276\",\"apiVersion\":\"v1\",\"resourceVersion\":\"26\"}}"
} }
}, },
"spec": { "spec": {
@@ -2503,16 +2503,16 @@ angular.module('kubernetesApp.components.dashboard')
function ReplicationControllerDataService($q) { function ReplicationControllerDataService($q) {
var replicationControllers = { var replicationControllers = {
"kind": "List", "kind": "List",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": {}, "metadata": {},
"items": [ "items": [
{ {
"kind": "ReplicationController", "kind": "ReplicationController",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-master", "name": "redis-master",
"namespace": "default", "namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/replicationcontrollers/redis-master", "selfLink": "/api/v1/namespaces/default/replicationcontrollers/redis-master",
"uid": "f12969e0-ff77-11e4-8f2d-080027213276", "uid": "f12969e0-ff77-11e4-8f2d-080027213276",
"resourceVersion": "28", "resourceVersion": "28",
"creationTimestamp": "2015-05-21T05:12:14Z", "creationTimestamp": "2015-05-21T05:12:14Z",
@@ -2592,16 +2592,16 @@ angular.module('kubernetesApp.components.dashboard')
function ServiceDataService($q) { function ServiceDataService($q) {
var services = { var services = {
"kind": "List", "kind": "List",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": {}, "metadata": {},
"items": [ "items": [
{ {
"kind": "Service", "kind": "Service",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "kubernetes", "name": "kubernetes",
"namespace": "default", "namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/services/kubernetes", "selfLink": "/api/v1/namespaces/default/services/kubernetes",
"resourceVersion": "6", "resourceVersion": "6",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
@@ -2624,11 +2624,11 @@ angular.module('kubernetesApp.components.dashboard')
}, },
{ {
"kind": "Service", "kind": "Service",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "kubernetes-ro", "name": "kubernetes-ro",
"namespace": "default", "namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/services/kubernetes-ro", "selfLink": "/api/v1/namespaces/default/services/kubernetes-ro",
"resourceVersion": "8", "resourceVersion": "8",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
@@ -2651,11 +2651,11 @@ angular.module('kubernetesApp.components.dashboard')
}, },
{ {
"kind": "Service", "kind": "Service",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-master", "name": "redis-master",
"namespace": "default", "namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/services/redis-master", "selfLink": "/api/v1/namespaces/default/services/redis-master",
"uid": "a6fde246-ff78-11e4-8f2d-080027213276", "uid": "a6fde246-ff78-11e4-8f2d-080027213276",
"resourceVersion": "72", "resourceVersion": "72",
"creationTimestamp": "2015-05-21T05:17:19Z", "creationTimestamp": "2015-05-21T05:17:19Z",

6
www/master/components/dashboard/js/modules/services/podsMock.js
View File

@@ -13,12 +13,12 @@
function PodDataService($q) { function PodDataService($q) {
var pods = { var pods = {
"kind": "Pod", "kind": "Pod",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-master-c0r1n", "name": "redis-master-c0r1n",
"generateName": "redis-master-", "generateName": "redis-master-",
"namespace": "default", "namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/pods/redis-master-c0r1n", "selfLink": "/api/v1/namespaces/default/pods/redis-master-c0r1n",
"uid": "f12ddfaf-ff77-11e4-8f2d-080027213276", "uid": "f12ddfaf-ff77-11e4-8f2d-080027213276",
"resourceVersion": "39", "resourceVersion": "39",
"creationTimestamp": "2015-05-21T05:12:14Z", "creationTimestamp": "2015-05-21T05:12:14Z",
@@ -26,7 +26,7 @@
"name": "redis-master" "name": "redis-master"
}, },
"annotations": { "annotations": {
"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\"}}" "kubernetes.io/created-by": "{\"kind\":\"SerializedReference\",\"apiVersion\":\"v1\",\"reference\":{\"kind\":\"ReplicationController\",\"namespace\":\"default\",\"name\":\"redis-master\",\"uid\":\"f12969e0-ff77-11e4-8f2d-080027213276\",\"apiVersion\":\"v1\",\"resourceVersion\":\"26\"}}"
} }
}, },
"spec": { "spec": {

6
www/master/components/dashboard/js/modules/services/replicationControllersMock.js
View File

@@ -14,16 +14,16 @@
function ReplicationControllerDataService($q) { function ReplicationControllerDataService($q) {
var replicationControllers = { var replicationControllers = {
"kind": "List", "kind": "List",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": {}, "metadata": {},
"items": [ "items": [
{ {
"kind": "ReplicationController", "kind": "ReplicationController",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-master", "name": "redis-master",
"namespace": "default", "namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/replicationcontrollers/redis-master", "selfLink": "/api/v1/namespaces/default/replicationcontrollers/redis-master",
"uid": "f12969e0-ff77-11e4-8f2d-080027213276", "uid": "f12969e0-ff77-11e4-8f2d-080027213276",
"resourceVersion": "28", "resourceVersion": "28",
"creationTimestamp": "2015-05-21T05:12:14Z", "creationTimestamp": "2015-05-21T05:12:14Z",

14
www/master/components/dashboard/js/modules/services/servicesMock.js
View File

@@ -13,16 +13,16 @@
function ServiceDataService($q) { function ServiceDataService($q) {
var services = { var services = {
"kind": "List", "kind": "List",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": {}, "metadata": {},
"items": [ "items": [
{ {
"kind": "Service", "kind": "Service",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "kubernetes", "name": "kubernetes",
"namespace": "default", "namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/services/kubernetes", "selfLink": "/api/v1/namespaces/default/services/kubernetes",
"resourceVersion": "6", "resourceVersion": "6",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
@@ -45,11 +45,11 @@
}, },
{ {
"kind": "Service", "kind": "Service",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "kubernetes-ro", "name": "kubernetes-ro",
"namespace": "default", "namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/services/kubernetes-ro", "selfLink": "/api/v1/namespaces/default/services/kubernetes-ro",
"resourceVersion": "8", "resourceVersion": "8",
"creationTimestamp": null, "creationTimestamp": null,
"labels": { "labels": {
@@ -72,11 +72,11 @@
}, },
{ {
"kind": "Service", "kind": "Service",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "redis-master", "name": "redis-master",
"namespace": "default", "namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/services/redis-master", "selfLink": "/api/v1/namespaces/default/services/redis-master",
"uid": "a6fde246-ff78-11e4-8f2d-080027213276", "uid": "a6fde246-ff78-11e4-8f2d-080027213276",
"resourceVersion": "72", "resourceVersion": "72",
"creationTimestamp": "2015-05-21T05:17:19Z", "creationTimestamp": "2015-05-21T05:17:19Z",

2
www/master/shared/config/development.example.json
View File

@@ -1,5 +1,5 @@
{ {
"k8sApiServer": "/api/v1beta3", "k8sApiServer": "/api/v1",
"k8sDataServer": "", "k8sDataServer": "",
"k8sDataPollMinIntervalSec": 10, "k8sDataPollMinIntervalSec": 10,
"k8sDataPollMaxIntervalSec": 120, "k8sDataPollMaxIntervalSec": 120,

2
www/master/shared/config/generated-config.js
View File

@@ -2,7 +2,7 @@ angular.module("kubernetesApp.config", [])
.constant("ENV", { .constant("ENV", {
"/": { "/": {
"k8sApiServer": "/api/v1beta3", "k8sApiServer": "/api/v1",
"k8sDataServer": "", "k8sDataServer": "",
"k8sDataPollMinIntervalSec": 10, "k8sDataPollMinIntervalSec": 10,
"k8sDataPollMaxIntervalSec": 120, "k8sDataPollMaxIntervalSec": 120,

2
www/master/shared/config/production.json
View File

@@ -1,5 +1,5 @@
{ {
"k8sApiServer": "/api/v1beta3", "k8sApiServer": "/api/v1",
"k8sDataServer": "", "k8sDataServer": "",
"k8sDataPollMinIntervalSec": 10, "k8sDataPollMinIntervalSec": 10,
"k8sDataPollMaxIntervalSec": 120, "k8sDataPollMaxIntervalSec": 120,