Skip to content

Commit 8b94d93

Browse files
committed
Merge branch 'cert-manager:master' into bug/renovate-config
Signed-off-by: hjoshi123 <[email protected]>
2 parents 4e0a61d + cabd784 commit 8b94d93

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/renovate.json5

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
automerge: false,
1414
useBaseBranchConfig: "merge",
1515
postUpgradeTasks: {
16-
commands: ["make generate"],
16+
// This is a temporary fix to disable errors on a non interactive shell. Longer term, fix this in the makefiles-module.
17+
commands: ["export PS1='> ' && make generate"],
1718
executionMode: "branch",
1819
},
1920
postUpdateOptions: ["gomodTidy", "gomodUpdateImportPaths"],
@@ -54,7 +55,7 @@
5455
matchDatasources: ["go"],
5556
enabled: true,
5657
groupSlug: "aws-sdk-go",
57-
matchPackagePrefixes: ["github.com/aws/aws-sdk-go-v2{/,}**"],
58+
matchPackagePrefixes: ["github.com/aws{/,}**"],
5859
},
5960
{
6061
description: "Group GitHub Actions",
@@ -138,6 +139,10 @@
138139
},
139140
prBodyColumns: ["Package", "Type", "Update", "Change", "References"],
140141
prBodyNotes: [
142+
"/kind cleanup",
143+
"```release-note \
144+
NONE \
145+
```",
141146
"**Note**: This PR was automatically created by Renovate Bot.",
142147
"",
143148
"Before merging:",

hack/k8s-codegen.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,14 @@ gen-applyconfigurations() {
157157
# This is a temporary hack to generate the schema YAMLs
158158
# required to generate fake clientsets that actually works.
159159
# Upstream issue: https://github.com/kubernetes/kubernetes/issues/126850
160-
GOPROXY=off go install \
161-
"${module_name}/internal/generated/openapi/cmd/models-schema"
160+
models_schema=( "${module_name}/internal/generated/openapi/cmd/models-schema" )
162161

163162
clean "${client_subpackage}"/applyconfigurations '*.go'
164163
echo "+++ Generating applyconfigurations..." >&2
165164
prefixed_inputs=( "${api_inputs[@]/#/$module_name/}" )
166165
"$applyconfigurationgen" \
167166
--go-header-file hack/boilerplate-go.txt \
168-
--openapi-schema <($(go env GOPATH)/bin/models-schema) \
167+
--openapi-schema <(go run "$models_schema") \
169168
--output-dir "${client_subpackage}"/applyconfigurations \
170169
--output-pkg "${client_package}"/applyconfigurations \
171170
"${prefixed_inputs[@]}"

0 commit comments

Comments
 (0)