Skip to content

Commit a4deda0

Browse files
committed
add extraManifests feature
1 parent 06ab683 commit a4deda0

File tree

4 files changed

+34
-2
lines changed

4 files changed

+34
-2
lines changed

deploy/helm/kubernetes/scripts/configure-cluster.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,7 @@ kubeadm init phase addon kube-proxy --config /config/kubeadmcfg.yaml
132132
# uninstall kube-proxy addon
133133
kubectl --kubeconfig /etc/kubernetes/admin.conf -n kube-system delete configmap/kube-proxy daemonset/kube-proxy 2>/dev/null || true
134134
{{- end }}
135+
136+
{{- with .Values.extraManifests }}{{"\n"}}
137+
kubectl apply{{- range $key, $value := . }} -f /manifests/{{ $key }}{{- end }}
138+
{{- end }}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{{- $fullName := include "kubernetes.fullname" . -}}
2+
{{- with .Values.extraManifests }}
3+
---
4+
apiVersion: v1
5+
kind: Secret
6+
metadata:
7+
name: {{ $fullName }}-extra-manifests
8+
data:
9+
{{- range $key, $value := . }}
10+
{{- if eq (printf "%T" $value) "string" }}
11+
{{ $key }}: {{ $value | b64enc }}
12+
{{- else }}
13+
{{ $key }}: {{ printf "%s\n" (toYaml $value) | b64enc }}
14+
{{- end }}
15+
{{- end }}
16+
{{- end }}

deploy/helm/kubernetes/templates/kubeadm-job.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ spec:
7979
name: pki-front-proxy-ca
8080
- mountPath: /scripts
8181
name: scripts
82-
{{- if or .Values.konnectivityServer.enabled .Values.konnectivityAgent.enabled }}
82+
{{- if or .Values.extraManifests .Values.konnectivityServer.enabled .Values.konnectivityAgent.enabled }}
8383
- mountPath: /manifests
8484
name: manifests
8585
{{- end }}
@@ -108,10 +108,14 @@ spec:
108108
configMap:
109109
name: "{{ $fullName }}-kubeadm-scripts"
110110
defaultMode: 0777
111-
{{- if or .Values.konnectivityServer.enabled .Values.konnectivityAgent.enabled }}
111+
{{- if or .Values.extraManifests .Values.konnectivityServer.enabled .Values.konnectivityAgent.enabled }}
112112
- name: manifests
113113
projected:
114114
sources:
115+
{{- if or .Values.extraManifests }}
116+
- secret:
117+
name: "{{ $fullName }}-extra-manifests"
118+
{{- end }}
115119
{{- if or .Values.konnectivityServer.enabled .Values.konnectivityAgent.enabled }}
116120
- configMap:
117121
name: "{{ $fullName }}-konnectivity-manifests"

deploy/helm/kubernetes/values.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,3 +301,11 @@ konnectivityAgent:
301301
sidecars: []
302302
extraVolumes: []
303303
extraVolumeMounts: []
304+
305+
# these manifests will be applied inside the cluster
306+
extraManifests: {}
307+
#namespace.yaml:
308+
# apiVersion: v1
309+
# kind: Namespace
310+
# metadata:
311+
# name: example

0 commit comments

Comments
 (0)