From 04baf6dfcc07fb8f3b6f23a65b4ef0e656e611a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 10:02:08 +0000 Subject: [PATCH 1/3] Update dependency golangci/golangci-lint to v1.64.2 | datasource | package | from | to | | ----------- | ---------------------- | ------- | ------- | | github-tags | golangci/golangci-lint | v1.63.4 | v1.64.2 | Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/lint.yml | 2 +- .pre-commit-config.yaml | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e6d69c7d1f..1a11c62dac 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -40,7 +40,7 @@ jobs: uses: golangci/golangci-lint-action@051d91933864810ecd5e2ea2cfd98f6a5bca5347 # v6.3.2 with: working-directory: ${{ matrix.directory }} - version: v1.63.4 # renovate: datasource=github-tags depName=golangci/golangci-lint + version: v1.64.2 # renovate: datasource=github-tags depName=golangci/golangci-lint njs-lint: name: NJS Lint diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2a0e726d35..7d86ceb9ad 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,7 +39,7 @@ repos: - javascript - repo: https://github.com/golangci/golangci-lint - rev: v1.63.4 + rev: v1.64.2 hooks: - id: golangci-lint-full name: golangci-lint-root diff --git a/Makefile b/Makefile index bf3d52d10f..375e48950f 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ GO_LINKER_FLAGS = $(GO_LINKER_FLAGS_OPTIMIZATIONS) $(GO_LINKER_FlAGS_VARS) # tools versions # renovate: datasource=github-tags depName=golangci/golangci-lint -GOLANGCI_LINT_VERSION = v1.63.4 +GOLANGCI_LINT_VERSION = v1.64.2 # renovate: datasource=docker depName=kindest/node KIND_K8S_VERSION = v1.32.0 # renovate: datasource=github-tags depName=norwoodj/helm-docs From d592eb535ce2d32e8f450b628d67a581fb7e21ab Mon Sep 17 00:00:00 2001 From: Benjamin Jee Date: Wed, 12 Feb 2025 11:10:44 -0800 Subject: [PATCH 2/3] Update conditional check --- internal/mode/static/state/graph/policies.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/internal/mode/static/state/graph/policies.go b/internal/mode/static/state/graph/policies.go index 38e9aec846..0ba57fff68 100644 --- a/internal/mode/static/state/graph/policies.go +++ b/internal/mode/static/state/graph/policies.go @@ -221,9 +221,7 @@ func processPolicies( continue } case hrGroupKind, grpcGroupKind: - if route, exists := routes[routeKeyForKind(ref.Kind, refNsName)]; !exists { - continue - } else { + if route, exists := routes[routeKeyForKind(ref.Kind, refNsName)]; exists { targetedRoutes[client.ObjectKeyFromObject(route.Source)] = route } case serviceGroupKind: From 8c70a9f93d3a37710d58219b9321c980c0bca6e9 Mon Sep 17 00:00:00 2001 From: Benjamin Jee Date: Wed, 12 Feb 2025 11:21:25 -0800 Subject: [PATCH 3/3] Fix conditional --- internal/mode/static/state/graph/policies.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/mode/static/state/graph/policies.go b/internal/mode/static/state/graph/policies.go index 0ba57fff68..04fb6a0767 100644 --- a/internal/mode/static/state/graph/policies.go +++ b/internal/mode/static/state/graph/policies.go @@ -223,6 +223,8 @@ func processPolicies( case hrGroupKind, grpcGroupKind: if route, exists := routes[routeKeyForKind(ref.Kind, refNsName)]; exists { targetedRoutes[client.ObjectKeyFromObject(route.Source)] = route + } else { + continue } case serviceGroupKind: if _, exists := services[refNsName]; !exists {