Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-02-02 02:24:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

AB#2077: add v1.24.3 support (#298)

Browse Source 
This is a squashed commit. 
* Necessary changes for 1.24 support. Trigger join-service build.
* Update joinservice version. Image was created 
by manually triggered workflow, based on now squashed commit.

microservice-demo can be deployed successfully.
No errors during cluster setup.
This commit is contained in:
Otto Bittner 2022-07-26 17:08:57 +02:00 committed by GitHub
parent ff5100f332
commit 83d2c7b6a3
6 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -20,6 +20,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Added
- Kubernetes version is configured through an entry in `constellation-config.yaml`.
- Kubernetes version 1.24 is now supported.
### Changed
- Nodes add themselves to the cluster after `constellation init` is done

5
bootstrapper/internal/kubernetes/k8sapi/kubeadm_config.go
View File

@ -38,10 +38,9 @@ func (c *CoreOSConfiguration) InitConfiguration(externalCloudProvider bool, k8sV
Kind: "InitConfiguration",
},
NodeRegistration: kubeadm.NodeRegistrationOptions{
CRISocket: "/run/containerd/containerd.sock",
CRISocket: "unix:///run/containerd/containerd.sock",
KubeletExtraArgs: map[string]string{
"cloud-provider": cloudProvider,
"network-plugin": "cni",
},
},
// AdvertiseAddress will be overwritten later
@ -162,7 +161,7 @@ func (c *CoreOSConfiguration) JoinConfiguration(externalCloudProvider bool) Kube
Kind: "JoinConfiguration",
},
NodeRegistration: kubeadm.NodeRegistrationOptions{
CRISocket: "/run/containerd/containerd.sock",
CRISocket: "unix:///run/containerd/containerd.sock",
KubeletExtraArgs: map[string]string{
"cloud-provider": cloudProvider,
},

2
bootstrapper/internal/kubernetes/k8sapi/resources/cloud_controller_manager.go
View File

@ -158,7 +158,7 @@ func NewDefaultCloudControllerManagerDeployment(cloudProvider, image, path, podC
},
},
NodeSelector: map[string]string{
"node-role.kubernetes.io/master": "",
"node-role.kubernetes.io/control-plane": "",
},
},
},

2
bootstrapper/internal/kubernetes/k8sapi/resources/joinservice.go
View File

@ -126,7 +126,7 @@ func NewJoinServiceDaemonset(csp, measurementsJSON string, measurementSalt []byt
},
// Only run on control plane nodes
NodeSelector: map[string]string{
"node-role.kubernetes.io/master": "",
"node-role.kubernetes.io/control-plane": "",
},
ImagePullSecrets: []k8s.LocalObjectReference{
{

2
bootstrapper/internal/kubernetes/k8sapi/resources/kms.go
View File

@ -153,7 +153,7 @@ func NewKMSDeployment(csp string, masterSecret []byte) *kmsDeployment {
},
// Only run on control plane nodes
NodeSelector: map[string]string{
"node-role.kubernetes.io/master": "",
"node-role.kubernetes.io/control-plane": "",
},
ImagePullSecrets: []k8s.LocalObjectReference{
{

27
internal/versions/versions.go
View File

@ -18,6 +18,8 @@ func IsSupportedK8sVersion(version string) bool {
switch version {
case string(V1_23):
return true
case string(V1_24):
return true
default:
return false
}
@ -26,7 +28,7 @@ func IsSupportedK8sVersion(version string) bool {
const (
// Constellation images.
// These images are built in a way that they support all versions currently listed in VersionConfigs.
JoinImage = "ghcr.io/edgelesssys/constellation/join-service:v1.3.2-0.20220719121753-1a6deb94"
JoinImage = "ghcr.io/edgelesssys/constellation/join-service:v1.3.2-0.20220725100031-c1d912ca"
AccessManagerImage = "ghcr.io/edgelesssys/constellation/access-manager:v1.3.2-0.20220714151638-d295be31"
KmsImage = "ghcr.io/edgelesssys/constellation/kmsserver:v1.3.2-0.20220722135959-3e250b12"
VerificationImage = "ghcr.io/edgelesssys/constellation/verification-service:v1.3.2-0.20220714151638-d295be31"
@ -34,12 +36,12 @@ const (
// currently supported versions.
V1_23 ValidK8sVersion = "1.23"
Latest ValidK8sVersion = V1_23
V1_24 ValidK8sVersion = "1.24"
Latest ValidK8sVersion = V1_24
)
// versionConfigs holds download URLs for all required kubernetes components for every supported version.
var VersionConfigs map[ValidK8sVersion]KubernetesVersion = map[ValidK8sVersion]KubernetesVersion{
// TODO:
V1_23: {
PatchVersion: "1.23.6",
CNIPluginsURL: "https://github.com/containernetworking/plugins/releases/download/v1.1.1/cni-plugins-linux-amd64-v1.1.1.tgz",
@ -59,6 +61,25 @@ var VersionConfigs map[ValidK8sVersion]KubernetesVersion = map[ValidK8sVersion]K
// External service image. Depends on k8s version.
ClusterAutoscalerImage: "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.23.0",
},
V1_24: {
PatchVersion: "1.24.3",
CNIPluginsURL: "https://github.com/containernetworking/plugins/releases/download/v1.1.1/cni-plugins-linux-amd64-v1.1.1.tgz",
CrictlURL: "https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.24.1/crictl-v1.24.1-linux-amd64.tar.gz",
KubeletServiceURL: "https://raw.githubusercontent.com/kubernetes/release/v0.13.0/cmd/kubepkg/templates/latest/deb/kubelet/lib/systemd/system/kubelet.service",
KubeadmConfURL: "https://raw.githubusercontent.com/kubernetes/release/v0.13.0/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf",
KubeletURL: "https://storage.googleapis.com/kubernetes-release/release/v1.24.3/bin/linux/amd64/kubelet",
KubeadmURL: "https://storage.googleapis.com/kubernetes-release/release/v1.24.3/bin/linux/amd64/kubeadm",
KubectlURL: "https://storage.googleapis.com/kubernetes-release/release/v1.24.3/bin/linux/amd64/kubectl",
// CloudControllerManagerImageGCP is the CCM image used on GCP.
// TODO: use newer "cloud-provider-gcp" from https://github.com/kubernetes/cloud-provider-gcp when newer releases are available.
CloudControllerManagerImageGCP: "ghcr.io/edgelesssys/cloud-provider-gcp:sha-2f6a5b07fc2d37f24f8ff725132f87584d627d8f",
// CloudControllerManagerImageAzure is the CCM image used on Azure.
CloudControllerManagerImageAzure: "mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.24.3",
// CloudNodeManagerImageAzure is the cloud-node-manager image used on Azure.
CloudNodeManagerImageAzure: "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.24.3",
// External service image. Depends on k8s version.
ClusterAutoscalerImage: "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.23.0",
},
}
// KubernetesVersion bundles download URLs to all version-releated binaries necessary for installing/deploying a particular Kubernetes version.