Skip to content

Commit 9938a8c

Browse files
authored
Merge branch 'main' into user-connections
2 parents 4ac92f6 + 018d746 commit 9938a8c

9 files changed

+102
-172
lines changed

.github/workflows/codeql-analysis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
# Initializes the CodeQL tools for scanning.
4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
48+
uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0
4949
with:
5050
languages: ${{ matrix.language }}
5151
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
5656
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below)
5858
- name: Autobuild
59-
uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
59+
uses: github/codeql-action/autobuild@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0
6060

6161
# ℹ️ Command-line programs to run using the OS shell.
6262
# 📚 https://git.io/JvXDl
@@ -70,4 +70,4 @@ jobs:
7070
# make release
7171

7272
- name: Perform CodeQL Analysis
73-
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
73+
uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0

.github/workflows/go-build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1717

1818
- name: Set up Go
19-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a
19+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
2020
with:
2121
go-version-file: ./go.mod
2222

@@ -31,7 +31,7 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3333
- name: Build Docker image
34-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
34+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
3535
id: build_docker
3636
with:
3737
context: .

.github/workflows/golangci-lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
15-
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a
15+
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
1616
with:
1717
go-version-file: ./go.mod
18-
- uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8
18+
- uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837
1919
with:
2020
version: latest

.github/workflows/make-release.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ jobs:
2626
password: ${{ secrets.GITHUB_TOKEN }}
2727

2828
- name: Build and push Docker image
29-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
29+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
3030
with:
3131
context: .
3232
push: true
3333
tags: ghcr.io/np-guard/net-top-analyzer:${{ github.ref_name }}
3434

3535
- name: Set up Go
36-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a
36+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
3737
with:
3838
go-version: 'stable'
3939

.github/workflows/test-output-validity.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2222

2323
- name: Set up Go
24-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a
24+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
2525
with:
2626
go-version-file: ./go.mod
2727

.golangci.yml

+2-16
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ linters-settings:
44
funlen:
55
lines: 100
66
statements: 50
7-
gci:
8-
prefix: github.com/np-guard
97
goconst:
108
min-len: 2
119
min-occurrences: 2
@@ -20,22 +18,10 @@ linters-settings:
2018
min-complexity: 15
2119
goimports:
2220
local-prefixes: github.com/np-guard
23-
mnd:
24-
# don't include the "operation" and "assign"
25-
checks: argument,case,condition,return
26-
ignored-numbers: 0,1,2,3
27-
ignored-functions: strings.SplitN
28-
govet:
29-
shadow: true
3021
lll:
3122
line-length: 140
3223
misspell:
3324
locale: US
34-
nolintlint:
35-
allow-leading-space: true # don't require machine-readable nolint directives (i.e. with no leading space)
36-
allow-unused: false # report any unused nolint directives
37-
require-explanation: false # don't require an explanation for nolint directives
38-
require-specific: false # don't require nolint directives to be specific about which linter is being skipped
3925
revive:
4026
# see https://github.com/mgechev/revive#available-rules for details.
4127
ignore-generated-header: true
@@ -67,12 +53,12 @@ linters:
6753
- bidichk
6854
- bodyclose
6955
- contextcheck
56+
- copyloopvar
7057
- dogsled
7158
- dupl
7259
- durationcheck
7360
- errcheck
7461
- errorlint
75-
- exportloopref
7662
- funlen
7763
- ginkgolinter
7864
- gochecknoinits
@@ -109,13 +95,13 @@ linters:
10995
- staticcheck
11096
- stylecheck
11197
- tagliatelle
112-
- tenv
11398
- testableexamples
11499
- typecheck
115100
- unconvert
116101
- unparam
117102
- unused
118103
- usestdlibvars
104+
- usetesting
119105
- whitespace
120106

121107
issues:

Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# FROM golang:1.22-alpine
2-
FROM golang@sha256:48eab5e3505d8c8b42a06fe5f1cf4c346c167cc6a89e772f31cb9e5c301dcf60
1+
# FROM golang:1.23-alpine
2+
FROM golang@sha256:f8113c4b13e2a8b3a168dceaee88ac27743cc84e959f43b9dbd2291e9c3f57a0
33

44
RUN apk update && apk upgrade && apk --no-cache add make
55

@@ -11,8 +11,7 @@ COPY go.mod go.sum Makefile ./
1111

