Skip to content

Commit 3495db3

Browse files
committed
Merge remote-tracking branch 'origin/main' into yuval-k/dev-doc
2 parents 262c3a1 + 07c0dfc commit 3495db3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+3038
-1218
lines changed

.github/actions/prep-go-runner/action.yaml

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,45 @@ runs:
2020
run: |
2121
echo "Before clearing disk space:"
2222
df -h
23+
docker system df -v
2324
24-
# https://github.com/actions/virtual-environments/issues/709
25-
sudo apt-get clean
26-
25+
# https://github.com/actions/runner-images/discussions/3242 github runners are bad at cleanup
26+
echo "Removing large packages"
27+
sudo apt-get remove -y '^dotnet-.*' || true
28+
sudo apt-get remove -y '^llvm-.*' || true
29+
sudo apt-get remove -y 'php.*' || true
30+
sudo apt-get remove -y '^mongodb-.*' || true
31+
sudo apt-get remove -y '^mysql-.*' || true
32+
sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri || true
33+
sudo apt-get autoremove -y || true
34+
sudo apt-get clean -y || true
35+
echo "Done removing large packages"
36+
2737
# Clean up pre-installed tools
28-
# https://github.com/actions/virtual-environments/issues/1918
29-
sudo rm -rf /usr/share/dotnet
30-
sudo rm -rf /opt/ghc
31-
sudo rm -rf /usr/local/share/boost
32-
sudo rm -rf $AGENT_TOOLSDIRECTORY
38+
sudo rm -rf /usr/local/lib/android || true
39+
sudo rm -rf /usr/share/dotnet || true
40+
sudo rm -rf /usr/local/graalvm || true
41+
sudo rm -rf /opt/ghc || true
42+
sudo rm -rf /usr/local/.ghcup || true
43+
sudo rm -rf /usr/local/share/boost || true
44+
sudo rm -rf /usr/local/share/powershell || true
45+
sudo rm -rf /usr/local/share/chromium || true
46+
sudo rm -rf $AGENT_TOOLSDIRECTORY || true
47+
48+
# Clean up images
49+
docker image rm node:16 || true
50+
docker image rm node:16-alpine || true
51+
docker image rm node:18 || true
52+
docker image rm node:18-alpine || true
53+
docker image rm node:20 || true
54+
docker image rm node:20-alpine || true
55+
# remove the dangling images and containers
56+
docker images | tail -n +2 | awk '$1 == "<none>" {print $3}' | xargs --no-run-if-empty docker rmi
57+
docker ps -a | tail -n +2 | awk '$2 ~ "^[0-9a-f]+$" {print $1}' | xargs --no-run-if-empty docker rm --volumes=true
3358
3459
echo "After clearing disk space:"
3560
df -h
61+
docker system df -v
3662
- name: Set up Go
3763
id: setup-go
3864
uses: actions/setup-go@v5

.github/workflows/pr-kubernetes-tests.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ jobs:
3131
- cluster-name: 'cluster-one'
3232
go-test-args: '-v -timeout=25m'
3333
go-test-run-regex: '^TestKgateway$$/^BasicRouting$$|^TestKgateway$$/^Deployer$$|^TestKgateway$$/^HTTPRouteServices$$|^TestKgateway$$/^TCPRouteServices$$|^TestKgateway$$/^TLSRouteServices$$|^TestKgateway$$/^Backends$$'
34+
# Mar 4, 2025: TODO minutes
35+
- cluster-name: 'cluster-two'
36+
go-test-args: '-v -timeout=25m'
37+
go-test-run-regex: '^TestKgateway$$/^Transformation$$'
38+
3439

3540
# # Dec 4, 2024: 23 minutes
3641
# - cluster-name: 'cluster-two'

.github/workflows/release.yaml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
- uses: actions/checkout@v4
4040
with:
4141
fetch-depth: 0
42-
4342
- name: Set the release related variables
4443
id: set_vars
4544
run: |
@@ -79,6 +78,9 @@ jobs:
7978
steps:
8079
- uses: actions/checkout@v4
8180

81+
- name: Prep Go Runner
82+
uses: ./.github/actions/prep-go-runner
83+
8284
- name: Helm login to ${{ env.IMAGE_REGISTRY }}
8385
if: ${{ github.event_name != 'pull_request' }}
8486
run: echo "${{ secrets.GITHUB_TOKEN }}" | helm registry login ${{ env.IMAGE_REGISTRY }} -u ${{ github.repository_owner }} --password-stdin
@@ -105,11 +107,8 @@ jobs:
105107
- uses: actions/checkout@v4
106108
with:
107109
fetch-depth: 0
108-
109-
- uses: actions/setup-go@v5
110-
with:
111-
go-version-file: "go.mod"
112-
cache: true
110+
- name: Prep Go Runner
111+
uses: ./.github/actions/prep-go-runner
113112

114113
# We publish a rolling main release for every commit to main. Deleting the release
115114
# ensures that the tagged commit is not stale. Goreleaser will create a new tag
@@ -151,10 +150,8 @@ jobs:
151150
runs-on: ubuntu-22.04
152151
steps:
153152
- uses: actions/checkout@v4
154-
155-
- uses: actions/setup-go@v5
156-
with:
157-
go-version-file: "go.mod"
153+
- name: Prep Go Runner
154+
uses: ./.github/actions/prep-go-runner
158155

