Skip to content

Commit

Permalink
Merge branch 'main' into remove-network-policies
Browse files Browse the repository at this point in the history
  • Loading branch information
mcharriere authored Jan 6, 2025
2 parents 11c8222 + 8f3050b commit 4c8568f
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 76 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.29.0] - 2024-11-12

### Changed

- Upgrade Cilium to [v1.16.3](https://github.com/cilium/cilium/releases/tag/v1.16.3).
Expand Down Expand Up @@ -339,7 +341,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [0.1.0] - 2022-03-25

[Unreleased]: https://github.com/giantswarm/cilium-app/compare/v0.28.0...HEAD
[Unreleased]: https://github.com/giantswarm/cilium-app/compare/v0.29.0...HEAD
[0.29.0]: https://github.com/giantswarm/cilium-app/compare/v0.28.0...v0.29.0
[0.28.0]: https://github.com/giantswarm/cilium-app/compare/v0.27.0...v0.28.0
[0.27.0]: https://github.com/giantswarm/cilium-app/compare/v0.26.0...v0.27.0
[0.26.0]: https://github.com/giantswarm/cilium-app/compare/v0.25.1...v0.26.0
Expand Down
2 changes: 1 addition & 1 deletion helm/cilium/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: cilium
displayName: Cilium
home: https://cilium.io/
version: 0.28.0
version: 0.29.0
appVersion: 1.16.1
kubeVersion: ">= 1.21.0-0"
icon: https://cdn.jsdelivr.net/gh/cilium/cilium@main/Documentation/images/logo-solo.svg
Expand Down
47 changes: 24 additions & 23 deletions tests/e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ require (
github.com/cilium/cilium v1.17.0-pre.2
github.com/fluxcd/helm-controller/api v1.1.0
github.com/giantswarm/apptest-framework v1.10.2
github.com/giantswarm/clustertest v1.30.2
github.com/onsi/ginkgo/v2 v2.21.0
github.com/onsi/gomega v1.35.1
k8s.io/api v0.31.2
k8s.io/apimachinery v0.31.2
github.com/giantswarm/clustertest v1.31.0
github.com/onsi/ginkgo/v2 v2.22.2
github.com/onsi/gomega v1.36.2
k8s.io/api v0.31.3
k8s.io/apimachinery v0.31.3
)

require (
Expand All @@ -25,14 +25,14 @@ require (
github.com/BurntSushi/toml v1.4.0 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.3.0 // indirect
github.com/Masterminds/semver/v3 v3.3.1 // indirect
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
github.com/Masterminds/squirrel v1.5.4 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
github.com/cert-manager/cert-manager v1.16.1 // indirect
github.com/cert-manager/cert-manager v1.16.2 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.3 // indirect
github.com/cilium/ebpf v0.16.0 // indirect
Expand Down Expand Up @@ -77,7 +77,7 @@ require (
github.com/giantswarm/microerror v0.4.1 // indirect
github.com/giantswarm/organization-operator v1.6.4 // indirect
github.com/giantswarm/release-operator/v4 v4.2.0 // indirect
github.com/giantswarm/releases/sdk v0.9.1 // indirect
github.com/giantswarm/releases/sdk v0.10.0 // indirect
github.com/go-errors/errors v1.5.1 // indirect
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
Expand All @@ -104,10 +104,11 @@ require (
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-github/v66 v66.0.0 // indirect
github.com/google/go-github/v67 v67.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/gops v0.3.28 // indirect
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gopacket/gopacket v1.3.0 // indirect
Expand Down Expand Up @@ -205,21 +206,21 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 // 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/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.7.0 // indirect
golang.org/x/tools v0.26.0 // indirect
golang.org/x/tools v0.28.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.35.1 // indirect
google.golang.org/protobuf v1.36.1 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand All @@ -228,17 +229,17 @@ require (
helm.sh/helm/v3 v3.16.2 // indirect
k8s.io/apiextensions-apiserver v0.31.2 // indirect
k8s.io/apiserver v0.31.2 // indirect
k8s.io/cli-runtime v0.31.2 // indirect
k8s.io/client-go v0.31.2 // indirect
k8s.io/cli-runtime v0.31.3 // indirect
k8s.io/client-go v0.31.3 // indirect
k8s.io/cluster-bootstrap v0.31.1 // indirect
k8s.io/component-base v0.31.2 // indirect
k8s.io/component-base v0.31.3 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
k8s.io/kubectl v0.31.2 // indirect
k8s.io/kubectl v0.31.3 // indirect
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
oras.land/oras-go v1.2.6 // indirect
sigs.k8s.io/cluster-api v1.8.5 // indirect
sigs.k8s.io/controller-runtime v0.19.1 // indirect
sigs.k8s.io/controller-runtime v0.19.2 // indirect
sigs.k8s.io/e2e-framework v0.5.0 // indirect
sigs.k8s.io/gateway-api v1.2.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
Loading

0 comments on commit 4c8568f

Please sign in to comment.