Merge branch 'main' into renovate/community.general-7.x

This commit is contained in:
Joseph Hanson 2023-09-23 13:55:09 +00:00
commit 21d1109003
2 changed files with 5 additions and 5 deletions

View file

@ -8,13 +8,13 @@ k3s_registration_address: 10.2.0.6
# /var/lib/rancher/k3s/server/manifests # /var/lib/rancher/k3s/server/manifests
k3s_server_manifests_urls: k3s_server_manifests_urls:
# Essential Prometheus Operator CRDs (the rest are installed with the kube-prometheus-stack helm release) # Essential Prometheus Operator CRDs (the rest are installed with the kube-prometheus-stack helm release)
- url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
filename: custom-prometheus-podmonitors.yaml filename: custom-prometheus-podmonitors.yaml
- url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
filename: custom-prometheus-prometheusrules.yaml filename: custom-prometheus-prometheusrules.yaml
- url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.1/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
filename: custom-prometheus-scrapeconfigs.yaml filename: custom-prometheus-scrapeconfigs.yaml
- url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.67.1/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
filename: custom-prometheus-servicemonitors.yaml filename: custom-prometheus-servicemonitors.yaml
# /var/lib/rancher/k3s/server/manifests # /var/lib/rancher/k3s/server/manifests
k3s_server_manifests_templates: k3s_server_manifests_templates:

View file

@ -1,5 +1,5 @@
ansible==8.4.0 ansible==8.4.0
ansible-lint==6.18.0 ansible-lint==6.20.0
bcrypt==4.0.1 bcrypt==4.0.1
jmespath==1.0.1 jmespath==1.0.1
netaddr==0.8.0 netaddr==0.8.0