teraslice 0.86.2 → 0.86.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -103,9 +103,19 @@ module.exports = function kubernetesClusterBackend(context, clusterMasterServer)
|
|
|
103
103
|
const jobResult = await k8s.post(exJob, 'job');
|
|
104
104
|
logger.debug(jobResult, 'k8s slicer job submitted');
|
|
105
105
|
|
|
106
|
-
|
|
106
|
+
let controllerLabel;
|
|
107
|
+
if (jobResult.spec.selector.matchLabels['controller-uid']) {
|
|
108
|
+
/// If running on kubernetes < v1.27.0
|
|
109
|
+
controllerLabel = 'controller-uid';
|
|
110
|
+
} else {
|
|
111
|
+
/// If running on kubernetes v1.27.0 or later
|
|
112
|
+
controllerLabel = 'batch.kubernetes.io/controller-uid';
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
const controllerUid = jobResult.spec.selector.matchLabels[controllerLabel];
|
|
116
|
+
|
|
107
117
|
const pod = await k8s.waitForSelectedPod(
|
|
108
|
-
|
|
118
|
+
`${controllerLabel}=${controllerUid}`,
|
|
109
119
|
null,
|
|
110
120
|
context.sysconfig.teraslice.slicer_timeout
|
|
111
121
|
);
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "teraslice",
|
|
3
3
|
"displayName": "Teraslice",
|
|
4
|
-
"version": "0.86.
|
|
4
|
+
"version": "0.86.3",
|
|
5
5
|
"description": "Distributed computing platform for processing JSON data",
|
|
6
6
|
"homepage": "https://github.com/terascope/teraslice#readme",
|
|
7
7
|
"bugs": {
|
|
@@ -41,10 +41,10 @@
|
|
|
41
41
|
"ms": "^2.1.3"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@terascope/elasticsearch-api": "^3.
|
|
45
|
-
"@terascope/job-components": "^0.
|
|
46
|
-
"@terascope/teraslice-messaging": "^0.
|
|
47
|
-
"@terascope/utils": "^0.
|
|
44
|
+
"@terascope/elasticsearch-api": "^3.11.0",
|
|
45
|
+
"@terascope/job-components": "^0.64.0",
|
|
46
|
+
"@terascope/teraslice-messaging": "^0.34.0",
|
|
47
|
+
"@terascope/utils": "^0.51.0",
|
|
48
48
|
"async-mutex": "^0.4.0",
|
|
49
49
|
"barbe": "^3.0.16",
|
|
50
50
|
"body-parser": "^1.20.2",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"easy-table": "^1.2.0",
|
|
54
54
|
"event-loop-stats": "^1.4.1",
|
|
55
55
|
"express": "^4.18.2",
|
|
56
|
-
"fs-extra": "^
|
|
56
|
+
"fs-extra": "^11.1.1",
|
|
57
57
|
"gc-stats": "^1.4.0",
|
|
58
58
|
"got": "^11.8.3",
|
|
59
59
|
"ip": "^1.1.8",
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
"semver": "^7.3.8",
|
|
66
66
|
"socket.io": "^1.7.4",
|
|
67
67
|
"socket.io-client": "^1.7.4",
|
|
68
|
-
"terafoundation": "^0.
|
|
68
|
+
"terafoundation": "^0.50.0",
|
|
69
69
|
"uuid": "^9.0.0"
|
|
70
70
|
},
|
|
71
71
|
"devDependencies": {
|