feat: remove the need for raw jinja blocks (#1158)
Signed-off-by: Devin Buhl <devin@buhl.casa>
This commit is contained in:
1 parent
f9481d6202
commit
e6fbc6e128
92 files changed
+430
-441
No files matched your search
@@ -5,6 +5,6 @@ resources:
|
||||
- ./namespace.yaml
|
||||
- ./descheduler/ks.yaml
|
||||
- ./reloader/ks.yaml
|
||||
{% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %}
|
||||
<% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %>
|
||||
- ./system-upgrade-controller/ks.yaml
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
@@ -29,4 +29,4 @@ spec:
|
||||
readOnlyRootFileSystem: true
|
||||
podMonitor:
|
||||
enabled: true
|
||||
namespace: "{% raw %}{{ .Release.Namespace }}{% endraw %}"
|
||||
namespace: "{{ .Release.Namespace }}"
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
{% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %}
|
||||
<% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: helm.toolkit.fluxcd.io/v2beta2
|
||||
kind: HelmRelease
|
||||
@@ -103,4 +103,4 @@ spec:
|
||||
globalMounts:
|
||||
- path: /etc/ca-certificates
|
||||
readOnly: true
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
{% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %}
|
||||
<% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
@@ -7,4 +7,4 @@ resources:
|
||||
- https://github.com/rancher/system-upgrade-controller/releases/download/v0.13.2/crd.yaml
|
||||
- helmrelease.yaml
|
||||
- rbac.yaml
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
{% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %}
|
||||
<% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: ClusterRoleBinding
|
||||
@@ -12,4 +12,4 @@ subjects:
|
||||
- kind: ServiceAccount
|
||||
name: system-upgrade
|
||||
namespace: tools
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
@@ -1,4 +1,4 @@
|
||||
{% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %}
|
||||
<% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
kind: Kustomization
|
||||
@@ -41,4 +41,4 @@ spec:
|
||||
interval: 30m
|
||||
retryInterval: 1m
|
||||
timeout: 5m
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
{% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %}
|
||||
<% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: upgrade.cattle.io/v1
|
||||
kind: Plan
|
||||
@@ -17,4 +17,4 @@ spec:
|
||||
args: ["prepare", "server"]
|
||||
upgrade:
|
||||
image: rancher/k3s-upgrade
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
{% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %}
|
||||
<% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- ./server.yaml
|
||||
- ./agent.yaml
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
{% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %}
|
||||
<% if bootstrap_distribution == "k3s" and system_upgrade_controller.enabled | default(false) %>
|
||||
---
|
||||
apiVersion: upgrade.cattle.io/v1
|
||||
kind: Plan
|
||||
@@ -22,4 +22,4 @@ spec:
|
||||
- {key: CriticalAddonsOnly, operator: Exists}
|
||||
upgrade:
|
||||
image: rancher/k3s-upgrade
|
||||
{% endif %}
|
||||
<% endif %>
|
||||
Reference in new issue
Block a user