Skip to content

Commit f4d1ca6

Browse files
authored
track kind node version and release go version (#5412)
Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
1 parent f4d0998 commit f4d1ca6

3 files changed

Lines changed: 14 additions & 5 deletions

File tree

kind.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ OS_LINUX = 1
99
endif
1010
endif
1111

12+
# renovate: datasource=docker depName=kindest/node packageName=kindest/node versioning=semver
13+
K8S_VERSION = v1.33.1
14+
1215
KIND_NETWORK_UNDERLAY = $(shell echo $${KIND_NETWORK_UNDERLAY:-kind})
1316
UNDERLAY_NETWORK_VAR_PREFIX = DOCKER_NETWORK_$(shell echo $(KIND_NETWORK_UNDERLAY) | tr '[:lower:]-' '[:upper:]_')
1417
UNDERLAY_NETWORK_IPV4_SUBNET = $(UNDERLAY_NETWORK_VAR_PREFIX)_IPV4_SUBNET
@@ -103,7 +106,7 @@ kind-iptables-accepct-underlay:
103106

104107
.PHONY: kind-generate-config
105108
kind-generate-config:
106-
jinjanate yamls/kind.yaml.j2 -o yamls/kind.yaml
109+
k8s_version=$(K8S_VERSION) jinjanate yamls/kind.yaml.j2 -o yamls/kind.yaml
107110

108111
.PHONY: kind-disable-hairpin
109112
kind-disable-hairpin:

renovate.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"customManagers:githubActionsVersions",
77
"customManagers:makefileVersions"
88
],
9-
"baseBranches": ["master", "release-1.13"],
9+
"baseBranches": ["master", "release-1.13", "release-1.14"],
1010
"postUpdateOptions": ["gomodTidy"],
1111
"labels": ["dependencies"],
1212
"packageRules": [
@@ -46,6 +46,15 @@
4646
"matchBaseBranches": ["release-*"],
4747
"extends":["security:only-security-updates"],
4848
"automerge": true
49+
},
50+
{
51+
"matchBaseBranches": ["release-*"],
52+
"matchPackageNames": [
53+
"golang.org/x/**",
54+
"go"
55+
],
56+
"enabled": true,
57+
"automerge": true
4958
}
5059
]
5160
}

yamls/kind.yaml.j2

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
{%- if k8s_version is not defined -%}
2-
{%- set k8s_version = "v1.32.5" -%}
3-
{%- endif -%}
41
{%- if kube_proxy_mode is not defined -%}
52
{%- set kube_proxy_mode = "ipvs" -%}
63
{%- endif -%}

0 commit comments

Comments
 (0)