Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 044d486

Browse files
krouseykrousey
committed
Merge pull request #9408 from bcbroussard/v1api
Update web ui to v1 api
2 parents 0487c65 + 4efa564 commit 044d486

File tree

8 files changed

+322
-322
lines changed

8 files changed

+322
-322
lines changed

‎pkg/ui/datafile.go‎

Lines changed: 292 additions & 292 deletions
Large diffs are not rendered by default.

‎www/app/assets/js/app.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ angular.module("kubernetesApp.config", [])
200200

201201
.constant("ENV", {
202202
"/": {
203-
"k8sApiServer": "/api/v1beta3",
203+
"k8sApiServer": "/api/v1",
204204
"k8sDataServer": "",
205205
"k8sDataPollMinIntervalSec": 10,
206206
"k8sDataPollMaxIntervalSec": 120,
@@ -2388,20 +2388,20 @@ angular.module('kubernetesApp.components.dashboard')
23882388
function PodDataService($q) {
23892389
var pods = {
23902390
"kind": "Pod",
2391-
"apiVersion": "v1beta3",
2391+
"apiVersion": "v1",
23922392
"metadata": {
23932393
"name": "redis-master-c0r1n",
23942394
"generateName": "redis-master-",
23952395
"namespace": "default",
2396-
"selfLink": "/api/v1beta3/namespaces/default/pods/redis-master-c0r1n",
2396+
"selfLink": "/api/v1/namespaces/default/pods/redis-master-c0r1n",
23972397
"uid": "f12ddfaf-ff77-11e4-8f2d-080027213276",
23982398
"resourceVersion": "39",
23992399
"creationTimestamp": "2015-05-21T05:12:14Z",
24002400
"labels": {
24012401
"name": "redis-master"
24022402
},
24032403
"annotations": {
2404-
"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\"}}"
2404+
"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\"}}"
24052405
}
24062406
},
24072407
"spec": {
@@ -2503,16 +2503,16 @@ angular.module('kubernetesApp.components.dashboard')
25032503
function ReplicationControllerDataService($q) {
25042504
var replicationControllers = {
25052505
"kind": "List",
2506-
"apiVersion": "v1beta3",
2506+
"apiVersion": "v1",
25072507
"metadata": {},
25082508
"items": [
25092509
{
25102510
"kind": "ReplicationController",
2511-
"apiVersion": "v1beta3",
2511+
"apiVersion": "v1",
25122512
"metadata": {
25132513
"name": "redis-master",
25142514
"namespace": "default",
2515-
"selfLink": "/api/v1beta3/namespaces/default/replicationcontrollers/redis-master",
2515+
"selfLink": "/api/v1/namespaces/default/replicationcontrollers/redis-master",
25162516
"uid": "f12969e0-ff77-11e4-8f2d-080027213276",
25172517
"resourceVersion": "28",
25182518
"creationTimestamp": "2015-05-21T05:12:14Z",
@@ -2592,16 +2592,16 @@ angular.module('kubernetesApp.components.dashboard')
25922592
function ServiceDataService($q) {
25932593
var services = {
25942594
"kind": "List",
2595-
"apiVersion": "v1beta3",
2595+
"apiVersion": "v1",
25962596
"metadata": {},
25972597
"items": [
25982598
{
25992599
"kind": "Service",
2600-
"apiVersion": "v1beta3",
2600+
"apiVersion": "v1",
26012601
"metadata": {
26022602
"name": "kubernetes",
26032603
"namespace": "default",
2604-
"selfLink": "/api/v1beta3/namespaces/default/services/kubernetes",
2604+
"selfLink": "/api/v1/namespaces/default/services/kubernetes",
26052605
"resourceVersion": "6",
26062606
"creationTimestamp": null,
26072607
"labels": {
@@ -2624,11 +2624,11 @@ angular.module('kubernetesApp.components.dashboard')
26242624
},
26252625
{
26262626
"kind": "Service",
2627-
"apiVersion": "v1beta3",
2627+
"apiVersion": "v1",
26282628
"metadata": {
26292629
"name": "kubernetes-ro",
26302630
"namespace": "default",
2631-
"selfLink": "/api/v1beta3/namespaces/default/services/kubernetes-ro",
2631+
"selfLink": "/api/v1/namespaces/default/services/kubernetes-ro",
26322632
"resourceVersion": "8",
26332633
"creationTimestamp": null,
26342634
"labels": {
@@ -2651,11 +2651,11 @@ angular.module('kubernetesApp.components.dashboard')
26512651
},
26522652
{
26532653
"kind": "Service",
2654-
"apiVersion": "v1beta3",
2654+
"apiVersion": "v1",
26552655
"metadata": {
26562656
"name": "redis-master",
26572657
"namespace": "default",
2658-
"selfLink": "/api/v1beta3/namespaces/default/services/redis-master",
2658+
"selfLink": "/api/v1/namespaces/default/services/redis-master",
26592659
"uid": "a6fde246-ff78-11e4-8f2d-080027213276",
26602660
"resourceVersion": "72",
26612661
"creationTimestamp": "2015-05-21T05:17:19Z",

‎www/master/components/dashboard/js/modules/services/podsMock.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
function PodDataService($q) {
1414
var pods = {
1515
"kind": "Pod",
16-
"apiVersion": "v1beta3",
16+
"apiVersion": "v1",
1717
"metadata": {
1818
"name": "redis-master-c0r1n",
1919
"generateName": "redis-master-",
2020
"namespace": "default",
21-
"selfLink": "/api/v1beta3/namespaces/default/pods/redis-master-c0r1n",
21+
"selfLink": "/api/v1/namespaces/default/pods/redis-master-c0r1n",
2222
"uid": "f12ddfaf-ff77-11e4-8f2d-080027213276",
2323
"resourceVersion": "39",
2424
"creationTimestamp": "2015-05-21T05:12:14Z",
2525
"labels": {
2626
"name": "redis-master"
2727
},
2828
"annotations": {
29-
"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\"}}"
29+
"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\"}}"
3030
}
3131
},
3232
"spec": {

‎www/master/components/dashboard/js/modules/services/replicationControllersMock.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
function ReplicationControllerDataService($q) {
1515
var replicationControllers = {
1616
"kind": "List",
17-
"apiVersion": "v1beta3",
17+
"apiVersion": "v1",
1818
"metadata": {},
1919
"items": [
2020
{
2121
"kind": "ReplicationController",
22-
"apiVersion": "v1beta3",
22+
"apiVersion": "v1",
2323
"metadata": {
2424
"name": "redis-master",
2525
"namespace": "default",
26-
"selfLink": "/api/v1beta3/namespaces/default/replicationcontrollers/redis-master",
26+
"selfLink": "/api/v1/namespaces/default/replicationcontrollers/redis-master",
2727
"uid": "f12969e0-ff77-11e4-8f2d-080027213276",
2828
"resourceVersion": "28",
2929
"creationTimestamp": "2015-05-21T05:12:14Z",

‎www/master/components/dashboard/js/modules/services/servicesMock.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
function ServiceDataService($q) {
1414
var services = {
1515
"kind": "List",
16-
"apiVersion": "v1beta3",
16+
"apiVersion": "v1",
1717
"metadata": {},
1818
"items": [
1919
{
2020
"kind": "Service",
21-
"apiVersion": "v1beta3",
21+
"apiVersion": "v1",
2222
"metadata": {
2323
"name": "kubernetes",
2424
"namespace": "default",
25-
"selfLink": "/api/v1beta3/namespaces/default/services/kubernetes",
25+
"selfLink": "/api/v1/namespaces/default/services/kubernetes",
2626
"resourceVersion": "6",
2727
"creationTimestamp": null,
2828
"labels": {
@@ -45,11 +45,11 @@
4545
},
4646
{
4747
"kind": "Service",
48-
"apiVersion": "v1beta3",
48+
"apiVersion": "v1",
4949
"metadata": {
5050
"name": "kubernetes-ro",
5151
"namespace": "default",
52-
"selfLink": "/api/v1beta3/namespaces/default/services/kubernetes-ro",
52+
"selfLink": "/api/v1/namespaces/default/services/kubernetes-ro",
5353
"resourceVersion": "8",
5454
"creationTimestamp": null,
5555
"labels": {
@@ -72,11 +72,11 @@
7272
},
7373
{
7474
"kind": "Service",
75-
"apiVersion": "v1beta3",
75+
"apiVersion": "v1",
7676
"metadata": {
7777
"name": "redis-master",
7878
"namespace": "default",
79-
"selfLink": "/api/v1beta3/namespaces/default/services/redis-master",
79+
"selfLink": "/api/v1/namespaces/default/services/redis-master",
8080
"uid": "a6fde246-ff78-11e4-8f2d-080027213276",
8181
"resourceVersion": "72",
8282
"creationTimestamp": "2015-05-21T05:17:19Z",

‎www/master/shared/config/development.example.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"k8sApiServer": "/api/v1beta3",
2+
"k8sApiServer": "/api/v1",
33
"k8sDataServer": "",
44
"k8sDataPollMinIntervalSec": 10,
55
"k8sDataPollMaxIntervalSec": 120,

‎www/master/shared/config/generated-config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ angular.module("kubernetesApp.config", [])
22

33
.constant("ENV", {
44
"/": {
5-
"k8sApiServer": "/api/v1beta3",
5+
"k8sApiServer": "/api/v1",
66
"k8sDataServer": "",
77
"k8sDataPollMinIntervalSec": 10,
88
"k8sDataPollMaxIntervalSec": 120,

‎www/master/shared/config/production.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"k8sApiServer": "/api/v1beta3",
2+
"k8sApiServer": "/api/v1",
33
"k8sDataServer": "",
44
"k8sDataPollMinIntervalSec": 10,
55
"k8sDataPollMaxIntervalSec": 120,

0 commit comments

Comments
 (0)