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.

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

delete ingress, knative, accesslogger #10469

Merged
merged 5 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
88 changes: 1 addition & 87 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -419,74 +419,6 @@ 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) $(QUAY_EXPIRATION_LABEL)

#----------------------------------------------------------------------------------
# Ingress
#----------------------------------------------------------------------------------

INGRESS_DIR=projects/ingress
INGRESS_SOURCES=$(call get_sources,$(INGRESS_DIR))
INGRESS_OUTPUT_DIR=$(OUTPUT_DIR)/$(INGRESS_DIR)

$(INGRESS_OUTPUT_DIR)/ingress-linux-$(GOARCH): $(INGRESS_SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags=$(LDFLAGS) -gcflags=$(GCFLAGS) -o $@ $(INGRESS_DIR)/cmd/main.go

.PHONY: ingress
ingress: $(INGRESS_OUTPUT_DIR)/ingress-linux-$(GOARCH)

$(INGRESS_OUTPUT_DIR)/Dockerfile.ingress: $(INGRESS_DIR)/cmd/Dockerfile
cp $< $@

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

$(INGRESS_OUTPUT_DIR)/Dockerfile.ingress.distroless: $(INGRESS_DIR)/cmd/Dockerfile.distroless
cp $< $@

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

#----------------------------------------------------------------------------------
# Access Logger
#----------------------------------------------------------------------------------

ACCESS_LOG_DIR=projects/accesslogger
ACCESS_LOG_SOURCES=$(call get_sources,$(ACCESS_LOG_DIR))
ACCESS_LOG_OUTPUT_DIR=$(OUTPUT_DIR)/$(ACCESS_LOG_DIR)

$(ACCESS_LOG_OUTPUT_DIR)/access-logger-linux-$(GOARCH): $(ACCESS_LOG_SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags=$(LDFLAGS) -gcflags=$(GCFLAGS) -o $@ $(ACCESS_LOG_DIR)/cmd/main.go

.PHONY: access-logger
access-logger: $(ACCESS_LOG_OUTPUT_DIR)/access-logger-linux-$(GOARCH)

$(ACCESS_LOG_OUTPUT_DIR)/Dockerfile.access-logger: $(ACCESS_LOG_DIR)/cmd/Dockerfile
cp $< $@

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

$(ACCESS_LOG_OUTPUT_DIR)/Dockerfile.access-logger.distroless: $(ACCESS_LOG_DIR)/cmd/Dockerfile.distroless
cp $< $@

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

#----------------------------------------------------------------------------------
# Discovery
#----------------------------------------------------------------------------------
Expand Down Expand Up @@ -881,8 +813,6 @@ docker-standard: discovery-docker
docker-standard: gloo-envoy-wrapper-docker
docker-standard: sds-docker
docker-standard: certgen-docker
docker-standard: ingress-docker
docker-standard: access-logger-docker
docker-standard: kubectl-docker

.PHONY: docker-distroless
Expand All @@ -892,8 +822,6 @@ docker-distroless: discovery-distroless-docker
docker-distroless: gloo-envoy-wrapper-distroless-docker
docker-distroless: sds-distroless-docker
docker-distroless: certgen-distroless-docker
docker-distroless: ingress-distroless-docker
docker-distroless: access-logger-distroless-docker
docker-distroless: kubectl-distroless-docker

IMAGE_VARIANT ?= all
Expand All @@ -917,7 +845,6 @@ docker-standard-push: docker-push-sds
ifeq ($(MULTIARCH), )
docker-standard-push: docker-push-certgen
endif
docker-standard-push: docker-push-ingress
docker-standard-push: docker-push-access-logger
ifeq ($(MULTIARCH), )
docker-standard-push: docker-push-kubectl
Expand All @@ -931,7 +858,6 @@ docker-distroless-push: docker-push-sds-distroless
ifeq ($(MULTIARCH), )
docker-distroless-push: docker-push-certgen-distroless
endif
docker-distroless-push: docker-push-ingress-distroless
docker-distroless-push: docker-push-access-logger-distroless
ifeq ($(MULTIARCH), )
docker-distroless-push: docker-push-kubectl-distroless
Expand All @@ -954,8 +880,6 @@ docker-standard-retag: docker-retag-discovery
docker-standard-retag: docker-retag-gloo-envoy-wrapper
docker-standard-retag: docker-retag-sds
docker-standard-retag: docker-retag-certgen
docker-standard-retag: docker-retag-ingress
docker-standard-retag: docker-retag-access-logger
docker-standard-retag: docker-retag-kubectl

.PHONY: docker-distroless-retag
Expand All @@ -964,8 +888,6 @@ docker-distroless-retag: docker-retag-discovery-distroless
docker-distroless-retag: docker-retag-gloo-envoy-wrapper-distroless
docker-distroless-retag: docker-retag-sds-distroless
docker-distroless-retag: docker-retag-certgen-distroless
docker-distroless-retag: docker-retag-ingress-distroless
docker-distroless-retag: docker-retag-access-logger-distroless
docker-distroless-retag: docker-retag-kubectl-distroless

# Re-tag docker images previously pushed to the ORIGINAL_IMAGE_REGISTRY,
Expand Down Expand Up @@ -1039,8 +961,6 @@ 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-ingress
kind-build-and-load-standard: kind-build-and-load-access-logger
kind-build-and-load-standard: kind-build-and-load-kubectl

.PHONY: kind-build-and-load-distroless
Expand All @@ -1049,8 +969,6 @@ 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-ingress-distroless
kind-build-and-load-distroless: kind-build-and-load-access-logger-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
Expand All @@ -1072,8 +990,6 @@ 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-ingress
kind-load-standard: kind-load-access-logger
kind-load-standard: kind-load-kubectl

.PHONY: kind-build-and-load-distroless
Expand All @@ -1082,8 +998,6 @@ 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-ingress-distroless
kind-load-distroless: kind-load-access-logger-distroless
kind-load-distroless: kind-load-kubectl-distroless

.PHONY: kind-load ## Use to build all images and load them into kind
Expand Down Expand Up @@ -1181,7 +1095,7 @@ scan-version: ## Scan all Gloo images with the tag matching {VERSION} env variab
PATH=$(DEPSGOBIN):$$PATH GO111MODULE=on go run github.com/solo-io/go-utils/securityscanutils/cli scan-version -v \
-r $(IMAGE_REGISTRY)\
-t $(VERSION)\
--images gloo,gloo-envoy-wrapper,discovery,ingress,sds,certgen,access-logger,kubectl
--images gloo,gloo-envoy-wrapper,discovery,sds,certgen,kubectl

#----------------------------------------------------------------------------------
# Third Party License Management
Expand Down
1 change: 0 additions & 1 deletion docs/content/static/content/osa_provided.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ Name|Version|License
[k8s.io/kube-openapi](https://k8s.io/kube-openapi)|v0.0.0-20240423202451-8948a665c108|Apache License 2.0
[k8s.io/kubectl](https://k8s.io/kubectl)|v0.31.1|Apache License 2.0
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20240711033017-18e509b52bc8|Apache License 2.0
[knative.dev/networking](https://knative.dev/networking)|v0.0.0-20211210083629-bace06e98aee|Apache License 2.0
[knative.dev/pkg](https://knative.dev/pkg)|v0.0.0-20211206113427-18589ac7627e|Apache License 2.0
[sigs.k8s.io/controller-runtime](https://sigs.k8s.io/controller-runtime)|v0.19.1|Apache License 2.0
[sigs.k8s.io/controller-tools](https://sigs.k8s.io/controller-tools)|v0.16.5|Apache License 2.0
Expand Down
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ require (
k8s.io/component-base v0.31.2
k8s.io/kubectl v0.31.2
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
knative.dev/networking v0.0.0-20211210083629-bace06e98aee
knative.dev/pkg v0.0.0-20211206113427-18589ac7627e
sigs.k8s.io/controller-runtime v0.19.1
sigs.k8s.io/gateway-api v1.2.0
Expand Down
5 changes: 0 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2641,7 +2641,6 @@ github.com/rollbar/rollbar-go v1.0.2/go.mod h1:AcFs5f0I+c71bpHlXNNDbOWJiKwjFDtIS
github.com/rotisserie/eris v0.1.1/go.mod h1:2ik3CyJrzlOjGyDGrKfqZivSfmkhCS3ktE+T1mNzzLk=
github.com/rotisserie/eris v0.5.4 h1:Il6IvLdAapsMhvuOahHWiBnl1G++Q0/L5UIkI5mARSk=
github.com/rotisserie/eris v0.5.4/go.mod h1:Z/kgYTJiJtocxCbFfvRmO+QejApzG6zpyky9G1A4g9s=
github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417/go.mod h1:qe5TWALJ8/a1Lqznoc5BDHpYX/8HU60Hm2AwRmqzxqA=
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
github.com/rs/zerolog v1.9.1/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
github.com/rs/zerolog v1.18.0/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I=
Expand Down Expand Up @@ -3425,7 +3424,6 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
Expand Down Expand Up @@ -4084,9 +4082,6 @@ k8s.io/metrics v0.31.1/go.mod h1:JuH1S9tJiH9q1VCY0yzSCawi7kzNLsDzlWDJN4xR+iA=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/hack v0.0.0-20211122162614-813559cefdda/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20211203062838-e11ac125e707/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/networking v0.0.0-20211210083629-bace06e98aee h1:tMn0wtCgn2X+i+JiRk0mYHGrzI/7dZOkCPogz3u3qTU=
knative.dev/networking v0.0.0-20211210083629-bace06e98aee/go.mod h1:5ARXhzfos0DMVbPwQ6bQC+vz/9t7smRYBwVrmVaSHrU=
knative.dev/pkg v0.0.0-20211206113427-18589ac7627e h1:8hK7g4jz56ZtF3iQLsvrvR/hHnP5ZWLSxLnyYMbfxwY=
knative.dev/pkg v0.0.0-20211206113427-18589ac7627e/go.mod h1:E6B4RTjZyxe55a0kxOlnEHEl71zuG7gghnqYvNBKwBw=
lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
Expand Down
5 changes: 0 additions & 5 deletions install/helm/gloo/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,6 @@ func generateValuesConfig(version, repositoryPrefix, globalPullPolicy string) (*
cfg.Gateway.RolloutJob.Image.Tag = &version
cfg.Gateway.CleanupJob.Image.Tag = &version

cfg.AccessLogger.Image.Tag = &version

cfg.Ingress.Deployment.Image.Tag = &version
cfg.IngressProxy.Deployment.Image.Tag = &version
cfg.Settings.Integrations.Knative.Proxy.Image.Tag = &version
cfg.Global.GlooMtls.Sds.Image.Tag = &version
cfg.Global.GlooMtls.EnvoySidecar.Image.Tag = &version

Expand Down
Loading