Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Replace flannel with calico
[icn.git]
/
deploy
/
cluster
/
templates
/
clusterresourceset.yaml
diff --git
a/deploy/cluster/templates/clusterresourceset.yaml
b/deploy/cluster/templates/clusterresourceset.yaml
index
294e7bd
..
c818be2
100644
(file)
--- a/
deploy/cluster/templates/clusterresourceset.yaml
+++ b/
deploy/cluster/templates/clusterresourceset.yaml
@@
-8,7
+8,12
@@
spec:
matchLabels:
cluster.x-k8s.io/cluster-name: {{ .Values.clusterName }}
resources:
matchLabels:
cluster.x-k8s.io/cluster-name: {{ .Values.clusterName }}
resources:
-{{- if eq .Values.cni "flannel" }}
+ - name: {{ .Values.clusterName }}-podsecurity-addon
+ kind: ConfigMap
+{{- if eq .Values.cni "calico" }}
+ - name: {{ .Values.clusterName }}-calico-addon
+ kind: ConfigMap
+{{- else if eq .Values.cni "flannel" }}
- name: {{ .Values.clusterName }}-flannel-addon
kind: ConfigMap
{{- end }}
- name: {{ .Values.clusterName }}-flannel-addon
kind: ConfigMap
{{- end }}
@@
-16,5
+21,3
@@
spec:
- name: {{ .Values.clusterName }}-flux-addon
kind: ConfigMap
{{- end }}
- name: {{ .Values.clusterName }}-flux-addon
kind: ConfigMap
{{- end }}
- - name: {{ .Values.clusterName }}-podsecurity-addon
- kind: ConfigMap