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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jimmi Dyson <jimmidyson@gmail.com>
nutanix-cloud-native · Aug 7, 2023 · c5c6873 · c5c6873
1 parent 50a866c
commit c5c6873
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 45 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -152,57 +152,74 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
       - name: Install devbox
         uses: jetpack-io/devbox-install-action@v0.5.0
         with:
           enable-cache: true
 
-      - if: github.ref != 'refs/heads/main'
-        name: Fetch main if necessary
-        run: git fetch origin main:main
-
       - name: Run chart-testing (list-changed)
         id: list-changed
         run: |
-          changed=$(devbox run -- ct list-changed --target-branch ${{ github.event.repository.default_branch }})
+          changed="$(devbox run -- \
+            ct list-changed --config charts/ct-config.yaml \
+          )"
           if [[ -n "$changed" ]]; then
             echo "changed=true" >> "$GITHUB_OUTPUT"
           fi
 
       - if: steps.list-changed.outputs.changed == 'true'
         name: Run chart-testing (lint)
-        run: devbox run -- ct lint --config charts/ct-config.yaml
+        run: |
+          devbox run -- \
+            ct lint --config charts/ct-config.yaml
 
       - if: steps.list-changed.outputs.changed == 'true'
         name: Create kind cluster
         run: |
-          devbox run -- kind create cluster \
-            --image=ghcr.io/mesosphere/kind-node:"$(kubectl version --output=json --client | gojq --raw-output .clientVersion.gitVersion)" \
-            --name=chart-testing
+          devbox run -- \
+            kind create cluster \
+              --image=ghcr.io/mesosphere/kind-node:"$(devbox run -- kubectl version --output=json --client | devbox run -- gojq --raw-output .clientVersion.gitVersion)" \
+              --name=chart-testing
         env:
           KUBECONFIG: ct-kind-kubeconfig
 
       - if: steps.list-changed.outputs.changed == 'true'
         name: Build Docker images
-        run: devbox run -- make release-snapshot
+        run: |
+          devbox run -- \
+            make release-snapshot
 
       - if: steps.list-changed.outputs.changed == 'true'
         name: Sideload docker image
-        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)"
+        run: |
+          devbox run -- \
+            kind load docker-image \
+              --name chart-testing \
+              "$(devbox run -- gojq -r '.[] | select(.type == "Docker Image" and .goos == "linux" and .goarch == "amd64").name' dist/artifacts.json)"
 
       - if: steps.list-changed.outputs.changed == 'true'
         name: Setup Cluster API and cert-manager
-        run: devbox run -- make clusterctl.init
+        run: |
+          devbox run -- \
+            make clusterctl.init
         env:
           KIND_KUBECONFIG: ct-kind-kubeconfig
 
       - if: steps.list-changed.outputs.changed == 'true'
         name: Run chart-testing (install)
-        run: devbox run -- ct install --config charts/ct-config.yaml --helm-extra-set-args "--set=image.tag=$(jq -r .version dist/metadata.json)"
+        run: |
+          devbox run -- \
+            ct install \
+              --config charts/ct-config.yaml \
+              --helm-extra-set-args "--set=image.tag=$(devbox run -- jq -r .version dist/metadata.json)"
         env:
           KUBECONFIG: ct-kind-kubeconfig
 
       - if: steps.list-changed.outputs.changed == 'true' && always()
         name:
-        run: devbox run -- kind delete cluster --name chart-testing || true
+        run: |
+          devbox run -- \
+            kind delete cluster --name chart-testing || true
diff --git a/devbox.json b/devbox.json
@@ -1,41 +1,36 @@
 {
   "packages": [
+    "actionlint@latest",
+    "chart-testing@3.8.0",
     "clusterctl@latest",
+    "crane@latest",
+    "envsubst@latest",
+    "findutils@latest",
     "fluxcd@latest",
     "ginkgo@latest",
+    "git@latest",
     "github-cli@latest",
-    "gojq@latest",
+    "gnumake@latest",
+    "gnused@latest",
     "go@latest",
+    "gojq@latest",
     "golangci-lint@latest",
+    "golines@latest",
+    "google-cloud-sdk@latest",
     "goreleaser@latest",
-    "kubernetes-helm@latest",
+    "gotestsum@latest",
+    "hadolint@latest",
     "helm-docs@latest",
     "kind@latest",
     "kubebuilder@latest",
     "kubectl@latest",
+    "kubernetes-controller-tools@latest",
+    "kubernetes-helm@latest",
     "kustomize@latest",
     "pre-commit@latest",
     "shfmt@latest",
     "upx@latest",
-    "yamllint@latest",
-    "chart-testing@latest",
-    "google-cloud-sdk@latest",
-    "crane@latest",
-    "gotestsum@latest",
-    "golines@latest",
-    "envsubst@latest",
-    "kubernetes-controller-tools@latest",
-    "actionlint@latest",
-    "hadolint@latest"
-  ],
-  "shell": {
-    "init_hook": [
-      "echo 'Welcome to devbox!' > /dev/null"
-    ],
-    "scripts": {
-      "test": [
-        "echo \"Error: no test specified\" && exit 1"
-      ]
-    }
-  }
+    "yamale@latest",
+    "yamllint@latest"
+  ]
 }
diff --git a/devbox.lock b/devbox.lock
@@ -7,11 +7,11 @@
       "source": "devbox-search",
       "version": "1.6.25"
     },
