K8SPG-1083 improve platform detection to reduce unknown telemetry values#1655
Open
hors wants to merge 7 commits into
Open
K8SPG-1083 improve platform detection to reduce unknown telemetry values#1655hors wants to merge 7 commits into
hors wants to merge 7 commits into
Conversation
Replace CRD-based detection (which relied on optional addons being installed) with discovery API group checks and API server URL patterns. Add detection for AKS, DOKS, OKE, ACK, NKP, Platform9, Tanzu, and Rancher alongside the existing GKE, EKS, and OpenShift detections.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the operator’s platform/managed-Kubernetes detection used for telemetry, moving away from CRD-based heuristics toward API discovery group checks and API server host pattern checks to reduce “unknown” platform values.
Changes:
- Added a
hasAPIGrouphelper that detects platforms by checking for the presence of API groups via the discovery API. - Updated existing platform detection (notably GKE/EKS) to use API groups and API server host patterns rather than optional addon CRDs.
- Added detection and telemetry labels for AKS, DOKS, OKE, ACK, NKP, Platform9, Tanzu, and Rancher.
Comment on lines
+361
to
+370
| // hasAPIGroup returns true if the cluster exposes the given API group name. | ||
| // Uses the discovery API which is available to all authenticated users with no extra RBAC. | ||
| func hasAPIGroup(ctx context.Context, cfg *rest.Config, groupName string) bool { | ||
| client, err := discovery.NewDiscoveryClientForConfig(cfg) | ||
| assertNoError(err) | ||
|
|
||
| if err != nil { | ||
| return false | ||
| } | ||
| groups, err := client.ServerGroups() | ||
| if err != nil { | ||
| assertNoError(err) | ||
| return false |
Comment on lines
+389
to
+396
| func isEKS(ctx context.Context, cfg *rest.Config) bool { | ||
| log := logging.FromContext(ctx) | ||
| // EKS API server hostnames always end with .eks.amazonaws.com. | ||
| if strings.Contains(cfg.Host, ".eks.amazonaws.com") { | ||
| logging.FromContext(ctx).Info("detected EKS environment") | ||
| return true | ||
| } | ||
| return false | ||
| } |
Comment on lines
+470
to
+493
| case isTanzu(ctx, cfg): | ||
| return "tanzu" | ||
| case isRancher(ctx, cfg): | ||
| return "rancher" |
hors
force-pushed
the
detect-more-platforms
branch
from
44406c3 to
6cbdb1e
Compare
Comment on lines
365
to
+369
| client, err := discovery.NewDiscoveryClientForConfig(cfg) | ||
| assertNoError(err) | ||
|
|
||
| if err != nil { | ||
| log.V(1).Info("platform detection: could not create discovery client", "error", err.Error()) | ||
| return false | ||
| } |
gkech
reviewed
Jun 29, 2026
Comment on lines
+428
to
+435
| func isACK(ctx context.Context, cfg *rest.Config) bool { | ||
| // ACK API server hostnames always end with .aliyuncs.com. | ||
| if strings.Contains(cfg.Host, ".aliyuncs.com") { | ||
| logging.FromContext(ctx).Info("detected ACK environment") | ||
| return true | ||
| } | ||
| return false | ||
| } |
Contributor
There was a problem hiding this comment.
I'm hesitating a little to add these without ensuring that the API group method works for them
Collaborator
Author
There was a problem hiding this comment.
I have tested ACK and updated the code
gkech
reviewed
Jun 29, 2026
Comment on lines
+481
to
+496
| case isAKS(ctx, cfg): | ||
| return "aks" | ||
| case isDOKS(ctx, cfg): | ||
| return "doks" | ||
| case isOKE(ctx, cfg): | ||
| return "oke" | ||
| case isACK(ctx, cfg): | ||
| return "ack" | ||
| case isNKP(ctx, cfg): | ||
| return "nkp" | ||
| case isPlatform9(ctx, cfg): | ||
| return "platform9" | ||
| case isTanzu(ctx, cfg): | ||
| return "tanzu" | ||
| case isRancher(ctx, cfg): | ||
| return "rancher" |
Contributor
There was a problem hiding this comment.
Maybe we can also avoid this repetition here cause every time we will have to add a function and a call here. We could have a generic logic for calling the hasAPIGroup(ctx, ...) and then iterate on the platforms that can be defined like this:
var platformProbes = []platformProbe{
{name: "gke", label: "GKE", apiGroups: []string{"networking.gke.io"}},
{name: "eks", label: "EKS", apiGroups: []string{"crd.k8s.amazonaws.com"}},
{name: "aks", label: "AKS", hosts: []string{".azmk8s.io"}},....
6cbdb1e to
ef39113
Compare
hors
changed the title
Collaborator
commit: 610fbfe |
hors
requested review from
egegunes,
mayankshah1607,
nmarukovich,
oksana-grishchenko and
pooknull
as code owners
Comment on lines
373
to
377
| groups, err := client.ServerGroups() | ||
| if err != nil { | ||
| assertNoError(err) | ||
| log.V(1).Info("platform detection: could not list API groups", "error", err.Error()) | ||
| return false | ||
| } |
| if err != nil { | ||
| assertNoError(err) | ||
| if hasAPIGroup(ctx, cfg, "security.openshift.io") { | ||
| logging.FromContext(ctx).Info("detected Openshift environment") |
Comment on lines
+456
to
+461
| for _, probe := range platformProbes { | ||
| if probe.detect(ctx, cfg) { | ||
| logging.FromContext(ctx).Info("detected " + probe.label + " environment") | ||
| return probe.name | ||
| } | ||
| } |
Comment on lines
+433
to
+435
| host := strings.TrimPrefix(cfg.Host, "https://") | ||
| host = strings.TrimPrefix(host, "http://") | ||
| netConn, err := (&tls.Dialer{Config: tlsCfg}).DialContext(ctx, "tcp", host) |
egegunes
reviewed
Jul 10, 2026
| func detectPlatform(ctx context.Context, cfg *rest.Config) string { | ||
| switch { | ||
| case isOpenshift(ctx, cfg): | ||
| func detectPlatform(ctx context.Context, cfg *rest.Config, openShift bool) string { |
Contributor
There was a problem hiding this comment.
why don't we detect openshift in this function as well and use the return value in IsOpenshift?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replace CRD-based detection (which relied on optional addons being installed) with discovery API group checks and API server URL patterns.
Add detection for AKS, DOKS, OKE, ACK, NKP, Platform9, Tanzu, and Rancher alongside the existing GKE, EKS, and OpenShift detections.
CHANGE DESCRIPTION
Problem:
Short explanation of the problem.
Cause:
Short explanation of the root cause of the issue if applicable.
Solution:
Short explanation of the solution we are providing with this PR.
CHECKLIST
Jira
Needs Doc) and QA (Needs QA)?Tests
Config/Logging/Testability