Merge pull request #10 from amazeeio/dioscuri-global-openshift

Toggle Dioscuri openshift support via chart
amazeeio · Mar 15, 2021 · 2c5e94f · 2c5e94f
2 parents e86d9b9 + 0588b87
commit 2c5e94f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/charts/dioscuri/Chart.yaml b/charts/dioscuri/Chart.yaml
@@ -15,6 +15,6 @@ maintainers:
 
 type: application
 
-version: 0.2.2
+version: 0.3.0
 
 appVersion: v0.1.9
diff --git a/charts/dioscuri/templates/deployment.yaml b/charts/dioscuri/templates/deployment.yaml
@@ -43,10 +43,15 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         command:
         - /manager
-        {{- with .Values.extraArgs }}
+        {{- if or .Values.extraArgs .Values.global.openshift }}
         args:
+        {{- if .Values.global.openshift }}
+        - "--is-openshift=true"
+        {{- end }}
+        {{- with .Values.extraArgs }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+        {{- end }}
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
       {{- with .Values.nodeSelector }}

diff --git a/charts/dioscuri/values.yaml b/charts/dioscuri/values.yaml
@@ -1,7 +1,9 @@
 # the following values are defaults which may be overridden
 
-# If the controller is running in an openshift,
-# then the argument `--is-openshift=true` should be added
+global:
+  # set to true to enable openshift support
+  openshift: false
+
 extraArgs:
 - "--metrics-addr=127.0.0.1:8080"
 - "--enable-leader-election=true"