Skip to content

Commit

Permalink
Prepare for v0.16.20 release
Browse files Browse the repository at this point in the history
Update workflow files to accommodate cilium/cilium#35483.

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
  • Loading branch information
michi-covalent committed Nov 6, 2024
1 parent e3bfedb commit 3286926
Show file tree
Hide file tree
Showing 371 changed files with 14,213 additions and 7,012 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/eks-tunnel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,7 @@ jobs:
# Port forward Relay
cilium hubble port-forward&
sleep 10s
if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
# support for native port-forwarding
# TODO: remove kubectl version after 0.16.20 release
[[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
fi
[[ $(pgrep -f "^cilium.*hubble.*port-forward$" | wc -l) == 1 ]]
# Run connectivity test
cilium connectivity test --test-concurrency=3 --all-flows --collect-sysdump-on-failure --external-target amazon.com. \
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/eks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,7 @@ jobs:
# Port forward Relay
cilium hubble port-forward&
sleep 10s
if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
# support for native port-forwarding
# TODO: remove kubectl version after 0.16.20 release
[[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
fi
[[ $(pgrep -f "^cilium.*hubble.*port-forward$" | wc -l) == 1 ]]
# Run connectivity test
cilium connectivity test --test-concurrency=3 --all-flows --collect-sysdump-on-failure --external-target amazon.com.
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/gke.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,8 @@ jobs:
# Port forward Relay
cilium hubble port-forward&
sleep 10s
if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
# support for native port-forwarding
# TODO: remove kubectl version after 0.16.20 release
[[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
fi
[[ $(pgrep -f "^cilium.*hubble.*port-forward$" | wc -l) == 1 ]]
# Run connectivity test
cilium connectivity test --test-concurrency=5 --all-flows --collect-sysdump-on-failure --external-target google.com.
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/kind.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,7 @@ jobs:
run: |
cilium hubble port-forward&
sleep 10s
if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
# support for native port-forwarding
# TODO: remove kubectl version after 0.16.20 release
[[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
fi
[[ $(pgrep -f "^cilium.*hubble.*port-forward$" | wc -l) == 1 ]]
- name: Set up external targets
id: external_targets
Expand Down Expand Up @@ -164,11 +160,7 @@ jobs:
run: |
cilium hubble port-forward&
sleep 10s
if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
# support for native port-forwarding
# TODO: remove kubectl version after 0.16.20 release
[[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
fi
[[ $(pgrep -f "^cilium.*hubble.*port-forward$" | wc -l) == 1 ]]
- name: Connectivity test
run: |
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/multicluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,7 @@ jobs:
# Port forward Relay
cilium --context "${{ steps.contexts.outputs.cluster1 }}" hubble port-forward&
sleep 10s
if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
# support for native port-forwarding
# TODO: remove kubectl version after 0.16.20 release
[[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
fi
[[ $(pgrep -f "^cilium.*hubble.*port-forward$" | wc -l) == 1 ]]
# Run connectivity test
cilium --context "${{ steps.contexts.outputs.cluster1 }}" connectivity test --test-concurrency=5 \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ binary releases.

| Release | Maintained | Compatible Cilium Versions |
|------------------------------------------------------------------------|------------|----------------------------|
| [v0.16.19](https://github.com/cilium/cilium-cli/releases/tag/v0.16.19) | Yes | Cilium 1.15 and newer |
| [v0.16.20](https://github.com/cilium/cilium-cli/releases/tag/v0.16.20) | Yes | Cilium 1.15 and newer |
| [v0.15.22](https://github.com/cilium/cilium-cli/releases/tag/v0.15.22) | Yes | Cilium 1.14 (*) |

Note:
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ table](https://github.com/cilium/cilium-cli#releases) for the most recent suppor
Set `RELEASE` environment variable to the new version. This variable will be
used in the commands throughout the documenat to allow copy-pasting.

export RELEASE=v0.16.20
export RELEASE=v0.16.21

## Update local checkout

Expand Down
65 changes: 33 additions & 32 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ replace (
sigs.k8s.io/controller-tools => github.com/cilium/controller-tools v0.8.0-2
)

require github.com/cilium/cilium v1.17.0-pre.1
require github.com/cilium/cilium v1.17.0-pre.2

require (
cel.dev/expr v0.16.0 // indirect
Expand All @@ -32,11 +32,11 @@ require (
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/cilium/charts v0.0.0-20240926142256-e20f2b5f5344 // indirect
github.com/cilium/charts v0.0.0-20241015090923-1f4c1b5ac12a // indirect
github.com/cilium/ebpf v0.16.0 // indirect
github.com/cilium/hive v0.0.0-20240926131619-aa37668760f2 // indirect
github.com/cilium/hive v0.0.0-20241021113747-bb8f3c0bede4 // indirect
github.com/cilium/proxy v0.0.0-20240909042906-ae435a5bef38 // indirect
github.com/cilium/statedb v0.3.0 // indirect
github.com/cilium/statedb v0.3.2 // indirect
github.com/cilium/stream v0.0.0-20240816054136-71321e385273 // indirect
github.com/cilium/workerpool v1.2.0 // indirect
github.com/cloudflare/cfssl v1.6.5 // indirect
Expand All @@ -58,7 +58,7 @@ require (
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/fatih/color v1.17.0 // indirect
github.com/fatih/color v1.18.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
Expand Down Expand Up @@ -137,9 +137,9 @@ require (
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.20.4 // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.59.1 // indirect
github.com/prometheus/common v0.60.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rubenv/sql-migrate v1.7.0 // indirect
Expand All @@ -156,7 +156,7 @@ require (
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
github.com/spf13/viper v1.19.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/vishvananda/netlink v1.3.0 // indirect
github.com/vishvananda/netlink v1.3.1-0.20241022031324-976bd8de7d81 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
github.com/weppos/publicsuffix-go v0.30.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
Expand All @@ -171,52 +171,53 @@ require (
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
go.mongodb.org/mongo-driver v1.14.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/dig v1.17.1 // indirect
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.27.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/oauth2 v0.22.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/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.6.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/time v0.7.0 // indirect
golang.org/x/tools v0.26.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240924160255-9d4c2d233b61 // indirect
google.golang.org/grpc v1.67.0 // indirect
google.golang.org/protobuf v1.34.2 // 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
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
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
helm.sh/helm/v3 v3.16.1 // indirect
k8s.io/api v0.31.1 // indirect
k8s.io/apiextensions-apiserver v0.31.1 // indirect
k8s.io/apimachinery v0.31.1 // indirect
k8s.io/apiserver v0.31.1 // indirect
k8s.io/cli-runtime v0.31.1 // indirect
k8s.io/client-go v0.31.1 // indirect
k8s.io/component-base v0.31.1 // indirect
helm.sh/helm/v3 v3.16.2 // indirect
k8s.io/api v0.31.2 // indirect
k8s.io/apiextensions-apiserver v0.31.2 // indirect
k8s.io/apimachinery 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/component-base v0.31.2 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 // indirect
k8s.io/kubectl v0.31.0 // indirect
k8s.io/kubectl v0.31.1 // indirect
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
oras.land/oras-go v1.2.5 // indirect
sigs.k8s.io/controller-runtime v0.19.0 // indirect
sigs.k8s.io/gateway-api v1.2.0-rc1.0.20240923191000-5c5fc388829d // indirect
sigs.k8s.io/gateway-api v1.2.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.17.2 // indirect
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
sigs.k8s.io/mcs-api v0.1.1-0.20240919125245-7bbb5990134a // indirect
sigs.k8s.io/mcs-api v0.1.1-0.20241002142749-eff1ba8c3ab2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit 3286926

Please sign in to comment.