infra/home-cluster
2
0 Fork 0
Code Issues Pull Requests 40 Actions Packages Projects Releases Wiki Activity

feat: change jinja block/start delimiters for renovate support (#1163)

Browse Source 
* feat: change jinja block/start delimiters for renovate support

Signed-off-by: Devin Buhl <devin@buhl.casa>

* fix: update renovate config an helm repos

Signed-off-by: Devin Buhl <devin@buhl.casa>

---------

Signed-off-by: Devin Buhl <devin@buhl.casa>
This commit is contained in:
Devin Buhl authored and GitHub committed 2024-01-15 19:31:45 -05:00
1 parent b602a7a1f5
commit 93c9d21581
90 files changed
+360 -354
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/renovate.json5
+8 -4
View File
@@ -15,7 +15,6 @@
"schedule": ["on saturday"], "schedule": ["on saturday"],
"flux": { "flux": {
"fileMatch": [ "fileMatch": [
"(^|/)addons/.+\\.ya?ml(\\.j2)?(\\.j2)?$",
"(^|/)ansible/.+\\.ya?ml(\\.j2)?(\\.j2)?$", "(^|/)ansible/.+\\.ya?ml(\\.j2)?(\\.j2)?$",
"(^|/)kubernetes/.+\\.ya?ml(\\.j2)?(\\.j2)?$" "(^|/)kubernetes/.+\\.ya?ml(\\.j2)?(\\.j2)?$"
] ]
@@ -228,11 +227,16 @@
"(^|/)k0s-config.ya?ml(\\.j2)?(\\.j2)?$" "(^|/)k0s-config.ya?ml(\\.j2)?(\\.j2)?$"
], ],
"matchStrings": [ "matchStrings": [
// Example: `k3s_release_version: "v1.27.3+k3s1"` // Example:
// k3s_release_version: "v1.27.3+k3s1"
"datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>\\S+))?\n.*?\"(?<currentValue>.*)\"\n", "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>\\S+))?\n.*?\"(?<currentValue>.*)\"\n",
// Example: `- https://github.com/rancher/system-upgrade-controller/releases/download/v0.11.0/crd.yaml` // Example:
// - https://github.com/rancher/system-upgrade-controller/releases/download/v0.11.0/crd.yaml
"datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>\\S+))?\n.*?-\\s(.*?)\/(?<currentValue>[^/]+)\/[^/]+\n", "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>\\S+))?\n.*?-\\s(.*?)\/(?<currentValue>[^/]+)\/[^/]+\n",
// Example: apiVersion=helm.cattle.io/v1 kind=HelmChart // Example:
// repo: https://helm.cilium.io
// chart: cilium
// version: 1.14.5
"datasource=(?<datasource>\\S+)\n.*?repo: (?<registryUrl>\\S+)\n.*?chart: (?<depName>\\S+)\n.*?version: (?<currentValue>\\S+)\n" "datasource=(?<datasource>\\S+)\n.*?repo: (?<registryUrl>\\S+)\n.*?chart: (?<depName>\\S+)\n.*?version: (?<currentValue>\\S+)\n"
], ],
"datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}", "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}",
bootstrap/templates/.sops.yaml.j2
+2 -2
View File
@@ -4,8 +4,8 @@ creation_rules:
encrypted_regex: "^(data|stringData)$" encrypted_regex: "^(data|stringData)$"
key_groups: key_groups:
- age: - age:
- "<< bootstrap_age_public_key >>" - "{% bootstrap_age_public_key %}"
- path_regex: ansible/.*\.sops\.ya?ml - path_regex: ansible/.*\.sops\.ya?ml
key_groups: key_groups:
- age: - age:
- "<< bootstrap_age_public_key >>" - "{% bootstrap_age_public_key %}"
bootstrap/templates/ansible/inventory/group_vars/kubernetes/main.yaml.j2
+7 -7
View File
@@ -1,4 +1,4 @@
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
--- ---
# #
# Below vars are for the xanmanning.k3s role # Below vars are for the xanmanning.k3s role
@@ -9,17 +9,17 @@
k3s_release_version: "v1.29.0+k3s1" k3s_release_version: "v1.29.0+k3s1"
k3s_install_hard_links: true k3s_install_hard_links: true
k3s_become: true k3s_become: true
<% if bootstrap_nodes.master | length > 1 %> #% if bootstrap_nodes.master | length > 1 %#
k3s_etcd_datastore: true k3s_etcd_datastore: true
<% else %> #% else %#
k3s_etcd_datastore: false k3s_etcd_datastore: false
<% endif %> #% endif %#
k3s_registration_address: "{{ kube_api_addr }}" k3s_registration_address: "{{ kube_api_addr }}"
# /var/lib/rancher/k3s/server/manifests # /var/lib/rancher/k3s/server/manifests
k3s_server_manifests_templates: k3s_server_manifests_templates:
- custom-cilium-helmchart.yaml.j2 - custom-cilium-helmchart.yaml.j2
- custom-coredns-helmchart.yaml.j2 - custom-coredns-helmchart.yaml.j2
<% if bootstrap_nodes.master | length > 1 and not bootstrap_kube_api_addr %> #% if bootstrap_nodes.master | length > 1 and not bootstrap_kube_api_addr %#
# /var/lib/rancher/k3s/server/manifests # /var/lib/rancher/k3s/server/manifests
k3s_server_manifests_urls: k3s_server_manifests_urls:
- url: https://raw.githubusercontent.com/kube-vip/website/main/content/manifests/rbac.yaml - url: https://raw.githubusercontent.com/kube-vip/website/main/content/manifests/rbac.yaml
@@ -27,5 +27,5 @@ k3s_server_manifests_urls:
# /var/lib/rancher/k3s/agent/pod-manifests # /var/lib/rancher/k3s/agent/pod-manifests
k3s_server_pod_manifests_templates: k3s_server_pod_manifests_templates:
- kube-vip-static-pod.yaml.j2 - kube-vip-static-pod.yaml.j2
<% endif %> #% endif %#
<% endif %> #% endif %#
bootstrap/templates/ansible/inventory/group_vars/kubernetes/supplemental.yaml.j2
+15 -15
View File
@@ -1,16 +1,16 @@
--- ---
timezone: "<< bootstrap_timezone >>" timezone: "{% bootstrap_timezone %}"
github_username: "<< bootstrap_github_username >>" github_username: "{% bootstrap_github_username %}"
coredns_addr: "<< bootstrap_service_cidr.split(',')[0] | nthhost(10) >>" coredns_addr: "{% bootstrap_service_cidr.split(',')[0] | nthhost(10) %}"
<% if bootstrap_nodes.master | length == 1 and not bootstrap_kube_api_addr %> #% if bootstrap_nodes.master | length == 1 and not bootstrap_kube_api_addr %#
kube_api_addr: "<< bootstrap_nodes.master[0].address >>" kube_api_addr: "{% bootstrap_nodes.master[0].address %}"
<% else %> #% else %#
kube_api_addr: "<< bootstrap_kube_api_addr >>" kube_api_addr: "{% bootstrap_kube_api_addr %}"
<% endif %> #% endif %#
cluster_cidr: "<< bootstrap_cluster_cidr.split(',')[0] >>" cluster_cidr: "{% bootstrap_cluster_cidr.split(',')[0] %}"
service_cidr: "<< bootstrap_service_cidr.split(',')[0] >>" service_cidr: "{% bootstrap_service_cidr.split(',')[0] %}"
node_cidr: "<< bootstrap_node_cidr >>" node_cidr: "{% bootstrap_node_cidr %}"
<% if bootstrap_ipv6_enabled | default(false) %> #% if bootstrap_ipv6_enabled | default(false) %#
cluster_cidr_v6: "<< bootstrap_cluster_cidr.split(',')[1] >>" cluster_cidr_v6: "{% bootstrap_cluster_cidr.split(',')[1] %}"
service_cidr_v6: "<< bootstrap_service_cidr.split(',')[1] >>" service_cidr_v6: "{% bootstrap_service_cidr.split(',')[1] %}"
<% endif %> #% endif %#
bootstrap/templates/ansible/inventory/group_vars/master/main.yaml.j2
+8 -8
View File
@@ -1,15 +1,15 @@
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
--- ---
# https://rancher.com/docs/k3s/latest/en/installation/install-options/server-config/ # https://rancher.com/docs/k3s/latest/en/installation/install-options/server-config/
# https://github.com/PyratLabs/ansible-role-k3s # https://github.com/PyratLabs/ansible-role-k3s
k3s_control_node: true k3s_control_node: true
k3s_server: k3s_server:
<% if bootstrap_ipv6_enabled | default(false) %> #% if bootstrap_ipv6_enabled | default(false) %#
node-ip: "{{ ansible_host }},{{ ansible_default_ipv6.address }}" node-ip: "{{ ansible_host }},{{ ansible_default_ipv6.address }}"
<% else %> #% else %#
node-ip: "{{ ansible_host }}" node-ip: "{{ ansible_host }}"
<% endif %> #% endif %#
tls-san: tls-san:
- "{{ kube_api_addr }}" - "{{ kube_api_addr }}"
docker: false docker: false
@@ -27,13 +27,13 @@ k3s_server:
write-kubeconfig-mode: "644" write-kubeconfig-mode: "644"
pause-image: registry.k8s.io/pause:3.9 pause-image: registry.k8s.io/pause:3.9
secrets-encryption: true secrets-encryption: true
<% if bootstrap_ipv6_enabled | default(false) %> #% if bootstrap_ipv6_enabled | default(false) %#
cluster-cidr: "{{ cluster_cidr }},{{ cluster_cidr_v6 }}" cluster-cidr: "{{ cluster_cidr }},{{ cluster_cidr_v6 }}"
service-cidr: "{{ service_cidr }},{{ service_cidr_v6 }}" service-cidr: "{{ service_cidr }},{{ service_cidr_v6 }}"
<% else %> #% else %#
cluster-cidr: "{{ cluster_cidr }}" cluster-cidr: "{{ cluster_cidr }}"
service-cidr: "{{ service_cidr }}" service-cidr: "{{ service_cidr }}"
<% endif %> #% endif %#
etcd-expose-metrics: true # Required to monitor etcd with kube-prometheus-stack etcd-expose-metrics: true # Required to monitor etcd with kube-prometheus-stack
kube-controller-manager-arg: kube-controller-manager-arg:
- "bind-address=0.0.0.0" # Required to monitor kube-controller-manager with kube-prometheus-stack - "bind-address=0.0.0.0" # Required to monitor kube-controller-manager with kube-prometheus-stack
@@ -45,4 +45,4 @@ k3s_server:
kubelet-arg: kubelet-arg:
- "image-gc-high-threshold=55" - "image-gc-high-threshold=55"
- "image-gc-low-threshold=50" - "image-gc-low-threshold=50"
<% endif %> #% endif %#
bootstrap/templates/ansible/inventory/group_vars/worker/main.yaml.j2
+5 -5
View File
@@ -1,18 +1,18 @@
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
--- ---
# https://rancher.com/docs/k3s/latest/en/installation/install-options/agent-config/ # https://rancher.com/docs/k3s/latest/en/installation/install-options/agent-config/
# https://github.com/PyratLabs/ansible-role-k3s # https://github.com/PyratLabs/ansible-role-k3s
k3s_control_node: false k3s_control_node: false
k3s_agent: k3s_agent:
<% if bootstrap_ipv6_enabled | default(false) %> #% if bootstrap_ipv6_enabled | default(false) %#
node-ip: "{{ ansible_host }},{{ ansible_default_ipv6.address }}" node-ip: "{{ ansible_host }},{{ ansible_default_ipv6.address }}"
<% else %> #% else %#
node-ip: "{{ ansible_host }}" node-ip: "{{ ansible_host }}"
<% endif %> #% endif %#
pause-image: registry.k8s.io/pause:3.9 pause-image: registry.k8s.io/pause:3.9
# TODO: Move these options to a kubelet config file # TODO: Move these options to a kubelet config file
kubelet-arg: kubelet-arg:
- "image-gc-high-threshold=55" - "image-gc-high-threshold=55"
- "image-gc-low-threshold=50" - "image-gc-low-threshold=50"
<% endif %> #% endif %#
bootstrap/templates/ansible/inventory/hosts.yaml.j2
+20 -20
View File
@@ -3,25 +3,25 @@ kubernetes:
children: children:
master: master:
hosts: hosts:
<% for item in bootstrap_nodes.master %> #% for item in bootstrap_nodes.master %#
<< item.name >>: "{% item.name %}":
ansible_user: << item.username >> ansible_user: "{% item.username %}"
<% if item.external_address is defined %> #% if item.external_address is defined %#
ansible_host: << item.external_address >> ansible_host: "{% item.external_address %}"
<% else %> #% else %#
ansible_host: << item.address >> ansible_host: "{% item.address %}"
<% endif %> #% endif %#
<% endfor %> #% endfor %#
<% if bootstrap_nodes.worker | default([]) | length > 0 %> #% if bootstrap_nodes.worker | default([]) | length > 0 %#
worker: worker:
hosts: hosts:
<% for item in bootstrap_nodes.worker %> #% for item in bootstrap_nodes.worker %#
<< item.name >>: "{% item.name %}":
ansible_user: << item.username >> ansible_user: "{% item.username %}"
<% if item.external_address is defined %> #% if item.external_address is defined %#
ansible_host: << item.external_address >> ansible_host: "{% item.external_address %}"
<% else %> #% else %#
ansible_host: << item.address >> ansible_host: "{% item.address %}"
<% endif %> #% endif %#
<% endfor %> #% endfor %#
<% endif %> #% endif %#
bootstrap/templates/ansible/playbooks/cluster-installation.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
--- ---
- name: Cluster Installation - name: Cluster Installation
hosts: kubernetes hosts: kubernetes
@@ -60,4 +60,4 @@
- name: Cruft - name: Cruft
when: k3s_primary_control_node when: k3s_primary_control_node
ansible.builtin.include_tasks: tasks/cruft.yaml ansible.builtin.include_tasks: tasks/cruft.yaml
<% endif %> #% endif %#
bootstrap/templates/ansible/playbooks/cluster-kube-vip.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
--- ---
- name: Cluster kube-vip - name: Cluster kube-vip
hosts: master hosts: master
@@ -23,4 +23,4 @@
src: templates/kube-vip-static-pod.yaml.j2 src: templates/kube-vip-static-pod.yaml.j2
dest: "{{ k3s_server_pod_manifests_dir }}/kube-vip-static-pod.yaml" dest: "{{ k3s_server_pod_manifests_dir }}/kube-vip-static-pod.yaml"
mode: preserve mode: preserve
<% endif %> #% endif %#
bootstrap/templates/ansible/playbooks/cluster-nuke.yaml.j2
+5 -5
View File
@@ -21,7 +21,7 @@
ansible.builtin.pause: ansible.builtin.pause:
seconds: 5 seconds: 5
tasks: tasks:
<% if bootstrap_distribution == "k3s" %> #% if bootstrap_distribution == "k3s" %#
- name: Stop Kubernetes # noqa: ignore-errors - name: Stop Kubernetes # noqa: ignore-errors
ignore_errors: true ignore_errors: true
block: block:
@@ -31,7 +31,7 @@
public: true public: true
vars: vars:
k3s_state: stopped k3s_state: stopped
<% endif %> #% endif %#
# https://github.com/k3s-io/docs/blob/main/docs/installation/network-options.md # https://github.com/k3s-io/docs/blob/main/docs/installation/network-options.md
- name: Networking - name: Networking
@@ -57,7 +57,7 @@
path: /etc/cni/net.d path: /etc/cni/net.d
state: absent state: absent
<% if bootstrap_distribution == "k3s" %> #% if bootstrap_distribution == "k3s" %#
- name: Check to see if k3s-killall.sh exits - name: Check to see if k3s-killall.sh exits
ansible.builtin.stat: ansible.builtin.stat:
path: /usr/local/bin/k3s-killall.sh path: /usr/local/bin/k3s-killall.sh
@@ -92,11 +92,11 @@
path: "{{ k3s_install_dir }}/{{ item }}" path: "{{ k3s_install_dir }}/{{ item }}"
state: absent state: absent
loop: ["kubectl", "crictl", "ctr"] loop: ["kubectl", "crictl", "ctr"]
<% endif %> #% endif %#
- name: Remove local storage path - name: Remove local storage path
ansible.builtin.file: ansible.builtin.file:
path: "<< bootstrap_local_storage_path >>" path: "{% bootstrap_local_storage_path %}"
state: absent state: absent
- name: Reboot - name: Reboot
bootstrap/templates/ansible/playbooks/cluster-rollout-update.yaml.j2
+12 -12
View File
@@ -12,11 +12,11 @@
seconds: 5 seconds: 5
tasks: tasks:
- name: Details - name: Details
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
ansible.builtin.command: "k3s kubectl get node {{ inventory_hostname }} -o json" ansible.builtin.command: "k3s kubectl get node {{ inventory_hostname }} -o json"
<% elif bootstrap_distribution == 'k0s' %> #% elif bootstrap_distribution == 'k0s' %#
ansible.builtin.command: "k0s kubectl get node {{ inventory_hostname }} -o json" ansible.builtin.command: "k0s kubectl get node {{ inventory_hostname }} -o json"
<% endif %> #% endif %#
register: kubectl_get_node register: kubectl_get_node
delegate_to: "{{ groups['master'][0] }}" delegate_to: "{{ groups['master'][0] }}"
failed_when: false failed_when: false
@@ -32,22 +32,22 @@
- name: Cordon - name: Cordon
kubernetes.core.k8s_drain: kubernetes.core.k8s_drain:
name: "{{ inventory_hostname }}" name: "{{ inventory_hostname }}"
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
kubeconfig: /etc/rancher/k3s/k3s.yaml kubeconfig: /etc/rancher/k3s/k3s.yaml
<% elif bootstrap_distribution == 'k0s' %> #% elif bootstrap_distribution == 'k0s' %#
kubeconfig: /var/lib/k0s/pki/admin.conf kubeconfig: /var/lib/k0s/pki/admin.conf
<% endif %> #% endif %#
state: cordon state: cordon
delegate_to: "{{ groups['master'][0] }}" delegate_to: "{{ groups['master'][0] }}"
- name: Drain - name: Drain
kubernetes.core.k8s_drain: kubernetes.core.k8s_drain:
name: "{{ inventory_hostname }}" name: "{{ inventory_hostname }}"
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
kubeconfig: /etc/rancher/k3s/k3s.yaml kubeconfig: /etc/rancher/k3s/k3s.yaml
<% elif bootstrap_distribution == 'k0s' %> #% elif bootstrap_distribution == 'k0s' %#
kubeconfig: /var/lib/k0s/pki/admin.conf kubeconfig: /var/lib/k0s/pki/admin.conf
<% endif %> #% endif %#
state: drain state: drain
delete_options: delete_options:
delete_emptydir_data: true delete_emptydir_data: true
@@ -79,10 +79,10 @@
- name: Uncordon - name: Uncordon
kubernetes.core.k8s_drain: kubernetes.core.k8s_drain:
name: "{{ inventory_hostname }}" name: "{{ inventory_hostname }}"
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
kubeconfig: /etc/rancher/k3s/k3s.yaml kubeconfig: /etc/rancher/k3s/k3s.yaml
<% elif bootstrap_distribution == 'k0s' %> #% elif bootstrap_distribution == 'k0s' %#
kubeconfig: /var/lib/k0s/pki/admin.conf kubeconfig: /var/lib/k0s/pki/admin.conf
<% endif %> #% endif %#
state: uncordon state: uncordon
delegate_to: "{{ groups['master'][0] }}" delegate_to: "{{ groups['master'][0] }}"
bootstrap/templates/ansible/playbooks/tasks/cilium.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
--- ---
- name: Cilium - name: Cilium
block: block:
@@ -55,4 +55,4 @@
definition: definition:
metadata: metadata:
finalizers: [] finalizers: []
<% endif %> #% endif %#
bootstrap/templates/ansible/playbooks/tasks/coredns.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
--- ---
- name: Coredns - name: Coredns
block: block:
@@ -55,4 +55,4 @@
definition: definition:
metadata: metadata:
finalizers: [] finalizers: []
<% endif %> #% endif %#
bootstrap/templates/ansible/playbooks/tasks/cruft.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
--- ---
# https://github.com/k3s-io/k3s/issues/1971 # https://github.com/k3s-io/k3s/issues/1971
- name: Cruft - name: Cruft
@@ -31,4 +31,4 @@
namespace: kube-system namespace: kube-system
state: absent state: absent
loop: "{{ addons_list.resources | selectattr('metadata.name', 'match', '^custom-.*') | list }}" loop: "{{ addons_list.resources | selectattr('metadata.name', 'match', '^custom-.*') | list }}"
<% endif %> #% endif %#
bootstrap/templates/ansible/playbooks/tasks/kubeconfig.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
--- ---
- name: Get absolute path to this Git repository # noqa: command-instead-of-module - name: Get absolute path to this Git repository # noqa: command-instead-of-module
ansible.builtin.command: git rev-parse --show-toplevel ansible.builtin.command: git rev-parse --show-toplevel
@@ -25,4 +25,4 @@
path: "{{ repository_path.stdout }}/kubeconfig" path: "{{ repository_path.stdout }}/kubeconfig"
regexp: https://127.0.0.1:6443 regexp: https://127.0.0.1:6443
replace: "https://{{ k3s_registration_address }}:6443" replace: "https://{{ k3s_registration_address }}:6443"
<% endif %> #% endif %#
bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2
+8 -8
View File
@@ -1,4 +1,4 @@
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
--- ---
# https://docs.k3s.io/helm # https://docs.k3s.io/helm
apiVersion: helm.cattle.io/v1 apiVersion: helm.cattle.io/v1
@@ -32,28 +32,28 @@ spec:
ipam: ipam:
mode: kubernetes mode: kubernetes
ipv4NativeRoutingCIDR: "{{ cluster_cidr }}" ipv4NativeRoutingCIDR: "{{ cluster_cidr }}"
<% if bootstrap_ipv6_enabled | default(false) %> #% if bootstrap_ipv6_enabled | default(false) %#
ipv6NativeRoutingCIDR: "{{ cluster_cidr_v6 }}" ipv6NativeRoutingCIDR: "{{ cluster_cidr_v6 }}"
ipv6: ipv6:
enabled: true enabled: true
<% endif %> #% endif %#
k8sServiceHost: "{{ kube_api_addr }}" k8sServiceHost: "{{ kube_api_addr }}"
k8sServicePort: 6443 k8sServicePort: 6443
kubeProxyReplacement: true kubeProxyReplacement: true
kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256 kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256
l2announcements: l2announcements:
<% if bootstrap_ipv6_enabled | default(false) %> #% if bootstrap_ipv6_enabled | default(false) %#
enabled: false enabled: false
<% else %> #% else %#
enabled: true enabled: true
# https://github.com/cilium/cilium/issues/26586 # https://github.com/cilium/cilium/issues/26586
leaseDuration: 120s leaseDuration: 120s
leaseRenewDeadline: 60s leaseRenewDeadline: 60s
leaseRetryPeriod: 1s leaseRetryPeriod: 1s
<% endif %> #% endif %#
loadBalancer: loadBalancer:
algorithm: maglev algorithm: maglev
mode: << bootstrap_cilium_loadbalancer_mode | default('dsr', true) >> mode: "{% bootstrap_cilium_loadbalancer_mode | default('dsr', true) %}"
localRedirectPolicy: true localRedirectPolicy: true
operator: operator:
replicas: 1 replicas: 1
@@ -62,4 +62,4 @@ spec:
routingMode: native routingMode: native
securityContext: securityContext:
privileged: true privileged: true
<% endif %> #% endif %#
bootstrap/templates/ansible/playbooks/templates/custom-coredns-helmchart.yaml.j2.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
--- ---
# https://docs.k3s.io/helm # https://docs.k3s.io/helm
apiVersion: helm.cattle.io/v1 apiVersion: helm.cattle.io/v1
@@ -76,4 +76,4 @@ spec:
labelSelector: labelSelector:
matchLabels: matchLabels:
app.kubernetes.io/instance: coredns app.kubernetes.io/instance: coredns
<% endif %> #% endif %#
bootstrap/templates/ansible/playbooks/templates/kube-vip-static-pod.yaml.j2.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if bootstrap_distribution == 'k3s' and bootstrap_nodes.master | length > 1 and not bootstrap_kube_api_addr %> #% if bootstrap_distribution == 'k3s' and bootstrap_nodes.master | length > 1 and not bootstrap_kube_api_addr %#
--- ---
apiVersion: v1 apiVersion: v1
kind: Pod kind: Pod
@@ -58,4 +58,4 @@ spec:
- name: kubeconfig - name: kubeconfig
hostPath: hostPath:
path: /etc/rancher/k3s/k3s.yaml path: /etc/rancher/k3s/k3s.yaml
<% endif %> #% endif %#
bootstrap/templates/k0s-config.yaml.j2
+42 -42
View File
@@ -1,4 +1,4 @@
<% if bootstrap_distribution == 'k0s' %> #% if bootstrap_distribution == 'k0s' %#
--- ---
apiVersion: k0sctl.k0sproject.io/v1beta1 apiVersion: k0sctl.k0sproject.io/v1beta1
kind: Cluster kind: Cluster
@@ -6,25 +6,25 @@ metadata:
name: k0s-cluster name: k0s-cluster
spec: spec:
hosts: hosts:
<% for item in bootstrap_nodes.master %> #% for item in bootstrap_nodes.master %#
- role: << item.role | default('controller+worker') >> - role: "{% item.role | default('controller+worker') %}"
ssh: ssh:
address: << item.address >> address: "{% item.address %}"
user: << item.username >> user: "{% item.username %}"
installFlags: installFlags:
- --disable-components=metrics-server - --disable-components=metrics-server
<% if item.role | default('') == 'controller+worker' %> #% if item.role | default('') == 'controller+worker' %#
- --no-taints - --no-taints
<% endif %> #% endif %#
<% endfor %> #% endfor %#
<% if bootstrap_nodes.worker | default([]) | length > 0 %> #% if bootstrap_nodes.worker | default([]) | length > 0 %#
<% for item in bootstrap_nodes.worker %> #% for item in bootstrap_nodes.worker %#
- role: worker - role: worker
ssh: ssh:
address: << item.address >> address: "{% item.address %}"
user: << item.username >> user: "{% item.username %}"
<% endfor %> #% endfor %#
<% endif %> #% endif %#
k0s: k0s:
# renovate: datasource=github-releases depName=k0sproject/k0s # renovate: datasource=github-releases depName=k0sproject/k0s
version: "v1.28.5+k0s.0" version: "v1.28.5+k0s.0"
@@ -43,18 +43,18 @@ spec:
bind-address: "0.0.0.0" bind-address: "0.0.0.0"
api: api:
sans: sans:
- << bootstrap_kube_api_addr >> - "{% bootstrap_kube_api_addr %}"
<% if bootstrap_kubeapi_hostname is defined %> #% if bootstrap_kubeapi_hostname is defined %#
- << bootstrap_kubeapi_hostname >> - "{% bootstrap_kubeapi_hostname %}"
<% endif %> #% endif %#
<% for item in bootstrap_nodes.master %> #% for item in bootstrap_nodes.master %#
<% if item.address != bootstrap_kube_api_addr %> #% if item.address != bootstrap_kube_api_addr %#
- << item.address >> - "{% item.address %}"
<% endif %> #% endif %#
<% if (bootstrap_kubeapi_hostname is not defined) or (item.name != bootstrap_kubeapi_hostname) %> #% if (bootstrap_kubeapi_hostname is not defined) or (item.name != bootstrap_kubeapi_hostname) %#
- << item.name >> - "{% item.name %}"
<% endif %> #% endif %#
<% endfor %> #% endfor %#
extensions: extensions:
helm: helm:
repositories: repositories:
@@ -84,33 +84,33 @@ spec:
enabled: false enabled: false
ipam: ipam:
mode: kubernetes mode: kubernetes
ipv4NativeRoutingCIDR: "<< bootstrap_cluster_cidr >>" ipv4NativeRoutingCIDR: "{% bootstrap_cluster_cidr %}"
<% if bootstrap_ipv6_enabled | default(false) %> #% if bootstrap_ipv6_enabled | default(false) %#
ipv6NativeRoutingCIDR: "<< bootstrap_cluster_cidr_v6 >>" ipv6NativeRoutingCIDR: "{% bootstrap_cluster_cidr_v6 %}"
ipv6: ipv6:
enabled: true enabled: true
<% endif %> #% endif %#
<% if bootstrap_nodes.master | length == 1 and not bootstrap_kube_api_addr %> #% if bootstrap_nodes.master | length == 1 and not bootstrap_kube_api_addr %#
k8sServiceHost: << bootstrap_nodes.master[0].address >> k8sServiceHost: "{% bootstrap_nodes.master[0].address %}"
<% else %> #% else %#
k8sServiceHost: << bootstrap_kube_api_addr >> k8sServiceHost: "{% bootstrap_kube_api_addr %}"
<% endif %> #% endif %#
k8sServicePort: 6443 k8sServicePort: 6443
kubeProxyReplacement: true kubeProxyReplacement: true
kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256 kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256
l2announcements: l2announcements:
<% if bootstrap_ipv6_enabled | default(false) %> #% if bootstrap_ipv6_enabled | default(false) %#
enabled: false enabled: false
<% else %> #% else %#
enabled: true enabled: true
# https://github.com/cilium/cilium/issues/26586 # https://github.com/cilium/cilium/issues/26586
leaseDuration: 120s leaseDuration: 120s
leaseRenewDeadline: 60s leaseRenewDeadline: 60s
leaseRetryPeriod: 1s leaseRetryPeriod: 1s
<% endif %> #% endif %#
loadBalancer: loadBalancer:
algorithm: maglev algorithm: maglev
mode: << bootstrap_cilium_loadbalancer_mode | default('dsr', true) >> mode: "{% bootstrap_cilium_loadbalancer_mode | default('dsr', true) %}"
localRedirectPolicy: true localRedirectPolicy: true
operator: operator:
replicas: 1 replicas: 1
@@ -122,10 +122,10 @@ spec:
network: network:
kubeProxy: kubeProxy:
disabled: true disabled: true
<% if bootstrap_nodes.master | length > 1 %> #% if bootstrap_nodes.master | length > 1 %#
nodeLocalLoadBalancing: nodeLocalLoadBalancing:
enabled: true enabled: true
type: EnvoyProxy type: EnvoyProxy
<% endif %> #% endif %#
provider: custom provider: custom
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/cert-manager/cert-manager/issuers/secret.sops.yaml.j2
+1 -1
View File
@@ -4,4 +4,4 @@ kind: Secret
metadata: metadata:
name: cert-manager-secret name: cert-manager-secret
stringData: stringData:
api-token: "<< bootstrap_cloudflare_token >>" api-token: "{% bootstrap_cloudflare_token %}"
bootstrap/templates/kubernetes/apps/default/discord-template-notifier/app/helmrelease.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if discord_template_notifier.enabled | default(false) %> #% if discord_template_notifier.enabled | default(false) %#
--- ---
apiVersion: helm.toolkit.fluxcd.io/v2beta2 apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease kind: HelmRelease
@@ -62,4 +62,4 @@ spec:
- path: /data/config.toml - path: /data/config.toml
subPath: config.toml subPath: config.toml
readOnly: true readOnly: true
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/default/discord-template-notifier/app/kustomization.yaml.j2
+2 -2
View File
@@ -1,8 +1,8 @@
<% if discord_template_notifier.enabled | default(false) %> #% if discord_template_notifier.enabled | default(false) %#
--- ---
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./secret.sops.yaml - ./secret.sops.yaml
- ./helmrelease.yaml - ./helmrelease.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/default/discord-template-notifier/app/secret.sops.yaml.j2
+3 -3
View File
@@ -1,4 +1,4 @@
<% if discord_template_notifier.enabled | default(false) %> #% if discord_template_notifier.enabled | default(false) %#
--- ---
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
@@ -12,5 +12,5 @@ stringData:
interval = "10m" interval = "10m"
retry_limit = 5 retry_limit = 5
sink.type = "discord" sink.type = "discord"
sink.url = "<< discord_template_notifier.webhook_url >>" sink.url = "{% discord_template_notifier.webhook_url %}"
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/default/discord-template-notifier/ks.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if discord_template_notifier.enabled | default(false) %> #% if discord_template_notifier.enabled | default(false) %#
--- ---
apiVersion: kustomize.toolkit.fluxcd.io/v1 apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization kind: Kustomization
@@ -19,4 +19,4 @@ spec:
interval: 30m interval: 30m
retryInterval: 1m retryInterval: 1m
timeout: 5m timeout: 5m
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/default/homepage/app/configmap.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if homepage.enabled | default(false) %> #% if homepage.enabled | default(false) %#
--- ---
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
@@ -76,4 +76,4 @@ data:
dateStyle: long dateStyle: long
timeStyle: short timeStyle: short
hourCycle: h23 hourCycle: h23
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/default/homepage/app/helmrelease.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if homepage.enabled | default(false) %> #% if homepage.enabled | default(false) %#
--- ---
apiVersion: helm.toolkit.fluxcd.io/v2beta2 apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease kind: HelmRelease
@@ -87,4 +87,4 @@ spec:
path: /app/config/widgets.yaml path: /app/config/widgets.yaml
serviceAccount: serviceAccount:
create: true create: true
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/default/homepage/app/kustomization.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if homepage.enabled | default(false) %> #% if homepage.enabled | default(false) %#
--- ---
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
@@ -6,4 +6,4 @@ resources:
- ./configmap.yaml - ./configmap.yaml
- ./helmrelease.yaml - ./helmrelease.yaml
- ./secret.sops.yaml - ./secret.sops.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/default/homepage/app/secret.sops.yaml.j2
+6 -6
View File
@@ -1,13 +1,13 @@
<% if homepage.enabled | default(false) %> #% if homepage.enabled | default(false) %#
--- ---
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: homepage-secret name: homepage-secret
stringData: stringData:
HOMEPAGE_VAR_CLOUDFLARED_ACCOUNTID: "<< bootstrap_cloudflare_account_tag >>" HOMEPAGE_VAR_CLOUDFLARED_ACCOUNTID: "{% bootstrap_cloudflare_account_tag %}"
HOMEPAGE_VAR_CLOUDFLARED_TUNNELID: "<< bootstrap_cloudflare_tunnel_id >>" HOMEPAGE_VAR_CLOUDFLARED_TUNNELID: "{% bootstrap_cloudflare_tunnel_id %}"
HOMEPAGE_VAR_CLOUDFLARED_API_TOKEN: "<< bootstrap_cloudflare_token >>" HOMEPAGE_VAR_CLOUDFLARED_API_TOKEN: "{% bootstrap_cloudflare_token %}"
HOMEPAGE_VAR_GRAFANA_USERNAME: admin HOMEPAGE_VAR_GRAFANA_USERNAME: admin
HOMEPAGE_VAR_GRAFANA_PASSWORD: "<< grafana.password >>" HOMEPAGE_VAR_GRAFANA_PASSWORD: "{% grafana.password %}"
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/default/homepage/ks.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if homepage.enabled | default(false) %> #% if homepage.enabled | default(false) %#
--- ---
apiVersion: kustomize.toolkit.fluxcd.io/v1 apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization kind: Kustomization
@@ -19,4 +19,4 @@ spec:
interval: 30m interval: 30m
retryInterval: 1m retryInterval: 1m
timeout: 5m timeout: 5m
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/default/kustomization.yaml.j2
+4 -4
View File
@@ -3,9 +3,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./namespace.yaml - ./namespace.yaml
<% if homepage.enabled | default(false) %> #% if homepage.enabled | default(false) %#
- ./homepage/ks.yaml - ./homepage/ks.yaml
<% endif %> #% endif %#
<% if discord_template_notifier.enabled | default(false) %> #% if discord_template_notifier.enabled | default(false) %#
- ./discord-template-notifier/ks.yaml - ./discord-template-notifier/ks.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/flux-system/addons/webhooks/github/secret.sops.yaml.j2
+1 -1
View File
@@ -4,4 +4,4 @@ kind: Secret
metadata: metadata:
name: github-webhook-token-secret name: github-webhook-token-secret
stringData: stringData:
token: "<< bootstrap_flux_github_webhook_token >>" token: "{% bootstrap_flux_github_webhook_token %}"
bootstrap/templates/kubernetes/apps/flux-system/kustomization.yaml.j2
+2 -2
View File
@@ -4,6 +4,6 @@ kind: Kustomization
resources: resources:
- ./namespace.yaml - ./namespace.yaml
- ./addons/ks.yaml - ./addons/ks.yaml
<% if weave_gitops.enabled | default(false) %> #% if weave_gitops.enabled | default(false) %#
- ./weave-gitops/ks.yaml - ./weave-gitops/ks.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml.j2
+4 -4
View File
@@ -1,4 +1,4 @@
<% if weave_gitops.enabled | default(false) %> #% if weave_gitops.enabled | default(false) %#
--- ---
apiVersion: helm.toolkit.fluxcd.io/v2beta2 apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease kind: HelmRelease
@@ -32,13 +32,13 @@ spec:
ingress: ingress:
enabled: true enabled: true
className: internal className: internal
<% if homepage.enabled | default(false) %> #% if homepage.enabled | default(false) %#
annotations: annotations:
gethomepage.dev/enabled: "true" gethomepage.dev/enabled: "true"
gethomepage.dev/group: Home gethomepage.dev/group: Home
gethomepage.dev/name: Weave-gitops gethomepage.dev/name: Weave-gitops
gethomepage.dev/icon: flux-cd.png gethomepage.dev/icon: flux-cd.png
<% endif %> #% endif %#
hosts: hosts:
- host: &host "gitops.${SECRET_DOMAIN}" - host: &host "gitops.${SECRET_DOMAIN}"
paths: paths:
@@ -56,4 +56,4 @@ spec:
impersonationResourceNames: ["admin"] impersonationResourceNames: ["admin"]
podAnnotations: podAnnotations:
secret.reloader.stakater.com/reload: cluster-user-auth secret.reloader.stakater.com/reload: cluster-user-auth
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/flux-system/weave-gitops/app/kustomization.yaml.j2
+2 -2
View File
@@ -1,8 +1,8 @@
<% if weave_gitops.enabled | default(false) %> #% if weave_gitops.enabled | default(false) %#
--- ---
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./secret.sops.yaml - ./secret.sops.yaml
- ./helmrelease.yaml - ./helmrelease.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/flux-system/weave-gitops/app/secret.sops.yaml.j2
+3 -3
View File
@@ -1,4 +1,4 @@
<% if weave_gitops.enabled | default(false) %> #% if weave_gitops.enabled | default(false) %#
--- ---
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
@@ -7,5 +7,5 @@ metadata:
type: Opaque type: Opaque
stringData: stringData:
username: admin username: admin
password: "<< weave_gitops.password | encrypt >>" password: "{% weave_gitops.password | encrypt %}"
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/flux-system/weave-gitops/ks.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if weave_gitops.enabled | default(false) %> #% if weave_gitops.enabled | default(false) %#
--- ---
apiVersion: kustomize.toolkit.fluxcd.io/v1 apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization kind: Kustomization
@@ -19,4 +19,4 @@ spec:
interval: 30m interval: 30m
retryInterval: 1m retryInterval: 1m
timeout: 5m timeout: 5m
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2
+11 -11
View File
@@ -34,11 +34,11 @@ spec:
id: 1 id: 1
containerRuntime: containerRuntime:
integration: containerd integration: containerd
<% if bootstrap_distribution == "k3s" %> #% if bootstrap_distribution == "k3s" %#
socketPath: /var/run/k3s/containerd/containerd.sock socketPath: /var/run/k3s/containerd/containerd.sock
<% else %> #% elif bootstrap_distribution == "k0s" %#
socketPath: /var/run/k0s/containerd.sock socketPath: /var/run/k0s/containerd.sock
<% endif %> #% endif %#
endpointRoutes: endpointRoutes:
enabled: true enabled: true
hubble: hubble:
@@ -70,13 +70,13 @@ spec:
ingress: ingress:
enabled: true enabled: true
className: internal className: internal
<% if homepage.enabled | default(false) %> #% if homepage.enabled | default(false) %#
annotations: annotations:
gethomepage.dev/enabled: "true" gethomepage.dev/enabled: "true"
gethomepage.dev/group: Network gethomepage.dev/group: Network
gethomepage.dev/name: Cilium gethomepage.dev/name: Cilium
gethomepage.dev/icon: cilium.png gethomepage.dev/icon: cilium.png
<% endif %> #% endif %#
hosts: hosts:
- "hubble.${SECRET_DOMAIN}" - "hubble.${SECRET_DOMAIN}"
tls: tls:
@@ -85,28 +85,28 @@ spec:
ipam: ipam:
mode: kubernetes mode: kubernetes
ipv4NativeRoutingCIDR: "${CLUSTER_CIDR}" ipv4NativeRoutingCIDR: "${CLUSTER_CIDR}"
<% if bootstrap_ipv6_enabled | default(false) %> #% if bootstrap_ipv6_enabled | default(false) %#
ipv6NativeRoutingCIDR: "${CLUSTER_CIDR_V6}" ipv6NativeRoutingCIDR: "${CLUSTER_CIDR_V6}"
ipv6: ipv6:
enabled: true enabled: true
<% endif %> #% endif %#
k8sServiceHost: "${KUBE_API_ADDR}" k8sServiceHost: "${KUBE_API_ADDR}"
k8sServicePort: 6443 k8sServicePort: 6443
kubeProxyReplacement: true kubeProxyReplacement: true
kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256 kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256
l2announcements: l2announcements:
<% if bootstrap_ipv6_enabled | default(false) %> #% if bootstrap_ipv6_enabled | default(false) %#
enabled: false enabled: false
<% else %> #% else %#
enabled: true enabled: true
# https://github.com/cilium/cilium/issues/26586 # https://github.com/cilium/cilium/issues/26586
leaseDuration: 120s leaseDuration: 120s
leaseRenewDeadline: 60s leaseRenewDeadline: 60s
leaseRetryPeriod: 1s leaseRetryPeriod: 1s
<% endif %> #% endif %#
loadBalancer: loadBalancer:
algorithm: maglev algorithm: maglev
mode: << bootstrap_cilium_loadbalancer_mode | default('dsr', true) >> mode: "{% bootstrap_cilium_loadbalancer_mode | default('dsr', true) %}"
localRedirectPolicy: true localRedirectPolicy: true
operator: operator:
replicas: 1 replicas: 1
bootstrap/templates/kubernetes/apps/kube-system/cilium/app/kustomization.yaml.j2
+2 -2
View File
@@ -2,7 +2,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
<% if not bootstrap_ipv6_enabled | default(false) %> #% if not bootstrap_ipv6_enabled | default(false) %#
- ./cilium-l2.yaml - ./cilium-l2.yaml
<% endif %> #% endif %#
- ./helmrelease.yaml - ./helmrelease.yaml
bootstrap/templates/kubernetes/apps/kube-system/coredns/app/helmrelease.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if bootstrap_distribution == "k3s" %> #% if bootstrap_distribution == "k3s" %#
--- ---
apiVersion: helm.toolkit.fluxcd.io/v2beta2 apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease kind: HelmRelease
@@ -87,4 +87,4 @@ spec:
labelSelector: labelSelector:
matchLabels: matchLabels:
app.kubernetes.io/instance: coredns app.kubernetes.io/instance: coredns
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/kube-system/coredns/app/kustomization.yaml.j2
+2 -2
View File
@@ -1,7 +1,7 @@
<% if bootstrap_distribution == "k3s" %> #% if bootstrap_distribution == "k3s" %#
--- ---
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./helmrelease.yaml - ./helmrelease.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/kube-system/coredns/ks.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if bootstrap_distribution == "k3s" %> #% if bootstrap_distribution == "k3s" %#
--- ---
apiVersion: kustomize.toolkit.fluxcd.io/v1 apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization kind: Kustomization
@@ -19,4 +19,4 @@ spec:
interval: 30m interval: 30m
retryInterval: 1m retryInterval: 1m
timeout: 5m timeout: 5m
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/kube-system/kustomization.yaml.j2
+2 -2
View File
@@ -4,7 +4,7 @@ kind: Kustomization
resources: resources:
- ./namespace.yaml - ./namespace.yaml
- ./cilium/ks.yaml - ./cilium/ks.yaml
<% if bootstrap_distribution == "k3s" %> #% if bootstrap_distribution == "k3s" %#
- ./coredns/ks.yaml - ./coredns/ks.yaml
<% endif %> #% endif %#
- ./metrics-server/ks.yaml - ./metrics-server/ks.yaml
bootstrap/templates/kubernetes/apps/network/cloudflared/app/secret.sops.yaml.j2
+4 -4
View File
@@ -4,10 +4,10 @@ kind: Secret
metadata: metadata:
name: cloudflared-secret name: cloudflared-secret
stringData: stringData:
TUNNEL_ID: "<< bootstrap_cloudflare_tunnel_id >>" TUNNEL_ID: "{% bootstrap_cloudflare_tunnel_id %}"
credentials.json: | credentials.json: |
{ {
"AccountTag": "<< bootstrap_cloudflare_account_tag >>", "AccountTag": "{% bootstrap_cloudflare_account_tag %}",
"TunnelSecret": "<< bootstrap_cloudflare_tunnel_secret >>", "TunnelSecret": "{% bootstrap_cloudflare_tunnel_secret %}",
"TunnelID": "<< bootstrap_cloudflare_tunnel_id >>" "TunnelID": "{% bootstrap_cloudflare_tunnel_id %}"
} }
bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2
+2 -2
View File
@@ -71,12 +71,12 @@ spec:
className: external className: external
annotations: annotations:
external-dns.alpha.kubernetes.io/target: "external.${SECRET_DOMAIN}" external-dns.alpha.kubernetes.io/target: "external.${SECRET_DOMAIN}"
<% if homepage.enabled | default(false) %> #% if homepage.enabled | default(false) %#
gethomepage.dev/enabled: "true" gethomepage.dev/enabled: "true"
gethomepage.dev/group: Network gethomepage.dev/group: Network
gethomepage.dev/name: Echo Server gethomepage.dev/name: Echo Server
gethomepage.dev/icon: mdi-video-input-antenna gethomepage.dev/icon: mdi-video-input-antenna
<% endif %> #% endif %#
hosts: hosts:
- host: &host "{{ .Release.Name }}.${SECRET_DOMAIN}" - host: &host "{{ .Release.Name }}.${SECRET_DOMAIN}"
paths: paths:
bootstrap/templates/kubernetes/apps/network/external-dns/app/secret.sops.yaml.j2
+1 -1
View File
@@ -4,4 +4,4 @@ kind: Secret
metadata: metadata:
name: external-dns-secret name: external-dns-secret
stringData: stringData:
api-token: "<< bootstrap_cloudflare_token >>" api-token: "{% bootstrap_cloudflare_token %}"
bootstrap/templates/kubernetes/apps/network/k8s-gateway/app/helmrelease.yaml.j2
+1 -1
View File
@@ -31,5 +31,5 @@ spec:
type: LoadBalancer type: LoadBalancer
port: 53 port: 53
annotations: annotations:
io.cilium/lb-ipam-ips: "<< bootstrap_k8s_gateway_addr >>" io.cilium/lb-ipam-ips: "{% bootstrap_k8s_gateway_addr %}"
externalTrafficPolicy: Cluster externalTrafficPolicy: Cluster
bootstrap/templates/kubernetes/apps/network/nginx/certificates/kustomization.yaml.j2
+2 -2
View File
@@ -3,6 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./staging.yaml - ./staging.yaml
<% if bootstrap_acme_production_enabled | default(false) %> #% if bootstrap_acme_production_enabled | default(false) %#
- ./production.yaml - ./production.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/network/nginx/external/helmrelease.yaml.j2
Vendored
+4 -4
View File
@@ -33,7 +33,7 @@ spec:
service: service:
annotations: annotations:
external-dns.alpha.kubernetes.io/hostname: "external.${SECRET_DOMAIN}" external-dns.alpha.kubernetes.io/hostname: "external.${SECRET_DOMAIN}"
io.cilium/lb-ipam-ips: "<< bootstrap_external_ingress_addr >>" io.cilium/lb-ipam-ips: "{% bootstrap_external_ingress_addr %}"
externalTrafficPolicy: Cluster externalTrafficPolicy: Cluster
ingressClassResource: ingressClassResource:
name: external name: external
@@ -71,11 +71,11 @@ spec:
namespaceSelector: namespaceSelector:
any: true any: true
extraArgs: extraArgs:
<% if bootstrap_acme_production_enabled | default(false) %> #% if bootstrap_acme_production_enabled | default(false) %#
default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-production-tls" default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-production-tls"
<% else %> #% else %#
default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-staging-tls" default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-staging-tls"
<% endif %> #% endif %#
topologySpreadConstraints: topologySpreadConstraints:
- maxSkew: 1 - maxSkew: 1
topologyKey: kubernetes.io/hostname topologyKey: kubernetes.io/hostname
bootstrap/templates/kubernetes/apps/network/nginx/internal/helmrelease.yaml.j2
+4 -4
View File
@@ -31,7 +31,7 @@ spec:
service: service:
annotations: annotations:
external-dns.alpha.kubernetes.io/hostname: "internal.${SECRET_DOMAIN}" external-dns.alpha.kubernetes.io/hostname: "internal.${SECRET_DOMAIN}"
io.cilium/lb-ipam-ips: "<< bootstrap_internal_ingress_addr >>" io.cilium/lb-ipam-ips: "{% bootstrap_internal_ingress_addr %}"
externalTrafficPolicy: Cluster externalTrafficPolicy: Cluster
ingressClassResource: ingressClassResource:
name: internal name: internal
@@ -69,11 +69,11 @@ spec:
namespaceSelector: namespaceSelector:
any: true any: true
extraArgs: extraArgs:
<% if bootstrap_acme_production_enabled | default(false) %> #% if bootstrap_acme_production_enabled | default(false) %#
default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-production-tls" default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-production-tls"
<% else %> #% else %#
default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-staging-tls" default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-staging-tls"
<% endif %> #% endif %#
topologySpreadConstraints: topologySpreadConstraints:
- maxSkew: 1 - maxSkew: 1
topologyKey: kubernetes.io/hostname topologyKey: kubernetes.io/hostname
bootstrap/templates/kubernetes/apps/observability/grafana/app/helmrelease.yaml.j2
+4 -4
View File
@@ -1,4 +1,4 @@
<% if grafana.enabled | default(false) %> #% if grafana.enabled | default(false) %#
--- ---
apiVersion: helm.toolkit.fluxcd.io/v2beta2 apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease kind: HelmRelease
@@ -160,7 +160,7 @@ spec:
ingress: ingress:
enabled: true enabled: true
ingressClassName: internal ingressClassName: internal
<% if homepage.enabled | default(false) %> #% if homepage.enabled | default(false) %#
annotations: annotations:
gethomepage.dev/enabled: "true" gethomepage.dev/enabled: "true"
gethomepage.dev/icon: grafana.png gethomepage.dev/icon: grafana.png
@@ -170,7 +170,7 @@ spec:
gethomepage.dev/widget.url: http://grafana.observability gethomepage.dev/widget.url: http://grafana.observability
gethomepage.dev/widget.username: "{{`{{HOMEPAGE_VAR_GRAFANA_USERNAME}}`}}" gethomepage.dev/widget.username: "{{`{{HOMEPAGE_VAR_GRAFANA_USERNAME}}`}}"
gethomepage.dev/widget.password: "{{`{{HOMEPAGE_VAR_GRAFANA_PASSWORD}}`}}" gethomepage.dev/widget.password: "{{`{{HOMEPAGE_VAR_GRAFANA_PASSWORD}}`}}"
<% endif %> #% endif %#
hosts: hosts:
- &host "grafana.${SECRET_DOMAIN}" - &host "grafana.${SECRET_DOMAIN}"
tls: tls:
@@ -181,4 +181,4 @@ spec:
storageClassName: openebs-hostpath storageClassName: openebs-hostpath
testFramework: testFramework:
enabled: false enabled: false
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/observability/grafana/app/kustomization.yaml.j2
+2 -2
View File
@@ -1,8 +1,8 @@
<% if grafana.enabled | default(false) %> #% if grafana.enabled | default(false) %#
--- ---
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./secret.sops.yaml - ./secret.sops.yaml
- ./helmrelease.yaml - ./helmrelease.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/observability/grafana/app/secret.sops.yaml.j2
+3 -3
View File
@@ -1,4 +1,4 @@
<% if grafana.enabled | default(false) %> #% if grafana.enabled | default(false) %#
--- ---
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
@@ -6,5 +6,5 @@ metadata:
name: grafana-admin-secret name: grafana-admin-secret
stringData: stringData:
admin-user: admin admin-user: admin
admin-password: "<< grafana.password >>" admin-password: "{% grafana.password %}"
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/observability/grafana/ks.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if grafana.enabled | default(false) %> #% if grafana.enabled | default(false) %#
--- ---
apiVersion: kustomize.toolkit.fluxcd.io/v1 apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization kind: Kustomization
@@ -19,4 +19,4 @@ spec:
interval: 30m interval: 30m
retryInterval: 1m retryInterval: 1m
timeout: 5m timeout: 5m
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml.j2
+18 -18
View File
@@ -1,4 +1,4 @@
<% if kube_prometheus_stack.enabled | default(false) %> #% if kube_prometheus_stack.enabled | default(false) %#
--- ---
apiVersion: helm.toolkit.fluxcd.io/v2beta2 apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease kind: HelmRelease
@@ -54,7 +54,7 @@ spec:
enabled: true enabled: true
serviceMonitor: serviceMonitor:
metricRelabelings: metricRelabelings:
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
# Remove duplicate labels provided by k3s # Remove duplicate labels provided by k3s
- action: keep - action: keep
sourceLabels: ["__name__"] sourceLabels: ["__name__"]
@@ -62,7 +62,7 @@ spec:
- action: replace - action: replace
sourceLabels: ["node"] sourceLabels: ["node"]
targetLabel: instance targetLabel: instance
<% endif %> #% endif %#
# Drop high cardinality labels # Drop high cardinality labels
- action: labeldrop - action: labeldrop
regex: (uid) regex: (uid)
@@ -75,12 +75,12 @@ spec:
enabled: true enabled: true
serviceMonitor: serviceMonitor:
metricRelabelings: metricRelabelings:
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
# Remove duplicate labels provided by k3s # Remove duplicate labels provided by k3s
- action: keep - action: keep
sourceLabels: ["__name__"] sourceLabels: ["__name__"]
regex: (aggregator_openapi|aggregator_unavailable|apiextensions_openapi|apiserver_admission|apiserver_audit|apiserver_cache|apiserver_cel|apiserver_client|apiserver_crd|apiserver_current|apiserver_envelope|apiserver_flowcontrol|apiserver_init|apiserver_kube|apiserver_longrunning|apiserver_request|apiserver_requested|apiserver_response|apiserver_selfrequest|apiserver_storage|apiserver_terminated|apiserver_tls|apiserver_watch|apiserver_webhooks|authenticated_user|authentication|disabled_metric|etcd_bookmark|etcd_lease|etcd_request|field_validation|get_token|go|grpc_client|hidden_metric|kube_apiserver|kubernetes_build|kubernetes_feature|node_authorizer|pod_security|process_cpu|process_max|process_open|process_resident|process_start|process_virtual|registered_metric|rest_client|scrape_duration|scrape_samples|scrape_series|serviceaccount_legacy|serviceaccount_stale|serviceaccount_valid|watch_cache|workqueue)_(.+) regex: (aggregator_openapi|aggregator_unavailable|apiextensions_openapi|apiserver_admission|apiserver_audit|apiserver_cache|apiserver_cel|apiserver_client|apiserver_crd|apiserver_current|apiserver_envelope|apiserver_flowcontrol|apiserver_init|apiserver_kube|apiserver_longrunning|apiserver_request|apiserver_requested|apiserver_response|apiserver_selfrequest|apiserver_storage|apiserver_terminated|apiserver_tls|apiserver_watch|apiserver_webhooks|authenticated_user|authentication|disabled_metric|etcd_bookmark|etcd_lease|etcd_request|field_validation|get_token|go|grpc_client|hidden_metric|kube_apiserver|kubernetes_build|kubernetes_feature|node_authorizer|pod_security|process_cpu|process_max|process_open|process_resident|process_start|process_virtual|registered_metric|rest_client|scrape_duration|scrape_samples|scrape_series|serviceaccount_legacy|serviceaccount_stale|serviceaccount_valid|watch_cache|workqueue)_(.+)
<% endif %> #% endif %#
# Drop high cardinality labels # Drop high cardinality labels
- action: drop - action: drop
sourceLabels: ["__name__"] sourceLabels: ["__name__"]
@@ -91,49 +91,49 @@ spec:
kubeControllerManager: kubeControllerManager:
enabled: true enabled: true
endpoints: &endpoints endpoints: &endpoints
<% for item in bootstrap_nodes.master %> #% for item in bootstrap_nodes.master %#
- << item.address >> - "{% item.address %}"
<% endfor %> #% endfor %#
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
serviceMonitor: serviceMonitor:
metricRelabelings: metricRelabelings:
# Remove duplicate labels provided by k3s # Remove duplicate labels provided by k3s
- action: keep - action: keep
sourceLabels: ["__name__"] sourceLabels: ["__name__"]
regex: "(apiserver_audit|apiserver_client|apiserver_delegated|apiserver_envelope|apiserver_storage|apiserver_webhooks|attachdetach_controller|authenticated_user|authentication|cronjob_controller|disabled_metric|endpoint_slice|ephemeral_volume|garbagecollector_controller|get_token|go|hidden_metric|job_controller|kubernetes_build|kubernetes_feature|leader_election|node_collector|node_ipam|process_cpu|process_max|process_open|process_resident|process_start|process_virtual|pv_collector|registered_metric|replicaset_controller|rest_client|retroactive_storageclass|root_ca|running_managed|scrape_duration|scrape_samples|scrape_series|service_controller|storage_count|storage_operation|ttl_after|volume_operation|workqueue)_(.+)" regex: "(apiserver_audit|apiserver_client|apiserver_delegated|apiserver_envelope|apiserver_storage|apiserver_webhooks|attachdetach_controller|authenticated_user|authentication|cronjob_controller|disabled_metric|endpoint_slice|ephemeral_volume|garbagecollector_controller|get_token|go|hidden_metric|job_controller|kubernetes_build|kubernetes_feature|leader_election|node_collector|node_ipam|process_cpu|process_max|process_open|process_resident|process_start|process_virtual|pv_collector|registered_metric|replicaset_controller|rest_client|retroactive_storageclass|root_ca|running_managed|scrape_duration|scrape_samples|scrape_series|service_controller|storage_count|storage_operation|ttl_after|volume_operation|workqueue)_(.+)"
<% endif %> #% endif %#
kubeEtcd: kubeEtcd:
<% if bootstrap_nodes.master | length > 1 %> #% if bootstrap_nodes.master | length > 1 %#
enabled: true enabled: true
<% else %> #% else %#
enabled: false enabled: false
<% endif %> #% endif %#
endpoints: *endpoints endpoints: *endpoints
kubeScheduler: kubeScheduler:
enabled: true enabled: true
endpoints: *endpoints endpoints: *endpoints
<% if bootstrap_distribution == 'k3s' %> #% if bootstrap_distribution == 'k3s' %#
serviceMonitor: serviceMonitor:
metricRelabelings: metricRelabelings:
# Remove duplicate labels provided by k3s # Remove duplicate labels provided by k3s
- action: keep - action: keep
sourceLabels: ["__name__"] sourceLabels: ["__name__"]
regex: "(apiserver_audit|apiserver_client|apiserver_delegated|apiserver_envelope|apiserver_storage|apiserver_webhooks|authenticated_user|authentication|disabled_metric|go|hidden_metric|kubernetes_build|kubernetes_feature|leader_election|process_cpu|process_max|process_open|process_resident|process_start|process_virtual|registered_metric|rest_client|scheduler|scrape_duration|scrape_samples|scrape_series|workqueue)_(.+)" regex: "(apiserver_audit|apiserver_client|apiserver_delegated|apiserver_envelope|apiserver_storage|apiserver_webhooks|authenticated_user|authentication|disabled_metric|go|hidden_metric|kubernetes_build|kubernetes_feature|leader_election|process_cpu|process_max|process_open|process_resident|process_start|process_virtual|registered_metric|rest_client|scheduler|scrape_duration|scrape_samples|scrape_series|workqueue)_(.+)"
<% endif %> #% endif %#
kubeProxy: kubeProxy:
enabled: false # Disabled due to eBPF enabled: false # Disabled due to eBPF
prometheus: prometheus:
ingress: ingress:
enabled: true enabled: true
ingressClassName: internal ingressClassName: internal
<% if homepage.enabled | default(false) %> #% if homepage.enabled | default(false) %#
annotations: annotations:
gethomepage.dev/enabled: "true" gethomepage.dev/enabled: "true"
gethomepage.dev/icon: prometheus.png gethomepage.dev/icon: prometheus.png
gethomepage.dev/name: Prometheus gethomepage.dev/name: Prometheus
gethomepage.dev/group: Observability gethomepage.dev/group: Observability
gethomepage.dev/widget.type: prometheus gethomepage.dev/widget.type: prometheus
<% endif %> #% endif %#
pathType: Prefix pathType: Prefix
hosts: hosts:
- "prometheus.${SECRET_DOMAIN}" - "prometheus.${SECRET_DOMAIN}"
@@ -164,4 +164,4 @@ spec:
multicluster: multicluster:
etcd: etcd:
enabled: true enabled: true
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/observability/kube-prometheus-stack/app/kustomization.yaml.j2
+2 -2
View File
@@ -1,7 +1,7 @@
<% if kube_prometheus_stack.enabled | default(false) %> #% if kube_prometheus_stack.enabled | default(false) %#
--- ---
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./helmrelease.yaml - ./helmrelease.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if kube_prometheus_stack.enabled | default(false) %> #% if kube_prometheus_stack.enabled | default(false) %#
--- ---
apiVersion: kustomize.toolkit.fluxcd.io/v1 apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization kind: Kustomization
@@ -19,4 +19,4 @@ spec:
interval: 30m interval: 30m
retryInterval: 1m retryInterval: 1m
timeout: 5m timeout: 5m
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/observability/kubernetes-dashboard/app/helmrelease.yaml.j2
+4 -4
View File
@@ -1,4 +1,4 @@
<% if kubernetes_dashboard.enabled | default(false) %> #% if kubernetes_dashboard.enabled | default(false) %#
--- ---
apiVersion: helm.toolkit.fluxcd.io/v2beta2 apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease kind: HelmRelease
@@ -32,13 +32,13 @@ spec:
ingress: ingress:
enabled: true enabled: true
className: internal className: internal
<% if homepage.enabled | default(false) %> #% if homepage.enabled | default(false) %#
annotations: annotations:
gethomepage.dev/enabled: "true" gethomepage.dev/enabled: "true"
gethomepage.dev/icon: kubernetes-dashboard.png gethomepage.dev/icon: kubernetes-dashboard.png
gethomepage.dev/name: Kubernetes Dashboard gethomepage.dev/name: Kubernetes Dashboard
gethomepage.dev/group: Observability gethomepage.dev/group: Observability
<% endif %> #% endif %#
hosts: hosts:
- &host "kubernetes.${SECRET_DOMAIN}" - &host "kubernetes.${SECRET_DOMAIN}"
tls: tls:
@@ -46,4 +46,4 @@ spec:
- *host - *host
metricsScraper: metricsScraper:
enabled: true enabled: true
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/observability/kubernetes-dashboard/app/kustomization.yaml.j2
+2 -2
View File
@@ -1,8 +1,8 @@
<% if kubernetes_dashboard.enabled | default(false) %> #% if kubernetes_dashboard.enabled | default(false) %#
--- ---
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./rbac.yaml - ./rbac.yaml
- ./helmrelease.yaml - ./helmrelease.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/observability/kubernetes-dashboard/app/rbac.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if kubernetes_dashboard.enabled | default(false) %> #% if kubernetes_dashboard.enabled | default(false) %#
# For dashboard sign in token: # For dashboard sign in token:
# kubectl -n observability get secret kubernetes-dashboard -o jsonpath='{.data.token}' | base64 -d # kubectl -n observability get secret kubernetes-dashboard -o jsonpath='{.data.token}' | base64 -d
--- ---
@@ -38,4 +38,4 @@ subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: kubernetes-dashboard name: kubernetes-dashboard
namespace: observability namespace: observability
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/observability/kubernetes-dashboard/ks.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if kubernetes_dashboard.enabled | default(false) %> #% if kubernetes_dashboard.enabled | default(false) %#
--- ---
apiVersion: kustomize.toolkit.fluxcd.io/v1 apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization kind: Kustomization
@@ -22,4 +22,4 @@ spec:
interval: 30m interval: 30m
retryInterval: 1m retryInterval: 1m
timeout: 5m timeout: 5m
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/observability/kustomization.yaml.j2
+6 -6
View File
@@ -3,12 +3,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./namespace.yaml - ./namespace.yaml
<% if grafana.enabled | default(false) %> #% if grafana.enabled | default(false) %#
- ./grafana/ks.yaml - ./grafana/ks.yaml
<% endif %> #% endif %#
<% if kube_prometheus_stack.enabled | default(false) %> #% if kube_prometheus_stack.enabled | default(false) %#
- ./kube-prometheus-stack/ks.yaml - ./kube-prometheus-stack/ks.yaml
<% endif %> #% endif %#
<% if kubernetes_dashboard.enabled | default(false) %> #% if kubernetes_dashboard.enabled | default(false) %#
- ./kubernetes-dashboard/ks.yaml - ./kubernetes-dashboard/ks.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/storage/csi-driver-nfs/app/helmrelease.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if csi_driver_nfs.enabled | default(false) %> #% if csi_driver_nfs.enabled | default(false) %#
--- ---
apiVersion: helm.toolkit.fluxcd.io/v2beta2 apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease kind: HelmRelease
@@ -27,4 +27,4 @@ spec:
values: values:
externalSnapshotter: externalSnapshotter:
enabled: false enabled: false
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/storage/csi-driver-nfs/app/kustomization.yaml.j2
+2 -2
View File
@@ -1,8 +1,8 @@
<% if csi_driver_nfs.enabled | default(false) %> #% if csi_driver_nfs.enabled | default(false) %#
--- ---
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./helmrelease.yaml - ./helmrelease.yaml
- ./storageclass.yaml - ./storageclass.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/storage/csi-driver-nfs/app/storageclass.yaml.j2
+7 -7
View File
@@ -1,16 +1,16 @@
<% if csi_driver_nfs.enabled | default(false) %> #% if csi_driver_nfs.enabled | default(false) %#
<% for item in csi_driver_nfs.storage_class %> #% for item in csi_driver_nfs.storage_class %#
--- ---
apiVersion: storage.k8s.io/v1 apiVersion: storage.k8s.io/v1
kind: StorageClass kind: StorageClass
metadata: metadata:
name: << item.name >> name: "{% item.name %}"
provisioner: nfs.csi.k8s.io provisioner: nfs.csi.k8s.io
parameters: parameters:
server: << item.server >> server: "{% item.server %}"
share: << item.share >> share: "{% item.share %}"
reclaimPolicy: Delete reclaimPolicy: Delete
volumeBindingMode: Immediate volumeBindingMode: Immediate
mountOptions: ["hard", "noatime"] mountOptions: ["hard", "noatime"]
<% endfor %> #% endfor %#
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/storage/csi-driver-nfs/ks.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if csi_driver_nfs.enabled | default(false) %> #% if csi_driver_nfs.enabled | default(false) %#
--- ---
apiVersion: kustomize.toolkit.fluxcd.io/v1 apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization kind: Kustomization
@@ -19,4 +19,4 @@ spec:
interval: 30m interval: 30m
retryInterval: 1m retryInterval: 1m
timeout: 5m timeout: 5m
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/storage/kustomization.yaml.j2
+4 -4
View File
@@ -4,9 +4,9 @@ kind: Kustomization
resources: resources:
- ./namespace.yaml - ./namespace.yaml
- ./openebs/ks.yaml - ./openebs/ks.yaml
<% if volsync.enabled | default(false) %> #% if volsync.enabled | default(false) %#
- ./volsync/ks.yaml - ./volsync/ks.yaml
<% endif %> #% endif %#
<% if csi_driver_nfs.enabled | default(false) %> #% if csi_driver_nfs.enabled | default(false) %#
- ./csi-driver-nfs/ks.yaml - ./csi-driver-nfs/ks.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/storage/openebs/app/helmrelease.yaml.j2
+1 -1
View File
@@ -29,5 +29,5 @@ spec:
enabled: true enabled: true
name: openebs-hostpath name: openebs-hostpath
isDefaultClass: false isDefaultClass: false
basePath: "<< bootstrap_local_storage_path >>" basePath: "{% bootstrap_local_storage_path %}"
bootstrap/templates/kubernetes/apps/storage/volsync/app/helmrelease.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if volsync.enabled | default(false) %> #% if volsync.enabled | default(false) %#
--- ---
apiVersion: helm.toolkit.fluxcd.io/v2beta2 apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease kind: HelmRelease
@@ -41,4 +41,4 @@ spec:
tag: *tag tag: *tag
metrics: metrics:
disableAuth: true disableAuth: true
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/storage/volsync/app/kustomization.yaml.j2
+2 -2
View File
@@ -1,8 +1,8 @@
<% if volsync.enabled | default(false) %> #% if volsync.enabled | default(false) %#
--- ---
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./helmrelease.yaml - ./helmrelease.yaml
- ./prometheusrule.yaml - ./prometheusrule.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/storage/volsync/app/prometheusrule.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if volsync.enabled | default(false) %> #% if volsync.enabled | default(false) %#
--- ---
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule kind: PrometheusRule
@@ -22,4 +22,4 @@ spec:
for: 15m for: 15m
labels: labels:
severity: critical severity: critical
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/storage/volsync/ks.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if volsync.enabled | default(false) %> #% if volsync.enabled | default(false) %#
--- ---
apiVersion: kustomize.toolkit.fluxcd.io/v1 apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization kind: Kustomization
@@ -39,4 +39,4 @@ spec:
interval: 30m interval: 30m
retryInterval: 1m retryInterval: 1m
timeout: 5m timeout: 5m
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/storage/volsync/snapshot-controller/helmrelease.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
<% if volsync.enabled | default(false) %> #% if volsync.enabled | default(false) %#
--- ---
apiVersion: helm.toolkit.fluxcd.io/v2beta2 apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease kind: HelmRelease
@@ -32,4 +32,4 @@ spec:
create: true create: true
webhook: webhook:
enabled: false enabled: false
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/storage/volsync/snapshot-controller/kustomization.yaml.j2
+2 -2
View File
@@ -1,7 +1,7 @@
<% if volsync.enabled | default(false) %> #% if volsync.enabled | default(false) %#
--- ---
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./helmrelease.yaml - ./helmrelease.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/tools/kustomization.yaml.j2
+2 -2
View File
@@ -5,6 +5,6 @@ resources:
- ./namespace.yaml - ./namespace.yaml
- ./descheduler/ks.yaml - ./descheduler/ks.yaml
- ./reloader/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 - ./system-upgrade-controller/ks.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/tools/system-upgrade-controller/app/helmrelease.yaml.j2
+2 -2
View File
@@ -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 apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease kind: HelmRelease
@@ -103,4 +103,4 @@ spec:
globalMounts: globalMounts:
- path: /etc/ca-certificates - path: /etc/ca-certificates
readOnly: true readOnly: true
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/tools/system-upgrade-controller/app/kustomization.yaml.j2
+2 -2
View File
@@ -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 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
@@ -7,4 +7,4 @@ resources:
- https://github.com/rancher/system-upgrade-controller/releases/download/v0.13.2/crd.yaml - https://github.com/rancher/system-upgrade-controller/releases/download/v0.13.2/crd.yaml
- helmrelease.yaml - helmrelease.yaml
- rbac.yaml - rbac.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/tools/system-upgrade-controller/app/rbac.yaml.j2
+2 -2
View File
@@ -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 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
@@ -12,4 +12,4 @@ subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: system-upgrade name: system-upgrade
namespace: tools namespace: tools
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/tools/system-upgrade-controller/ks.yaml.j2
+2 -2
View File
@@ -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 apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization kind: Kustomization
@@ -41,4 +41,4 @@ spec:
interval: 30m interval: 30m
retryInterval: 1m retryInterval: 1m
timeout: 5m timeout: 5m
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/tools/system-upgrade-controller/plans/agent.yaml.j2
+2 -2
View File
@@ -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 apiVersion: upgrade.cattle.io/v1
kind: Plan kind: Plan
@@ -17,4 +17,4 @@ spec:
args: ["prepare", "server"] args: ["prepare", "server"]
upgrade: upgrade:
image: rancher/k3s-upgrade image: rancher/k3s-upgrade
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/tools/system-upgrade-controller/plans/kustomization.yaml.j2
+2 -2
View File
@@ -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 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./server.yaml - ./server.yaml
- ./agent.yaml - ./agent.yaml
<% endif %> #% endif %#
bootstrap/templates/kubernetes/apps/tools/system-upgrade-controller/plans/server.yaml.j2
+2 -2
View File
@@ -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 apiVersion: upgrade.cattle.io/v1
kind: Plan kind: Plan
@@ -22,4 +22,4 @@ spec:
- {key: CriticalAddonsOnly, operator: Exists} - {key: CriticalAddonsOnly, operator: Exists}
upgrade: upgrade:
image: rancher/k3s-upgrade image: rancher/k3s-upgrade
<% endif %> #% endif %#
bootstrap/templates/kubernetes/flux/config/cluster.yaml.j2
+6 -6
View File
@@ -7,14 +7,14 @@ metadata:
spec: spec:
interval: 30m interval: 30m
ref: ref:
branch: << bootstrap_github_repository_branch | default('main', true) >> branch: "{% bootstrap_github_repository_branch | default('main', true) %}"
<% if bootstrap_private_github_repo | default(false) %> #% if bootstrap_private_github_repo | default(false) %#
secretRef: secretRef:
name: github-deploy-key name: github-deploy-key
url: "ssh://github.com/<< bootstrap_github_username >>/<< bootstrap_github_repository_name >>" url: "ssh://github.com/{% bootstrap_github_username %}/{% bootstrap_github_repository_name %}"
<% else %> #% else %#
url: "https://github.com/<< bootstrap_github_username >>/<< bootstrap_github_repository_name >>.git" url: "https://github.com/{% bootstrap_github_username %}/{% bootstrap_github_repository_name %}.git"
<% endif %> #% endif %#
ignore: | ignore: |
# exclude all # exclude all
/* /*
bootstrap/templates/kubernetes/flux/repositories/helm/backube.yaml.j2
+1 -1
View File
@@ -6,4 +6,4 @@ metadata:
namespace: flux-system namespace: flux-system
spec: spec:
interval: 1h interval: 1h
url: https://backube.github.io/helm-charts/ url: https://backube.github.io/helm-charts
bootstrap/templates/kubernetes/flux/repositories/helm/jetstack.yaml.j2
+1 -1
View File
@@ -6,4 +6,4 @@ metadata:
namespace: flux-system namespace: flux-system
spec: spec:
interval: 1h interval: 1h
url: https://charts.jetstack.io/ url: https://charts.jetstack.io
bootstrap/templates/kubernetes/flux/repositories/helm/k8s-gateway.yaml.j2
+1 -1
View File
@@ -6,4 +6,4 @@ metadata:
namespace: flux-system namespace: flux-system
spec: spec:
interval: 1h interval: 1h
url: https://ori-edge.github.io/k8s_gateway/ url: https://ori-edge.github.io/k8s_gateway
bootstrap/templates/kubernetes/flux/repositories/helm/kubernetes-dashboard.yaml.j2
+1 -1
View File
@@ -6,4 +6,4 @@ metadata:
namespace: flux-system namespace: flux-system
spec: spec:
interval: 1h interval: 1h
url: https://kubernetes.github.io/dashboard/ url: https://kubernetes.github.io/dashboard
bootstrap/templates/kubernetes/flux/repositories/helm/piraeus.yaml.j2
+1 -1
View File
@@ -6,4 +6,4 @@ metadata:
namespace: flux-system namespace: flux-system
spec: spec:
interval: 1h interval: 1h
url: https://piraeus.io/helm-charts/ url: https://piraeus.io/helm-charts
bootstrap/templates/kubernetes/flux/vars/cluster-secrets.sops.yaml.j2
+3 -3
View File
@@ -5,6 +5,6 @@ metadata:
name: cluster-secrets name: cluster-secrets
namespace: flux-system namespace: flux-system
stringData: stringData:
SECRET_DOMAIN: "<< bootstrap_cloudflare_domain >>" SECRET_DOMAIN: "{% bootstrap_cloudflare_domain %}"
SECRET_ACME_EMAIL: "<< bootstrap_acme_email >>" SECRET_ACME_EMAIL: "{% bootstrap_acme_email %}"
SECRET_CLOUDFLARE_TUNNEL_ID: "<< bootstrap_cloudflare_tunnel_id >>" SECRET_CLOUDFLARE_TUNNEL_ID: "{% bootstrap_cloudflare_tunnel_id %}"
bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2
+14 -14
View File
@@ -5,17 +5,17 @@ metadata:
name: cluster-settings name: cluster-settings
namespace: flux-system namespace: flux-system
data: data:
TIMEZONE: "<< bootstrap_timezone >>" TIMEZONE: "{% bootstrap_timezone %}"
COREDNS_ADDR: "<< bootstrap_service_cidr.split(',')[0] | nthhost(10) >>" COREDNS_ADDR: "{% bootstrap_service_cidr.split(',')[0] | nthhost(10) %}"
<% if bootstrap_nodes.master | length == 1 and not bootstrap_kube_api_addr %> #% if bootstrap_nodes.master | length == 1 and not bootstrap_kube_api_addr %#
KUBE_API_ADDR: "<< bootstrap_nodes.master[0].address >>" KUBE_API_ADDR: "{% bootstrap_nodes.master[0].address %}"
<% else %> #% else %#
KUBE_API_ADDR: "<< bootstrap_kube_api_addr >>" KUBE_API_ADDR: "{% bootstrap_kube_api_addr %}"
<% endif %> #% endif %#
CLUSTER_CIDR: "<< bootstrap_cluster_cidr.split(',')[0] >>" CLUSTER_CIDR: "{% bootstrap_cluster_cidr.split(',')[0] %}"
SERVICE_CIDR: "<< bootstrap_service_cidr.split(',')[0] >>" SERVICE_CIDR: "{% bootstrap_service_cidr.split(',')[0] %}"
NODE_CIDR: "<< bootstrap_node_cidr >>" NODE_CIDR: "{% bootstrap_node_cidr %}"
<% if bootstrap_ipv6_enabled | default(false) %> #% if bootstrap_ipv6_enabled | default(false) %#
CLUSTER_CIDR_V6: "<< bootstrap_cluster_cidr.split(',')[1] >>" CLUSTER_CIDR_V6: "{% bootstrap_cluster_cidr.split(',')[1] %}"
SERVICE_CIDR_V6: "<< bootstrap_service_cidr.split(',')[1] >>" SERVICE_CIDR_V6: "{% bootstrap_service_cidr.split(',')[1] %}"
<% endif %> #% endif %#
makejinja.toml
+8 -6
View File
@@ -6,10 +6,12 @@ import_paths = ["./bootstrap/scripts"]
loaders = ["loader:Loader"] loaders = ["loader:Loader"]
jinja_suffix = ".j2" jinja_suffix = ".j2"
# Block delimiters are changed to avoid conflicts with Renovate
# https://github.com/renovatebot/renovate/discussions/18470
[makejinja.delimiter] [makejinja.delimiter]
block_start = "<%" block_start = "#%"
block_end = "%>" block_end = "%#"
comment_start = "<#" comment_start = "{#"
comment_end = "#>" comment_end = "#}"
variable_start = "<<" variable_start = "{%"
variable_end = ">>" variable_end = "%}"