Skip to content

Commit 9cc3438

Browse files
Merge branch 'main' into v1beta1
2 parents 89626f4 + 6ac339f commit 9cc3438

28 files changed

+344
-457
lines changed

.custom-gcl.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
version: v2.4.0
2-
name: golangci-lint-kube-api-linter
1+
version: v2.5.0
2+
name: golangci-lint-custom
33
destination: ./bin
44
plugins:
55
- module: 'sigs.k8s.io/kube-api-linter'
66
version: v0.0.0-20250819121536-a575e84f4ce8
7+
- module: "go.uber.org/nilaway"
8+
import: "go.uber.org/nilaway/cmd/gclplugin"
9+
version: "v0.0.0-20250821055425-361559d802f0"

.github/workflows/build_test_ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
api.github.com:443
5555
github.com:443
5656
golang.org:443
57+
go.dev:443
5758
proxy.golang.org:443
5859
sum.golang.org:443
5960
*.githubusercontent.com:443

.github/workflows/e2e-test.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ jobs:
9393
github.com:443
9494
gcr.io:443
9595
ghcr.io:443
96+
golang.org:443
9697
proxy.golang.org:443
9798
sum.golang.org:443
9899
*.githubusercontent.com:443
@@ -152,7 +153,7 @@ jobs:
152153
if: ${{ always() }}
153154
run: docker cp tilt-control-plane:/var/log .logs
154155

155-
- uses: actions/upload-artifact@v4
156+
- uses: actions/upload-artifact@v5
156157
if: ${{ always() }}
157158
with:
158159
name: ${{ inputs.e2e-selector }}-logs

.github/workflows/e2e-upgrade-test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
github.com:443
5757
gcr.io:443
5858
ghcr.io:443
59+
golang.org:443
5960
proxy.golang.org:443
6061
sum.golang.org:443
6162
*.githubusercontent.com:443

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616
jobs:
1717
generate-docs:
1818
runs-on: ubuntu-latest
19-
container: docker.io/node:22-bullseye-slim
19+
container: docker.io/node:24-bullseye-slim
2020
timeout-minutes: 2
2121
steps:
2222
- uses: actions/checkout@v5

.github/workflows/go-analyze.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ jobs:
5050
github.com:443
5151
proxy.golang.org:443
5252
sum.golang.org:443
53+
golang.org:443
54+
go.dev:443
5355
*.githubusercontent.com:443
5456
auth.docker.io:443
5557
production.cloudflare.docker.com:443
@@ -70,7 +72,7 @@ jobs:
7072
check-latest: true
7173

7274
- name: lint
73-
uses: golangci/golangci-lint-action@v8
75+
uses: golangci/golangci-lint-action@v9
7476

7577
- name: lint-api
7678
run: make lint-api

.github/workflows/pull_request_ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
api.github.com:443
5858
github.com:443
5959
golang.org:443
60+
go.dev:443
6061
proxy.golang.org:443
6162
sum.golang.org:443
6263
*.githubusercontent.com:443

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
env:
2222
RELEASE_TAG: ${{ github.ref_name }}
2323
- name: Upload Release Artifacts
24-
uses: softprops/[email protected].1
24+
uses: softprops/[email protected].2
2525
with:
2626
files: |
2727
./infrastructure-linode/*

.golangci-kal.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,26 @@ linters:
1515
type: "module"
1616
description: Kube API LInter lints Kube like APIs based on API conventions and best practices.
1717
settings:
18-
linters:
19-
# TODO: remove linters from this list as we add support from them
20-
disable:
21-
# integers linter will force type change from int to int32/int64, we are going to wait for v1beta1 to enable this
22-
- "integers"
23-
# optionalfields requires changing fields to pointers in a way that might be hard to support in a backwards compatible way
24-
- "optionalfields"
25-
lintersConfig: { }
18+
linters: {}
19+
lintersConfig:
20+
optionalfields:
21+
pointers:
22+
preference: WhenRequired
2623
exclusions:
2724
rules:
2825
- path-except: "^api/"
2926
linters:
3027
- kubeapilinter
28+
# integers linter will force type change from int to int32/int64, we are going to wait for v1beta1 to enable this
29+
- path: "api/v1alpha2/*"
30+
text: "integers"
31+
linters:
32+
- kubeapilinter
33+
# optionalfields requires changing fields to pointers in a way that might be hard to support in a backwards compatible way
34+
- path: "api/v1alpha2/*"
35+
text: "optionalfields"
36+
linters:
37+
- kubeapilinter
3138
issues:
3239
max-issues-per-linter: 0
3340
max-same-issues: 0

.golangci-nilaway.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
version: "2"
2+
run:
3+
issues-exit-code: 1
4+
output:
5+
formats:
6+
text:
7+
path: stdout
8+
linters:
9+
default: none
10+
enable:
11+
- nilaway
12+
settings:
13+
custom:
14+
nilaway:
15+
type: "module"
16+
description: Static analysis tool to detect potential nil panics in Go code.
17+
settings:
18+
include-pkgs: ""
19+
exclude-file-docstrings: ignore_autogenerated
20+
issues:
21+
max-issues-per-linter: 0
22+
max-same-issues: 0
23+
new: false

0 commit comments

Comments
 (0)