Skip to content

Commit 9dbf566

Browse files
authored
Prevent etcd from running when scheduler disabled (#754)
* Restrict etcd from running when scheduler disable * Update openwhisk commit
1 parent ba72e9a commit 9dbf566

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

helm/openwhisk/templates/etcd-pod.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616
#
1717

18-
{{ if not .Values.etcd.external }}
18+
{{- if and (.Values.scheduler.enabled) (not .Values.etcd.external) }}
1919
apiVersion: apps/v1
2020
kind: Deployment
2121
metadata:
@@ -111,4 +111,4 @@ spec:
111111
ports:
112112
- name: etcd
113113
containerPort: {{ .Values.etcd.port }}
114-
{{ end }}
114+
{{- end }}

helm/openwhisk/values.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ whisk:
139139
includeSystemTests: false
140140
versions:
141141
openwhisk:
142-
buildDate: "2022-09-13-02:40:10Z"
143-
buildNo: "20220912"
144-
gitTag: "a1639f0e4d7270c9a230190ac26acb61413b6bbb"
142+
buildDate: "2022-10-14-13:44:50Z"
143+
buildNo: "20221014"
144+
gitTag: "ef725a653ab112391f79c274d8e3dcfb915d59a3"
145145
openwhiskCli:
146146
tag: "1.1.0"
147147
openwhiskCatalog:
@@ -162,7 +162,7 @@ k8s:
162162
# Images used to run auxillary tasks/jobs
163163
utility:
164164
imageName: "openwhisk/ow-utils"
165-
imageTag: "a1639f0"
165+
imageTag: "ef725a6"
166166
imagePullPolicy: "IfNotPresent"
167167

168168
# Docker registry
@@ -260,7 +260,7 @@ nginx:
260260
# Controller configurations
261261
controller:
262262
imageName: "openwhisk/controller"
263-
imageTag: "a1639f0"
263+
imageTag: "ef725a6"
264264
imagePullPolicy: "IfNotPresent"
265265
replicaCount: 1
266266
restartPolicy: "Always"
@@ -274,7 +274,7 @@ controller:
274274
scheduler:
275275
enabled: false
276276
imageName: "openwhisk/scheduler"
277-
imageTag: "a1639f0"
277+
imageTag: "ef725a6"
278278
imagePullPolicy: "IfNotPresent"
279279
replicaCount: 1
280280
restartPolicy: "Always"
@@ -331,7 +331,7 @@ etcd:
331331
# Invoker configurations
332332
invoker:
333333
imageName: "openwhisk/invoker"
334-
imageTag: "a1639f0"
334+
imageTag: "ef725a6"
335335
imagePullPolicy: "IfNotPresent"
336336
restartPolicy: "Always"
337337
runtimeDeleteTimeout: "30 seconds"
@@ -386,7 +386,7 @@ redis:
386386
# User-events configuration
387387
user_events:
388388
imageName: "openwhisk/user-events"
389-
imageTag: "a1639f0"
389+
imageTag: "ef725a6"
390390
imagePullPolicy: "IfNotPresent"
391391
replicaCount: 1
392392
restartPolicy: "Always"

0 commit comments

Comments
 (0)