From b83c9145910d64fa401b1ab11927d7180aab2bba Mon Sep 17 00:00:00 2001 From: Arik Hadas Date: Wed, 6 Mar 2024 11:56:51 +0200 Subject: [PATCH] Make the value of OpenShift var a string And also rename the env var OpenShift to OPENSHIFT Signed-off-by: Arik Hadas --- .../templates/controller/deployment-controller.yml.j2 | 6 +++--- pkg/settings/settings.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/operator/roles/forkliftcontroller/templates/controller/deployment-controller.yml.j2 b/operator/roles/forkliftcontroller/templates/controller/deployment-controller.yml.j2 index 9ad0a79de..5ad44b316 100644 --- a/operator/roles/forkliftcontroller/templates/controller/deployment-controller.yml.j2 +++ b/operator/roles/forkliftcontroller/templates/controller/deployment-controller.yml.j2 @@ -50,11 +50,11 @@ spec: - name: API_TLS_CA value: /var/run/secrets/{{ inventory_tls_secret_name }}/ca.crt {% endif %} - - name: OpenShift + - name: OPENSHIFT {% if k8s_cluster|bool %} - value: false + value: "false" {% else %} - value: true + value: "true" {% endif %} {% if controller_log_level is defined and controller_log_level is number %} - name: LOG_LEVEL diff --git a/pkg/settings/settings.go b/pkg/settings/settings.go index 2bbecbfc0..b0149e415 100644 --- a/pkg/settings/settings.go +++ b/pkg/settings/settings.go @@ -11,7 +11,7 @@ import ( // Global var Settings = ControllerSettings{} -const OpenShift = "OpenShift" +const OpenShift = "OPENSHIFT" // Settings type ControllerSettings struct {