From e4925a3886cd251fa306f69185c089960bec8a22 Mon Sep 17 00:00:00 2001 From: Arnob Kumar Saha Date: Sat, 26 Sep 2026 13:53:40 +0600 Subject: [PATCH] Avoid null spec.valuesFrom in Feature templates Bare 'valuesFrom:' renders as null, which the apiserver rejects under server-side apply (Helm v4 / helm-controller >= v1.5.0 default for new installs). Client-side apply silently prunes it, hiding the bug. Signed-off-by: Arnob Kumar Saha --- .../opscenter-security/cert-manager/cert-manager.yaml | 1 - .../templates/featuresets/capi-capa/aws-ebs-csi-driver.yaml | 2 +- .../featuresets/capi-capa/aws-load-balancer-controller.yaml | 2 +- .../featuresets/capi-capa/capa-vpc-peering-operator.yaml | 2 +- .../templates/featuresets/capi-capa/cluster-autoscaler.yaml | 2 +- .../templates/featuresets/capi-core/capi-ops-manager.yaml | 2 +- .../templates/featuresets/crossplane/crossplane.yaml | 2 +- .../templates/featuresets/crossplane/kubedb-provider-aws.yaml | 2 +- .../templates/featuresets/crossplane/kubedb-provider-azure.yaml | 2 +- .../templates/featuresets/crossplane/kubedb-provider-gcp.yaml | 2 +- .../templates/featuresets/opscenter-backup/stash-opscenter.yaml | 2 +- .../templates/featuresets/opscenter-backup/stash.yaml | 2 +- .../featuresets/opscenter-cost/keda/keda-add-ons-http.yaml | 2 +- .../templates/featuresets/opscenter-cost/keda/keda.yaml | 2 +- .../templates/featuresets/opscenter-cost/opencost/opencost.yaml | 2 +- .../templates/featuresets/opscenter-networking/voyager.yaml | 2 +- .../monitoring/kube-prometheus-stack.yaml | 2 +- .../opscenter-observability/monitoring/metrics-server.yaml | 2 +- .../opscenter-observability/monitoring/prometheus-adapter.yaml | 2 +- .../opscenter-policy-management/gatekeeper/gatekeeper.yaml | 2 +- .../opscenter-policy-management/kyverno/kyverno.yaml | 2 +- .../opscenter-secret-management/external-secrets.yaml | 2 +- .../featuresets/opscenter-secret-management/sealed-secrets.yaml | 2 +- .../csi-secrets-store-provider-aws.yaml | 2 +- .../csi-secrets-store-provider-azure.yaml | 2 +- .../csi-secrets-store-provider-gcp.yaml | 2 +- .../csi-secrets-store-provider-vault.yaml | 2 +- .../secrets-store-csi-driver/secrets-store-csi-driver.yaml | 2 +- .../opscenter-secret-management/vault-secret-operator.yaml | 2 +- .../templates/featuresets/opscenter-security/falco/falco.yaml | 2 +- .../templates/featuresets/opscenter-storage/csi-driver-nfs.yaml | 2 +- .../templates/featuresets/opscenter-storage/longhorn.yaml | 2 +- .../featuresets/opscenter-storage/snapshot-controller.yaml | 2 +- .../templates/featuresets/opscenter-storage/topolvm.yaml | 2 +- 34 files changed, 33 insertions(+), 34 deletions(-) diff --git a/charts/ace-installer/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml b/charts/ace-installer/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml index 8188f2bb36..23bc41a5c1 100644 --- a/charts/ace-installer/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml +++ b/charts/ace-installer/templates/featuresets/opscenter-security/cert-manager/cert-manager.yaml @@ -101,7 +101,6 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ $.Release.Namespace }} - valuesFrom: {{- with $vals }} {{- dict "values" . | toYaml | nindent 2 }} {{- end }} diff --git a/charts/opscenter-features/templates/featuresets/capi-capa/aws-ebs-csi-driver.yaml b/charts/opscenter-features/templates/featuresets/capi-capa/aws-ebs-csi-driver.yaml index da85d6dd44..fea24bf9bd 100644 --- a/charts/opscenter-features/templates/featuresets/capi-capa/aws-ebs-csi-driver.yaml +++ b/charts/opscenter-features/templates/featuresets/capi-capa/aws-ebs-csi-driver.yaml @@ -46,8 +46,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: aws-ebs-csi-driver.yaml diff --git a/charts/opscenter-features/templates/featuresets/capi-capa/aws-load-balancer-controller.yaml b/charts/opscenter-features/templates/featuresets/capi-capa/aws-load-balancer-controller.yaml index 42c4f13d7e..f300b0013a 100644 --- a/charts/opscenter-features/templates/featuresets/capi-capa/aws-load-balancer-controller.yaml +++ b/charts/opscenter-features/templates/featuresets/capi-capa/aws-load-balancer-controller.yaml @@ -52,8 +52,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: aws-load-balancer-controller.yaml diff --git a/charts/opscenter-features/templates/featuresets/capi-capa/capa-vpc-peering-operator.yaml b/charts/opscenter-features/templates/featuresets/capi-capa/capa-vpc-peering-operator.yaml index 987461dd99..49538fc22c 100644 --- a/charts/opscenter-features/templates/featuresets/capi-capa/capa-vpc-peering-operator.yaml +++ b/charts/opscenter-features/templates/featuresets/capi-capa/capa-vpc-peering-operator.yaml @@ -38,8 +38,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: capa-vpc-peering-operator.yaml diff --git a/charts/opscenter-features/templates/featuresets/capi-capa/cluster-autoscaler.yaml b/charts/opscenter-features/templates/featuresets/capi-capa/cluster-autoscaler.yaml index 312e363cd2..2bf7076b0b 100644 --- a/charts/opscenter-features/templates/featuresets/capi-capa/cluster-autoscaler.yaml +++ b/charts/opscenter-features/templates/featuresets/capi-capa/cluster-autoscaler.yaml @@ -52,8 +52,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: cluster-autoscaler.yaml diff --git a/charts/opscenter-features/templates/featuresets/capi-core/capi-ops-manager.yaml b/charts/opscenter-features/templates/featuresets/capi-core/capi-ops-manager.yaml index c33fed2ab9..71d7fe9366 100644 --- a/charts/opscenter-features/templates/featuresets/capi-core/capi-ops-manager.yaml +++ b/charts/opscenter-features/templates/featuresets/capi-core/capi-ops-manager.yaml @@ -35,8 +35,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: capi-ops-manager.yaml diff --git a/charts/opscenter-features/templates/featuresets/crossplane/crossplane.yaml b/charts/opscenter-features/templates/featuresets/crossplane/crossplane.yaml index fbb17851d5..8fc03c34e0 100644 --- a/charts/opscenter-features/templates/featuresets/crossplane/crossplane.yaml +++ b/charts/opscenter-features/templates/featuresets/crossplane/crossplane.yaml @@ -38,8 +38,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: crossplane.yaml diff --git a/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-aws.yaml b/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-aws.yaml index 10b8e0f7ef..46302af413 100644 --- a/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-aws.yaml +++ b/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-aws.yaml @@ -40,8 +40,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: kubedb-provider-aws.yaml diff --git a/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-azure.yaml b/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-azure.yaml index 499b91349a..547aa1c24a 100644 --- a/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-azure.yaml +++ b/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-azure.yaml @@ -40,8 +40,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: kubedb-provider-azure.yaml diff --git a/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-gcp.yaml b/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-gcp.yaml index 67804e0c74..d25f580713 100644 --- a/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-gcp.yaml +++ b/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-gcp.yaml @@ -40,8 +40,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: kubedb-provider-gcp.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-backup/stash-opscenter.yaml b/charts/opscenter-features/templates/featuresets/opscenter-backup/stash-opscenter.yaml index da23dafa64..b818606da4 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-backup/stash-opscenter.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-backup/stash-opscenter.yaml @@ -45,8 +45,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: stash-opscenter.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-backup/stash.yaml b/charts/opscenter-features/templates/featuresets/opscenter-backup/stash.yaml index 6e57ab09a9..dbc329f181 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-backup/stash.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-backup/stash.yaml @@ -49,8 +49,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: stash.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-cost/keda/keda-add-ons-http.yaml b/charts/opscenter-features/templates/featuresets/opscenter-cost/keda/keda-add-ons-http.yaml index bedbfbfc27..4e1995cd41 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-cost/keda/keda-add-ons-http.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-cost/keda/keda-add-ons-http.yaml @@ -86,8 +86,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: keda-add-ons-http.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-cost/keda/keda.yaml b/charts/opscenter-features/templates/featuresets/opscenter-cost/keda/keda.yaml index a417387120..7343cee559 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-cost/keda/keda.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-cost/keda/keda.yaml @@ -58,8 +58,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: keda.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-cost/opencost/opencost.yaml b/charts/opscenter-features/templates/featuresets/opscenter-cost/opencost/opencost.yaml index 9350e02dc3..25fb1cf53e 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-cost/opencost/opencost.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-cost/opencost/opencost.yaml @@ -105,8 +105,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: opencost.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-networking/voyager.yaml b/charts/opscenter-features/templates/featuresets/opscenter-networking/voyager.yaml index fc7e1cf1b3..805ff71d86 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-networking/voyager.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-networking/voyager.yaml @@ -36,8 +36,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: voyager.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/kube-prometheus-stack.yaml b/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/kube-prometheus-stack.yaml index 5bc9a937ef..b3a8755ca6 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/kube-prometheus-stack.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/kube-prometheus-stack.yaml @@ -163,8 +163,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: kube-prometheus-stack.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/metrics-server.yaml b/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/metrics-server.yaml index 4fc5dec663..1f01f9fa89 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/metrics-server.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/metrics-server.yaml @@ -59,8 +59,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: metrics-server.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/prometheus-adapter.yaml b/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/prometheus-adapter.yaml index 29a93eed8c..369acd55bf 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/prometheus-adapter.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/prometheus-adapter.yaml @@ -110,8 +110,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: prometheus-adapter.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-policy-management/gatekeeper/gatekeeper.yaml b/charts/opscenter-features/templates/featuresets/opscenter-policy-management/gatekeeper/gatekeeper.yaml index 9efde8d24b..d57606b60e 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-policy-management/gatekeeper/gatekeeper.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-policy-management/gatekeeper/gatekeeper.yaml @@ -88,8 +88,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: gatekeeper.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-policy-management/kyverno/kyverno.yaml b/charts/opscenter-features/templates/featuresets/opscenter-policy-management/kyverno/kyverno.yaml index 5b1c42eb7a..4169c01a70 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-policy-management/kyverno/kyverno.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-policy-management/kyverno/kyverno.yaml @@ -131,8 +131,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: kyverno.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/external-secrets.yaml b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/external-secrets.yaml index 7f154abc25..1944c506cc 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/external-secrets.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/external-secrets.yaml @@ -62,8 +62,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: external-secrets.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/sealed-secrets.yaml b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/sealed-secrets.yaml index 59f1999de4..3bb3aa7c31 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/sealed-secrets.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/sealed-secrets.yaml @@ -43,8 +43,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: sealed-secrets.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-aws.yaml b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-aws.yaml index 2c2a6d969f..9c68010e9e 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-aws.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-aws.yaml @@ -40,8 +40,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: secrets-store-csi-driver-provider-aws.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-azure.yaml b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-azure.yaml index a1c1a0c1e9..8da1b99232 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-azure.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-azure.yaml @@ -43,8 +43,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: csi-secrets-store-provider-azure.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-gcp.yaml b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-gcp.yaml index bd1393b680..aeb68c4fb0 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-gcp.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-gcp.yaml @@ -38,8 +38,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: secrets-store-csi-driver-provider-gcp.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-vault.yaml b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-vault.yaml index 815c56b4d7..03a54d9d5d 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-vault.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/csi-secrets-store-provider-vault.yaml @@ -60,8 +60,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: vault.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/secrets-store-csi-driver.yaml b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/secrets-store-csi-driver.yaml index e607d9e198..bf72e02858 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/secrets-store-csi-driver.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/secrets-store-csi-driver/secrets-store-csi-driver.yaml @@ -51,8 +51,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: secrets-store-csi-driver.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/vault-secret-operator.yaml b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/vault-secret-operator.yaml index be4c19922e..69d765762a 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-secret-management/vault-secret-operator.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-secret-management/vault-secret-operator.yaml @@ -49,8 +49,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: vault-secrets-operator.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-security/falco/falco.yaml b/charts/opscenter-features/templates/featuresets/opscenter-security/falco/falco.yaml index 38524439bf..a77f8f4005 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-security/falco/falco.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-security/falco/falco.yaml @@ -71,8 +71,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: falco.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-storage/csi-driver-nfs.yaml b/charts/opscenter-features/templates/featuresets/opscenter-storage/csi-driver-nfs.yaml index 9272a8f1d9..0ed28280d4 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-storage/csi-driver-nfs.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-storage/csi-driver-nfs.yaml @@ -59,8 +59,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: csi-driver-nfs.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-storage/longhorn.yaml b/charts/opscenter-features/templates/featuresets/opscenter-storage/longhorn.yaml index 643bfd39ad..11e81c33e5 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-storage/longhorn.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-storage/longhorn.yaml @@ -105,8 +105,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: longhorn.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-storage/snapshot-controller.yaml b/charts/opscenter-features/templates/featuresets/opscenter-storage/snapshot-controller.yaml index 095cd39926..506d5f0c9a 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-storage/snapshot-controller.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-storage/snapshot-controller.yaml @@ -47,8 +47,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: snapshot-controller.yaml diff --git a/charts/opscenter-features/templates/featuresets/opscenter-storage/topolvm.yaml b/charts/opscenter-features/templates/featuresets/opscenter-storage/topolvm.yaml index 700fcfd472..c6beab007f 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-storage/topolvm.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-storage/topolvm.yaml @@ -47,8 +47,8 @@ spec: kind: HelmRepository name: appscode-charts-oci namespace: {{ .Release.Namespace }} - valuesFrom: {{- if eq (include "distro.openshift" $) "true" }} + valuesFrom: - kind: ConfigMap name: ace-openshift-scc valuesKey: topolvm.yaml