-    "chart-testing@latest": {
-      "last_modified": "2023-07-23T03:35:12Z",
-      "resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#chart-testing",
+    "chart-testing@3.8.0": {
+      "last_modified": "2023-06-30T04:44:22Z",
+      "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#chart-testing",
       "source": "devbox-search",
-      "version": "3.9.0"
+      "version": "3.8.0"
     },
     "clusterctl@latest": {
       "last_modified": "2023-07-23T03:35:12Z",
@@ -31,6 +31,12 @@
       "source": "devbox-search",
       "version": "1.4.2"
     },
+    "findutils@latest": {
+      "last_modified": "2023-07-23T03:35:12Z",
+      "resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#findutils",
+      "source": "devbox-search",
+      "version": "4.9.0"
+    },
     "fluxcd@latest": {
       "last_modified": "2023-07-23T03:35:12Z",
       "resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#fluxcd",
@@ -43,12 +49,30 @@
       "source": "devbox-search",
       "version": "2.11.0"
     },
+    "git@latest": {
+      "last_modified": "2023-07-23T03:35:12Z",
+      "resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#git",
+      "source": "devbox-search",
+      "version": "2.41.0"
+    },
     "github-cli@latest": {
       "last_modified": "2023-05-14T19:13:12Z",
       "resolved": "github:NixOS/nixpkgs/3007746b3f5bfcb49e102b517bca891822a41b31#github-cli",
       "source": "devbox-search",
       "version": "2.29.0"
     },
+    "gnumake@latest": {
+      "last_modified": "2023-07-23T03:35:12Z",
+      "resolved": "github:NixOS/nixpkgs/af8cd5ded7735ca1df1a1174864daab75feeb64a#gnumake",
+      "source": "devbox-search",
+      "version": "4.4.1"
+    },
+    "gnused@latest": {
+      "last_modified": "2023-06-30T04:44:22Z",
+      "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#gnused",
+      "source": "devbox-search",
+      "version": "4.9"
+    },
     "go@latest": {
       "last_modified": "2023-07-30T12:29:02Z",
       "resolved": "github:NixOS/nixpkgs/3acb5c4264c490e7714d503c7166a3fde0c51324#go",
@@ -157,6 +181,12 @@
       "source": "devbox-search",
       "version": "4.0.2"
     },
+    "yamale@latest": {
+      "last_modified": "2023-06-30T04:44:22Z",
+      "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#yamale",
+      "source": "devbox-search",
+      "version": "4.0.4"
+    },
     "yamllint@latest": {
       "last_modified": "2023-06-30T04:44:22Z",
       "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#yamllint",

diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	k8s.io/component-base v0.27.4
 	k8s.io/klog/v2 v2.100.1
 	sigs.k8s.io/cluster-api v1.5.0
-	sigs.k8s.io/controller-runtime v0.15.0
+	sigs.k8s.io/controller-runtime v0.15.1
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -305,8 +305,8 @@ k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPB
 k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/cluster-api v1.5.0 h1:pwXvzScbAwnrB7EWHTApzW+VQfrj2OSrWAQDC9+bcbU=
 sigs.k8s.io/cluster-api v1.5.0/go.mod h1:ZSEP01t8oT6104gB4ljsOwwp5uJcI8SWy8IFp2HUvrc=
-sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0UPojU=
-sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
+sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUTb/+4c=
+sigs.k8s.io/controller-runtime v0.15.1/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

diff --git a/make/go.mk b/make/go.mk
@@ -126,7 +126,6 @@ endif
 .PHONY: lint.%
 lint.%: ## Runs golangci-lint for a specific module
 lint.%: ; $(info $(M) linting $* module)
-	$(if $(filter-out root,$*),cd $* && )go fix ./...
 	$(if $(filter-out root,$*),cd $* && )golines -w $$(go list ./... | sed "s|^$$(go list -m)|.|")
 	$(if $(filter-out root,$*),cd $* && )golangci-lint run --fix --config=$(GOLANGCI_CONFIG_FILE)
 	$(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
 go-clean.%: ; $(info $(M) running go clean for $* module)
 	$(if $(filter-out root,$*),cd $* && )go clean -r -i -cache -testcache -modcache
 
+.PHONY: go-fix
+go-fix: ## Runs go fix for all modules in repository
+ifneq ($(wildcard $(REPO_ROOT)/go.mod),)
+go-fix: go-fix.root
+endif
+ifneq ($(words $(GO_SUBMODULES_NO_TOOLS)),0)
+go-fix: $(addprefix go-fix.,$(GO_SUBMODULES_NO_TOOLS:/go.mod=))
+endif
+
+.PHONY: go-fix.%
+go-fix.%: ## Runs golangci-lint for a specific module
+go-fix.%: ; $(info $(M) linting $* module)
+	$(if $(filter-out root,$*),cd $* && )go fix ./...
+
 .PHONY: go-generate
 go-generate: ## Runs go generate
 go-generate: ; $(info $(M) running go generate)
@@ -168,6 +181,7 @@ go-generate: ; $(info $(M) running go generate)
 		output:crd:artifacts:config=charts/capi-runtime-extensions/crds \
 		output:rbac:artifacts:config=charts/capi-runtime-extensions/templates
 	controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
+	$(MAKE) go-fix
 
 .PHONY: go-mod-upgrade
 go-mod-upgrade: ## Interactive check for direct module dependency upgrades