From 7436eb43ce14eb19ac12f9f5fa012f706fdbe244 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Thu, 25 Jan 2024 18:39:54 -0500 Subject: [PATCH] chore: update renovate config and annotations Signed-off-by: Devin Buhl --- .github/renovate.json5 | 19 ++----------------- .taskfiles/Flux/Taskfile.yaml | 2 +- .../group_vars/kubernetes/main.yaml.j2 | 2 +- .../templates/custom-cilium-helmchart.yaml.j2 | 2 +- .../templates/kubernetes/k0s/k0sctl.yaml.j2 | 4 ++-- .../kubernetes/talos/talconfig.yaml.j2 | 19 ++++--------------- 6 files changed, 11 insertions(+), 37 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 542dcbdf..dc9455a2 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -73,16 +73,6 @@ }, "separateMinorPatch": true }, - { - "description": ["System Upgrade Controller Group"], - "groupName": "System Upgrade Controller", - "matchPackagePatterns": ["rancher/system-upgrade-controller"], - "matchDatasources": ["docker", "github-releases"], - "group": { - "commitMessageTopic": "{{{groupName}}} group" - }, - "separateMinorPatch": true - }, // custom versioning { "description": ["Use custom versioning for k0s/k3s"], @@ -229,19 +219,14 @@ "customManagers": [ { "customType": "regex", - "description": ["Process various other dependencies"], + "description": ["Process custom dependencies"], "fileMatch": [ "(^|/).taskfiles/.+\\.ya?ml$", "(^|/)ansible/.+\\.ya?ml(\\.j2)?$", "(^|/)kubernetes/.+\\.ya?ml(\\.j2)?$" ], "matchStrings": [ - // Example: - // k3s_release_version: "v1.27.3+k3s1" - "datasource=(?\\S+) depName=(?\\S+)( repository=(?\\S+))?( extractVersion=(?\\S+))?\n.*?\"(?.*)\"\n", - // Example: - // - https://github.com/rancher/system-upgrade-controller/releases/download/v0.11.0/crd.yaml - "datasource=(?\\S+) depName=(?\\S+)\n.*?-\\s(.*?)\/(?[^/]+)\/[^/]+\n" + "(?m:# renovate: datasource=(?\\S+) depName=(?\\S+)( repository=(?\\S+))?\\n.+?: \"?(?\\S+?)\"?$)" ], "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}" } diff --git a/.taskfiles/Flux/Taskfile.yaml b/.taskfiles/Flux/Taskfile.yaml index bf0c4f08..8c6888fa 100644 --- a/.taskfiles/Flux/Taskfile.yaml +++ b/.taskfiles/Flux/Taskfile.yaml @@ -4,7 +4,7 @@ version: "3" vars: # renovate: datasource=github-releases depName=prometheus-operator/prometheus-operator - PROMETHEUS_OPERATOR_VERSION: "v0.71.0" + PROMETHEUS_OPERATOR_VERSION: v0.71.0 CLUSTER_SECRET_SOPS_FILE: "{{.KUBERNETES_DIR}}/flux/vars/cluster-secrets.sops.yaml" CLUSTER_SECRET_USER_SOPS_FILE: "{{.KUBERNETES_DIR}}/flux/vars/cluster-secrets-user.sops.yaml" CLUSTER_SETTINGS_FILE: "{{.KUBERNETES_DIR}}/flux/vars/cluster-settings.yaml" diff --git a/bootstrap/templates/ansible/inventory/group_vars/kubernetes/main.yaml.j2 b/bootstrap/templates/ansible/inventory/group_vars/kubernetes/main.yaml.j2 index eacff76f..2eee1a7c 100644 --- a/bootstrap/templates/ansible/inventory/group_vars/kubernetes/main.yaml.j2 +++ b/bootstrap/templates/ansible/inventory/group_vars/kubernetes/main.yaml.j2 @@ -1,7 +1,7 @@ --- # https://github.com/PyratLabs/ansible-role-k3s # renovate: datasource=github-releases depName=k3s-io/k3s -k3s_release_version: "v1.29.0+k3s1" +k3s_release_version: v1.29.0+k3s1 k3s_install_hard_links: true k3s_become: true k3s_etcd_datastore: true diff --git a/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2 b/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2 index e7346b68..35de3f15 100644 --- a/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2 +++ b/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2 @@ -9,7 +9,7 @@ spec: repo: https://helm.cilium.io/ chart: cilium # renovate: datasource=helm depName=cilium repository=https://helm.cilium.io - version: "1.14.6" + version: 1.14.6 targetNamespace: kube-system bootstrap: true valuesContent: |- diff --git a/bootstrap/templates/kubernetes/k0s/k0sctl.yaml.j2 b/bootstrap/templates/kubernetes/k0s/k0sctl.yaml.j2 index 79bfd811..769cfe31 100644 --- a/bootstrap/templates/kubernetes/k0s/k0sctl.yaml.j2 +++ b/bootstrap/templates/kubernetes/k0s/k0sctl.yaml.j2 @@ -43,7 +43,7 @@ spec: #% endif %# k0s: # renovate: datasource=github-releases depName=k0sproject/k0s - version: "v1.28.6+k0s.0" + version: v1.28.6+k0s.0 dynamicConfig: false config: spec: @@ -91,7 +91,7 @@ spec: - name: cilium chartname: cilium/cilium # renovate: datasource=helm depName=cilium repository=https://helm.cilium.io - version: "1.14.6" + version: 1.14.6 namespace: kube-system values: |2 #% filter indent(width=18, first=True) %# diff --git a/bootstrap/templates/kubernetes/talos/talconfig.yaml.j2 b/bootstrap/templates/kubernetes/talos/talconfig.yaml.j2 index 2f79604c..c77a6fdc 100644 --- a/bootstrap/templates/kubernetes/talos/talconfig.yaml.j2 +++ b/bootstrap/templates/kubernetes/talos/talconfig.yaml.j2 @@ -1,9 +1,9 @@ # yaml-language-server: $schema=https://raw.githubusercontent.com/budimanjojo/talhelper/master/pkg/config/schemas/talconfig.json --- -# renovate: depName=ghcr.io/siderolabs/installer datasource=docker extractVersion=^(?.*)$ +# renovate: datasource=docker depName=ghcr.io/siderolabs/installer talosVersion: v1.6.1 -# renovate: datasource=github-releases depName=kubernetes/kubernetes extractVersion=^v(?.*)$ -kubernetesVersion: 1.29.1 +# renovate: datasource=docker depName=ghcr.io/siderolabs/kubelet +kubernetesVersion: v1.29.1 clusterName: &cluster home-kubernetes endpoint: https://#{ bootstrap_kube_api_addr }#:6443 @@ -13,7 +13,7 @@ clusterSvcNets: - "#{ bootstrap_service_cidr.split(',')[0] }#" additionalApiServerCertSans: &sans - "#{ bootstrap_kube_api_addr }#" - - 127.0.0.1 # KubePrism + - 127.0.0.1 #% for item in bootstrap_kube_additional_tls_sans %# - "#{ item }#" #% endfor %# @@ -156,17 +156,6 @@ controlPlane: - op: remove path: /cluster/apiServer/admissionControl - # Enable K8s Talos API Access - - |- - machine: - features: - kubernetesTalosAPIAccess: - enabled: true - allowedRoles: - - os:admin - allowedKubernetesNamespaces: - - kube-system - worker: patches: - *containerdPatch