159156
- name: Login to ghcr.io
160157
if: ${{ github.event_name != 'pull_request' }}
@@ -173,7 +170,7 @@ jobs:
173170
- name: Install the released chart
174171
run: |
175172
helm install --create-namespace --namespace kgateway-system kgateway \
176-
oci://${{ env.IMAGE_REGISTRY }}/kgateway-dev/charts/kgateway \
173+
oci://${{ env.IMAGE_REGISTRY }}/charts/kgateway \
177174
--set image.registry=${{ env.IMAGE_REGISTRY }} \
178175
--version ${{ needs.setup.outputs.version }} \
179176
--wait --timeout 5m

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,10 @@ istio-*/*
5959
.bin/
6060
# Added by goreleaser init:
6161
dist/
62+
63+
*.o
64+
*.d
65+
*-build
66+
67+
68+
internal/envoyinit/rustformations/target/*

.goreleaser.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,10 @@ dockers:
107107
- "--build-arg=GOARCH=arm64"
108108
- "--build-arg=ENTRYPOINT_SCRIPT=/internal/envoyinit/cmd/docker-entrypoint.sh"
109109
- "--build-arg=ENVOY_IMAGE={{ .Env.ENVOY_IMAGE }}"
110+
- "--build-arg=RUSTFORMATIONS_DIR=/internal/envoyinit/rustformations"
110111
extra_files:
111112
- internal/envoyinit/cmd/docker-entrypoint.sh
113+
- internal/envoyinit/rustformations
112114
- image_templates:
113115
- &envoyinit_amd_image "{{ .Env.IMAGE_REGISTRY }}/{{ .Env.ENVOYINIT_IMAGE_REPO }}:{{ .Env.VERSION }}-amd64"
114116
use: buildx
@@ -121,8 +123,10 @@ dockers:
121123
- "--build-arg=GOARCH=amd64"
122124
- "--build-arg=ENTRYPOINT_SCRIPT=/internal/envoyinit/cmd/docker-entrypoint.sh"
123125
- "--build-arg=ENVOY_IMAGE={{ .Env.ENVOY_IMAGE }}"
126+
- "--build-arg=RUSTFORMATIONS_DIR=/internal/envoyinit/rustformations"
124127
extra_files:
125128
- internal/envoyinit/cmd/docker-entrypoint.sh
129+
- internal/envoyinit/rustformations
126130
docker_manifests:
127131
- name_template: "{{ .Env.IMAGE_REGISTRY }}/{{ .Env.CONTROLLER_IMAGE_REPO }}:{{ .Env.VERSION }}"
128132
image_templates:

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ envoyversion: ENVOY_VERSION_TAG ?= $(shell echo $(ENVOY_IMAGE) | cut -d':' -f2)
166166
envoyversion:
167167
echo "Version is $(ENVOY_VERSION_TAG)"
168168
echo "Commit for envoyproxy is $(shell curl -s https://raw.githubusercontent.com/solo-io/envoy-gloo/refs/tags/v$(ENVOY_VERSION_TAG)/bazel/repository_locations.bzl | grep "envoy =" -A 4 | grep commit | cut -d'"' -f2)"
169+
echo "Current ABI in envoyinit can be found in the cargo.toml's envoy-proxy-dynamic-modules-rust-sdk"
169170
#----------------------------------------------------------------------------------
170171
# Ginkgo Tests
171172
#----------------------------------------------------------------------------------
@@ -312,7 +313,10 @@ generated-code: update-licenses
312313
generated-code: fmt
313314

314315
.PHONY: go-generate-all
315-
go-generate-all: ## Run all go generate directives in the repo, including codegen for protos, mockgen, and more
316+
go-generate-all: go-generate-apis go-generate-mocks
317+
318+
.PHONY: go-generate-apis
319+
go-generate-apis: ## Run all go generate directives in the repo, including codegen for protos, mockgen, and more
316320
GO111MODULE=on go generate ./hack/...
317321

318322
.PHONY: go-generate-mocks
@@ -459,6 +463,7 @@ envoyinit: $(ENVOYINIT_OUTPUT_DIR)/envoyinit-linux-$(GOARCH)
459463

460464
# TODO(nfuden) cheat the process for now with -r but try to find a cleaner method
461465
$(ENVOYINIT_OUTPUT_DIR)/Dockerfile.envoyinit: internal/envoyinit/Dockerfile.envoyinit
466+
cp -r ${ENVOYINIT_DIR}/rustformations $(ENVOYINIT_OUTPUT_DIR)
462467
cp $< $@
463468

464469
$(ENVOYINIT_OUTPUT_DIR)/docker-entrypoint.sh: internal/envoyinit/cmd/docker-entrypoint.sh

api/applyconfiguration/api/v1alpha1/bodytransformation.go

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/applyconfiguration/api/v1alpha1/headertransformation.go

Lines changed: 38 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/applyconfiguration/api/v1alpha1/routepolicyspec.go

Lines changed: 12 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/applyconfiguration/api/v1alpha1/transform.go

Lines changed: 62 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/applyconfiguration/api/v1alpha1/transformationpolicy.go

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)