prskr/infrastructure
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore(k8s): upgrade to v1.26.3

Browse source
This commit is contained in:
Peter 2023-04-18 11:29:21 +02:00
parent 33a9bbdecc
commit 273a4ae240
Signed by: prskr
GPG key ID: C1DB5D2E8DB512F9
6 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -7,4 +7,5 @@
.vscode/ .vscode/
.ssh/ .ssh/
.monokle .monokle
.ansible-log

2
infrastructure/versions.tf
View file

@ -4,7 +4,7 @@ terraform {
required_providers { required_providers {
hcloud = { hcloud = {
source = "hetznercloud/hcloud" source = "hetznercloud/hcloud"
version = "1.36.2" version = "1.38.2"
} }
ct = { ct = {
source = "poseidon/ct" source = "poseidon/ct"

8
infrastructure/vms.auto.tfvars
View file

@ -1,16 +1,16 @@
k3os_workers = { k3os_workers = {
"worker1-gen2" = { "worker1-gen3" = {
backups = false backups = false
node_type = "worker" node_type = "worker"
server_type = "cx31" server_type = "cx31"
private_ip = "172.23.2.22" private_ip = "172.23.2.24"
} }
"worker2-gen2" = { "worker2-gen3" = {
backups = false backups = false
node_type = "worker" node_type = "worker"
server_type = "cx31" server_type = "cx31"
private_ip = "172.23.2.23" private_ip = "172.23.2.25"
} }
} }

2
k8s/inventory/clusters.yaml
View file

@ -14,4 +14,4 @@ all:
ansible_host: "95.216.168.169" ansible_host: "95.216.168.169"
k8s_ip: "172.23.2.10" k8s_ip: "172.23.2.10"
vars: vars:
k3s_version: v1.25.4+k3s1 k3s_version: v1.26.3+k3s1

2
k8s/roles/gitea/tasks/main.yml
View file

@ -29,6 +29,6 @@
chart_ref: oci://codeberg.org/forgejo-contrib/forgejo chart_ref: oci://codeberg.org/forgejo-contrib/forgejo
release_namespace: forgejo release_namespace: forgejo
release_state: present release_state: present
chart_version: 0.5.0 chart_version: 0.7.0
update_repo_cache: true update_repo_cache: true
release_values: "{{ lookup('template', 'values.forgejo.yml.j2') | from_yaml }}" release_values: "{{ lookup('template', 'values.forgejo.yml.j2') | from_yaml }}"

15
k8s/roles/prometheus/tasks/main.yaml
View file

@ -28,10 +28,23 @@
user: "{{ grafana.admin.user | b64encode }}" user: "{{ grafana.admin.user | b64encode }}"
password: "{{ grafana.admin.password | b64encode }}" password: "{{ grafana.admin.password | b64encode }}"
- name: Update Prometheus operator CRDs
kubernetes.core.k8s:
state: present
definition: "{{ lookup('ansible.builtin.url', item, split_lines=False) | from_yaml }}"
loop:
- https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.63.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
- https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.63.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
- https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.63.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
- https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.63.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
- https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.63.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
- https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.63.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
- https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.63.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
- name: Deploy Prometheus chart - name: Deploy Prometheus chart
kubernetes.core.helm: kubernetes.core.helm:
name: prometheus name: prometheus
chart_ref: prometheus-community/kube-prometheus-stack chart_ref: prometheus-community/kube-prometheus-stack
release_namespace: observability-system release_namespace: observability-system
chart_version: 43.2.1 chart_version: 45.10.1
release_values: "{{ lookup('ansible.builtin.template', 'values.yaml.j2') | from_yaml }}" release_values: "{{ lookup('ansible.builtin.template', 'values.yaml.j2') | from_yaml }}"