screwdriver-queue-service 4.0.1 → 4.0.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.
|
@@ -89,6 +89,71 @@ executor:
|
|
|
89
89
|
# in milliseconds
|
|
90
90
|
retryDelay: REQUEST_RETRYDELAY
|
|
91
91
|
maxAttempts: REQUEST_MAXATTEMPTS
|
|
92
|
+
k8s-vm:
|
|
93
|
+
options:
|
|
94
|
+
# Configuration of Docker
|
|
95
|
+
kubernetes:
|
|
96
|
+
# The host or IP of the kubernetes cluster
|
|
97
|
+
host: K8S_HOST
|
|
98
|
+
# Privileged mode, default restricted, set to true for trusted container runtime use-case
|
|
99
|
+
privileged: K8S_SECURITYCONTEXT_PRIVILEGED
|
|
100
|
+
# The jwt token used for authenticating kubernetes requests
|
|
101
|
+
token: K8S_TOKEN
|
|
102
|
+
jobsNamespace: K8S_JOBS_NAMESPACE
|
|
103
|
+
baseImage: K8S_BASE_IMAGE
|
|
104
|
+
# Resources for build pod
|
|
105
|
+
resources:
|
|
106
|
+
# Number of cpu cores
|
|
107
|
+
cpu:
|
|
108
|
+
micro: K8S_CPU_MICRO
|
|
109
|
+
low: K8S_CPU_LOW
|
|
110
|
+
high: K8S_CPU_HIGH
|
|
111
|
+
turbo: K8S_CPU_TURBO
|
|
112
|
+
# upper bound for user custom cpu
|
|
113
|
+
max: K8S_CPU_MAX
|
|
114
|
+
# Memory in GB
|
|
115
|
+
memory:
|
|
116
|
+
micro: K8S_MEMORY_MICRO
|
|
117
|
+
low: K8S_MEMORY_LOW
|
|
118
|
+
high: K8S_MEMORY_HIGH
|
|
119
|
+
turbo: K8S_MEMORY_TURBO
|
|
120
|
+
# upper bound for user custom memory
|
|
121
|
+
max: K8S_MEMORY_MAX
|
|
122
|
+
disk:
|
|
123
|
+
space: K8S_DISK_LABEL
|
|
124
|
+
speed: K8S_DISK_SPEED_LABEL
|
|
125
|
+
# Default build timeout for all builds in this cluster
|
|
126
|
+
buildTimeout: K8S_VM_BUILD_TIMEOUT
|
|
127
|
+
# Default max build timeout
|
|
128
|
+
maxBuildTimeout: K8S_VM_MAX_BUILD_TIMEOUT
|
|
129
|
+
# k8s node selectors for approprate build pod scheduling.
|
|
130
|
+
# Value is Object of format { label: 'value' } See
|
|
131
|
+
# https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#step-one-attach-label-to-the-node
|
|
132
|
+
# Eg: { dedicated: 'screwdriver' } to schedule pods on nodes having
|
|
133
|
+
# label-value of dedicated=screwdriver
|
|
134
|
+
nodeSelectors:
|
|
135
|
+
__name: K8S_VM_NODE_SELECTORS
|
|
136
|
+
__format: json
|
|
137
|
+
# k8s preferred node selectors for build pod scheduling
|
|
138
|
+
# See https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#node-affinity-beta-feature
|
|
139
|
+
preferredNodeSelectors:
|
|
140
|
+
__name: K8S_VM_PREFERRED_NODE_SELECTORS
|
|
141
|
+
__format: json
|
|
142
|
+
# Launcher image to use
|
|
143
|
+
launchImage: LAUNCH_IMAGE
|
|
144
|
+
# Launcher container tag to use
|
|
145
|
+
launchVersion: LAUNCH_VERSION
|
|
146
|
+
# Prefix to the container
|
|
147
|
+
prefix: EXECUTOR_PREFIX
|
|
148
|
+
# Circuit breaker config
|
|
149
|
+
fusebox:
|
|
150
|
+
breaker:
|
|
151
|
+
# in milliseconds
|
|
152
|
+
timeout: CIRCUIT_TIMEOUT
|
|
153
|
+
requestretry:
|
|
154
|
+
# in milliseconds
|
|
155
|
+
retryDelay: REQUEST_RETRYDELAY
|
|
156
|
+
maxAttempts: REQUEST_MAXATTEMPTS
|
|
92
157
|
jenkins:
|
|
93
158
|
options:
|
|
94
159
|
jenkins:
|
package/config/default.yaml
CHANGED
|
@@ -74,6 +74,53 @@ executor:
|
|
|
74
74
|
# in milliseconds
|
|
75
75
|
retryDelay: 3000
|
|
76
76
|
maxAttempts: 5
|
|
77
|
+
k8s-vm:
|
|
78
|
+
options:
|
|
79
|
+
# Configuration of Docker
|
|
80
|
+
kubernetes:
|
|
81
|
+
# The host or IP of the kubernetes cluster
|
|
82
|
+
host: kubernetes.default
|
|
83
|
+
# Privileged mode, default restricted, set to true for trusted container runtime use-case
|
|
84
|
+
privileged: false
|
|
85
|
+
# Resources for build pod
|
|
86
|
+
resources:
|
|
87
|
+
cpu:
|
|
88
|
+
# Number of cpu cores
|
|
89
|
+
micro: 1
|
|
90
|
+
low: 2
|
|
91
|
+
high: 6
|
|
92
|
+
turbo: 12
|
|
93
|
+
# upper bound for user custom cpu
|
|
94
|
+
max: 12
|
|
95
|
+
memory:
|
|
96
|
+
# Memory in GB
|
|
97
|
+
micro: 1
|
|
98
|
+
low: 2
|
|
99
|
+
high: 12
|
|
100
|
+
turbo: 16
|
|
101
|
+
# upper bound for user custom memory
|
|
102
|
+
max: 16
|
|
103
|
+
# Default build timeout for all builds in this cluster
|
|
104
|
+
buildTimeout: 90
|
|
105
|
+
# Default max build timeout
|
|
106
|
+
maxBuildTimeout: 120
|
|
107
|
+
# k8s node selectors for approprate pod scheduling
|
|
108
|
+
nodeSelectors: {}
|
|
109
|
+
preferredNodeSelectors: {}
|
|
110
|
+
# Launcher image to use
|
|
111
|
+
launchImage: screwdrivercd/launcher
|
|
112
|
+
# Launcher container tag to use
|
|
113
|
+
launchVersion: stable
|
|
114
|
+
# Circuit breaker config
|
|
115
|
+
fusebox:
|
|
116
|
+
breaker:
|
|
117
|
+
# in milliseconds
|
|
118
|
+
timeout: 10000
|
|
119
|
+
# requestretry configs
|
|
120
|
+
requestretry:
|
|
121
|
+
# in milliseconds
|
|
122
|
+
retryDelay: 3000
|
|
123
|
+
maxAttempts: 5
|
|
77
124
|
|
|
78
125
|
httpd:
|
|
79
126
|
# Port to listen on
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "screwdriver-queue-service",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.3",
|
|
4
4
|
"description": "Screwdriver Queue Service API",
|
|
5
5
|
"main": "app.js",
|
|
6
6
|
"directories": {
|
|
@@ -32,6 +32,7 @@
|
|
|
32
32
|
"screwdriver-executor-docker": "^7.0.0",
|
|
33
33
|
"screwdriver-executor-jenkins": "^7.0.0",
|
|
34
34
|
"screwdriver-executor-k8s": "^16.0.0",
|
|
35
|
+
"screwdriver-executor-k8s-vm": "^5.0.0",
|
|
35
36
|
"screwdriver-executor-router": "^4.0.0",
|
|
36
37
|
"screwdriver-logger": "^2.0.0",
|
|
37
38
|
"screwdriver-request": "^2.0.1",
|