1212
RUN make
1313

14-
FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:1b6d711648229a1c987f39cfdfccaebe2bd92d0b5d8caa5dbaa5234a9278a0b2
15-
RUN microdnf --nodocs -y upgrade
14+
FROM scratch
1615

1716
WORKDIR /gitsecure
1817
COPY --from=0 go/src/github.ibm.com/gitsecure-net-top/bin/net-top .

go.mod

+25-24
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
module github.com/np-guard/cluster-topology-analyzer/v2
22

3-
go 1.22.0
3+
go 1.23.0
44

5-
toolchain go1.22.2
5+
toolchain go1.23.6
66

77
require (
8-
github.com/np-guard/netpol-analyzer v1.2.1
8+
github.com/np-guard/netpol-analyzer v1.3.1
99
github.com/openshift/api v0.0.0-20230502160752-c71432710382
1010
github.com/stretchr/testify v1.10.0
1111
gopkg.in/yaml.v3 v3.0.1
12-
k8s.io/api v0.30.0
13-
k8s.io/apimachinery v0.30.0
14-
k8s.io/cli-runtime v0.30.0
12+
k8s.io/api v0.32.2
13+
k8s.io/apimachinery v0.32.2
14+
k8s.io/cli-runtime v0.32.2
1515
sigs.k8s.io/gateway-api v1.1.0
1616
)
1717

1818
require (
19-
github.com/davecgh/go-spew v1.1.1 // indirect
19+
github.com/blang/semver/v4 v4.0.0 // indirect
20+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2021
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
21-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
22+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2223
github.com/go-errors/errors v1.4.2 // indirect
23-
github.com/go-logr/logr v1.4.1 // indirect
24+
github.com/go-logr/logr v1.4.2 // indirect
2425
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2526
github.com/go-openapi/jsonreference v0.21.0 // indirect
2627
github.com/go-openapi/swag v0.23.0 // indirect
2728
github.com/gogo/protobuf v1.3.2 // indirect
2829
github.com/golang/protobuf v1.5.4 // indirect
2930
github.com/google/gnostic-models v0.6.8 // indirect
31+
github.com/google/go-cmp v0.6.0 // indirect
3032
github.com/google/gofuzz v1.2.0 // indirect
3133
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
3234
github.com/google/uuid v1.6.0 // indirect
33-
github.com/imdario/mergo v0.3.16 // indirect
3435
github.com/josharian/intern v1.0.0 // indirect
3536
github.com/json-iterator/go v1.1.12 // indirect
3637
github.com/mailru/easyjson v0.7.7 // indirect
@@ -39,26 +40,26 @@ require (
3940
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
4041
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4142
github.com/pkg/errors v0.9.1 // indirect
42-
github.com/pmezard/go-difflib v1.0.0 // indirect
43+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
44+
github.com/x448/float16 v0.8.4 // indirect
4345
github.com/xlab/treeprint v1.2.0 // indirect
44-
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
4546
golang.org/x/net v0.33.0 // indirect
46-
golang.org/x/oauth2 v0.19.0 // indirect
47+
golang.org/x/oauth2 v0.23.0 // indirect
4748
golang.org/x/sync v0.10.0 // indirect
4849
golang.org/x/sys v0.28.0 // indirect
4950
golang.org/x/term v0.27.0 // indirect
5051
golang.org/x/text v0.21.0 // indirect
51-
golang.org/x/time v0.5.0 // indirect
52-
google.golang.org/protobuf v1.33.0 // indirect
52+
golang.org/x/time v0.7.0 // indirect
53+
google.golang.org/protobuf v1.35.1 // indirect
54+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
5355
gopkg.in/inf.v0 v0.9.1 // indirect
54-
gopkg.in/yaml.v2 v2.4.0 // indirect
55-
k8s.io/client-go v0.30.0 // indirect
56-
k8s.io/klog/v2 v2.120.1 // indirect
57-
k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 // indirect
58-
k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 // indirect
59-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
60-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
61-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
62-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
56+
k8s.io/client-go v0.32.2 // indirect
57+
k8s.io/klog/v2 v2.130.1 // indirect
58+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
59+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
60+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
61+
sigs.k8s.io/kustomize/api v0.18.0 // indirect
62+
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
63+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
6364
sigs.k8s.io/yaml v1.4.0 // indirect
6465
)

0 commit comments

Comments
 (0)