Skip to content

Commit

Permalink
Bump ubi8/go-toolset from 1.20.12-2 to 1.20.12-2.1711036149 (#323)
Browse files Browse the repository at this point in the history
* Bump ubi8/go-toolset from 1.20.12-2 to 1.20.12-2.1711036149

Bumps ubi8/go-toolset from 1.20.12-2 to 1.20.12-2.1711036149.

---
updated-dependencies:
- dependency-name: ubi8/go-toolset
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* pin setup-envtest version and update golangcilint

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: maskarb <mskarbek@redhat.com>
  • Loading branch information
dependabot[bot] and maskarb authored Mar 25, 2024
1 parent 42d123a commit 6e92814
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
3 changes: 1 addition & 2 deletions .golangci.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
run:
timeout: 5m
skip-dirs:
- vendor

linters-settings:
goimports:
Expand All @@ -15,6 +13,7 @@ linters:
## enabled by default
- errcheck
- gosimple
- gofmt
- govet
- ineffassign
- staticcheck
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=${BUILDPLATFORM:-linux/amd64} registry.access.redhat.com/ubi8/go-toolset:1.20.12-2 AS builder
FROM --platform=${BUILDPLATFORM:-linux/amd64} registry.access.redhat.com/ubi8/go-toolset:1.20.12-2.1711036149 AS builder
ARG TARGETOS
ARG TARGETARCH

Expand Down
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ verify-manifests: ## Verify manifests are up to date.
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.29.x
.PHONY: test
test: manifests generate fmt vet envtest ## Run tests.
test: envtest ## Run tests.
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test ./... -coverprofile cover.out

.PHONY: test-qemu
Expand Down Expand Up @@ -401,6 +401,7 @@ ENVTEST_NOT_LOCAL ?= $(shell go env GOPATH)/bin/$(shell go env GOOS)_$(shell go
## Tool Versions
KUSTOMIZE_VERSION ?= v5.3.0
CONTROLLER_TOOLS_VERSION ?= v0.14.0
SETUP_ENVTEST_VERSION ?= v0.0.0-20240318095156-c7e1dc9b5302
YQ_VERSION ?= v4.2.0

# Set the Operator SDK version to use. By default, what is installed on the system is used.
Expand Down Expand Up @@ -441,11 +442,11 @@ $(CONTROLLER_GEN): $(LOCALBIN)
.PHONY: envtest
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
$(ENVTEST): $(LOCALBIN)
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(SETUP_ENVTEST_VERSION)

.PHONY: envtest-not-local
envtest-not-local: ## Download envtest-setup for qemu unit tests - specific to github action.
test -s setup-envtest || go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
test -s setup-envtest || go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(SETUP_ENVTEST_VERSION)

.PHONY: operator-sdk
OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk
Expand Down

0 comments on commit 6e92814

Please sign in to comment.