Prevent etcd from running when scheduler disabled (#754)
* Restrict etcd from running when scheduler disable
* Update openwhisk commit
diff --git a/helm/openwhisk/templates/etcd-pod.yaml b/helm/openwhisk/templates/etcd-pod.yaml
index dea4552..9cf8381 100644
--- a/helm/openwhisk/templates/etcd-pod.yaml
+++ b/helm/openwhisk/templates/etcd-pod.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-{{ if not .Values.etcd.external }}
+{{- if and (.Values.scheduler.enabled) (not .Values.etcd.external) }}
apiVersion: apps/v1
kind: Deployment
metadata:
@@ -111,4 +111,4 @@
ports:
- name: etcd
containerPort: {{ .Values.etcd.port }}
-{{ end }}
+{{- end }}
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index d6c19da..b923da1 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -139,9 +139,9 @@
includeSystemTests: false
versions:
openwhisk:
- buildDate: "2022-09-13-02:40:10Z"
- buildNo: "20220912"
- gitTag: "a1639f0e4d7270c9a230190ac26acb61413b6bbb"
+ buildDate: "2022-10-14-13:44:50Z"
+ buildNo: "20221014"
+ gitTag: "ef725a653ab112391f79c274d8e3dcfb915d59a3"
openwhiskCli:
tag: "1.1.0"
openwhiskCatalog:
@@ -162,7 +162,7 @@
# Images used to run auxillary tasks/jobs
utility:
imageName: "openwhisk/ow-utils"
- imageTag: "a1639f0"
+ imageTag: "ef725a6"
imagePullPolicy: "IfNotPresent"
# Docker registry
@@ -260,7 +260,7 @@
# Controller configurations
controller:
imageName: "openwhisk/controller"
- imageTag: "a1639f0"
+ imageTag: "ef725a6"
imagePullPolicy: "IfNotPresent"
replicaCount: 1
restartPolicy: "Always"
@@ -274,7 +274,7 @@
scheduler:
enabled: false
imageName: "openwhisk/scheduler"
- imageTag: "a1639f0"
+ imageTag: "ef725a6"
imagePullPolicy: "IfNotPresent"
replicaCount: 1
restartPolicy: "Always"
@@ -331,7 +331,7 @@
# Invoker configurations
invoker:
imageName: "openwhisk/invoker"
- imageTag: "a1639f0"
+ imageTag: "ef725a6"
imagePullPolicy: "IfNotPresent"
restartPolicy: "Always"
runtimeDeleteTimeout: "30 seconds"
@@ -386,7 +386,7 @@
# User-events configuration
user_events:
imageName: "openwhisk/user-events"
- imageTag: "a1639f0"
+ imageTag: "ef725a6"
imagePullPolicy: "IfNotPresent"
replicaCount: 1
restartPolicy: "Always"