bug fixes

OpenNMS · Nov 28, 2023 · 6af734d · 6af734d
1 parent 833ee09
commit 6af734d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/horizon/templates/docker.secret.yaml b/horizon/templates/docker.secret.yaml
@@ -1,4 +1,5 @@
 # ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+{{- $namespace := include "namespace" . }}
 {{- range $k, $r := .Values.imagePullSecrets }}
 # TODO: find a better way to format this JSON that won't be sensitive to special characters
 {{- $json := printf "{\"auths\":{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}}" $r.dockerServer $r.dockerUsername $r.dockerPassword $r.dockerEmail (printf "%s:%s" $r.dockerUsername $r.dockerPassword | b64enc) }}
@@ -8,7 +9,7 @@ kind: Secret
 type: kubernetes.io/dockerconfigjson
 metadata:
   name: {{ $r.name }}
-  namespace: {{ include "grafana.namespace" . }}
+  namespace: {{ $namespace }}
 data:
   .dockerconfigjson: {{ $json | b64enc }}
 {{- end }}
diff --git a/horizon/templates/opennms-core.clusterrole.yaml b/horizon/templates/opennms-core.clusterrole.yaml
@@ -1,4 +1,4 @@
-{{- if and (eq (include "onOpenShift" .) "true") (.Values.dependencies.clusterRoleBinding) }}
+{{- if and (eq (include "onOpenShift" .) "true") (.Values.dependencies.clusterRole) }}
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

diff --git a/horizon/templates/opennms-core.clusterrolebinding.yaml b/horizon/templates/opennms-core.clusterrolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if and (eq (include "onOpenShift" .) "true") (.Values.dependencies.clusterRole)  }}
+{{- if and (eq (include "onOpenShift" .) "true") (.Values.dependencies.clusterRoleBinding)  }}
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata: