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

dev to stable #4709

Merged
merged 22 commits into from
Oct 11, 2021
Merged

dev to stable #4709

merged 22 commits into from
Oct 11, 2021

Conversation

zalando-teapot-robot
Copy link
Collaborator

@zalando-teapot-robot zalando-teapot-robot commented Oct 7, 2021

  • Update to Prometheus 2.30.2 (#⁠4699)
  • added option to route traces traffic to local availability zone (#⁠4655)
  • Fix the DS configuration (#⁠4694)
  • Update tokeninfo image to the latest version (#⁠4695)
  • added tracing_ prefix to coredns rewrite parameters (#⁠4703)
  • Skipper/routesrv [1/2] (#⁠4702)
  • fix component selector needed if we have routesrv deployed (#⁠4710)

Konstantin Zhukov and others added 19 commits September 23, 2021 15:16
Signed-off-by: Alexey Ermakov <alexey.ermakov@zalando.de>
Signed-off-by: Alexey Ermakov <alexey.ermakov@zalando.de>
https://github.com/prometheus/prometheus/releases/tag/v2.30.2

Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
…ilability-zone

added option to route traces traffic to local availability zone
Update tokeninfo image to the latest version
Signed-off-by: Sandor Szücs <sandor.szuecs@zalando.de>
Signed-off-by: Sandor Szücs <sandor.szuecs@zalando.de>
Signed-off-by: Sandor Szücs <sandor.szuecs@zalando.de>
Signed-off-by: Sandor Szücs <sandor.szuecs@zalando.de>
added tracing_ prefix to coredns rewrite parameters
Signed-off-by: Sandor Szücs <sandor.szuecs@zalando.de>
@szuecs
Copy link
Member

szuecs commented Oct 8, 2021

#4709 needs to be merged before merge here ( the mentioned PR was merged)

szuecs and others added 2 commits October 8, 2021 16:18
@szuecs szuecs added frozen new updates to the dev branch won't be added to dev-to-alpha pull request and removed do-not-merge labels Oct 8, 2021
@marcinzaremba
Copy link
Contributor

@szuecs What does label frozen mean here? As far as I understand from our side there are no more blockers to go ahead with the rollout of the first part (#4702) which is included in this batch of commits. Or is there something else?

@gargravarr
Copy link
Contributor

👍

@aermakov-zalando
Copy link
Contributor

👍

@gargravarr gargravarr merged commit ca911ca into stable Oct 11, 2021
@gargravarr gargravarr deleted the dev-to-stable branch October 11, 2021 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
frozen new updates to the dev branch won't be added to dev-to-alpha pull request internal/merges-tagged updates/defaults updates/master-nodes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants