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

Cleanup unneeded PKS logic & fix for #56 #70

Merged
merged 2 commits into from
Jul 6, 2022
Merged

Cleanup unneeded PKS logic & fix for #56 #70

merged 2 commits into from
Jul 6, 2022

Conversation

phenixblue
Copy link
Owner

@phenixblue phenixblue commented Jul 5, 2022

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespace from that line:

/kind bug
/kind cleanup
/kind deprecation
/kind design
/kind documentation

/kind feature

/kind release

What this PR does / why we need it:

This cleans up pre-existing logic for handling PKS (Pivotal Kubernetes Service, aka. TKGi) where the K8s Root CA Cert was stored in a non-standard location.

Previously the Root CA Cert was read from either a PKS specific ConfigMap or from the in-cluster kubeconfig.

This change moves to reading the K8s Root CA cert from the now standardized kube-root-ca.crt ConfigMap that conformant k8s clusters will have in every namespace by default.

This simplifies the code for the init container and moves to a unified logic.

Which issue(s) this PR fixes:

Fixes #56
Fixes #69

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

- Move to unified logic for detecting the k8s Root CA Cert for all conformant clusters

Additional documentation e.g., usage docs, etc.:


@phenixblue
Copy link
Owner Author

Looks like this needs to be k8s v1.20+ for the kube-root-ca.crt configMap to be standard.

@phenixblue phenixblue changed the title Cleanup unneeded PKS logic & fix for #56 [WIP] Cleanup unneeded PKS logic & fix for #56 Jul 5, 2022
@phenixblue phenixblue changed the title [WIP] Cleanup unneeded PKS logic & fix for #56 Cleanup unneeded PKS logic & fix for #56 Jul 5, 2022
Copy link
Collaborator

@ilrudie ilrudie left a comment

Choose a reason for hiding this comment

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

lgtm

@phenixblue phenixblue merged commit 585ad25 into master Jul 6, 2022
@phenixblue phenixblue deleted the k3s-fix branch July 6, 2022 05:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants