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.

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

Jump to bottom

feat: rancher rke2 version support #292

Merged
merged 2 commits into from
Jan 23, 2024
Merged

feat: rancher rke2 version support #292

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
993cde3
feat: rancher rke2 version support
chen-keinan Jan 23, 2024
0369033
feat: rancher rke2 version support
chen-keinan Jan 23, 2024
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
13 changes: 11 additions & 2 deletions pkg/k8s/k8s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

var (
UpstreamOrgName = map[string]string{
"k8s.io": "controller-manager,kubelet,apiserver,kubectl,kubernetes,kube-scheduler,kube-proxy",
"k8s.io": "controller-manager,kubelet,apiserver,kubectl,kubernetes,kube-scheduler,kube-proxy,cloud-provider",
"sigs.k8s.io": "secrets-store-csi-driver",
"go.etcd.io": "etcd/v3",
}
Expand All @@ -43,13 +43,15 @@ var (
"kube-proxy": "kube-proxy",
"api server": "apiserver",
"etcd": "etcd/v3",
"cloud-controller-manager": "cloud-provider",
"secrets-store-csi-driver": "secrets-store-csi-driver",
}
CoreComponentPropertyType = map[string]string{
"controller-manager": "controlPlane",
"apiserver": "controlPlane",
"kube-scheduler": "controlPlane",
"etcd/v3": "controlPlane",
"cloud-provider": "controlPlane",
"kube-proxy": "node",
}
)
Expand Down Expand Up @@ -519,7 +521,14 @@ func PodInfo(pod corev1.Pod, labelSelector string) (*bom.Component, error) {

func findComponentVersion(containers []bom.Container, name string) string {
for _, c := range containers {
if strings.Contains(c.ID, name) {
switch {
case strings.Contains(c.Version, "-rke2"):
index := strings.Index(c.Version, "-rke2")
return c.Version[:index]
case strings.Contains(c.Version, "-k3s"):
index := strings.Index(c.Version, "-k3s")
return c.Version[:index]
case strings.Contains(c.ID, name):
return c.Version
}
}
Expand Down
Loading