Make AdoptExistingResources optional (#1453)

charts/README.md

@@ -66,6 +66,7 @@ Parameter | Description | Default
 `prometheus.serviceEndpoint` | If prometheus.enabled is false, please assign the prometheus service URL that is accessible by components. | `nil`
 `canaryDeployment.enabled` | Set to true if you need canary deployment feature | `true` in `fission-all`, `false` in `fission-core`
 `extraCoreComponentPodConfig` | Extend the container specs for the core fission pods. Can be used to add things like affinty/tolerations/nodeSelectors/etc. | None
+`executor.adoptExistingResources` | If true, executor will try to adopt existing resources created by the old executor instance. | `false`
 `router.deployAsDaemonSet` | Deploy router as DaemonSet instead of Deployment | `false`
 `router.svcAddressMaxRetries` | Max retries times for router to retry on a certain service URL returns from cache/executor | `5`
 `router.svcAddressUpdateTimeout` | The length of update lock expiry time for router to get a service URL returns from executor | `30`

charts/fission-all/templates/deployment.yaml

@@ -215,6 +215,8 @@ spec:
           value: "{{ .Values.pullPolicy }}"
         - name: RUNTIME_IMAGE_PULL_POLICY
           value: "{{ .Values.pullPolicy }}"
+        - name: ADOPT_EXISTING_RESOURCES
+          value: {{ .Values.executor.adoptExistingResources | default false | quote }}
         - name: ENABLE_ISTIO
           value: "{{ .Values.enableIstio }}"
         - name: TRACE_JAEGER_COLLECTOR_ENDPOINT

charts/fission-all/values.yaml

@@ -65,6 +65,9 @@ logger:
   ## security context and set privileged to true.
   enableSecurityContext: false
 
+executor:
+  adoptExistingResources: false
+
 ## Router config
 router:
   deployAsDaemonSet: false

charts/fission-core/templates/deployment.yaml

@@ -217,6 +217,8 @@ spec:
           value: "{{ .Values.traceCollectorEndpoint }}"
         - name: TRACING_SAMPLING_RATE
           value: {{ .Values.traceSamplingRate | default "0.5" | quote }}
+        - name: ADOPT_EXISTING_RESOURCES
+          value: {{ .Values.executor.adoptExistingResources | default false | quote }}
         - name: ENABLE_ISTIO
           value: "{{ .Values.enableIstio }}"
         - name: FETCHER_MINCPU

charts/fission-core/values.yaml

@@ -45,6 +45,9 @@ builderNamespace: fission-builder
 ## Enable istio integration
 enableIstio: false
 
+executor:
+  adoptExistingResources: false
+
 ## Router config
 router:
   deployAsDaemonSet: false