diff --git a/deploy/helm/distributed-compute-operator/dco-values.yaml b/deploy/helm/distributed-compute-operator/dco-values.yaml index 6b570389..fe0116ac 100644 --- a/deploy/helm/distributed-compute-operator/dco-values.yaml +++ b/deploy/helm/distributed-compute-operator/dco-values.yaml @@ -11,10 +11,7 @@ global: istio: cni: true enabled: false - httpIdleTimeout: - timeout: 24h install: false - rootConfigNamespace: istio-system mpi: initImage: registry: quay.io diff --git a/deploy/helm/distributed-compute-operator/templates/http-timeout-envoyfilter.yaml b/deploy/helm/distributed-compute-operator/templates/http-timeout-envoyfilter.yaml deleted file mode 100644 index 69dcb3fe..00000000 --- a/deploy/helm/distributed-compute-operator/templates/http-timeout-envoyfilter.yaml +++ /dev/null @@ -1,45 +0,0 @@ -{{- if and (.Values.global.istio.enabled) (.Values.global.istio.httpIdleTimeout.timeout) }} -{{- $commonFullname := include "common.names.fullname" . }} -{{- $justRootConfigNamespace := list .Values.global.istio.rootConfigNamespace }} -{{- $defaultNamespaces := .Values.config.watchNamespaces | default $justRootConfigNamespace }} -{{- $namespaces := .Values.global.istio.httpIdleTimeout.namespaces | default $defaultNamespaces }} -{{- range $namespace := $namespaces }} -apiVersion: networking.istio.io/v1alpha3 -kind: EnvoyFilter -metadata: - name: {{ $commonFullname }}-envoyfilter - namespace: {{ $namespace }} -spec: - workloadSelector: - labels: - app.kubernetes.io/managed-by: distributed-compute-operator - configPatches: - - applyTo: NETWORK_FILTER - match: - listener: - filterChain: - filter: - name: "envoy.filters.network.http_connection_manager" - patch: - operation: MERGE - value: - name: "envoy.filters.network.http_connection_manager" - typed_config: - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager" - common_http_protocol_options: - idle_timeout: {{ $.Values.global.istio.httpIdleTimeout.timeout }} - - applyTo: NETWORK_FILTER - match: - listener: - filterChain: - filter: - name: envoy.filters.network.tcp_proxy - patch: - operation: MERGE - value: - name: envoy.filters.network.tcp_proxy - typed_config: - '@type': type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy - idle_timeout: {{ $.Values.global.istio.httpIdleTimeout.timeout }} -{{- end }} -{{- end }} diff --git a/deploy/helm/distributed-compute-operator/values.yaml b/deploy/helm/distributed-compute-operator/values.yaml index df719b20..bf283bd0 100644 --- a/deploy/helm/distributed-compute-operator/values.yaml +++ b/deploy/helm/distributed-compute-operator/values.yaml @@ -9,18 +9,6 @@ global: # Elevate pod execution permissions so that Istio's init container can modify # network settings when CNI plugin is NOT installed cniPluginInstalled: true - # namespace for istio mesh-level settings - rootConfigNamespace: istio-config - # set the HTTP connection idle timeout for pods managed by the distributed-compute-operator - httpIdleTimeout: - # the timeout to set. Leave empty for istio default. - timeout: "" - # If timeout and namespaces are set, sets the timeout only in given namespaces. - # If timeout is set but namespaces is empty: - # - if config.watchNamespaces is empty, then timeout is set across the whole istio mesh - # - else timeout is set for namespaces in config.watchNamespaces - # If any namespaces in the istio mesh are unaffected by this setting, they get istio default. - namespaces: [] # Number of controller instances to run replicaCount: 1