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 kube 1.14 #2415

Merged
merged 13 commits into from
Aug 14, 2019
Merged

Dev to kube 1.14 #2415

merged 13 commits into from
Aug 14, 2019

Conversation

aermakov-zalando
Copy link
Contributor

Merge ongoing changes & resolve conflicts.

arjunrn and others added 12 commits August 8, 2019 15:22
Signed-off-by: Arjun Naik <arjun.rn@gmail.com>
Revert "Platform Injected Environment Variables"
Signed-off-by: Konstantin <konstantin.manna@zalando.de>
Changed Ubuntu AMI to use ID from name and account ID
Signed-off-by: Arjun Naik <arjun.rn@gmail.com>
Fixed e2e tests to be compatible to other channels
Signed-off-by: Arjun Naik <arjun.rn@gmail.com>
bump kubernetes-log-watcher to version 0.31
Signed-off-by: Alexey Ermakov <alexey.ermakov@zalando.de>
…rable

Make node_exporter resources configurable
@aermakov-zalando aermakov-zalando added the frozen new updates to the dev branch won't be added to dev-to-alpha pull request label Aug 13, 2019
Signed-off-by: Alexey Ermakov <alexey.ermakov@zalando.de>
@aermakov-zalando
Copy link
Contributor Author

👍

1 similar comment
@aryszka
Copy link
Contributor

aryszka commented Aug 14, 2019

👍

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 merged/alpha merged/beta merged/stable
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants