Skip to content

Commit

Permalink
Merge pull request #133 from aojea/deps_032
Browse files Browse the repository at this point in the history
bump dependecies to kube 1.32
  • Loading branch information
aojea authored Dec 18, 2024
2 parents 7de5fbe + 42e480f commit 037df9a
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 85 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ on:

env:
GO_VERSION: "1.23"
K8S_VERSION: "v1.31.2"
KIND_VERSION: "v0.25.0"
K8S_VERSION: "v1.32.0"
KIND_VERSION: "v0.26.0"
IMAGE_NAME: registry.k8s.io/networking/kube-network-policies
KIND_CLUSTER_NAME: kind

Expand All @@ -25,13 +25,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}
id: go

- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Build
run: |
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
KUBEPROXY_MODE: ${{ matrix.proxyMode }}
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Enable ipv4 and ipv6 forwarding
run: |
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
- name: Export logs
if: always()
run: |
/usr/local/bin/kind export logs --name ${KIND_CLUSTER_NAME} --loglevel=debug ./_artifacts/logs
/usr/local/bin/kind export logs --name ${KIND_CLUSTER_NAME} ./_artifacts/logs
- name: Upload logs
if: always()
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/npa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ on:

env:
GO_VERSION: "1.23"
K8S_VERSION: "v1.31.2"
KIND_VERSION: "v0.25.0"
K8S_VERSION: "v1.32.0"
KIND_VERSION: "v0.26.0"
IMAGE_NAME: registry.k8s.io/networking/kube-network-policies
KIND_CLUSTER_NAME: kind

Expand All @@ -26,13 +26,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: ${{ env.GO_VERSION }}
id: go

- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Build
run: |
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
IP_FAMILY: ${{ matrix.ipFamily }}
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Enable ipv4 and ipv6 forwarding
run: |
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
- name: Export logs
if: always()
run: |
/usr/local/bin/kind export logs --name ${KIND_CLUSTER_NAME} --loglevel=debug ./_artifacts/logs
/usr/local/bin/kind export logs --name ${KIND_CLUSTER_NAME} ./_artifacts/logs
- name: Upload logs
if: always()
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: [1.22.x]
go-version: [1.23.x]
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: make test
- run: make lint

4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.22 AS builder
FROM --platform=$BUILDPLATFORM golang:1.23 AS builder

WORKDIR /src

Expand All @@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
go build -o /go/bin/netpol ./cmd

# STEP 2: Build small image
FROM registry.k8s.io/build-image/distroless-iptables:v0.5.5
FROM registry.k8s.io/build-image/distroless-iptables:v0.6.5
COPY --from=builder --chown=root:root /go/bin/netpol /bin/netpol

CMD ["/bin/netpol"]
40 changes: 20 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
module sigs.k8s.io/kube-network-policies

go 1.22.0
go 1.23.0

require (
github.com/florianl/go-nfqueue v1.3.2
github.com/mdlayher/netlink v1.7.2
github.com/prometheus/client_golang v1.20.5
golang.org/x/sys v0.28.0
k8s.io/api v0.31.3
k8s.io/apimachinery v0.31.3
k8s.io/client-go v0.31.3
k8s.io/component-base v0.31.2
k8s.io/component-helpers v0.31.2
k8s.io/api v0.32.0
k8s.io/apimachinery v0.32.0
k8s.io/client-go v0.32.0
k8s.io/component-base v0.32.0
k8s.io/component-helpers v0.32.0
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
sigs.k8s.io/knftables v0.0.18
sigs.k8s.io/network-policy-api v0.1.5
)
Expand All @@ -31,7 +31,6 @@ require (
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
Expand All @@ -54,21 +53,22 @@ require (
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.7.0 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit 037df9a

Please sign in to comment.