From 244b5d74c531ab131f34395b5a7cfd8722e5cfb1 Mon Sep 17 00:00:00 2001
From: Ronnie Webb <rwebb@revacomm.com>
Date: Thu, 16 Sep 2021 08:20:26 -0500
Subject: [PATCH] removing secretName conditional
---
chart/templates/anchore/secret-ca.yaml | 2 +-
chart/templates/argocd/secret-ca.yaml | 2 +-
chart/templates/gitlab/secret-ca.yaml | 2 +-
chart/templates/jaeger/secret-ca.yaml | 2 +-
chart/templates/kiali/secret-ca.yaml | 2 +-
chart/templates/logging/elasticsearch-kibana/secret-ca.yaml | 2 +-
chart/templates/mattermost/mattermost/secret-ca.yaml | 2 +-
chart/templates/monitoring/secret-ca.yaml | 2 +-
chart/templates/sonarqube/secret-ca.yaml | 2 +-
chart/templates/twistlock/secret-ca.yaml | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/chart/templates/anchore/secret-ca.yaml b/chart/templates/anchore/secret-ca.yaml
index 2803202e2e..087ba515f7 100644
--- a/chart/templates/anchore/secret-ca.yaml
+++ b/chart/templates/anchore/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.addons.anchore.enabled) .Values.addons.anchore.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName}}
+{{- if and (or .Values.addons.anchore.enabled) .Values.addons.anchore.sso.enabled .Values.sso.certificate_authority }}
apiVersion: v1
kind: Secret
metadata:
diff --git a/chart/templates/argocd/secret-ca.yaml b/chart/templates/argocd/secret-ca.yaml
index 1a806a27a5..00365cdac5 100644
--- a/chart/templates/argocd/secret-ca.yaml
+++ b/chart/templates/argocd/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.addons.argocd.enabled .Values.addons.argocd.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName }}
+{{- if and .Values.addons.argocd.enabled .Values.addons.argocd.sso.enabled .Values.sso.certificate_authority }}
apiVersion: v1
kind: Secret
metadata:
diff --git a/chart/templates/gitlab/secret-ca.yaml b/chart/templates/gitlab/secret-ca.yaml
index cd51cc4196..d723c28ba5 100644
--- a/chart/templates/gitlab/secret-ca.yaml
+++ b/chart/templates/gitlab/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled .Values.addons.gitlab.sso.enabled) .Values.sso.certificate_authority .Values.sso.secretName}}
+{{- if and .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled .Values.addons.gitlab.sso.enabled .Values.sso.certificate_authority}}
apiVersion: v1
kind: Secret
metadata:
diff --git a/chart/templates/jaeger/secret-ca.yaml b/chart/templates/jaeger/secret-ca.yaml
index 8c3d07486c..0d94b9f558 100644
--- a/chart/templates/jaeger/secret-ca.yaml
+++ b/chart/templates/jaeger/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.jaeger.enabled .Values.jaeger.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName}}
+{{- if and .Values.jaeger.enabled .Values.jaeger.sso.enabled .Values.sso.certificate_authority }}
apiVersion: v1
kind: Secret
metadata:
diff --git a/chart/templates/kiali/secret-ca.yaml b/chart/templates/kiali/secret-ca.yaml
index 2e3d6129d4..a242cf6afb 100644
--- a/chart/templates/kiali/secret-ca.yaml
+++ b/chart/templates/kiali/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.kiali.enabled .Values.kiali.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName }}
+{{- if and .Values.kiali.enabled .Values.kiali.sso.enabled .Values.sso.certificate_authority }}
apiVersion: v1
kind: Secret
metadata:
diff --git a/chart/templates/logging/elasticsearch-kibana/secret-ca.yaml b/chart/templates/logging/elasticsearch-kibana/secret-ca.yaml
index b89da78e9c..7d0ea6ce39 100644
--- a/chart/templates/logging/elasticsearch-kibana/secret-ca.yaml
+++ b/chart/templates/logging/elasticsearch-kibana/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.logging.enabled .Values.logging.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName }}
+{{- if and .Values.logging.enabled .Values.logging.sso.enabled .Values.sso.certificate_authority }}
apiVersion: v1
kind: Secret
metadata:
diff --git a/chart/templates/mattermost/mattermost/secret-ca.yaml b/chart/templates/mattermost/mattermost/secret-ca.yaml
index 4e418af28c..7752a8a844 100644
--- a/chart/templates/mattermost/mattermost/secret-ca.yaml
+++ b/chart/templates/mattermost/mattermost/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.addons.mattermost.enabled .Values.addons.mattermost.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName }}
+{{- if and .Values.addons.mattermost.enabled .Values.addons.mattermost.sso.enabled .Values.sso.certificate_authority }}
apiVersion: v1
kind: Secret
metadata:
diff --git a/chart/templates/monitoring/secret-ca.yaml b/chart/templates/monitoring/secret-ca.yaml
index 419904eeee..300ad3fab0 100644
--- a/chart/templates/monitoring/secret-ca.yaml
+++ b/chart/templates/monitoring/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.monitoring.enabled .Values.monitoring.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName}}
+{{- if and .Values.monitoring.enabled .Values.monitoring.sso.enabled .Values.sso.certificate_authority }}
apiVersion: v1
kind: Secret
metadata:
diff --git a/chart/templates/sonarqube/secret-ca.yaml b/chart/templates/sonarqube/secret-ca.yaml
index d1a4665b7c..29109e5bca 100644
--- a/chart/templates/sonarqube/secret-ca.yaml
+++ b/chart/templates/sonarqube/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.addons.sonarqube.enabled .Values.addons.sonarqube.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName}}
+{{- if and .Values.addons.sonarqube.enabled .Values.addons.sonarqube.sso.enabled .Values.sso.certificate_authority }}
apiVersion: v1
kind: Secret
metadata:
diff --git a/chart/templates/twistlock/secret-ca.yaml b/chart/templates/twistlock/secret-ca.yaml
index 6774af528b..23519f33c3 100644
--- a/chart/templates/twistlock/secret-ca.yaml
+++ b/chart/templates/twistlock/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.twistlock.enabled .Values.twistlock.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName }}
+{{- if and .Values.twistlock.enabled .Values.twistlock.sso.enabled .Values.sso.certificate_authority }}
apiVersion: v1
kind: Secret
metadata:
--
GitLab