Skip to content

Commit 2fe820e

Browse files
authored
Load openshift scc values from ace-openshift-scc configmap (#531)
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 641b360 commit 2fe820e

98 files changed

Lines changed: 666 additions & 5 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

charts/ace-installer/templates/_helpers.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,7 @@ Image Templates
107107
{{- define "kubectl.image" -}}
108108
{{ list .Values.image.proxies.ghcr "appscode/kubectl-nonroot:1.31" | compact | join "/" }}
109109
{{- end }}
110+
111+
{{- define "clustermanager.openshift" -}}
112+
{{- ternary "true" "false" (.Capabilities.APIVersions.Has "project.openshift.io/v1/Project") -}}
113+
{{- end }}

charts/ace-installer/templates/ace/ace.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ spec:
4747
kind: HelmRepository
4848
name: appscode-charts-oci
4949
namespace: {{ $.Release.Namespace }}
50+
valuesFrom:
51+
{{- if eq (include "clustermanager.openshift" $) "true" }}
52+
- kind: ConfigMap
53+
name: ace-openshift-scc
54+
valuesKey: ace.yaml
55+
optional: true
56+
{{- end }}
5057
{{- with (dig "values" dict .) }}
5158
{{- dict "values" . | toYaml | nindent 2 }}
5259
{{- end }}

charts/ace-installer/templates/featuresets/opscenter-backup/kubestash.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@ spec:
5454
kind: HelmRepository
5555
name: appscode-charts-oci
5656
namespace: {{ $.Release.Namespace }}
57+
valuesFrom:
58+
{{- if eq (include "clustermanager.openshift" $) "true" }}
59+
- kind: ConfigMap
60+
name: ace-openshift-scc
61+
valuesKey: kubestash.yaml
62+
optional: true
63+
{{- end }}
5764
{{- with $vals }}
5865
{{- dict "values" . | toYaml | nindent 2 }}
5966
{{- end }}

charts/ace-installer/templates/featuresets/opscenter-core/kube-ui-server.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ spec:
5454
name: ace-features-cred
5555
valuesKey: kube-ui-server.yaml
5656
optional: true
57+
{{- if eq (include "clustermanager.openshift" $) "true" }}
58+
- kind: ConfigMap
59+
name: ace-openshift-scc
60+
valuesKey: kube-ui-server.yaml
61+
optional: true
62+
{{- end }}
5763
{{- with $vals }}
5864
{{- dict "values" . | toYaml | nindent 2 }}
5965
{{- end }}

charts/ace-installer/templates/featuresets/opscenter-core/license-proxyserver.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ spec:
4646
name: ace-licenseserver-cred
4747
valuesKey: license-proxyserver.yaml
4848
optional: true
49+
{{- if eq (include "clustermanager.openshift" $) "true" }}
50+
- kind: ConfigMap
51+
name: ace-openshift-scc
52+
valuesKey: license-proxyserver.yaml
53+
optional: true
54+
{{- end }}
4955
{{- with $vals }}
5056
{{- dict "values" . | toYaml | nindent 2 }}
5157
{{- end }}

charts/ace-installer/templates/featuresets/opscenter-datastore/kubedb.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,13 @@ spec:
6464
kind: HelmRepository
6565
name: appscode-charts-oci
6666
namespace: {{ $.Release.Namespace }}
67+
valuesFrom:
68+
{{- if eq (include "clustermanager.openshift" $) "true" }}
69+
- kind: ConfigMap
70+
name: ace-openshift-scc
71+
valuesKey: kubedb.yaml
72+
optional: true
73+
{{- end }}
6774
{{- with $vals }}
6875
{{- dict "values" . | toYaml | nindent 2 }}
6976
{{- end }}

charts/ace-installer/templates/featuresets/opscenter-networking/external-dns-operator.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ spec:
4141
kind: HelmRepository
4242
name: appscode-charts-oci
4343
namespace: {{ $.Release.Namespace }}
44+
valuesFrom:
45+
{{- if eq (include "clustermanager.openshift" $) "true" }}
46+
- kind: ConfigMap
47+
name: ace-openshift-scc
48+
valuesKey: external-dns-operator.yaml
49+
optional: true
50+
{{- end }}
4451
{{- with $vals }}
4552
{{- dict "values" . | toYaml | nindent 2 }}
4653
{{- end }}

charts/ace-installer/templates/featuresets/opscenter-observability/monitoring/panopticon.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ spec:
4747
kind: HelmRepository
4848
name: appscode-charts-oci
4949
namespace: {{ $.Release.Namespace }}
50+
valuesFrom:
51+
{{- if eq (include "clustermanager.openshift" $) "true" }}
52+
- kind: ConfigMap
53+
name: ace-openshift-scc
54+
valuesKey: panopticon.yaml
55+
optional: true
56+
{{- end }}
5057
{{- with $vals }}
5158
{{- dict "values" . | toYaml | nindent 2 }}
5259
{{- end }}

charts/ace-installer/templates/featuresets/opscenter-secret-management/reloader.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@ spec:
5555
kind: HelmRepository
5656
name: appscode-charts-oci
5757
namespace: {{ $.Release.Namespace }}
58+
valuesFrom:
59+
{{- if eq (include "clustermanager.openshift" $) "true" }}
60+
- kind: ConfigMap
61+
name: ace-openshift-scc
62+
valuesKey: reloader.yaml
63+
optional: true
64+
{{- end }}
5865
{{- with $vals }}
5966
{{- dict "values" . | toYaml | nindent 2 }}
6067
{{- end }}

charts/ace-installer/templates/featuresets/opscenter-security/cert-manager/cert-manager-csi-driver-cacerts.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@ spec:
5555
kind: HelmRepository
5656
name: appscode-charts-oci
5757
namespace: {{ $.Release.Namespace }}
58+
valuesFrom:
59+
{{- if eq (include "clustermanager.openshift" $) "true" }}
60+
- kind: ConfigMap
61+
name: ace-openshift-scc
62+
valuesKey: cert-manager-csi-driver-cacerts.yaml
63+
optional: true
64+
{{- end }}
5865
{{- with $vals }}
5966
{{- dict "values" . | toYaml | nindent 2 }}
6067
{{- end }}

0 commit comments

Comments
 (0)