Skip to content

Commit

Permalink
Merge pull request kubernetes#9408 from bcbroussard/v1api
Browse files Browse the repository at this point in the history 
Update web ui to v1 api
  • Loading branch information
@krousey
krousey committed Jun 9, 2015
2 parents 0487c65 + 4efa564 commit 044d486
Show file tree
Hide file tree
Showing 8 changed files with 322 additions and 322 deletions.
584 changes: 292 additions & 292 deletions pkg/ui/datafile.go
View file

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions www/app/assets/js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ angular.module("kubernetesApp.config", [])

.constant("ENV", {
"/": {
"k8sApiServer": "/api/v1beta3",
"k8sApiServer": "/api/v1",
"k8sDataServer": "",
"k8sDataPollMinIntervalSec": 10,
"k8sDataPollMaxIntervalSec": 120,
Expand Down Expand Up @@ -2388,20 +2388,20 @@ angular.module('kubernetesApp.components.dashboard')
function PodDataService($q) {
var pods = {
"kind": "Pod",
"apiVersion": "v1beta3",
"apiVersion": "v1",
"metadata": {
"name": "redis-master-c0r1n",
"generateName": "redis-master-",
"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",
"resourceVersion": "39",
"creationTimestamp": "2015-05-21T05:12:14Z",
"labels": {
"name": "redis-master"
},
"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": {
Expand Down Expand Up @@ -2503,16 +2503,16 @@ angular.module('kubernetesApp.components.dashboard')
function ReplicationControllerDataService($q) {
var replicationControllers = {
"kind": "List",
"apiVersion": "v1beta3",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "ReplicationController",
"apiVersion": "v1beta3",
"apiVersion": "v1",
"metadata": {
"name": "redis-master",
"namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/replicationcontrollers/redis-master",
"selfLink": "/api/v1/namespaces/default/replicationcontrollers/redis-master",
"uid": "f12969e0-ff77-11e4-8f2d-080027213276",
"resourceVersion": "28",
"creationTimestamp": "2015-05-21T05:12:14Z",
Expand Down Expand Up @@ -2592,16 +2592,16 @@ angular.module('kubernetesApp.components.dashboard')
function ServiceDataService($q) {
var services = {
"kind": "List",
"apiVersion": "v1beta3",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Service",
"apiVersion": "v1beta3",
"apiVersion": "v1",
"metadata": {
"name": "kubernetes",
"namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/services/kubernetes",
"selfLink": "/api/v1/namespaces/default/services/kubernetes",
"resourceVersion": "6",
"creationTimestamp": null,
"labels": {
Expand All @@ -2624,11 +2624,11 @@ angular.module('kubernetesApp.components.dashboard')
},
{
"kind": "Service",
"apiVersion": "v1beta3",
"apiVersion": "v1",
"metadata": {
"name": "kubernetes-ro",
"namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/services/kubernetes-ro",
"selfLink": "/api/v1/namespaces/default/services/kubernetes-ro",
"resourceVersion": "8",
"creationTimestamp": null,
"labels": {
Expand All @@ -2651,11 +2651,11 @@ angular.module('kubernetesApp.components.dashboard')
},
{
"kind": "Service",
"apiVersion": "v1beta3",
"apiVersion": "v1",
"metadata": {
"name": "redis-master",
"namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/services/redis-master",
"selfLink": "/api/v1/namespaces/default/services/redis-master",
"uid": "a6fde246-ff78-11e4-8f2d-080027213276",
"resourceVersion": "72",
"creationTimestamp": "2015-05-21T05:17:19Z",
Expand Down
6 changes: 3 additions & 3 deletions www/master/components/dashboard/js/modules/services/podsMock.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@
function PodDataService($q) {
var pods = {
"kind": "Pod",
"apiVersion": "v1beta3",
"apiVersion": "v1",
"metadata": {
"name": "redis-master-c0r1n",
"generateName": "redis-master-",
"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",
"resourceVersion": "39",
"creationTimestamp": "2015-05-21T05:12:14Z",
"labels": {
"name": "redis-master"
},
"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": {
Expand Down
6 changes: 3 additions & 3 deletions www/master/components/dashboard/js/modules/services/replicationControllersMock.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
function ReplicationControllerDataService($q) {
var replicationControllers = {
"kind": "List",
"apiVersion": "v1beta3",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "ReplicationController",
"apiVersion": "v1beta3",
"apiVersion": "v1",
"metadata": {
"name": "redis-master",
"namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/replicationcontrollers/redis-master",
"selfLink": "/api/v1/namespaces/default/replicationcontrollers/redis-master",
"uid": "f12969e0-ff77-11e4-8f2d-080027213276",
"resourceVersion": "28",
"creationTimestamp": "2015-05-21T05:12:14Z",
Expand Down
14 changes: 7 additions & 7 deletions www/master/components/dashboard/js/modules/services/servicesMock.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
function ServiceDataService($q) {
var services = {
"kind": "List",
"apiVersion": "v1beta3",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Service",
"apiVersion": "v1beta3",
"apiVersion": "v1",
"metadata": {
"name": "kubernetes",
"namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/services/kubernetes",
"selfLink": "/api/v1/namespaces/default/services/kubernetes",
"resourceVersion": "6",
"creationTimestamp": null,
"labels": {
Expand All @@ -45,11 +45,11 @@
},
{
"kind": "Service",
"apiVersion": "v1beta3",
"apiVersion": "v1",
"metadata": {
"name": "kubernetes-ro",
"namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/services/kubernetes-ro",
"selfLink": "/api/v1/namespaces/default/services/kubernetes-ro",
"resourceVersion": "8",
"creationTimestamp": null,
"labels": {
Expand All @@ -72,11 +72,11 @@
},
{
"kind": "Service",
"apiVersion": "v1beta3",
"apiVersion": "v1",
"metadata": {
"name": "redis-master",
"namespace": "default",
"selfLink": "/api/v1beta3/namespaces/default/services/redis-master",
"selfLink": "/api/v1/namespaces/default/services/redis-master",
"uid": "a6fde246-ff78-11e4-8f2d-080027213276",
"resourceVersion": "72",
"creationTimestamp": "2015-05-21T05:17:19Z",
Expand Down
2 changes: 1 addition & 1 deletion www/master/shared/config/development.example.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"k8sApiServer": "/api/v1beta3",
"k8sApiServer": "/api/v1",
"k8sDataServer": "",
"k8sDataPollMinIntervalSec": 10,
"k8sDataPollMaxIntervalSec": 120,
Expand Down
2 changes: 1 addition & 1 deletion www/master/shared/config/generated-config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ angular.module("kubernetesApp.config", [])

.constant("ENV", {
"/": {
"k8sApiServer": "/api/v1beta3",
"k8sApiServer": "/api/v1",
"k8sDataServer": "",
"k8sDataPollMinIntervalSec": 10,
"k8sDataPollMaxIntervalSec": 120,
Expand Down
2 changes: 1 addition & 1 deletion www/master/shared/config/production.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"k8sApiServer": "/api/v1beta3",
"k8sApiServer": "/api/v1",
"k8sDataServer": "",
"k8sDataPollMinIntervalSec": 10,
"k8sDataPollMaxIntervalSec": 120,
Expand Down

0 comments on commit 044d486

Please sign in to comment.