Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
mallardduck committed Jan 22, 2025
1 parent 62bdf65 commit 9e72c6d
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 32 deletions.
20 changes: 7 additions & 13 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,14 @@
"renovate-test"
],
"prHourlyLimit": 2,
"customManagers": [
{
"customType": "regex",
"fileMatch": [
"hack/make/deps.mk"
],
"matchStrings": [
"KUBECTL\\d+_VERSION.*\\=\\s*(?<currentValue>.*?)\\n"
],
"depNameTemplate": "kubernetes/kubernetes",
"datasourceTemplate": "github-tags"
}
],
"packageRules": [
{
"groupName": "Kubectl Bumps",
"groupSlug": "kubectl-deps",
"matchDepNames": [
"kubernetes/kubernetes"
]
},
{
"matchBaseBranches": ["renovate-test"],
"matchDepNames": [
Expand Down
36 changes: 18 additions & 18 deletions hack/make/deps.mk
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
KUBECTL1_VERSION := v1.29.12
KUBECTL1_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL1_VERSION)/bin/linux/arm64/kubectl.sha256")
KUBECTL1_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL1_VERSION)/bin/linux/amd64/kubectl.sha256")
KUBECTL_VERSION1 := v1.29.12
KUBECTL1_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL_VERSION1)/bin/linux/arm64/kubectl.sha256")
KUBECTL1_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL_VERSION1)/bin/linux/amd64/kubectl.sha256")

KUBECTL2_VERSION := v1.30.8
KUBECTL2_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL2_VERSION)/bin/linux/arm64/kubectl.sha256")
KUBECTL2_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL2_VERSION)/bin/linux/amd64/kubectl.sha256")
KUBECTL_VERSION2 := v1.30.8
KUBECTL2_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL_VERSION2)/bin/linux/arm64/kubectl.sha256")
KUBECTL2_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL_VERSION2)/bin/linux/amd64/kubectl.sha256")

KUBECTL3_VERSION := v1.31.4
KUBECTL3_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL3_VERSION)/bin/linux/arm64/kubectl.sha256")
KUBECTL3_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL3_VERSION)/bin/linux/amd64/kubectl.sha256")
KUBECTL_VERSION3 := v1.31.4
KUBECTL3_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL_VERSION3)/bin/linux/arm64/kubectl.sha256")
KUBECTL3_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL_VERSION3)/bin/linux/amd64/kubectl.sha256")

KUBECTL4_VERSION := v1.32.0
KUBECTL4_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL4_VERSION)/bin/linux/arm64/kubectl.sha256")
KUBECTL4_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL4_VERSION)/bin/linux/amd64/kubectl.sha256")
KUBECTL_VERSION4 := v1.32.0
KUBECTL4_SUM_arm64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL_VERSION4)/bin/linux/arm64/kubectl.sha256")
KUBECTL4_SUM_amd64 ?= $(shell curl -L "https://dl.k8s.io/release/$(KUBECTL_VERSION4)/bin/linux/amd64/kubectl.sha256")

KUBECTL1 := "$(KUBECTL1_VERSION):$(KUBECTL1_SUM_arm64):$(KUBECTL1_SUM_amd64)"
KUBECTL2 := "$(KUBECTL2_VERSION):$(KUBECTL2_SUM_arm64):$(KUBECTL2_SUM_amd64)"
KUBECTL3 := "$(KUBECTL3_VERSION):$(KUBECTL3_SUM_arm64):$(KUBECTL3_SUM_amd64)"
KUBECTL4 := "$(KUBECTL4_VERSION):$(KUBECTL4_SUM_arm64):$(KUBECTL4_SUM_amd64)"
KUBECTL1 := "$(KUBECTL_VERSION1):$(KUBECTL1_SUM_arm64):$(KUBECTL1_SUM_amd64)"
KUBECTL2 := "$(KUBECTL_VERSION2):$(KUBECTL2_SUM_arm64):$(KUBECTL2_SUM_amd64)"
KUBECTL3 := "$(KUBECTL_VERSION3):$(KUBECTL3_SUM_arm64):$(KUBECTL3_SUM_amd64)"
KUBECTL4 := "$(KUBECTL_VERSION4):$(KUBECTL4_SUM_arm64):$(KUBECTL4_SUM_amd64)"

KUBECTLS_VERSION_INFO := "$(KUBECTL1) $(KUBECTL2) $(KUBECTL3) $(KUBECTL4)"
KUBECTL_INFO_LIST := "$(KUBECTL1) $(KUBECTL2) $(KUBECTL3) $(KUBECTL4)"

# Reduces the code duplication on Makefile by keeping all args into a single variable.
IMAGE_ARGS := --build-arg KUBECTLS_VERSION_INFO=$(KUBECTLS_VERSION_INFO)
IMAGE_ARGS := --build-arg KUBECTL_INFO_LIST=$(KUBECTL_INFO_LIST)
2 changes: 1 addition & 1 deletion package/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN sed -i 's/AllowDownload = true/AllowDownload = false/' /chroot/home/kuberlr/

WORKDIR /tmp

ARG KUBECTL_VERSION_INFO
ARG KUBECTL_INFO_LIST

SHELL ["/bin/bash", "-c"]
RUN set -fx; versions=($KUBECTL_VERSION_INFO); \
Expand Down

0 comments on commit 9e72c6d

Please sign in to comment.