Commit ac8f8d04 by Samuel Padgett

Bug 1539566 - Add DataService methods for getting server version

See https://bugzilla.redhat.com/show_bug.cgi?id=1539566
parent 495aa646
...@@ -2768,6 +2768,28 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR ...@@ -2768,6 +2768,28 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
return new URI({protocol: protocol, hostname: hostPort}).toString(); return new URI({protocol: protocol, hostname: hostPort}).toString();
}; };
DataService.prototype._getAPIServerVersion = function(path) {
var protocol = window.location.protocol === "http:" ? "http" : "https";
var versionURL = new URI({
protocol: protocol,
hostname: API_CFG.k8s.hostPort,
path: path
}).toString();
return $http.get(versionURL, {
headers: {
Accept: 'application/json'
}
});
};
DataService.prototype.getKubernetesMasterVersion = function() {
return this._getAPIServerVersion('/version');
};
DataService.prototype.getOpenShiftMasterVersion = function() {
return this._getAPIServerVersion('/version/openshift');
};
// Used by ProjectsService when a list fails. // Used by ProjectsService when a list fails.
DataService.prototype.createData = function(array) { DataService.prototype.createData = function(array) {
return new Data(array); return new Data(array);
......
...@@ -4819,6 +4819,28 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR ...@@ -4819,6 +4819,28 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
return new URI({protocol: protocol, hostname: hostPort}).toString(); return new URI({protocol: protocol, hostname: hostPort}).toString();
}; };
DataService.prototype._getAPIServerVersion = function(path) {
var protocol = window.location.protocol === "http:" ? "http" : "https";
var versionURL = new URI({
protocol: protocol,
hostname: API_CFG.k8s.hostPort,
path: path
}).toString();
return $http.get(versionURL, {
headers: {
Accept: 'application/json'
}
});
};
DataService.prototype.getKubernetesMasterVersion = function() {
return this._getAPIServerVersion('/version');
};
DataService.prototype.getOpenShiftMasterVersion = function() {
return this._getAPIServerVersion('/version/openshift');
};
// Used by ProjectsService when a list fails. // Used by ProjectsService when a list fails.
DataService.prototype.createData = function(array) { DataService.prototype.createData = function(array) {
return new Data(array); return new Data(array);
......
...@@ -2128,6 +2128,21 @@ return new URI({ ...@@ -2128,6 +2128,21 @@ return new URI({
protocol:protocol, protocol:protocol,
hostname:hostPort hostname:hostPort
}).toString(); }).toString();
}, DataService.prototype._getAPIServerVersion = function(path) {
var protocol = "http:" === window.location.protocol ? "http" :"https", versionURL = new URI({
protocol:protocol,
hostname:API_CFG.k8s.hostPort,
path:path
}).toString();
return $http.get(versionURL, {
headers:{
Accept:"application/json"
}
});
}, DataService.prototype.getKubernetesMasterVersion = function() {
return this._getAPIServerVersion("/version");
}, DataService.prototype.getOpenShiftMasterVersion = function() {
return this._getAPIServerVersion("/version/openshift");
}, DataService.prototype.createData = function(array) { }, DataService.prototype.createData = function(array) {
return new Data(array); return new Data(array);
}; };
......
...@@ -1370,6 +1370,28 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR ...@@ -1370,6 +1370,28 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
return new URI({protocol: protocol, hostname: hostPort}).toString(); return new URI({protocol: protocol, hostname: hostPort}).toString();
}; };
DataService.prototype._getAPIServerVersion = function(path) {
var protocol = window.location.protocol === "http:" ? "http" : "https";
var versionURL = new URI({
protocol: protocol,
hostname: API_CFG.k8s.hostPort,
path: path
}).toString();
return $http.get(versionURL, {
headers: {
Accept: 'application/json'
}
});
};
DataService.prototype.getKubernetesMasterVersion = function() {
return this._getAPIServerVersion('/version');
};
DataService.prototype.getOpenShiftMasterVersion = function() {
return this._getAPIServerVersion('/version/openshift');
};
// Used by ProjectsService when a list fails. // Used by ProjectsService when a list fails.
DataService.prototype.createData = function(array) { DataService.prototype.createData = function(array) {
return new Data(array); return new Data(array);
......
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