rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-19 01:44:28 +00:00
Code Issues Releases Wiki Activity

Add compatibility with k8s v1.22

Browse Source
This commit is contained in:
Sebastiaan van Steenis
2021-06-16 21:36:14 +02:00
parent b7ef427a9a
commit 546a61b24a
9 changed files with 63 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
addons/addons.go
View File

@@ -6,26 +6,45 @@ import (
"k8s.io/client-go/transport"
"github.com/blang/semver"
"github.com/rancher/rke/k8s"
"github.com/rancher/rke/templates"
"github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
func GetAddonsExecuteJob(addonName, nodeName, image string) (string, error) {
return getAddonJob(addonName, nodeName, image, false)
func GetAddonsExecuteJob(addonName, nodeName, image, k8sVersion string) (string, error) {
return getAddonJob(addonName, nodeName, image, k8sVersion, false)
}
func GetAddonsDeleteJob(addonName, nodeName, image string) (string, error) {
return getAddonJob(addonName, nodeName, image, true)
func GetAddonsDeleteJob(addonName, nodeName, image, k8sVersion string) (string, error) {
return getAddonJob(addonName, nodeName, image, k8sVersion, true)
}
func getAddonJob(addonName, nodeName, image string, isDelete bool) (string, error) {
func getAddonJob(addonName, nodeName, image, k8sVersion string, isDelete bool) (string, error) {
OSLabel := "beta.kubernetes.io/os"
toMatch, err := semver.Make(k8sVersion[1:])
if err != nil {
return "", fmt.Errorf("Cluster version [%s] can not be parsed as semver: %v", k8sVersion, err)
}
logrus.Debugf("Checking addon job OS label for cluster version [%s]", k8sVersion)
// kubernetes.io/os should be used 1.22.0 and up
OSLabelRange, err := semver.ParseRange(">=1.22.0-rancher0")
if err != nil {
return "", fmt.Errorf("Failed to parse semver range for checking OS label for addon job: %v", err)
}
if OSLabelRange(toMatch) {
logrus.Debugf("Cluster version [%s] needs to use new OS label", k8sVersion)
OSLabel = "kubernetes.io/os"
}
jobConfig := map[string]string{
"AddonName": addonName,
"NodeName": nodeName,
"Image": image,
"DeleteJob": strconv.FormatBool(isDelete),
"OSLabel": OSLabel,
}
template, err := templates.CompileTemplateFromMap(templates.AddonJobTemplate, jobConfig)
logrus.Tracef("template for [%s] is: [%s]", addonName, template)

3
addons/addons_test.go
View File

@@ -14,10 +14,11 @@ const (
FakeAddonName = "example-addon"
FakeNodeName = "node1"
FakeAddonImage = "example/example:latest"
FakeK8sVersion = "v1.21.1-rancher1-1"
)
func TestJobManifest(t *testing.T) {
jobYaml, err := GetAddonsExecuteJob(FakeAddonName, FakeNodeName, FakeAddonImage)
jobYaml, err := GetAddonsExecuteJob(FakeAddonName, FakeNodeName, FakeAddonImage, FakeK8sVersion)
if err != nil {
t.Fatalf("Failed to get addon execute job: %v", err)
}