feat: update jinja delimiters back to default (#1269)
* feat: update jinja delimiters back to default Signed-off-by: Devin Buhl <devin@buhl.casa> * feat: remove cert-manager promrules Signed-off-by: Devin Buhl <devin@buhl.casa> * fix: update talos csr approver Signed-off-by: Devin Buhl <devin@buhl.casa> --------- Signed-off-by: Devin Buhl <devin@buhl.casa>
This commit is contained in:
1 parent
5fa8b9685a
commit
df642e5425
55 files changed
+295
-358
No files matched your search
@@ -23,6 +23,6 @@ spec:
|
||||
uninstall:
|
||||
keepHistory: false
|
||||
values:
|
||||
#% filter indent(width=4, first=True) %#
|
||||
#% include 'partials/cilium-values-full.partial.yaml.j2' %#
|
||||
#% endfilter %#
|
||||
{% filter indent(width=4, first=True) %}
|
||||
{% include 'partials/cilium-values-full.partial.yaml.j2' %}
|
||||
{% endfilter %}
|
||||
@@ -2,7 +2,7 @@
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
#% if not feature_gates.dual_stack_ipv4_first %#
|
||||
{% if not feature_gates.dual_stack_ipv4_first %}
|
||||
- ./cilium-l2.yaml
|
||||
#% endif %#
|
||||
{% endif %}
|
||||
- ./helmrelease.yaml
|
||||
+3
-3
@@ -23,6 +23,6 @@ spec:
|
||||
uninstall:
|
||||
keepHistory: false
|
||||
values:
|
||||
#% filter indent(width=4, first=True) %#
|
||||
#% include 'partials/kubelet-csr-approver-values.partial.yaml.j2' %#
|
||||
#% endfilter %#
|
||||
{% filter indent(width=4, first=True) %}
|
||||
{% include 'partials/kubelet-csr-approver-values.partial.yaml.j2' %}
|
||||
{% endfilter %}
|
||||
@@ -4,11 +4,11 @@ kind: Kustomization
|
||||
resources:
|
||||
- ./namespace.yaml
|
||||
- ./cilium/ks.yaml
|
||||
#% if distribution in ['talos'] %#
|
||||
{% if distribution in ['talos'] %}
|
||||
- ./kubelet-csr-approver/ks.yaml
|
||||
#% endif %#
|
||||
{% endif %}
|
||||
- ./metrics-server/ks.yaml
|
||||
#% if distribution in ['k0s', 'talos'] %#
|
||||
{% if distribution in ['k0s', 'talos'] %}
|
||||
- ./spegel/ks.yaml
|
||||
#% endif %#
|
||||
{% endif %}
|
||||
- ./reloader/ks.yaml
|
||||
@@ -24,13 +24,13 @@ spec:
|
||||
keepHistory: false
|
||||
values:
|
||||
spegel:
|
||||
#% if distribution in ['k0s'] %#
|
||||
{% if distribution in ['k0s'] %}
|
||||
containerdSock: /run/k0s/containerd.sock
|
||||
containerdRegistryConfigPath: /var/lib/k0s/containerd/certs.d
|
||||
#% elif distribution in ['talos'] %#
|
||||
{% elif distribution in ['talos'] %}
|
||||
containerdSock: /run/containerd/containerd.sock
|
||||
containerdRegistryConfigPath: /etc/cri/conf.d/hosts
|
||||
#% endif %#
|
||||
{% endif %}
|
||||
service:
|
||||
registry:
|
||||
hostPort: 29999
|
||||
Reference in new issue
Block a user