Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

breakout kgateway from gloo/solo deps #10492

Merged
merged 10 commits into from
Jan 23, 2025
Merged

breakout kgateway from gloo/solo deps #10492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a17ce01
breakout kgw from gloo deps
lgadban Jan 23, 2025
017d98c
fixup codegen
lgadban Jan 23, 2025
2d65a7f
Merge branch 'main' into law/kgw-breakout
lgadban Jan 23, 2025
486189f
only lint gateway2 dir for now
lgadban Jan 23, 2025
c949958
remove redundant helm templates
lgadban Jan 23, 2025
3b4a093
undo
lgadban Jan 23, 2025
3d82895
fix tests until deletion
lgadban Jan 23, 2025
7c20bbe
fix proto conflict on gloo pod until del
lgadban Jan 23, 2025
a8d2c6a
prepare for git mv
lgadban Jan 23, 2025
c2cd229
git mv projects/gloo/cmd
lgadban Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/pr-unit-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@ jobs:
with:
go-version-file: go.mod
- name: Build
run: go build -v ./projects/gateway2/... ./projects/gloo/cli/cmd
run: go build -v ./projects/gateway2/...
- name: Install Test Utils
shell: bash
run: make -C ./projects/gateway2/ install-go-tools
- name: Run Tests
shell: bash
env:
TEST_PKG: "./projects/gateway2/... ./test/kubernetes/testutils/helper"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we no longer need to use/test whatever's under ./test/kubernetes/testutils/helper?

TEST_PKG: "./projects/gateway2/..."
# TODO: remove this once we delete gloo
GOLANG_PROTOBUF_REGISTRATION_CONFLICT: "ignore"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needed until we remove gloo, dupe protos from gloo and envoy-gloo/go

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i hate that variable haha :) happy to see a path to remove it

run: make go-test-with-coverage
- name: Validate Test Coverage
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .goreleaser.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ before:
- go mod download
builds:
- id: controller
main: ./projects/gloo/cmd/
main: ./projects/gateway2/cmd/
binary: gloo-linux-{{ .Arch }}
gcflags: "{{ .Env.GCFLAGS }}"
ldflags: "{{ .Env.LDFLAGS }}"
Expand All @@ -24,7 +24,7 @@ dockers:
- image_templates:
- &arm_image "{{ .Env.IMAGE_REGISTRY }}/{{ .Env.GLOO_IMAGE_REPO }}:{{ .Env.VERSION }}-arm64"
use: buildx
dockerfile: &dockerfile projects/gloo/cmd/Dockerfile
dockerfile: &dockerfile projects/gateway2/cmd/Dockerfile
goos: linux
goarch: arm64
build_flag_templates:
Expand Down
101 changes: 26 additions & 75 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,9 @@ generate-all-debug: generate-all
# Generates all required code, cleaning and formatting as well; this target is executed in CI
.PHONY: generated-code
generated-code: check-go-version
generated-code: go-generate-all generate-cli-docs getter-check mod-tidy
generated-code: go-generate-all getter-check mod-tidy
generated-code: update-licenses
generated-code: generate-crd-reference-docs
# generated-code: generate-crd-reference-docs
generated-code: fmt

.PHONY: go-generate-all
Expand All @@ -338,9 +338,10 @@ generate-cli-docs: clean-cli-docs ## Removes existing CLI docs and re-generates
GO111MODULE=on go run projects/gloo/cli/cmd/docs/main.go

# Ensures that accesses for fields which have "getter" functions are exclusively done via said "getter" functions
# TODO: do we still want this?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the answer is likely yes?

I kinda hate the Format of .GetSomething but having panics due to bad accessors is super painful and people seem to be good at writing that kind of bug.
Therefore I am marginally on the side of keeping it

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm in favor of getter checks, but iirc this only works with protobuf-generated go types?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my reasoning here is that we are going away from proto generated APIs so this is much less likely of a concern.
but thinking a bit more, we still will interact with envoy protos and in general it doesn't hurt to keep it around!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we replace this tool in favor of https://golangci-lint.run/usage/linters/#protogetter? or remove it entirely until there's a need?

.PHONY: getter-check
getter-check:
go run github.com/saiskee/gettercheck -ignoretests -ignoregenerated -write ./...
go run github.com/saiskee/gettercheck -ignoretests -ignoregenerated -write ./projects/gateway2/...

.PHONY: mod-tidy
mod-tidy:
Expand Down Expand Up @@ -407,62 +408,26 @@ distroless-with-utils-docker: distroless-docker $(DISTROLESS_OUTPUT_DIR)/Dockerf
--build-arg BASE_IMAGE=$(GLOO_DISTROLESS_BASE_IMAGE) \
-t $(GLOO_DISTROLESS_BASE_WITH_UTILS_IMAGE)

#----------------------------------------------------------------------------------
# Discovery
#----------------------------------------------------------------------------------

DISCOVERY_DIR=projects/discovery
DISCOVERY_SOURCES=$(call get_sources,$(DISCOVERY_DIR))
DISCOVERY_OUTPUT_DIR=$(OUTPUT_DIR)/$(DISCOVERY_DIR)

$(DISCOVERY_OUTPUT_DIR)/discovery-linux-$(GOARCH): $(DISCOVERY_SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(DISCOVERY_DIR)/cmd/main.go

.PHONY: discovery
discovery: $(DISCOVERY_OUTPUT_DIR)/discovery-linux-$(GOARCH)

$(DISCOVERY_OUTPUT_DIR)/Dockerfile.discovery: $(DISCOVERY_DIR)/cmd/Dockerfile
cp $< $@

.PHONY: discovery-docker
discovery-docker: $(DISCOVERY_OUTPUT_DIR)/discovery-linux-$(GOARCH) $(DISCOVERY_OUTPUT_DIR)/Dockerfile.discovery
docker buildx build --load $(PLATFORM) $(DISCOVERY_OUTPUT_DIR) -f $(DISCOVERY_OUTPUT_DIR)/Dockerfile.discovery \
--build-arg GOARCH=$(GOARCH) \
--build-arg BASE_IMAGE=$(ALPINE_BASE_IMAGE) \
-t $(IMAGE_REGISTRY)/discovery:$(VERSION)

$(DISCOVERY_OUTPUT_DIR)/Dockerfile.discovery.distroless: $(DISCOVERY_DIR)/cmd/Dockerfile.distroless
cp $< $@

.PHONY: discovery-distroless-docker
discovery-distroless-docker: $(DISCOVERY_OUTPUT_DIR)/discovery-linux-$(GOARCH) $(DISCOVERY_OUTPUT_DIR)/Dockerfile.discovery.distroless distroless-docker
docker buildx build --load $(PLATFORM) $(DISCOVERY_OUTPUT_DIR) -f $(DISCOVERY_OUTPUT_DIR)/Dockerfile.discovery.distroless \
--build-arg GOARCH=$(GOARCH) \
--build-arg BASE_IMAGE=$(GLOO_DISTROLESS_BASE_IMAGE) \
-t $(IMAGE_REGISTRY)/discovery:$(VERSION)-distroless

#----------------------------------------------------------------------------------
# Gloo
#----------------------------------------------------------------------------------

GLOO_DIR=projects/gloo
EDGE_GATEWAY_DIR=projects/gateway
K8S_GATEWAY_DIR=projects/gateway2
GLOO_SOURCES=$(call get_sources,$(GLOO_DIR))
# GLOO_SOURCES=$(call get_sources,$(GLOO_DIR))
EDGE_GATEWAY_SOURCES=$(call get_sources,$(EDGE_GATEWAY_DIR))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove?

K8S_GATEWAY_SOURCES=$(call get_sources,$(K8S_GATEWAY_DIR))
GLOO_OUTPUT_DIR=$(OUTPUT_DIR)/$(GLOO_DIR)
GLOO_OUTPUT_DIR=$(OUTPUT_DIR)/$(K8S_GATEWAY_DIR)
export GLOO_IMAGE_REPO ?= gloo

# We include the files in EDGE_GATEWAY_DIR and K8S_GATEWAY_DIR as dependencies to the gloo build
# so changes in those directories cause the make target to rebuild
$(GLOO_OUTPUT_DIR)/gloo-linux-$(GOARCH): $(GLOO_SOURCES) $(EDGE_GATEWAY_SOURCES) $(K8S_GATEWAY_SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(GLOO_DIR)/cmd/main.go
$(GLOO_OUTPUT_DIR)/gloo-linux-$(GOARCH): $(K8S_GATEWAY_SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(K8S_GATEWAY_DIR)/cmd/main.go

.PHONY: gloo
gloo: $(GLOO_OUTPUT_DIR)/gloo-linux-$(GOARCH)

$(GLOO_OUTPUT_DIR)/Dockerfile.gloo: $(GLOO_DIR)/cmd/Dockerfile
$(GLOO_OUTPUT_DIR)/Dockerfile.gloo: $(K8S_GATEWAY_DIR)/cmd/Dockerfile
cp $< $@

.PHONY: gloo-docker
Expand Down Expand Up @@ -571,21 +536,21 @@ sds-distroless-docker: $(SDS_OUTPUT_DIR)/sds-linux-$(GOARCH) $(SDS_OUTPUT_DIR)/D
# Envoy init (BASE/SIDECAR)
#----------------------------------------------------------------------------------

ENVOYINIT_DIR=projects/envoyinit/cmd
ENVOYINIT_SOURCES=$(call get_sources,$(ENVOYINIT_DIR))
ENVOYINIT_OUTPUT_DIR=$(OUTPUT_DIR)/$(ENVOYINIT_DIR)
# ENVOYINIT_DIR=projects/envoyinit/cmd
# ENVOYINIT_SOURCES=$(call get_sources,$(ENVOYINIT_DIR))
# ENVOYINIT_OUTPUT_DIR=$(OUTPUT_DIR)/$(ENVOYINIT_DIR)

$(ENVOYINIT_OUTPUT_DIR)/envoyinit-linux-$(GOARCH): $(ENVOYINIT_SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(ENVOYINIT_DIR)/main.go
# $(ENVOYINIT_OUTPUT_DIR)/envoyinit-linux-$(GOARCH): $(ENVOYINIT_SOURCES)
# $(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(ENVOYINIT_DIR)/main.go

.PHONY: envoyinit
envoyinit: $(ENVOYINIT_OUTPUT_DIR)/envoyinit-linux-$(GOARCH)
# .PHONY: envoyinit
# envoyinit: $(ENVOYINIT_OUTPUT_DIR)/envoyinit-linux-$(GOARCH)

$(ENVOYINIT_OUTPUT_DIR)/Dockerfile.envoyinit: $(ENVOYINIT_DIR)/Dockerfile.envoyinit
cp $< $@
# $(ENVOYINIT_OUTPUT_DIR)/Dockerfile.envoyinit: $(ENVOYINIT_DIR)/Dockerfile.envoyinit
# cp $< $@

$(ENVOYINIT_OUTPUT_DIR)/docker-entrypoint.sh: $(ENVOYINIT_DIR)/docker-entrypoint.sh
cp $< $@
# $(ENVOYINIT_OUTPUT_DIR)/docker-entrypoint.sh: $(ENVOYINIT_DIR)/docker-entrypoint.sh
# cp $< $@

.PHONY: gloo-envoy-wrapper-docker
gloo-envoy-wrapper-docker: $(ENVOYINIT_OUTPUT_DIR)/envoyinit-linux-$(GOARCH) $(ENVOYINIT_OUTPUT_DIR)/Dockerfile.envoyinit $(ENVOYINIT_OUTPUT_DIR)/docker-entrypoint.sh
Expand All @@ -594,8 +559,8 @@ gloo-envoy-wrapper-docker: $(ENVOYINIT_OUTPUT_DIR)/envoyinit-linux-$(GOARCH) $(E
--build-arg ENVOY_IMAGE=$(ENVOY_GLOO_IMAGE) \
-t $(IMAGE_REGISTRY)/gloo-envoy-wrapper:$(VERSION)

$(ENVOYINIT_OUTPUT_DIR)/Dockerfile.envoyinit.distroless: $(ENVOYINIT_DIR)/Dockerfile.envoyinit.distroless
cp $< $@
# $(ENVOYINIT_OUTPUT_DIR)/Dockerfile.envoyinit.distroless: $(ENVOYINIT_DIR)/Dockerfile.envoyinit.distroless
# cp $< $@

# Explicitly specify the base image is amd64 as we only build the amd64 flavour of gloo envoy
.PHONY: gloo-envoy-wrapper-distroless-docker
Expand Down Expand Up @@ -798,20 +763,14 @@ docker-push-%:
.PHONY: docker-standard
docker-standard: check-go-version ## Build docker images (standard only)
docker-standard: gloo-docker
docker-standard: discovery-docker
docker-standard: gloo-envoy-wrapper-docker
# docker-standard: gloo-envoy-wrapper-docker
docker-standard: sds-docker
docker-standard: certgen-docker
docker-standard: kubectl-docker

.PHONY: docker-distroless
docker-distroless: check-go-version ## Build docker images (distroless only)
docker-distroless: gloo-distroless-docker
docker-distroless: discovery-distroless-docker
docker-distroless: gloo-envoy-wrapper-distroless-docker
docker-distroless: sds-distroless-docker
docker-distroless: certgen-distroless-docker
docker-distroless: kubectl-distroless-docker

IMAGE_VARIANT ?= all
# Build docker images using the defined IMAGE_REGISTRY, VERSION
Expand Down Expand Up @@ -946,19 +905,15 @@ kind-reload-gloo-envoy-wrapper:

.PHONY: kind-build-and-load-standard
kind-build-and-load-standard: kind-build-and-load-gloo
kind-build-and-load-standard: kind-build-and-load-discovery
kind-build-and-load-standard: kind-build-and-load-gloo-envoy-wrapper
kind-build-and-load-standard: kind-build-and-load-sds
kind-build-and-load-standard: kind-build-and-load-certgen
kind-build-and-load-standard: kind-build-and-load-kubectl
# kind-build-and-load-standard: kind-build-and-load-gloo-envoy-wrapper
# kind-build-and-load-standard: kind-build-and-load-sds
# kind-build-and-load-standard: kind-build-and-load-certgen

.PHONY: kind-build-and-load-distroless
kind-build-and-load-distroless: kind-build-and-load-gloo-distroless
kind-build-and-load-distroless: kind-build-and-load-discovery-distroless
kind-build-and-load-distroless: kind-build-and-load-gloo-envoy-wrapper-distroless
kind-build-and-load-distroless: kind-build-and-load-sds-distroless
kind-build-and-load-distroless: kind-build-and-load-certgen-distroless
kind-build-and-load-distroless: kind-build-and-load-kubectl-distroless

.PHONY: kind-build-and-load ## Use to build all images and load them into kind
kind-build-and-load: # Standard images
Expand All @@ -975,19 +930,15 @@ kind-build-and-load: kind-build-and-load-sds
# Load existing images. This can speed up development if the images have already been built / are unchanged
.PHONY: kind-load-standard
kind-load-standard: kind-load-gloo
kind-load-standard: kind-load-discovery
kind-load-standard: kind-load-gloo-envoy-wrapper
kind-load-standard: kind-load-sds
kind-load-standard: kind-load-certgen
kind-load-standard: kind-load-kubectl

.PHONY: kind-build-and-load-distroless
kind-load-distroless: kind-load-gloo-distroless
kind-load-distroless: kind-load-discovery-distroless
kind-load-distroless: kind-load-gloo-envoy-wrapper-distroless
kind-load-distroless: kind-load-sds-distroless
kind-load-distroless: kind-load-certgen-distroless
kind-load-distroless: kind-load-kubectl-distroless

.PHONY: kind-load ## Use to build all images and load them into kind
kind-load: # Standard images
Expand Down
2 changes: 1 addition & 1 deletion ci/kind/setup-kind.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ else
fi

# 4. Build the gloo command line tool, ensuring we have one in the `_output` folder
make -s build-cli-local
# make -s build-cli-local

# 5. Apply the Kubernetes Gateway API CRDs
# Note, we're using kustomize to apply the CRDs from the k8s gateway api repo as
Expand Down
4 changes: 2 additions & 2 deletions docs/content/static/content/osa_provided.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Name|Version|License
[retry-go/v4](https://github.com/avast/retry-go)|v4.3.3|MIT License
[aws/aws-sdk-go](https://github.com/aws/aws-sdk-go)|v1.34.9|Apache License 2.0
[census-instrumentation/opencensus-proto](https://github.com/census-instrumentation/opencensus-proto)|v0.2.0|Apache License 2.0
[xds/go](https://github.com/cncf/xds)|v0.0.0-20240905190251-b4127c9b8d78|Apache License 2.0
[xds/go](https://github.com/cncf/xds)|v0.0.0-20241223141626-cff3c89139a3|Apache License 2.0
[envoyproxy/go-control-plane](https://github.com/envoyproxy/go-control-plane)|v0.13.2-0.20241022220226-23b7e55d7f65|Apache License 2.0
[envoyproxy/protoc-gen-validate](https://github.com/envoyproxy/protoc-gen-validate)|v1.1.0|Apache License 2.0
[fgrosse/zaptest](https://github.com/fgrosse/zaptest)|v1.1.0|MIT License
Expand Down Expand Up @@ -63,7 +63,7 @@ Name|Version|License
[googleapis/api](https://google.golang.org/genproto/googleapis/api)|v0.0.0-20241021214115-324edc3d5d38|Apache License 2.0
[googleapis/rpc](https://google.golang.org/genproto/googleapis/rpc)|v0.0.0-20241021214115-324edc3d5d38|Apache License 2.0
[google.golang.org/grpc](https://google.golang.org/grpc)|v1.67.1|Apache License 2.0
[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.35.1|BSD 3-clause "New" or "Revised" License
[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.36.1|BSD 3-clause "New" or "Revised" License
[AlecAivazis/survey.v1](https://gopkg.in/AlecAivazis/survey.v1)|v1.8.7|MIT License
[helm/v3](https://helm.sh/helm/v3)|v3.16.2|Apache License 2.0
[istio.io/api](https://istio.io/api)|v1.24.0-alpha.0.0.20241106042855-9e26cdd3450a|Apache License 2.0
Expand Down
5 changes: 3 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/avast/retry-go v2.4.3+incompatible
github.com/aws/aws-sdk-go v1.34.9
github.com/census-instrumentation/opencensus-proto v0.4.1
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78
github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3
github.com/envoyproxy/go-control-plane v0.13.2-0.20241022220226-23b7e55d7f65
github.com/envoyproxy/protoc-gen-validate v1.1.0
github.com/form3tech-oss/jwt-go v3.2.5+incompatible
Expand Down Expand Up @@ -66,7 +66,7 @@ require (
golang.org/x/sync v0.8.0
golang.org/x/tools v0.26.0
google.golang.org/grpc v1.67.1
google.golang.org/protobuf v1.35.1
google.golang.org/protobuf v1.36.1
gopkg.in/AlecAivazis/survey.v1 v1.8.7
helm.sh/helm/v3 v3.16.2
k8s.io/api v0.31.2
Expand Down Expand Up @@ -96,6 +96,7 @@ require (
github.com/google/uuid v1.6.0
github.com/mccutchen/go-httpbin/v2 v2.15.0
github.com/quasilyte/go-ruleguard/dsl v0.3.22
github.com/solo-io/envoy-gloo/go v0.0.0-20250102165327-33a74fcf9966
github.com/stoewer/go-strcase v1.3.0
github.com/stretchr/testify v1.9.0
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
Expand Down
10 changes: 6 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1531,8 +1531,8 @@ github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101/go.mod h1:eXthEFrGJvWH
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM=
github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50/go.mod h1:5e1+Vvlzido69INQaVO6d87Qn543Xr6nooe9Kz7oBFM=
github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 h1:QVw89YDxXxEe+l8gU8ETbOasdwEV+avkR75ZzsVV9WI=
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 h1:boJj011Hh+874zpIySeApCX4GeOjPl9qhRF3QuIZq+Q=
github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
github.com/cockroachdb/apd/v3 v3.2.1 h1:U+8j7t0axsIgvQUqthuNm82HIrYXodOV2iWLWtEaIwg=
github.com/cockroachdb/apd/v3 v3.2.1/go.mod h1:klXJcjp+FffLTHlhIG69tezTDvdP065naDsHzKhYSqc=
github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
Expand Down Expand Up @@ -2688,6 +2688,8 @@ github.com/solo-io/anyvendor v0.1.0 h1:pzqilD2dxOJnosCe01gl7bU91EHrYjBnfB6W3lQmF
github.com/solo-io/anyvendor v0.1.0/go.mod h1:pm4oeT20nrF6moqurCc7U4fEC1oi1RzkqoD/Lp/z/4Y=
github.com/solo-io/cue v0.4.7 h1:X65mDmyBrS3ODvDvAgzIt9aTxbwBtdt+ayg4w9XKoaA=
github.com/solo-io/cue v0.4.7/go.mod h1:P1tN9y6nBPAMoEK5aJxI8kn0VUcjVcRc+8esieRzQ7M=
github.com/solo-io/envoy-gloo/go v0.0.0-20250102165327-33a74fcf9966 h1:MavIqMAvo9dxhcuN0/m7Ok830e7htfhR+JWRDqs3qj4=
github.com/solo-io/envoy-gloo/go v0.0.0-20250102165327-33a74fcf9966/go.mod h1:27GcajR+wxZ34COPvLp1+4hxGN66/GSx7SSjVn8LySY=
github.com/solo-io/go-list-licenses v0.1.4 h1:u4xh1OUORT4iSWuAp3Q4NsfHcDaeUV8QRDH8ACQqbxw=
github.com/solo-io/go-list-licenses v0.1.4/go.mod h1:x6LSp/NrYgVXwNum7ZOiaAYTpg6B3F6TrWYfcdHVroA=
github.com/solo-io/go-utils v0.20.2/go.mod h1:6e8K1spnMWwlnJRSNp/J84GEyJbrcK4Gm7i+ehzCi8c=
Expand Down Expand Up @@ -3971,8 +3973,8 @@ google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHh
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/AlecAivazis/survey.v1 v1.8.2/go.mod h1:iBNOmqKz/NUbZx3bA+4hAGLRC7fSK7tgtVDT4tB22XA=
gopkg.in/AlecAivazis/survey.v1 v1.8.7 h1:oBJqtgsyBLg9K5FK9twNUbcPnbCPoh+R9a+7nag3qJM=
gopkg.in/AlecAivazis/survey.v1 v1.8.7/go.mod h1:iBNOmqKz/NUbZx3bA+4hAGLRC7fSK7tgtVDT4tB22XA=
Expand Down
12 changes: 2 additions & 10 deletions install/helm/gloo/templates/1-gloo-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,6 @@ spec:
- path: "labels"
fieldRef:
fieldPath: metadata.labels
{{- if and .Values.gateway.enabled .Values.gateway.validation.enabled }}
- name: validation-certs
secret:
defaultMode: 420
secretName: {{ .Values.gateway.validation.secretName }}
{{- end }}
containers:
{{- if .Values.global.glooMtls.enabled }}
{{- $sdsImage := merge .Values.global.glooMtls.sds.image .Values.global.image }}
Expand Down Expand Up @@ -201,10 +195,6 @@ spec:
protocol: TCP
{{- end }}
volumeMounts:
{{- if and .Values.gateway.validation.enabled .Values.gateway.enabled }}
- mountPath: /etc/gateway/validation-certs
name: validation-certs
{{- end }}
- name: labels-volume
mountPath: /etc/gloo
readOnly: true
Expand Down Expand Up @@ -269,6 +259,8 @@ spec:
- name: HEADER_SECRET_REF_NS_MATCHES_US
value: "true"
{{- end}}
- name: GOLANG_PROTOBUF_REGISTRATION_CONFLICT
value: ignore
Comment on lines +262 to +263
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needed until we remove gloo, dupe protos from gloo and envoy-gloo/go

{{- if not .Values.global.glooMtls.enabled }}
readinessProbe:
tcpSocket:
Expand Down
Loading
Loading