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

Update kubeadm integration of kube-prometheus #1569

Merged

Conversation

inductor
Copy link
Contributor

Description

In short, this PR fixes #1194

It was reported that kubeadm configuration advisory on this repository is very outdated; it uses kubeadm.k8s.io/v1alpha1 while the upstream is using kubeadm.k8s.io/v1beta2 and it has no compatibility with the current state.

I addressed this by introducing the latest kubeadm config spec based on https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2 and each component's args, as well as removing cAdvisor section entirely as it is no longer required due to kubernetes/kubernetes#56523

Type of change

  • NONE (if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)

Changelog entry

  • Enhanced kubeadm integration doc to follow the upstream

Copy link
Member

@paulfantom paulfantom left a comment

Choose a reason for hiding this comment

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

lgtm on green

@paulfantom paulfantom merged commit afd216d into prometheus-operator:main Jan 3, 2022
@inductor inductor deleted the fix_kubeadm_integration branch January 3, 2022 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

matches for kind "MasterConfiguration" in version "kubeadm.k8s.io/v1alpha1"
2 participants