Skip to content

Commit c5c6873

Browse files
dependabot[bot]jimmidyson
dependabot[bot]
and
jimmidyson
authored
build(deps): Bump sigs.k8s.io/controller-runtime from 0.15.0 to 0.15.1 (#97)
Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.15.0 to 0.15.1. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/kubernetes-sigs/controller-runtime/releases">sigs.k8s.io/controller-runtime's releases</a>.</em></p> <blockquote> <h2>v0.15.1</h2> <h2>What's Changed</h2> <ul> <li>[release-0.15] ✨Fix logs in unstructured client by <a href="https://github.com/k8s-infra-cherrypick-robot"><code>@​k8s-infra-cherrypick-robot</code></a> in <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/pull/2344">kubernetes-sigs/controller-runtime#2344</a></li> <li>[release-0.15] 🐛 fix unspecified KindsFor version by <a href="https://github.com/k8s-infra-cherrypick-robot"><code>@​k8s-infra-cherrypick-robot</code></a> in <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/pull/2347">kubernetes-sigs/controller-runtime#2347</a></li> <li>[release-0.15] 🐛 fakeClient.Status().Update(...) cannot recognize resource version conflicts by <a href="https://github.com/k8s-infra-cherrypick-robot"><code>@​k8s-infra-cherrypick-robot</code></a> in <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/pull/2372">kubernetes-sigs/controller-runtime#2372</a></li> <li>[release-0.15] 🐛 hasLabels and matchingLabels step on each other by <a href="https://github.com/k8s-infra-cherrypick-robot"><code>@​k8s-infra-cherrypick-robot</code></a> in <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/pull/2373">kubernetes-sigs/controller-runtime#2373</a></li> <li>[release-0.15] 🐛 Fix Defaulting of the User Agent by <a href="https://github.com/alvaroaleman"><code>@​alvaroaleman</code></a> in <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/pull/2436">kubernetes-sigs/controller-runtime#2436</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/kubernetes-sigs/controller-runtime/compare/v0.15.0...v0.15.1">https://github.com/kubernetes-sigs/controller-runtime/compare/v0.15.0...v0.15.1</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/40203bfeac472914f36ea35bf386326814f6f82e"><code>40203bf</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2436">#2436</a> from alvaroaleman/fix-ua-3</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/3de96247226760a0b7c4c6c36e688d1cb41609b8"><code>3de9624</code></a> :bug: Fix Defaulting of the User Agent</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/0e372174d255599738c91c830998a5869e9b81a3"><code>0e37217</code></a> [release-0.15] 🐛 hasLabels and matchingLabels step on each other (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2373">#2373</a>)</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/111c9381c98953ed3c41694300b6a7cccbb09dac"><code>111c938</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2372">#2372</a> from k8s-infra-cherrypick-robot/cherry-pick-2365-to-...</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/37c58aeadfd781cdab0bd8cbdd8f14b2538703c2"><code>37c58ae</code></a> 🐛 fakeClient.Status().Update(...) cannot recognize resource version conflicts</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/530dde03b6585d1056b525543be02467a91c279f"><code>530dde0</code></a> [release-0.15] 🐛 fix unspecified KindsFor version (<a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2347">#2347</a>)</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/1a82503d75c3d8ab2c38dbd23bc555cc1b7b9f82"><code>1a82503</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/controller-runtime/issues/2344">#2344</a> from k8s-infra-cherrypick-robot/cherry-pick-2343-to-...</li> <li><a href="https://github.com/kubernetes-sigs/controller-runtime/commit/c9cefc78b03af2db8a22389800412235ac06718c"><code>c9cefc7</code></a> Fix logs in unstructured client</li> <li>See full diff in <a href="https://github.com/kubernetes-sigs/controller-runtime/compare/v0.15.0...v0.15.1">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=sigs.k8s.io/controller-runtime&package-manager=go_modules&previous-version=0.15.0&new-version=0.15.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jimmi Dyson <[email protected]>
1 parent 50a866c commit c5c6873

File tree

6 files changed

+101
-45
lines changed

6 files changed

+101
-45
lines changed

‎.github/workflows/checks.yml

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -152,57 +152,74 @@ jobs:
152152
steps:
153153
- name: Checkout
154154
uses: actions/checkout@v3
155+
with:
156+
fetch-depth: 0
155157

156158
- name: Install devbox
157159
uses: jetpack-io/[email protected]
158160
with:
159161
enable-cache: true
160162

161-
- if: github.ref != 'refs/heads/main'
162-
name: Fetch main if necessary
163-
run: git fetch origin main:main
164-
165163
- name: Run chart-testing (list-changed)
166164
id: list-changed
167165
run: |
168-
changed=$(devbox run -- ct list-changed --target-branch ${{ github.event.repository.default_branch }})
166+
changed="$(devbox run -- \
167+
ct list-changed --config charts/ct-config.yaml \
168+
)"
169169
if [[ -n "$changed" ]]; then
170170
echo "changed=true" >> "$GITHUB_OUTPUT"
171171
fi
172172
173173
- if: steps.list-changed.outputs.changed == 'true'
174174
name: Run chart-testing (lint)
175-
run: devbox run -- ct lint --config charts/ct-config.yaml
175+
run: |
176+
devbox run -- \
177+
ct lint --config charts/ct-config.yaml
176178
177179
- if: steps.list-changed.outputs.changed == 'true'
178180
name: Create kind cluster
179181
run: |
180-
devbox run -- kind create cluster \
181-
--image=ghcr.io/mesosphere/kind-node:"$(kubectl version --output=json --client | gojq --raw-output .clientVersion.gitVersion)" \
182-
--name=chart-testing
182+
devbox run -- \
183+
kind create cluster \
184+
--image=ghcr.io/mesosphere/kind-node:"$(devbox run -- kubectl version --output=json --client | devbox run -- gojq --raw-output .clientVersion.gitVersion)" \
185+
--name=chart-testing
183186
env:
184187
KUBECONFIG: ct-kind-kubeconfig
185188

186189
- if: steps.list-changed.outputs.changed == 'true'
187190
name: Build Docker images
188-
run: devbox run -- make release-snapshot
191+
run: |
192+
devbox run -- \
193+
make release-snapshot
189194
190195
- if: steps.list-changed.outputs.changed == 'true'
191196
name: Sideload docker image
192-
run: devbox run -- kind load docker-image --name chart-testing "$(jq -r '.[] | select(.type == "Docker Image" and .goos == "linux" and .goarch == "amd64").name' dist/artifacts.json)"
197+
run: |
198+
devbox run -- \
199+
kind load docker-image \
200+
--name chart-testing \
201+
"$(devbox run -- gojq -r '.[] | select(.type == "Docker Image" and .goos == "linux" and .goarch == "amd64").name' dist/artifacts.json)"
193202
194203
- if: steps.list-changed.outputs.changed == 'true'
195204
name: Setup Cluster API and cert-manager
196-
run: devbox run -- make clusterctl.init
205+
run: |
206+
devbox run -- \
207+
make clusterctl.init
197208
env:
198209
KIND_KUBECONFIG: ct-kind-kubeconfig
199210

200211
- if: steps.list-changed.outputs.changed == 'true'
201212
name: Run chart-testing (install)
202-
run: devbox run -- ct install --config charts/ct-config.yaml --helm-extra-set-args "--set=image.tag=$(jq -r .version dist/metadata.json)"
213+
run: |
214+
devbox run -- \
215+
ct install \
216+
--config charts/ct-config.yaml \
217+
--helm-extra-set-args "--set=image.tag=$(devbox run -- jq -r .version dist/metadata.json)"
203218
env:
204219
KUBECONFIG: ct-kind-kubeconfig
205220

206221
- if: steps.list-changed.outputs.changed == 'true' && always()
207222
name:
208-
run: devbox run -- kind delete cluster --name chart-testing || true
223+
run: |
224+
devbox run -- \
225+
kind delete cluster --name chart-testing || true

‎devbox.json

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,36 @@
11
{
22
"packages": [
3+
"actionlint@latest",
4+
"[email protected]",
35
"clusterctl@latest",
6+
"crane@latest",
7+
"envsubst@latest",
8+
"findutils@latest",
49
"fluxcd@latest",
510
"ginkgo@latest",
11+
"git@latest",
612
"github-cli@latest",
7-
"gojq@latest",
13+
"gnumake@latest",
14+
"gnused@latest",
815
"go@latest",
16+
"gojq@latest",
917
"golangci-lint@latest",
18+
"golines@latest",
19+
"google-cloud-sdk@latest",
1020
"goreleaser@latest",
11-
"kubernetes-helm@latest",
21+
"gotestsum@latest",
22+
"hadolint@latest",
1223
"helm-docs@latest",
1324
"kind@latest",
1425
"kubebuilder@latest",
1526
"kubectl@latest",
27+
"kubernetes-controller-tools@latest",
28+
"kubernetes-helm@latest",
1629
"kustomize@latest",
1730
"pre-commit@latest",
1831
"shfmt@latest",
1932
"upx@latest",
20-
"yamllint@latest",
21-
"chart-testing@latest",
22-
"google-cloud-sdk@latest",
23-
"crane@latest",
24-
"gotestsum@latest",
25-
"golines@latest",
26-
"envsubst@latest",
27-
"kubernetes-controller-tools@latest",
28-
"actionlint@latest",
29-
"hadolint@latest"
30-
],
31-
"shell": {
32-
"init_hook": [
33-
"echo 'Welcome to devbox!' > /dev/null"
34-
],
35-
"scripts": {
36-
"test": [
37-
"echo \"Error: no test specified\" && exit 1"
38-
]
39-
}
40-
}
33+
"yamale@latest",
34+
"yamllint@latest"
35+
]
4136
}

