Skip to content

Report k8s distro and storage providers #590

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.

Sign up for GitHub

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

Merged
tamalsaha merged 1 commit into from
Feb 16, 2026
+82 −5
Merged

Report k8s distro and storage providers #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions apis/identity/v1alpha1/openapi_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions apis/identity/v1alpha1/siteinfo_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,13 @@ type KubernetesInfo struct {
// Deprecated
ClusterName string `json:"clusterName,omitempty"`
// Deprecated
ClusterUID string `json:"clusterUID,omitempty"`
Cluster *kmapi.ClusterMetadata `json:"cluster,omitempty"`
Version *version.Info `json:"version,omitempty"`
ControlPlane *ControlPlaneInfo `json:"controlPlane,omitempty"`
NodeStats NodeInfo `json:"nodeStats"`
ClusterUID string `json:"clusterUID,omitempty"`
Cluster *kmapi.ClusterMetadata `json:"cluster,omitempty"`
Version *version.Info `json:"version,omitempty"`
ControlPlane *ControlPlaneInfo `json:"controlPlane,omitempty"`
NodeStats NodeInfo `json:"nodeStats"`
Distributions []string `json:"distributions,omitempty"`
StorageProvisioners []string `json:"storageProvisioners,omitempty"`
}

// https://github.com/kmodules/client-go/blob/kubernetes-1.16.3/tools/analytics/analytics.go#L66
Expand Down
10 changes: 10 additions & 0 deletions apis/identity/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions crds/identity.k8s.appscode.com_siteinfos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ spec:
- notAfter
- notBefore
type: object
distributions:
items:
type: string
type: array
nodeStats:
properties:
allocatable:
Expand Down Expand Up @@ -202,6 +206,10 @@ spec:
type: integer
type: object
type: object
storageProvisioners:
items:
type: string
type: array
version:
description: |-
Info contains versioning information.
Expand Down
29 changes: 29 additions & 0 deletions pkg/identity/siteinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"net"
"strings"

kmapi "kmodules.xyz/client-go/api/v1"
clustermeta "kmodules.xyz/client-go/cluster"
"kmodules.xyz/client-go/tools/clusterid"
identityapi "kmodules.xyz/resource-metadata/apis/identity/v1alpha1"
Expand All @@ -31,8 +32,10 @@ import (
core "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/discovery/cached/memory"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/restmapper"
)

func GetSiteInfo(cfg *rest.Config, kc kubernetes.Interface, nodes []*core.Node, licenseID string) (*identityapi.SiteInfo, error) {
Expand Down Expand Up @@ -128,6 +131,19 @@ func GetSiteInfo(cfg *rest.Config, kc kubernetes.Interface, nodes []*core.Node,
si.Kubernetes.ControlPlane.URIs = uris
}

si.Kubernetes.Distributions = DetectDistributions(kc)

scList, err := kc.StorageV1().StorageClasses().List(context.Background(), metav1.ListOptions{})
scProvisioners := sets.NewString()
if err == nil {
for _, sc := range scList.Items {
scProvisioners.Insert(sc.Provisioner)
}
}
if scProvisioners.Len() > 0 {
si.Kubernetes.StorageProvisioners = scProvisioners.List()
}

if len(nodes) == 0 {
result, err := kc.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
if err != nil {
Expand Down Expand Up @@ -188,3 +204,16 @@ func skipIP(ip net.IP) bool {
ip.IsLinkLocalMulticast() ||
ip.IsLinkLocalUnicast()
}

func DetectDistributions(kc kubernetes.Interface) []string {
mapper := restmapper.NewDeferredDiscoveryRESTMapper(memory.NewMemCacheClient(kc.Discovery()))

distros := sets.NewString()
if clustermeta.IsRancherManaged(mapper) {
distros.Insert(kmapi.ClusterManagerRancher.Name())
}
if clustermeta.IsOpenShiftManaged(mapper) {
distros.Insert(kmapi.ClusterManagerOpenShift.Name())
}
return distros.List()
}
Loading