Skip to content

Commit

Permalink
Merge pull request #246 from 3scale-ops/fix/discoveryservice-metrics-…
Browse files Browse the repository at this point in the history
…port

fix/discoveryservice-metrics-port
  • Loading branch information
3scale-robot authored Nov 8, 2024
2 parents 7cb19c9 + 501aa2c commit a7983d5
Show file tree
Hide file tree
Showing 15 changed files with 1,380 additions and 1,270 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 0.13.2-alpha.1
VERSION ?= 0.13.2-alpha.2

# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
Expand Down Expand Up @@ -272,7 +272,7 @@ bundle-push: ## Push the bundle image.
$(MAKE) docker-push IMG=$(BUNDLE_IMG)

.PHONY: opm
OPM = ./bin/opm
OPM = $(LOCALBIN)/opm
opm: ## Download opm locally if necessary.
ifeq (,$(wildcard $(OPM)))
ifeq (,$(shell which opm 2>/dev/null))
Expand Down Expand Up @@ -395,6 +395,7 @@ run-ds: manifests generate fmt vet go-generate tmp/certs
--server-certificate-path tmp/certs/server \
--ca-certificate-path tmp/certs/ca \
--client-certificate-path tmp/certs/client \
--metrics-bind-address :8383
--debug

run-envoy: ## runs an envoy process in a container that will try to connect to a local discovery service
Expand Down
355 changes: 191 additions & 164 deletions bundle/manifests/marin3r.3scale.net_envoyconfigrevisions.yaml

Large diffs are not rendered by default.

412 changes: 223 additions & 189 deletions bundle/manifests/marin3r.3scale.net_envoyconfigs.yaml

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions bundle/manifests/marin3r.clusterserviceversion.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a7983d5

Please sign in to comment.