Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into dependabot/go_modules/sigs.k8s.io/controller…
Browse files Browse the repository at this point in the history
…-runtime-0.18.2
ralikio authored May 13, 2024
2 parents db00d38 + ea89a44 commit ac41ac3
Showing 7 changed files with 13 additions and 12 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/run-go-linter.yaml
Original file line number Diff line number Diff line change
@@ -50,9 +50,6 @@ jobs:

- name: Go linter
if: steps.changed-files-specific.outputs.any_modified == 'true'
uses: golangci/golangci-lint-action@v3
with:
version: v1.55.2
skip-cache: true
only-new-issues: true
args: --timeout 2m0s
env:
GOLINT_TIMEOUT: ${{ vars.GOLINT_TIMEOUT }}
run: make go-lint
1 change: 1 addition & 0 deletions .github/workflows/sync-with-main.yaml
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.BOT_TOKEN }}
- name: Setup Git User
run: |
git config --global user.email ${{ vars.GIT_USER_EMAIL }}
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 golang:1.22.2 as builder
FROM golang:1.22.3 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -34,6 +34,9 @@ SHELL = /usr/bin/env bash -o pipefail
.SHELLFLAGS = -ec

GOLINT_VER = v1.55.2
ifeq (,$(GOLINT_TIMEOUT))
GOLINT_TIMEOUT=2m
endif

.PHONY: all
all: build
@@ -190,7 +193,7 @@ go-lint-install: ## linter config in file at root of project -> '.golangci.yaml'

.PHONY: go-lint
go-lint: go-lint-install ## linter config in file at root of project -> '.golangci.yaml'
golangci-lint run
golangci-lint run --timeout=$(GOLINT_TIMEOUT)

.PHONY: fix
fix: go-lint-install ## try to fix automatically issues
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ require (
github.com/go-logr/logr v1.4.1
github.com/onsi/ginkgo/v2 v2.17.2
github.com/onsi/gomega v1.33.0
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/client_golang v1.19.1
github.com/stretchr/testify v1.9.0
go.uber.org/zap v1.27.0
gopkg.in/yaml.v3 v3.0.1
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -72,8 +72,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU=
github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k=
github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE=
2 changes: 1 addition & 1 deletion scripts/testing/yaml/secret.tmpl.yaml
Original file line number Diff line number Diff line change
@@ -2,6 +2,6 @@ apiVersion: v1
kind: Secret
type: Opaque
metadata:
name: sss-002
name: ${SECRET_NAME}-000
namespace: kyma-system
stringData:

0 comments on commit ac41ac3

Please sign in to comment.