Skip to content

Commit 61bd1b0

Browse files
authored
Merge pull request #13 from upbound/feature/p-t-function
feat(function): switch to function, add renovate, bump providers
2 parents 7102b62 + c195187 commit 61bd1b0

File tree

4 files changed

+651
-545
lines changed

4 files changed

+651
-545
lines changed

.github/renovate.json5

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:recommended",
5+
"helpers:pinGitHubActionDigests",
6+
":semanticCommits"
7+
],
8+
"rebaseWhen": "conflicted",
9+
"prConcurrentLimit": 5,
10+
"baseBranches": ["main"],
11+
"labels": ["automated"],
12+
"customManagers": [
13+
{
14+
"customType": "regex",
15+
"description": "Bump up version in the Makefile",
16+
"fileMatch": ["^Makefile$"],
17+
"matchStrings": [
18+
"UP_VERSION = (?<currentValue>.*?)\\n"
19+
],
20+
"datasourceTemplate": "github-releases",
21+
"depNameTemplate": "upbound/up",
22+
}, {
23+
"customType": "regex",
24+
"description": "Bump uptest version in the Makefile",
25+
"fileMatch": ["^Makefile$"],
26+
"matchStrings": [
27+
"UPTEST_VERSION = (?<currentValue>.*?)\\n"
28+
],
29+
"datasourceTemplate": "github-releases",
30+
"depNameTemplate": "upbound/uptest",
31+
}, {
32+
"customType": "regex",
33+
"description": "Bump providers/functions/configurations in crossplane.yaml",
34+
"fileMatch": ["crossplane.yaml"],
35+
"matchStrings": [
36+
"#\\s*renovate:\\s*datasource=(?<datasource>[^\\s]+)\\s+depName=(?<depName>[^\\s]+)\\s*\\n\\s*version:\\s*\"(?<currentValue>[^\"]+)\""
37+
],
38+
"datasourceTemplate": "{{{datasource}}}",
39+
"depNameTemplate": "{{{depName}}}",
40+
}
41+
],
42+
}

Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@ PLATFORMS ?= linux_amd64
1111
# ====================================================================================
1212
# Setup Kubernetes tools
1313

14-
# set UXP_VERSION because of https://github.com/crossplane/crossplane/issues/5055
15-
UXP_VERSION = 1.13.2-up.2
16-
UP_VERSION = v0.19.1
14+
UP_VERSION = v0.21.0
1715
UP_CHANNEL = stable
18-
UPTEST_VERSION = v0.6.1
16+
UPTEST_VERSION = v0.9.0
1917

2018
-include build/makelib/k8s_tools.mk
2119
# ====================================================================================
@@ -67,7 +65,7 @@ build.init: $(UP)
6765
# - UPTEST_DATASOURCE_PATH (optional), see https://github.com/upbound/uptest#injecting-dynamic-values-and-datasource
6866
uptest: $(UPTEST) $(KUBECTL) $(KUTTL)
6967
@$(INFO) running automated tests
70-
@KUBECTL=$(KUBECTL) KUTTL=$(KUTTL) $(UPTEST) e2e examples/network-xr.yaml,examples/eks-xr.yaml --data-source="${UPTEST_DATASOURCE_PATH}" --setup-script=test/setup.sh --default-timeout=2400 || $(FAIL)
68+
@KUBECTL=$(KUBECTL) KUTTL=$(KUTTL) CROSSPLANE_NAMESPACE=$(CROSSPLANE_NAMESPACE) $(UPTEST) e2e examples/network-xr.yaml,examples/eks-xr.yaml --data-source="${UPTEST_DATASOURCE_PATH}" --setup-script=test/setup.sh --default-timeout=2400 || $(FAIL)
7169
@$(OK) running automated tests
7270

7371
# This target requires the following environment variables to be set:

0 commit comments

Comments
 (0)