diff --git a/internal/constants/constants.go b/internal/constants/constants.go index 40b194d2d..68d0fd6e2 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -106,6 +106,8 @@ const ( KubeadmPath = "/run/state/bin/kubeadm" // KubeletPath install path for kubelet. KubeletPath = "/run/state/bin/kubelet" + // KubeadmPatchDir directory for kubeadm patches . + KubeadmPatchDir = "/opt/kubernetes/patches" // // Filenames for Constellation's micro services. diff --git a/internal/versions/versions.go b/internal/versions/versions.go index e7339fff9..bf13a2b73 100644 --- a/internal/versions/versions.go +++ b/internal/versions/versions.go @@ -13,6 +13,7 @@ package versions import ( "fmt" + "path" "sort" "strings" @@ -154,6 +155,12 @@ func hasPatchVersion(version string) bool { return semver.MajorMinor(version) != version } +// patchFilePath returns the canonical path for kubeadm patch files for the given component. +// See https://pkg.go.dev/k8s.io/kubernetes@v1.27.7/cmd/kubeadm/app/apis/kubeadm/v1beta3#InitConfiguration. +func patchFilePath(component string) string { + return path.Join(constants.KubeadmPatchDir, fmt.Sprintf("%s+json.json", component)) +} + const ( // // Constellation images. @@ -229,15 +236,15 @@ var VersionConfigs = map[ValidK8sVersion]KubernetesVersion{ }, { Url: "data:application/json;base64,W3sib3AiOiJyZXBsYWNlIiwicGF0aCI6Ii9zcGVjL2NvbnRhaW5lcnMvMC9pbWFnZSIsInZhbHVlIjoicmVnaXN0cnkuazhzLmlvL2t1YmUtYXBpc2VydmVyOnYxLjI2LjExQHNoYTI1NjozOTUzNWQwZWZlODk1YWU5MWI1NTExZmRhZGI1MmVjOTMyOWYzODk4NzYxMTYzYThjMGRlMjAzZTIzZTMzODUzIn1d", - InstallPath: "/opt/kubernetes/patches/kube-apiserver+json.json", + InstallPath: patchFilePath("kube-apiserver"), }, { Url: "data:application/json;base64,W3sib3AiOiJyZXBsYWNlIiwicGF0aCI6Ii9zcGVjL2NvbnRhaW5lcnMvMC9pbWFnZSIsInZhbHVlIjoicmVnaXN0cnkuazhzLmlvL2t1YmUtY29udHJvbGxlci1tYW5hZ2VyOnYxLjI2LjExQHNoYTI1NjpjZGJlZmZmMTU0ZDRjY2I1ZDhlOGIxNmI4MDRjYmM2Y2M5MzI2YTc2MGI5ZjkxNDIyMjcwOGY5OTExOThkNTdjIn1d", - InstallPath: "/opt/kubernetes/patches/kube-controller-manager+json.json", + InstallPath: patchFilePath("kube-controller-manager"), }, { Url: "data:application/json;base64,W3sib3AiOiJyZXBsYWNlIiwicGF0aCI6Ii9zcGVjL2NvbnRhaW5lcnMvMC9pbWFnZSIsInZhbHVlIjoicmVnaXN0cnkuazhzLmlvL2t1YmUtc2NoZWR1bGVyOnYxLjI2LjExQHNoYTI1NjowNjg0ZTIzMTcyZDkyMDMxNDk3MTU4MGFiMTE1YTViNjc5YWMxZmFlMmNiOTRkODNlOTEwNWMwYjFlOTNhMWJjIn1d", - InstallPath: "/opt/kubernetes/patches/kube-scheduler+json.json", + InstallPath: patchFilePath("kube-scheduler"), }, }, // CloudControllerManagerImageAWS is the CCM image used on AWS. @@ -292,15 +299,15 @@ var VersionConfigs = map[ValidK8sVersion]KubernetesVersion{ }, { Url: "data:application/json;base64,W3sib3AiOiJyZXBsYWNlIiwicGF0aCI6Ii9zcGVjL2NvbnRhaW5lcnMvMC9pbWFnZSIsInZhbHVlIjoicmVnaXN0cnkuazhzLmlvL2t1YmUtYXBpc2VydmVyOnYxLjI3LjhAc2hhMjU2OjcwYjA1YjYxZDg0NmViYjY5YTkwN2ZlMjU1ZDM5YTZmNmMxMGQ1Y2E5NTA0ZjNkMmMwZGZmM2Y4NjQ2OTBkMzMifV0=", - InstallPath: "/opt/kubernetes/patches/kube-apiserver+json.json", + InstallPath: patchFilePath("kube-apiserver"), }, { Url: "data:application/json;base64,W3sib3AiOiJyZXBsYWNlIiwicGF0aCI6Ii9zcGVjL2NvbnRhaW5lcnMvMC9pbWFnZSIsInZhbHVlIjoicmVnaXN0cnkuazhzLmlvL2t1YmUtY29udHJvbGxlci1tYW5hZ2VyOnYxLjI3LjhAc2hhMjU2OmU1OWM2MzczZDI2YjY4NGE5MWNmYTU5NDJjMGY3MzcxYmRhOWI0YmI3Njg5ZTNmOTBmN2VlNGY5NjUxZWUyMmIifV0=", - InstallPath: "/opt/kubernetes/patches/kube-controller-manager+json.json", + InstallPath: patchFilePath("kube-controller-manager"), }, { Url: "data:application/json;base64,W3sib3AiOiJyZXBsYWNlIiwicGF0aCI6Ii9zcGVjL2NvbnRhaW5lcnMvMC9pbWFnZSIsInZhbHVlIjoicmVnaXN0cnkuazhzLmlvL2t1YmUtc2NoZWR1bGVyOnYxLjI3LjhAc2hhMjU2OjYyMzdlNzEwMGNjZGJiZDVlMGU3Y2ZmNzc5NjgzMWMxODVhMzk0NzE5OTgyM2YzOTEyODNjNzlkMDBhZmYwNzAifV0=", - InstallPath: "/opt/kubernetes/patches/kube-scheduler+json.json", + InstallPath: patchFilePath("kube-scheduler"), }, }, // CloudControllerManagerImageAWS is the CCM image used on AWS. @@ -355,15 +362,15 @@ var VersionConfigs = map[ValidK8sVersion]KubernetesVersion{ }, { Url: "data:application/json;base64,W3sib3AiOiJyZXBsYWNlIiwicGF0aCI6Ii9zcGVjL2NvbnRhaW5lcnMvMC9pbWFnZSIsInZhbHVlIjoicmVnaXN0cnkuazhzLmlvL2t1YmUtYXBpc2VydmVyOnYxLjI4LjRAc2hhMjU2OjViMjhhMzY0NDY3Y2Y3ZTEzNDM0M2JiM2VlMmM2ZDQwNjgyYjQ3M2E3NDNhNzIxNDJjN2JiZTI1NzY3ZDM2ZWIifV0=", - InstallPath: "/opt/kubernetes/patches/kube-apiserver+json.json", + InstallPath: patchFilePath("kube-apiserver"), }, { Url: "data:application/json;base64,W3sib3AiOiJyZXBsYWNlIiwicGF0aCI6Ii9zcGVjL2NvbnRhaW5lcnMvMC9pbWFnZSIsInZhbHVlIjoicmVnaXN0cnkuazhzLmlvL2t1YmUtY29udHJvbGxlci1tYW5hZ2VyOnYxLjI4LjRAc2hhMjU2OjY1NDg2YzhjMzM4Zjk2ZGMwMjJkZDFhMGFiZTg3NjNlMzhmMzUwOTViODRiMjA4Yzc4ZjQ0ZDllOTk0NDdkMWMifV0=", - InstallPath: "/opt/kubernetes/patches/kube-controller-manager+json.json", + InstallPath: patchFilePath("kube-controller-manager"), }, { Url: "data:application/json;base64,W3sib3AiOiJyZXBsYWNlIiwicGF0aCI6Ii9zcGVjL2NvbnRhaW5lcnMvMC9pbWFnZSIsInZhbHVlIjoicmVnaXN0cnkuazhzLmlvL2t1YmUtc2NoZWR1bGVyOnYxLjI4LjRAc2hhMjU2OjMzNWJiYTllODYxYjg4ZmE4YjdiYjkyNTBiY2Q2OWI3YTMzZjgzZGE0ZmVlOTNmOWZjMGVlZGM2ZjM0ZTI4YmEifV0=", - InstallPath: "/opt/kubernetes/patches/kube-scheduler+json.json", + InstallPath: patchFilePath("kube-scheduler"), }, }, // CloudControllerManagerImageAWS is the CCM image used on AWS.