diff --git a/deployments/gpu-operator/templates/clusterpolicy.yaml b/deployments/gpu-operator/templates/clusterpolicy.yaml index 121a00f159..e0b720305c 100644 --- a/deployments/gpu-operator/templates/clusterpolicy.yaml +++ b/deployments/gpu-operator/templates/clusterpolicy.yaml @@ -25,24 +25,6 @@ spec: {{- if .Values.operator.defaultGPUMode }} defaultGPUMode: {{ .Values.operator.defaultGPUMode }} {{- end }} - {{- if .Values.operator.initContainer }} - initContainer: - {{- if .Values.operator.initContainer.repository }} - repository: {{ .Values.operator.initContainer.repository }} - {{- end }} - {{- if .Values.operator.initContainer.image }} - image: {{ .Values.operator.initContainer.image }} - {{- end }} - {{- if .Values.operator.initContainer.version }} - version: {{ .Values.operator.initContainer.version | quote }} - {{- end }} - {{- if .Values.operator.initContainer.imagePullPolicy }} - imagePullPolicy: {{ .Values.operator.initContainer.imagePullPolicy }} - {{- end }} - {{- if .Values.operator.initContainer.imagePullSecrets }} - imagePullSecrets: {{ toYaml .Values.operator.initContainer.imagePullSecrets | nindent 8 }} - {{- end }} - {{- end }} {{- if .Values.operator.use_ocp_driver_toolkit }} use_ocp_driver_toolkit: {{ .Values.operator.use_ocp_driver_toolkit }} {{- end }} diff --git a/tests/scripts/env-to-values.sh b/tests/scripts/env-to-values.sh index a2d82ca6d7..2ed23cdcc4 100755 --- a/tests/scripts/env-to-values.sh +++ b/tests/scripts/env-to-values.sh @@ -28,7 +28,6 @@ set -euo pipefail # - TOOLKIT_CONTAINER_IMAGE: container-toolkit image override # - DEVICE_PLUGIN_IMAGE: device-plugin image override # - MIG_MANAGER_IMAGE: mig-manager image override -# - CONTAINER_RUNTIME: default runtime (docker, containerd, crio) if [[ $# -ne 1 ]]; then echo "Usage: $0 OUTPUT_FILE" >&2 @@ -70,12 +69,6 @@ if [[ -n "${OPERATOR_VERSION:-}" ]]; then HAS_VALUES=true fi -if [[ -n "${CONTAINER_RUNTIME:-}" ]]; then - OPERATOR_CONFIG="${OPERATOR_CONFIG} defaultRuntime: \"${CONTAINER_RUNTIME}\"\n" - echo "Added operator.defaultRuntime: ${CONTAINER_RUNTIME}" - HAS_VALUES=true -fi - # Write operator configuration if any if [[ -n "${OPERATOR_CONFIG}" ]]; then echo "operator:" >> "${OUTPUT_FILE}" diff --git a/tests/scripts/install-operator.sh b/tests/scripts/install-operator.sh index af15af2c33..d874519b1b 100755 --- a/tests/scripts/install-operator.sh +++ b/tests/scripts/install-operator.sh @@ -26,8 +26,6 @@ if [[ "${USE_VALUES_FILE}" == "false" ]]; then if [[ -n "${OPERATOR_VERSION}" ]]; then OPERATOR_OPTIONS="${OPERATOR_OPTIONS} --set operator.version=${OPERATOR_VERSION} --set validator.version=${OPERATOR_VERSION}" fi - - OPERATOR_OPTIONS="${OPERATOR_OPTIONS} --set operator.defaultRuntime=${CONTAINER_RUNTIME}" fi if [[ "${USE_VALUES_FILE}" == "true" ]]; then