‎devbox.lock

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"source": "devbox-search",
88
"version": "1.6.25"
99
},
10-
"chart-testing@latest": {
11-
"last_modified": "2023-07-23T03:35:12Z",
12-
"resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#chart-testing",
10+
"chart-testing@3.8.0": {
11+
"last_modified": "2023-06-30T04:44:22Z",
12+
"resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#chart-testing",
1313
"source": "devbox-search",
14-
"version": "3.9.0"
14+
"version": "3.8.0"
1515
},
1616
"clusterctl@latest": {
1717
"last_modified": "2023-07-23T03:35:12Z",
@@ -31,6 +31,12 @@
3131
"source": "devbox-search",
3232
"version": "1.4.2"
3333
},
34+
"findutils@latest": {
35+
"last_modified": "2023-07-23T03:35:12Z",
36+
"resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#findutils",
37+
"source": "devbox-search",
38+
"version": "4.9.0"
39+
},
3440
"fluxcd@latest": {
3541
"last_modified": "2023-07-23T03:35:12Z",
3642
"resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#fluxcd",
@@ -43,12 +49,30 @@
4349
"source": "devbox-search",
4450
"version": "2.11.0"
4551
},
52+
"git@latest": {
53+
"last_modified": "2023-07-23T03:35:12Z",
54+
"resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#git",
55+
"source": "devbox-search",
56+
"version": "2.41.0"
57+
},
4658
"github-cli@latest": {
4759
"last_modified": "2023-05-14T19:13:12Z",
4860
"resolved": "github:NixOS/nixpkgs/3007746b3f5bfcb49e102b517bca891822a41b31#github-cli",
4961
"source": "devbox-search",
5062
"version": "2.29.0"
5163
},
64+
"gnumake@latest": {
65+
"last_modified": "2023-07-23T03:35:12Z",
66+
"resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#gnumake",
67+
"source": "devbox-search",
68+
"version": "4.4.1"
69+
},
70+
"gnused@latest": {
71+
"last_modified": "2023-06-30T04:44:22Z",
72+
"resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#gnused",
73+
"source": "devbox-search",
74+
"version": "4.9"
75+
},
5276
"go@latest": {
5377
"last_modified": "2023-07-30T12:29:02Z",
5478
"resolved": "github:NixOS/nixpkgs/3acb5c4264c490e7714d503c7166a3fde0c51324#go",
@@ -157,6 +181,12 @@
157181
"source": "devbox-search",
158182
"version": "4.0.2"
159183
},
184+
"yamale@latest": {
185+
"last_modified": "2023-06-30T04:44:22Z",
186+
"resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#yamale",
187+
"source": "devbox-search",
188+
"version": "4.0.4"
189+
},
160190
"yamllint@latest": {
161191
"last_modified": "2023-06-30T04:44:22Z",
162192
"resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#yamllint",

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
k8s.io/component-base v0.27.4
1313
k8s.io/klog/v2 v2.100.1
1414
sigs.k8s.io/cluster-api v1.5.0
15-
sigs.k8s.io/controller-runtime v0.15.0
15+
sigs.k8s.io/controller-runtime v0.15.1
1616
)
1717

1818
require (

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPB
305305
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
306306
sigs.k8s.io/cluster-api v1.5.0 h1:pwXvzScbAwnrB7EWHTApzW+VQfrj2OSrWAQDC9+bcbU=
307307
sigs.k8s.io/cluster-api v1.5.0/go.mod h1:ZSEP01t8oT6104gB4ljsOwwp5uJcI8SWy8IFp2HUvrc=
308-
sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0UPojU=
309-
sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
308+
sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUTb/+4c=
309+
sigs.k8s.io/controller-runtime v0.15.1/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
310310
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
311311
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
312312
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

‎make/go.mk

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ endif
126126
.PHONY: lint.%
127127
lint.%: ## Runs golangci-lint for a specific module
128128
lint.%: ; $(info $(M) linting $* module)
129-
$(if $(filter-out root,$*),cd $* && )go fix ./...
130129
$(if $(filter-out root,$*),cd $* && )golines -w $$(go list ./... | sed "s|^$$(go list -m)|.|")
131130
$(if $(filter-out root,$*),cd $* && )golangci-lint run --fix --config=$(GOLANGCI_CONFIG_FILE)
132131
$(if $(filter-out root,$*),cd $* && )golines -w $$(go list ./... | sed "s|^$$(go list -m)|.|")
@@ -160,6 +159,20 @@ go-clean.%: ## Cleans go build, test and modules caches for a specific module
160159
go-clean.%: ; $(info $(M) running go clean for $* module)
161160
$(if $(filter-out root,$*),cd $* && )go clean -r -i -cache -testcache -modcache
162161

162+
.PHONY: go-fix
163+
go-fix: ## Runs go fix for all modules in repository
164+
ifneq ($(wildcard $(REPO_ROOT)/go.mod),)
165+
go-fix: go-fix.root
166+
endif
167+
ifneq ($(words $(GO_SUBMODULES_NO_TOOLS)),0)
168+
go-fix: $(addprefix go-fix.,$(GO_SUBMODULES_NO_TOOLS:/go.mod=))
169+
endif
170+
171+
.PHONY: go-fix.%
172+
go-fix.%: ## Runs golangci-lint for a specific module
173+
go-fix.%: ; $(info $(M) linting $* module)
174+
$(if $(filter-out root,$*),cd $* && )go fix ./...
175+
163176
.PHONY: go-generate
164177
go-generate: ## Runs go generate
165178
go-generate: ; $(info $(M) running go generate)
@@ -168,6 +181,7 @@ go-generate: ; $(info $(M) running go generate)
168181
output:crd:artifacts:config=charts/capi-runtime-extensions/crds \
169182
output:rbac:artifacts:config=charts/capi-runtime-extensions/templates
170183
controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
184+
$(MAKE) go-fix
171185

172186
.PHONY: go-mod-upgrade
173187
go-mod-upgrade: ## Interactive check for direct module dependency upgrades

0 commit comments

Comments
 (0)